[patch] Updated patch to app-admin/php-toolkit 1.0-r2 to make it work with the prefixed portage

php-toolkit.patch (text/plain), 5.91 KB, created by Dirk Tilger on 2007-11-11 17:03:57 UTC

diff -ur ../portage.main.converted/app-admin/php-toolkit/files/php-select app-admin/php-toolkit/files/php-select
--- ../portage.main.converted/app-admin/php-toolkit/files/php-select	2007-11-01 19:59:14 +0400
+++ app-admin/php-toolkit/files/php-select	2007-11-11 17:12:58 +0400
@@ -39,10 +39,10 @@
 G_COPYRIGHT[0]="Copyright (c) 2005 Gentoo Foundation, Inc."
 G_COPYRIGHT[1]="Released under v2 of the GNU General Public License"
 G_EXITSTATUS=0
-G_LIBDIR[0]="/usr/lib64"
-G_LIBDIR[1]="/usr/lib32"
-G_LIBDIR[2]="/usr/lib"
-G_MODULE_PATH="/usr/share/php-select"
+G_LIBDIR[0]="@GENTOO_PORTAGE_EPREFIX@/usr/lib64"
+G_LIBDIR[1]="@GENTOO_PORTAGE_EPREFIX@/usr/lib32"
+G_LIBDIR[2]="@GENTOO_PORTAGE_EPREFIX@/usr/lib"
+G_MODULE_PATH="@GENTOO_PORTAGE_EPREFIX@/usr/share/php-select"
 G_NEED_COMPONENT=0
 G_NEED_PHPVERSION=0
 G_PN="$0"
@@ -106,8 +106,8 @@
 	echo
 	echo "    apache1   - Apache webserver v1.x"
 	echo "    apache2   - Apache webserver v2.x"
-	echo "    php       - /usr/bin/php (the CLI SAPI)"
-	echo "    php-cgi   - /usr/bin/php-cgi (the CGI SAPI)"
+	echo "    php       - @GENTOO_PORTAGE_EPREFIX@/usr/bin/php (the CLI SAPI)"
+	echo "    php-cgi   - @GENTOO_PORTAGE_EPREFIX@/usr/bin/php-cgi (the CGI SAPI)"
 	echo "    php-devel - the scripts used to build PECL extensions"
 	echo
 	echo "and where <php-version> is one of:"
diff -ur ../portage.main.converted/app-admin/php-toolkit/files/php-select-modules/apache1.sh app-admin/php-toolkit/files/php-select-modules/apache1.sh
--- ../portage.main.converted/app-admin/php-toolkit/files/php-select-modules/apache1.sh	2007-11-01 19:59:14 +0400
+++ app-admin/php-toolkit/files/php-select-modules/apache1.sh	2007-11-11 17:13:11 +0400
@@ -12,9 +12,9 @@
 #
 # ========================================================================
 
-G_APACHE_CONF=/etc/conf.d/apache
-G_APACHE_INIT=/etc/init.d/apache
+G_APACHE_CONF="@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/apache"
+G_APACHE_INIT="@GENTOO_PORTAGE_EPREFIX@/etc/init.d/apache"
 G_OPTS_VAR="APACHE_OPTS"
-G_APACHE_MOD_DIR="/usr/lib/apache/modules"
+G_APACHE_MOD_DIR="@GENTOO_PORTAGE_EPREFIX@/usr/lib/apache/modules"
 
 . $G_MODULE_PATH/libapache.sh
diff -ur ../portage.main.converted/app-admin/php-toolkit/files/php-select-modules/apache2.sh app-admin/php-toolkit/files/php-select-modules/apache2.sh
--- ../portage.main.converted/app-admin/php-toolkit/files/php-select-modules/apache2.sh	2007-11-01 19:59:14 +0400
+++ app-admin/php-toolkit/files/php-select-modules/apache2.sh	2007-11-11 17:13:01 +0400
@@ -12,9 +12,9 @@
 #
 # ========================================================================
 
-G_APACHE_CONF=/etc/conf.d/apache2
-G_APACHE_INIT=/etc/init.d/apache2
+G_APACHE_CONF="@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/apache2"
+G_APACHE_INIT="@GENTOO_PORTAGE_EPREFIX@/etc/init.d/apache2"
 G_OPTS_VAR="APACHE2_OPTS"
-G_APACHE_MOD_DIR="/usr/lib/apache2/modules"
+G_APACHE_MOD_DIR="@GENTOO_PORTAGE_EPREFIX@/usr/lib/apache2/modules"
 
 . $G_MODULE_PATH/libapache.sh
diff -ur ../portage.main.converted/app-admin/php-toolkit/files/php-select-modules/php-cgi.sh app-admin/php-toolkit/files/php-select-modules/php-cgi.sh
--- ../portage.main.converted/app-admin/php-toolkit/files/php-select-modules/php-cgi.sh	2007-11-01 19:59:14 +0400
+++ app-admin/php-toolkit/files/php-select-modules/php-cgi.sh	2007-11-11 17:13:04 +0400
@@ -13,6 +13,6 @@
 # ========================================================================
 
 G_SYMLINK_SOURCE[0]="bin/php-cgi"
-G_SYMLINK_TARGET[0]="/usr/bin/php-cgi"
+G_SYMLINK_TARGET[0]="@GENTOO_PORTAGE_EPREFIX@/usr/bin/php-cgi"
 
 . $G_MODULE_PATH/libsymlink.sh
diff -ur ../portage.main.converted/app-admin/php-toolkit/files/php-select-modules/php-devel.sh app-admin/php-toolkit/files/php-select-modules/php-devel.sh
--- ../portage.main.converted/app-admin/php-toolkit/files/php-select-modules/php-devel.sh	2007-11-01 19:59:14 +0400
+++ app-admin/php-toolkit/files/php-select-modules/php-devel.sh	2007-11-11 17:13:06 +0400
@@ -13,9 +13,9 @@
 # ========================================================================
 
 G_SYMLINK_SOURCE[0]="bin/php-config"
-G_SYMLINK_TARGET[0]="/usr/bin/php-config"
+G_SYMLINK_TARGET[0]="@GENTOO_PORTAGE_EPREFIX@/usr/bin/php-config"
 
 G_SYMLINK_SOURCE[1]="bin/phpize"
-G_SYMLINK_TARGET[1]="/usr/bin/phpize"
+G_SYMLINK_TARGET[1]="@GENTOO_PORTAGE_EPREFIX@/usr/bin/phpize"
 
 . $G_MODULE_PATH/libsymlink.sh
diff -ur ../portage.main.converted/app-admin/php-toolkit/files/php-select-modules/php.sh app-admin/php-toolkit/files/php-select-modules/php.sh
--- ../portage.main.converted/app-admin/php-toolkit/files/php-select-modules/php.sh	2007-11-01 19:59:14 +0400
+++ app-admin/php-toolkit/files/php-select-modules/php.sh	2007-11-11 17:13:08 +0400
@@ -13,6 +13,6 @@
 # ========================================================================
 
 G_SYMLINK_SOURCE[0]="bin/php"
-G_SYMLINK_TARGET[0]="/usr/bin/php"
+G_SYMLINK_TARGET[0]="@GENTOO_PORTAGE_EPREFIX@/usr/bin/php"
 
 . $G_MODULE_PATH/libsymlink.sh
diff -ur ../portage.main.converted/app-admin/php-toolkit/php-toolkit-1.0-r2.ebuild app-admin/php-toolkit/php-toolkit-1.0-r2.ebuild
--- ../portage.main.converted/app-admin/php-toolkit/php-toolkit-1.0-r2.ebuild	2007-11-01 19:59:57 +0400
+++ app-admin/php-toolkit/php-toolkit-1.0-r2.ebuild	2007-11-11 20:55:20 +0400
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-macos"
 IUSE=""
 
 DEPEND="!app-admin/eselect-php"
@@ -28,4 +28,12 @@
 	doins "${FILESDIR}/php-select-modules/php.sh"
 	doins "${FILESDIR}/php-select-modules/php-cgi.sh"
 	doins "${FILESDIR}/php-select-modules/php-devel.sh"
+	eprefixify "${ED}/usr/sbin/php-select" \
+		"${ED}/usr/share/php-select/libapache.sh" \
+		"${ED}/usr/share/php-select/libsymlink.sh" \
+		"${ED}/usr/share/php-select/apache1.sh" \
+		"${ED}/usr/share/php-select/apache2.sh" \
+		"${ED}/usr/share/php-select/php.sh" \
+		"${ED}/usr/share/php-select/php-cgi.sh" \
+		"${ED}/usr/share/php-select/php-devel.sh"
 }