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

[valholla at users.sourceforge.net]

Revision: 4901
          http://gar.svn.sourceforge.net/gar/?rev=4901&view=rev
Author:   valholla
Date:     2009-05-16 14:38:21 +0000 (Sat, 16 May 2009)

Log Message:
-----------
fix checkusms

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/checksums
    csw/mgar/pkg/php5/trunk/files/php.ini.CSW
    csw/mgar/pkg/php5/trunk/files/scripts.mk

Modified: csw/mgar/pkg/php5/trunk/checksums
===================================================================
--- csw/mgar/pkg/php5/trunk/checksums	2009-05-16 14:29:17 UTC (rev 4900)
+++ csw/mgar/pkg/php5/trunk/checksums	2009-05-16 14:38:21 UTC (rev 4901)
@@ -12,5 +12,5 @@
 13db46097c9686302bebf160e2d26ed2  download/pgsql.diff
 280d6cda7f72a4fc6de42fda21ac2db7  download/php-5.2.9.tar.bz2
 a450a46ce0ea9fd0c0abe432e750a873  download/php-bug-45557-fix.diff
-831a08d2844440929be816d45bf5ae4f  download/php.ini.CSW
+670b8fbf4cf9105d72f22dbf4b1e29cd  download/php.ini.CSW
 6251f3adcefc6ffa61d6339ac6b2d1eb  download/phpext

Modified: csw/mgar/pkg/php5/trunk/files/php.ini.CSW
===================================================================
--- csw/mgar/pkg/php5/trunk/files/php.ini.CSW	2009-05-16 14:29:17 UTC (rev 4900)
+++ csw/mgar/pkg/php5/trunk/files/php.ini.CSW	2009-05-16 14:38:21 UTC (rev 4901)
@@ -517,7 +517,7 @@
 user_dir =
 
 ; Directory in which the loadable extensions (modules) reside.
-extension_dir = "_PHPEXTDIR_"
+extension_dir = "x_PHPEXTDIR_x"
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically

Modified: csw/mgar/pkg/php5/trunk/files/scripts.mk
===================================================================
--- csw/mgar/pkg/php5/trunk/files/scripts.mk	2009-05-16 14:29:17 UTC (rev 4900)
+++ csw/mgar/pkg/php5/trunk/files/scripts.mk	2009-05-16 14:38:21 UTC (rev 4901)
@@ -24,14 +24,15 @@
 
 install-extras:
 	@echo "[====> Fixing Admin Scripts <====]"
+	gcp $(DOWNLOADDIR)/php.ini.CSW $(DOWNLOADDIR)/php.ini.CSW.fixed
+	perl -i -pne "s|x_PHPEXTDIR_x|_PHPEXTDIR_|" $(DOWNLOADDIR)/php.ini.CSW.fixed
 	perl -i -pne "s|_PHPINIFILE_|$(call _get_php_ini_path,$(DESTDIR))/php.ini|" `gfind $(DOWNLOADDIR) -type f -print`
 	perl -i -pne "s|_PHPLIBDIR_|$(call _get_php_ini_path,$(DESTDIR))|" `gfind $(DOWNLOADDIR) -type f -print`
 	perl -i -pne "s|_PHPBINDIR_|$(call _get_php_prefix,$(DESTDIR))/bin|" `gfind $(DOWNLOADDIR) -type f -print`
 	perl -i -pne "s|_PHPETCDIR_|$(call _get_php_prefix,$(DESTDIR))/etc|" `gfind $(DOWNLOADDIR) -type f -print`
+	perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' `gfind $(DOWNLOADDIR) -type f -print`
 	@echo "[====> Installing Extra Files <====]"
 	ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin
-	gcp $(DOWNLOADDIR)/php.ini.CSW $(DOWNLOADDIR)/php.ini.CSW.fixed
-	perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' $(DOWNLOADDIR)/php.ini.CSW.fixed
 	gcp $(DOWNLOADDIR)/php.ini.CSW.fixed $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW
 	gmv $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf.CSW
 	gchmod 0644 $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW


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