[patch] Updated patch to the dev-lang/php 5.2.4 ebuild from the 14th September

php-5.2.4_p20070914-r2.ebuild.patch (text/plain), 2.10 KB, created by Dirk Tilger on 2007-11-03 21:01:38 UTC

--- ../portage.main.converted/dev-lang/php/php-5.2.4_p20070914-r2.ebuild	2007-11-02 17:29:40 +0400
+++ dev-lang/php/php-5.2.4_p20070914-r2.ebuild	2007-10-09 12:29:38 +0400
@@ -228,7 +212,7 @@
 	fi
 
 	if [[ ${build_apache2} = 1 ]] ; then
-		my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
+		my_conf="${my_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs2"
 
 		# Threaded Apache2 support
 		if use threads ; then
@@ -340,7 +324,7 @@
 				cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
 				;;
 			apache2)
-				my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
+				my_conf="${my_conf} --disable-cli --with-apxs2=${EPREFIX}/usr/sbin/apxs2"
 				php5_2-sapi_src_compile
 				;;
 		esac
@@ -353,7 +337,7 @@
 src_install() {
 	php_determine_sapis
 
-	destdir=/usr/$(get_libdir)/php5
+	destdir=${EPREFIX}/usr/$(get_libdir)/php5
 
 	# Let the eclass do the common work
 	php5_2-sapi_src_install
@@ -444,8 +428,8 @@
 			php-select php php5
 		elif [[ ${exitStatus} == 4 ]] ; then
 			ewarn
-			ewarn "/usr/bin/php links to a different version of PHP."
-			ewarn "To make /usr/bin/php point to PHP v5, use php-select:"
+			ewarn "${EPREFIX}/usr/bin/php links to a different version of PHP."
+			ewarn "To make ${EPREFIX}/usr/bin/php point to PHP v5, use php-select:"
 			ewarn
 			ewarn "    php-select php php5"
 			ewarn
@@ -460,8 +444,8 @@
 			php-select php-cgi php5
 		elif [[ ${exitStatus} == 4 ]] ; then
 			ewarn
-			ewarn "/usr/bin/php-cgi links to a different version of PHP."
-			ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:"
+			ewarn "${EPREFIX}/usr/bin/php-cgi links to a different version of PHP."
+			ewarn "To make ${EPREFIX}/usr/bin/php-cgi point to PHP v5, use php-select:"
 			ewarn
 			ewarn "    php-select php-cgi php5"
 			ewarn
@@ -475,7 +459,7 @@
 		php-select php-devel php5
 	elif [[ $exitStatus == 4 ]] ; then
 		ewarn
-		ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
+		ewarn "${EPREFIX}/usr/bin/php-config and/or ${EPREFIX}/usr/bin/phpize are linked to a"
 		ewarn "different version of PHP. To make them point to PHP v5, use"
 		ewarn "php-select:"
 		ewarn