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

[valholla at users.sourceforge.net]

Revision: 4896
          http://gar.svn.sourceforge.net/gar/?rev=4896&view=rev
Author:   valholla
Date:     2009-05-16 13:52:02 +0000 (Sat, 16 May 2009)

Log Message:
-----------
tweaks

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/files/scripts.mk

Removed Paths:
-------------
    csw/mgar/pkg/php5/trunk/files/pear.conf.CSW

Deleted: csw/mgar/pkg/php5/trunk/files/pear.conf.CSW
===================================================================
--- csw/mgar/pkg/php5/trunk/files/pear.conf.CSW	2009-05-16 13:41:31 UTC (rev 4895)
+++ csw/mgar/pkg/php5/trunk/files/pear.conf.CSW	2009-05-16 13:52:02 UTC (rev 4896)
@@ -1,2 +0,0 @@
-#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/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";}

Modified: csw/mgar/pkg/php5/trunk/files/scripts.mk
===================================================================
--- csw/mgar/pkg/php5/trunk/files/scripts.mk	2009-05-16 13:41:31 UTC (rev 4895)
+++ csw/mgar/pkg/php5/trunk/files/scripts.mk	2009-05-16 13:52:02 UTC (rev 4896)
@@ -29,9 +29,12 @@
 	perl -i -pne "s|_PHPBINDIR_|$(call _get_php_prefix,$(DESTDIR))/bin|" `gfind $(DOWNLOADDIR) -type f -print`
 	@echo "[====> Installing Extra Files <====]"
 	ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin
-	perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' $(DOWNLOADDIR)/php.ini.CSW
-	ginstall -m 0644 $(DOWNLOADDIR)/php.ini.CSW $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))
-	ginstall -m 0644 $(DOWNLOADDIR)/pear.conf.CSW $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc
+	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
+	$(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc
 	@$(MAKECOOKIE)
 
 install-ap2modphp5:
@@ -59,7 +62,6 @@
 install-cleanup:
 	@echo "[====> Cleaning Up Extra Install Files <====]"
 	gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr
-	grm -f $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf
 	gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr
 	$(MAKECOOKIE)
 


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