[csw-devel] SF.net SVN: gar:[4855] csw/mgar/pkg/php5/trunk

valholla at users.sourceforge.net valholla at users.sourceforge.net
Thu May 14 21:41:00 CEST 2009


Revision: 4855
          http://gar.svn.sourceforge.net/gar/?rev=4855&view=rev
Author:   valholla
Date:     2009-05-14 19:41:00 +0000 (Thu, 14 May 2009)

Log Message:
-----------
move to default location

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile
    csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall
    csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh
    csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh
    csw/mgar/pkg/php5/trunk/files/pear.conf.CSW

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -2,6 +2,7 @@
 GARVERSION = 5.2.9
 CATEGORIES = lang
 SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g')
+DISTNAME = $(SF_PROJ)-$(GARVERSION)
 
 DESCRIPTION = A high-level scripting language.
 define BLURB
@@ -17,19 +18,13 @@
 	available.
 endef
 
-php5_root = $(DESTDIR)$(prefix)/php5
-php5_bin  = $(php5_root)/bin
-php5_lib  = $(php5_root)/lib
-
 MASTER_SITES   = http://us.php.net/distributions/
 SPKG_SOURCEURL = http://www.php.net/downloads.php
 DISTFILES     += $(SF_PROJ)-$(GARVERSION).tar.bz2
 
 INSTALL_ENV   += INSTALL_ROOT=$(DESTDIR)
-PHP5ROOT       = $(DESTDIR)$(prefix)/php5
 
-STRIP_DIRS    += $(PHP5ROOT)/lib/php/extensions/*/
-STRIP_DIRS    += $(PHP5ROOT)/bin
+STRIP_DIRS    += $(prefix)/lib/php/extensions/*/
 
 # Auxilliary files
 DISTFILES += php.ini.CSW phpext pear.conf.CSW
@@ -46,12 +41,12 @@
 REQUIRED_PKGS_CSWphp5     += CSWlibxml2 CSWzlib CSWmysql5rt
 REQUIRED_PKGS_CSWphp5devel = CSWphp5
 
-PKGFILES_CSWphp5devel  = $(prefix)/php5/bin/php-config
-PKGFILES_CSWphp5devel += $(prefix)/php5/bin/phpize
-PKGFILES_CSWphp5devel += $(prefix)/php5/bin/peardev
-PKGFILES_CSWphp5devel += $(prefix)/php5/include.*
-PKGFILES_CSWphp5devel += $(prefix)/php5/lib/php/build/.*
-PKGFILES_CSWphp5devel += $(prefix)/php5/man/.*
+PKGFILES_CSWphp5devel  = $(bindir)/php-config
+PKGFILES_CSWphp5devel += $(bindir)/phpize
+PKGFILES_CSWphp5devel += $(bindir)/peardev
+PKGFILES_CSWphp5devel += $(includedir)/.*
+PKGFILES_CSWphp5devel += $(libdir)/php/build/.*
+PKGFILES_CSWphp5devel += $(mandir)/.*
 
 PATCHFILES += configure.diff
 PATCHFILES += php-bug-45557-fix.diff
@@ -69,9 +64,8 @@
 
 STRIP_LIBTOOL = 1
 
-CONFIGURE_ARGS += --prefix=$(prefix)/php5
+CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-static
-CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin
 CONFIGURE_ARGS += --enable-cli
 CONFIGURE_ARGS += --enable-fastcgi
 CONFIGURE_ARGS += --enable-force-cgi-redirect
@@ -101,17 +95,17 @@
 	@$(MAKECOOKIE)
 
 install-extras:
-	ginstall -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(prefix)/php5/bin
-	gsed -i -e s,PHPEXTDIR,$(shell $(PHP5ROOT)/bin/php-config --extension-dir),\
+	ginstall -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(bindir)
+	gsed -i -e s,PHPEXTDIR,$(shell $(bindir)/php-config --extension-dir),\
 		$(WORKDIR)/php.ini.CSW
-	ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(prefix)/php5/lib
-	ginstall -m 0644 $(WORKDIR)/pear.conf.CSW $(DESTDIR)$(prefix)/php5/etc
+	ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(libdir)
+	ginstall -m 0644 $(WORKDIR)/pear.conf.CSW $(DESTDIR)$(sysconfdir)
 	ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
 	ginstall -m 0644 $(WORKDIR)/httpd-php5.conf.CSW \
 		$(DESTDIR)$(prefix)/apache2/etc/extra
 	@(grm -fr $(DESTDIR)/.[a-z]*)
-	@(gfind $(PHP5ROOT)/lib -name "*.a" -exec grm {} \;)
-	@(grm -f $(DESTDIR)$(prefix)/php5/etc/pear.conf)
+	@(gfind $(libdir) -name "*.a" -exec grm {} \;)
+	@(grm -f $(DESTDIR)$(sysconfdir)/pear.conf)
 	@$(MAKECOOKIE)
 
 install-ap2modphp5:

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5bcmath_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling bcmath extension"
@@ -56,7 +56,7 @@
 define CSWphp5bcmath_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling bcmath extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5bz2_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling bz2 extension"
@@ -56,7 +56,7 @@
 define CSWphp5bz2_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling bz2 extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5calendar_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling calendar extension"
@@ -56,7 +56,7 @@
 define CSWphp5calendar_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling calendar extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5ctype_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling ctype extension"
@@ -56,7 +56,7 @@
 define CSWphp5ctype_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ctype extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -15,7 +15,7 @@
 define CSWphp5curl_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling curl extension"
@@ -58,7 +58,7 @@
 define CSWphp5curl_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling curl extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -17,7 +17,7 @@
 define CSWphp5dba_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling dba extension"
@@ -60,7 +60,7 @@
 define CSWphp5dba_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling dba extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5dbase_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling dbase extension"
@@ -56,7 +56,7 @@
 define CSWphp5dbase_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling dbase extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -14,7 +14,7 @@
 define CSWphp5dom_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling dom extension"
@@ -57,7 +57,7 @@
 define CSWphp5dom_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling dom extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -16,7 +16,7 @@
 define CSWphp5exif_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling exif extension"
@@ -59,7 +59,7 @@
 define CSWphp5exif_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling exif extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5ftp_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling ftp extension"
@@ -56,7 +56,7 @@
 define CSWphp5ftp_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ftp extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -24,7 +24,7 @@
 define CSWphp5gd_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling gd extension"
@@ -67,7 +67,7 @@
 define CSWphp5gd_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling gd extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5gettext_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling gettext extension"
@@ -56,7 +56,7 @@
 define CSWphp5gettext_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling gettext extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5gmp_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling gmp extension"
@@ -56,7 +56,7 @@
 define CSWphp5gmp_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling gmp extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5hash_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling hash extension"
@@ -56,7 +56,7 @@
 define CSWphp5hash_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling hash extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -20,7 +20,7 @@
 define CSWphp5iconv_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling iconv extension"
@@ -63,7 +63,7 @@
 define CSWphp5iconv_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling iconv extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -15,7 +15,7 @@
 define CSWphp5imap_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling imap extension"
@@ -58,7 +58,7 @@
 define CSWphp5imap_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling imap extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5json_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling json extension"
@@ -56,7 +56,7 @@
 define CSWphp5json_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling json extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -15,7 +15,7 @@
 define CSWphp5ldap_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling ldap extension"
@@ -58,7 +58,7 @@
 define CSWphp5ldap_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ldap extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -15,7 +15,7 @@
 define CSWphp5mbstring_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling mbstring extension"
@@ -58,7 +58,7 @@
 define CSWphp5mbstring_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling mbstring extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5mcrypt_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling mcrypt extension"
@@ -56,7 +56,7 @@
 define CSWphp5mcrypt_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling mcrypt extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5mhash_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling mhash extension"
@@ -56,7 +56,7 @@
 define CSWphp5mhash_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling mhash extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5mimemagic_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling mime_magic extension"
@@ -56,7 +56,7 @@
 define CSWphp5mimemagic_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling mime_magic extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5mssql_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling mssql extension"
@@ -56,7 +56,7 @@
 define CSWphp5mssql_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling mssql extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5mysql_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling mysql extension"
@@ -56,7 +56,7 @@
 define CSWphp5mysql_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling mysql extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5mysqli_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling mysqli extension"
@@ -56,7 +56,7 @@
 define CSWphp5mysqli_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling mysqli extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5ncurses_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling ncurses extension"
@@ -56,7 +56,7 @@
 define CSWphp5ncurses_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ncurses extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -15,7 +15,7 @@
 define CSWphp5odbc_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling odbc extension"
@@ -58,7 +58,7 @@
 define CSWphp5odbc_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling odbc extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5openssl_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling openssl extension"
@@ -56,7 +56,7 @@
 define CSWphp5openssl_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling openssl extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5pcntl_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling pcntl extension"
@@ -56,7 +56,7 @@
 define CSWphp5pcntl_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling pcntl extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -11,7 +11,7 @@
 define CSWphp5pdo_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling pdo extension"
@@ -54,7 +54,7 @@
 define CSWphp5pdo_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling pdo extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -14,7 +14,7 @@
 define CSWphp5pdomysql_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling pdo_mysql extension"
@@ -57,7 +57,7 @@
 define CSWphp5pdomysql_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling pdo_mysql extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5pdoodbc_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling pdo_odbc extension"
@@ -56,7 +56,7 @@
 define CSWphp5pdoodbc_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling pdo_odbc extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -15,7 +15,7 @@
 define CSWphp5pdopgsql_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling pdo_pgsql extension"
@@ -58,7 +58,7 @@
 define CSWphp5pdopgsql_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling pdo_pgsql extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5pdosqlite_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling pdo_sqlite extension"
@@ -56,7 +56,7 @@
 define CSWphp5pdosqlite_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling pdo_sqlite extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -15,7 +15,7 @@
 define CSWphp5pgsql_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling pgsql extension"
@@ -58,7 +58,7 @@
 define CSWphp5pgsql_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling pgsql extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5posix_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling posix extension"
@@ -56,7 +56,7 @@
 define CSWphp5posix_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling posix extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5pspell_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling pspell extension"
@@ -56,7 +56,7 @@
 define CSWphp5pspell_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling pspell extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -14,7 +14,7 @@
 define CSWphp5readline_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling readline extension"
@@ -57,7 +57,7 @@
 define CSWphp5readline_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling readline extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5session_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling session extension"
@@ -56,7 +56,7 @@
 define CSWphp5session_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling session extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5shmop_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling shmop extension"
@@ -56,7 +56,7 @@
 define CSWphp5shmop_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling shmop extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -9,7 +9,7 @@
 define CSWphp5simplexml_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling simplexml extension"
@@ -52,7 +52,7 @@
 define CSWphp5simplexml_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling simplexml extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5snmp_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling snmp extension"
@@ -56,7 +56,7 @@
 define CSWphp5snmp_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling snmp extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -14,7 +14,7 @@
 define CSWphp5soap_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling soap extension"
@@ -57,7 +57,7 @@
 define CSWphp5soap_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling soap extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5sockets_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling sockets extension"
@@ -56,7 +56,7 @@
 define CSWphp5sockets_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling sockets extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -14,7 +14,7 @@
 define CSWphp5sqlite_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling sqlite extension"
@@ -57,7 +57,7 @@
 define CSWphp5sqlite_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling sqlite extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5sysvmsg_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling sysvmsg extension"
@@ -56,7 +56,7 @@
 define CSWphp5sysvmsg_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling sysvmsg extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5sysvsem_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling sysvsem extension"
@@ -56,7 +56,7 @@
 define CSWphp5sysvsem_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling sysvsem extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5sysvshm_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling sysvshm extension"
@@ -56,7 +56,7 @@
 define CSWphp5sysvshm_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling sysvshm extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5tidy_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling tidy extension"
@@ -56,7 +56,7 @@
 define CSWphp5tidy_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling tidy extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -13,7 +13,7 @@
 define CSWphp5tokenizer_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling tokenizer extension"
@@ -56,7 +56,7 @@
 define CSWphp5tokenizer_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling tokenizer extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -15,7 +15,7 @@
 define CSWphp5wddx_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling wddx extension"
@@ -58,7 +58,7 @@
 define CSWphp5wddx_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling wddx extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -7,7 +7,7 @@
 define CSWphp5xml_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling xml extension"
@@ -50,7 +50,7 @@
 define CSWphp5xml_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling xml extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -14,7 +14,7 @@
 define CSWphp5xmlreader_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling xmlreader extension"
@@ -57,7 +57,7 @@
 define CSWphp5xmlreader_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling xmlreader extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -16,7 +16,7 @@
 define CSWphp5xmlrpc_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling xmlrpc extension"
@@ -59,7 +59,7 @@
 define CSWphp5xmlrpc_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling xmlrpc extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -14,7 +14,7 @@
 define CSWphp5xmlwriter_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling xmlwriter extension"
@@ -57,7 +57,7 @@
 define CSWphp5xmlwriter_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling xmlwriter extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -14,7 +14,7 @@
 define CSWphp5xsl_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling xsl extension"
@@ -57,7 +57,7 @@
 define CSWphp5xsl_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling xsl extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -14,7 +14,7 @@
 define CSWphp5zip_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling zip extension"
@@ -57,7 +57,7 @@
 define CSWphp5zip_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling zip extension"

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile	2009-05-14 19:41:00 UTC (rev 4855)
@@ -6,7 +6,7 @@
 define CSWphp5zlib_postinstall
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Post Install <===]"
 echo "   ===> Enabling zlib extension"
@@ -49,7 +49,7 @@
 define CSWphp5zlib_preremove
 #!/bin/sh
 
-PHP_INI=/opt/csw/php5/lib/php.ini
+PHP_INI=/opt/csw/lib/php.ini
 
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling zlib extension"

Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall
===================================================================
--- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall	2009-05-14 19:41:00 UTC (rev 4855)
@@ -2,8 +2,8 @@
 
 PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin
 PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
-PHP_LIB=$PKG_INSTALL_ROOT/opt/csw/php5/lib
-PHP_BIN=$PKG_INSTALL_ROOT/opt/csw/php5/bin
+PHP_LIB=$PKG_INSTALL_ROOT/opt/csw/lib
+PHP_BIN=$PKG_INSTALL_ROOT/opt/csw/bin
 PHP_INI=$PHP_LIB/php.ini
 
 if [ ! -f $PHP_INI ]; then

Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh
===================================================================
--- csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh	2009-05-14 19:41:00 UTC (rev 4855)
@@ -5,8 +5,8 @@
     CSW_PREFIX=${PKG_INSTALL_ROOT}${CSW_PREFIX}
 fi
 
-PHP_INI=$CSW_PREFIX/php5/lib/php.ini
-PHP_BIN=$CSW_PREFIX/php5/bin
+PHP_INI=$CSW_PREFIX/lib/php.ini
+PHP_BIN=$CSW_PREFIX/bin
 PHP_EXTMGR=$PHP_BIN/phpext
 
 if [ -z "$PHPEXT" ]; then

Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh
===================================================================
--- csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh	2009-05-14 19:41:00 UTC (rev 4855)
@@ -5,8 +5,8 @@
     CSW_PREFIX=${PKG_INSTALL_ROOT}${CSW_PREFIX}
 fi
 
-PHP_INI=$CSW_PREFIX/php5/lib/php.ini
-PHP_BIN=$CSW_PREFIX/php5/bin
+PHP_INI=$CSW_PREFIX/lib/php.ini
+PHP_BIN=$CSW_PREFIX/bin
 PHP_EXTMGR=$PHP_BIN/phpext
 
 if [ -z "$PHPEXT" ]; then

Modified: csw/mgar/pkg/php5/trunk/files/pear.conf.CSW
===================================================================
--- csw/mgar/pkg/php5/trunk/files/pear.conf.CSW	2009-05-14 19:22:37 UTC (rev 4854)
+++ csw/mgar/pkg/php5/trunk/files/pear.conf.CSW	2009-05-14 19:41:00 UTC (rev 4855)
@@ -1,2 +1,2 @@
 #PEAR_Config 0.9
-a:29:{s:9:"cache_dir";s:15:"/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:21:"/opt/csw/php5/lib/php";s:7:"ext_dir";s:58:"/opt/csw/php5/lib/php/extensions/no-debug-non-zts-20060613";s:7:"doc_dir";s:25:"/opt/csw/php5/lib/php/doc";s:7:"bin_dir";s:17:"/opt/csw/php5/bin";s:8:"data_dir";s:26:"/opt/csw/php5/lib/php/data";s:7:"cfg_dir";s:25:"/opt/csw/php5/lib/php/cfg";s:7:"www_dir";s:28:"/opt/csw/php5/lib/php/htdocs";s:8:"test_dir";s:26:"/opt/csw/php5/lib/php/test";s:8:"temp_dir";s:14:"/tmp/pear/temp";s:12:"download_dir";s:18:"/tmp/pear/download";s:7:"php_bin";s:21:"/opt/csw/php5/bin/php";s:7:"php_ini";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:16:"/opt
 /csw/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"sig_keydir";s:26:"/opt/csw/php5/etc/pearkeys";}
\ No newline at end of file
+a:29:{s:9:"cache_dir";s:15:"/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:21:"/opt/csw/lib/php";s:7:"ext_dir";s:58:"/opt/csw/lib/php/extensions/no-debug-non-zts-20060613";s:7:"doc_dir";s:25:"/opt/csw/lib/php/doc";s:7:"bin_dir";s:17:"/opt/csw/bin";s:8:"data_dir";s:26:"/opt/csw/lib/php/data";s:7:"cfg_dir";s:25:"/opt/csw/lib/php/cfg";s:7:"www_dir";s:28:"/opt/csw/lib/php/htdocs";s:8:"test_dir";s:26:"/opt/csw/lib/php/test";s:8:"temp_dir";s:14:"/tmp/pear/temp";s:12:"download_dir";s:18:"/tmp/pear/download";s:7:"php_bin";s:21:"/opt/csw/bin/php";s:7:"php_ini";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:16:"/opt/csw/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"si
 g_keydir";s:26:"/opt/csw/etc/pearkeys";}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list