[patch] Patch to php-toolkit 1.0-r2 to make it work with the prefixed portage

php-toolkit.patch (text/plain), 5.30 KB, created by Dirk Tilger on 2007-10-13 21:02:34 UTC

diff -ur /Volumes/localhorst/usr/portage/app-admin/php-toolkit/files/php-select app-admin/php-toolkit/files/php-select
--- /Volumes/localhorst/usr/portage/app-admin/php-toolkit/files/php-select	2005-12-28 17:49:36 +0400
+++ app-admin/php-toolkit/files/php-select	2007-10-13 22:49:19 +0400
@@ -42,7 +42,7 @@
 G_LIBDIR[0]="/usr/lib64"
 G_LIBDIR[1]="/usr/lib32"
 G_LIBDIR[2]="/usr/lib"
-G_MODULE_PATH="/usr/share/php-select"
+G_MODULE_PATH="$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       - $EPREFIX/usr/bin/php (the CLI SAPI)"
+	echo "    php-cgi   - $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 /Volumes/localhorst/usr/portage/app-admin/php-toolkit/files/php-select-modules/apache1.sh app-admin/php-toolkit/files/php-select-modules/apache1.sh
--- /Volumes/localhorst/usr/portage/app-admin/php-toolkit/files/php-select-modules/apache1.sh	2005-12-28 17:49:36 +0400
+++ app-admin/php-toolkit/files/php-select-modules/apache1.sh	2007-10-13 22:50:13 +0400
@@ -12,9 +12,9 @@
 #
 # ========================================================================
 
-G_APACHE_CONF=/etc/conf.d/apache
-G_APACHE_INIT=/etc/init.d/apache
+G_APACHE_CONF=$EPREFIX/etc/conf.d/apache
+G_APACHE_INIT=$EPREFIX/etc/init.d/apache
 G_OPTS_VAR="APACHE_OPTS"
-G_APACHE_MOD_DIR="/usr/lib/apache/modules"
+G_APACHE_MOD_DIR="$EPREFIX/usr/lib/apache/modules"
 
 . $G_MODULE_PATH/libapache.sh
diff -ur /Volumes/localhorst/usr/portage/app-admin/php-toolkit/files/php-select-modules/apache2.sh app-admin/php-toolkit/files/php-select-modules/apache2.sh
--- /Volumes/localhorst/usr/portage/app-admin/php-toolkit/files/php-select-modules/apache2.sh	2005-12-28 17:49:36 +0400
+++ app-admin/php-toolkit/files/php-select-modules/apache2.sh	2007-10-13 22:49:49 +0400
@@ -12,9 +12,9 @@
 #
 # ========================================================================
 
-G_APACHE_CONF=/etc/conf.d/apache2
-G_APACHE_INIT=/etc/init.d/apache2
+G_APACHE_CONF=$EPREFIX/etc/conf.d/apache2
+G_APACHE_INIT=$EPREFIX/etc/init.d/apache2
 G_OPTS_VAR="APACHE2_OPTS"
-G_APACHE_MOD_DIR="/usr/lib/apache2/modules"
+G_APACHE_MOD_DIR="$EPREFIX/usr/lib/apache2/modules"
 
 . $G_MODULE_PATH/libapache.sh
diff -ur /Volumes/localhorst/usr/portage/app-admin/php-toolkit/files/php-select-modules/php-cgi.sh app-admin/php-toolkit/files/php-select-modules/php-cgi.sh
--- /Volumes/localhorst/usr/portage/app-admin/php-toolkit/files/php-select-modules/php-cgi.sh	2005-12-28 17:49:36 +0400
+++ app-admin/php-toolkit/files/php-select-modules/php-cgi.sh	2007-10-13 22:52:22 +0400
@@ -13,6 +13,6 @@
 # ========================================================================
 
 G_SYMLINK_SOURCE[0]="bin/php-cgi"
-G_SYMLINK_TARGET[0]="/usr/bin/php-cgi"
+G_SYMLINK_TARGET[0]="$EPREFIX/usr/bin/php-cgi"
 
 . $G_MODULE_PATH/libsymlink.sh
diff -ur /Volumes/localhorst/usr/portage/app-admin/php-toolkit/files/php-select-modules/php-devel.sh app-admin/php-toolkit/files/php-select-modules/php-devel.sh
--- /Volumes/localhorst/usr/portage/app-admin/php-toolkit/files/php-select-modules/php-devel.sh	2005-12-28 17:49:36 +0400
+++ app-admin/php-toolkit/files/php-select-modules/php-devel.sh	2007-10-13 22:52:50 +0400
@@ -13,9 +13,9 @@
 # ========================================================================
 
 G_SYMLINK_SOURCE[0]="bin/php-config"
-G_SYMLINK_TARGET[0]="/usr/bin/php-config"
+G_SYMLINK_TARGET[0]="$EPREFIX/usr/bin/php-config"
 
 G_SYMLINK_SOURCE[1]="bin/phpize"
-G_SYMLINK_TARGET[1]="/usr/bin/phpize"
+G_SYMLINK_TARGET[1]="$EPREFIX/usr/bin/phpize"
 
 . $G_MODULE_PATH/libsymlink.sh
diff -ur /Volumes/localhorst/usr/portage/app-admin/php-toolkit/files/php-select-modules/php.sh app-admin/php-toolkit/files/php-select-modules/php.sh
--- /Volumes/localhorst/usr/portage/app-admin/php-toolkit/files/php-select-modules/php.sh	2005-12-28 17:49:36 +0400
+++ app-admin/php-toolkit/files/php-select-modules/php.sh	2007-10-13 22:50:36 +0400
@@ -13,6 +13,6 @@
 # ========================================================================
 
 G_SYMLINK_SOURCE[0]="bin/php"
-G_SYMLINK_TARGET[0]="/usr/bin/php"
+G_SYMLINK_TARGET[0]="$EPREFIX/usr/bin/php"
 
 . $G_MODULE_PATH/libsymlink.sh
diff -ur /Volumes/localhorst/usr/portage/app-admin/php-toolkit/php-toolkit-1.0-r2.ebuild app-admin/php-toolkit/php-toolkit-1.0-r2.ebuild
--- /Volumes/localhorst/usr/portage/app-admin/php-toolkit/php-toolkit-1.0-r2.ebuild	2006-08-25 09:35:23 +0400
+++ app-admin/php-toolkit/php-toolkit-1.0-r2.ebuild	2007-10-11 14:58:35 +0400
@@ -2,13 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-admin/php-toolkit/php-toolkit-1.0-r2.ebuild,v 1.13 2006/08/25 05:24:01 sebastian Exp $
 
+EAPI="prefix"
+
 DESCRIPTION="Utilities for managing installed copies of PHP"
 HOMEPAGE="http://www.gentoo.org/proj/en/php/"
 SRC_URI=""
 
 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"