Revision: 4885
http://gar.svn.sourceforge.net/gar/?rev=4885&view=rev
Author: valholla
Date: 2009-05-16 00:12:25 +0000 (Sat, 16 May 2009)
Log Message:
-----------
remove extra files and tweak post* scripts
Modified Paths:
--------------
csw/mgar/pkg/php5/trunk/Makefile
csw/mgar/pkg/php5/trunk/Makefile.Orig
csw/mgar/pkg/php5/trunk/Makefile.default-dirs
csw/mgar/pkg/php5/trunk/checksums
csw/mgar/pkg/php5/trunk/files/php.ini.CSW
Removed Paths:
-------------
csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh
csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh
Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile 2009-05-15 17:39:47 UTC (rev 4884)
+++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-16 00:12:25 UTC (rev 4885)
@@ -24,9 +24,7 @@
STRIP_DIRS += $(DESTDIR)$(prefix)/lib/php/extensions/*/
DISTFILES += $(DISTNAME).tar.bz2
-DISTFILES += php.ini.CSW phpext pear.conf.CSW
-DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh
-DISTFILES += CSWphp5.postinstall
+DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall
PACKAGES = CSWphp5 CSWphp5devel
CATALOGNAME_CSWphp5 = php5
@@ -95,13 +93,22 @@
@$(MAKECOOKIE)
install-extras:
- ginstall -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(bindir)
- gsed -i -e s,PHPEXTDIR,$(shell $(DESTDIR)$(bindir)/php-config
--extension-dir),\
- $(WORKDIR)/php.ini.CSW
- ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(libdir)
- ginstall -m 0644 $(WORKDIR)/pear.conf.CSW $(DESTDIR)$(sysconfdir)
+ @echo "[====> Fixing Admin Scripts <====]"
+ PHP_INI_FILE=`$(PKGROOT)$(bindir)/php -i |
+ grep "Configuration File .* Path" | awk '{print $$NF}'`; \
+ perl -i -pne "s|_PHPINIFILE_|$${PHP_INI_FILE}/php.ini|"
\
+ `gfind $(DOWNLOADDIR) -type f -print`
+ perl -i -pne "s|_PHPLIBDIR_|$(libdir)|" \
+ `gfind $(DOWNLOADDIR) -type f -print`
+ perl -i -pne "s|_PHPBINDIR_|$(bindir)|" \
+ `gfind $(DOWNLOADDIR) -type f -print`
+ ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(bindir)
+ gsed -i -e s,PHPEXTDIR,`$(DESTDIR)$(bindir)/php-config
--extension-dir`,\
+ $(DOWNLOADDIR)/php.ini.CSW
+ ginstall -m 0644 $(DOWNLOADDIR)/php.ini.CSW $(DESTDIR)$(libdir)
+ ginstall -m 0644 $(DOWNLOADDIR)/pear.conf.CSW $(DESTDIR)$(sysconfdir)
ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
- ginstall -m 0644 $(WORKDIR)/httpd-php5.conf.CSW \
+ ginstall -m 0644 $(DOWNLOADDIR)/httpd-php5.conf.CSW \
$(DESTDIR)$(prefix)/apache2/etc/extra
@$(MAKECOOKIE)
@@ -138,13 +145,5 @@
pre-fetch:
$(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR)))
-post-merge-modulated:
- @echo "[====> Fixing Admin Scripts <====]"
- PHP_INI_FILE=`$(PKGROOT)$(bindir)/php -i | grep "Configuration File .*
Path" | awk '{print $$NF}'`; \
- perl -i -pne "s|_PHPINIFILE_|$${PHP_INI_FILE}/php.ini|" `gfind
$(DOWNLOADDIR) -type f -print`
- perl -i -pne "s|_PHPLIBDIR_|$(libdir)|" `gfind $(DOWNLOADDIR) -type f
-print`
- perl -i -pne "s|_PHPBINDIR_|$(bindir)|" `gfind $(DOWNLOADDIR) -type f
-print`
- @$(MAKECOOKIE)
-
# System Rules/Configuration
include gar/category.mk
Modified: csw/mgar/pkg/php5/trunk/Makefile.Orig
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile.Orig 2009-05-15 17:39:47 UTC (rev
4884)
+++ csw/mgar/pkg/php5/trunk/Makefile.Orig 2009-05-16 00:12:25 UTC (rev
4885)
@@ -32,9 +32,7 @@
STRIP_DIRS += $(PHP5ROOT)/bin
DISTFILES += $(DISTNAME).tar.bz2
-DISTFILES += php.ini.CSW phpext pear.conf.CSW
-DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh
-DISTFILES += CSWphp5.postinstall
+DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall
PACKAGES = CSWphp5 CSWphp5devel
Modified: csw/mgar/pkg/php5/trunk/Makefile.default-dirs
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile.default-dirs 2009-05-15 17:39:47 UTC
(rev 4884)
+++ csw/mgar/pkg/php5/trunk/Makefile.default-dirs 2009-05-16 00:12:25 UTC
(rev 4885)
@@ -24,9 +24,7 @@
STRIP_DIRS += $(DESTDIR)$(prefix)/lib/php/extensions/*/
DISTFILES += $(DISTNAME).tar.bz2
-DISTFILES += php.ini.CSW phpext pear.conf.CSW
-DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh
-DISTFILES += CSWphp5.postinstall
+DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall
PACKAGES = CSWphp5 CSWphp5devel
CATALOGNAME_CSWphp5 = php5
Modified: csw/mgar/pkg/php5/trunk/checksums
===================================================================
--- csw/mgar/pkg/php5/trunk/checksums 2009-05-15 17:39:47 UTC (rev 4884)
+++ csw/mgar/pkg/php5/trunk/checksums 2009-05-16 00:12:25 UTC (rev 4885)
@@ -5,8 +5,6 @@
2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove
0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space
0914febc951a55cd2bc587a2f9c30652 download/CSWphp5.postinstall
-55b520081d24e992e04265b3d8de8bf5 download/CSWphp5_ext_disable.sh
-f4f08ba7e83cc4ae6e1c485b42cfb965 download/CSWphp5_ext_enable.sh
ab08e2ba62667bf13fa236099e433e84 download/configure.diff
a71677d80f5cfd1aeb03547dfdeb705a download/httpd-php5.conf.CSW
2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff
@@ -15,5 +13,5 @@
13db46097c9686302bebf160e2d26ed2 download/pgsql.diff
280d6cda7f72a4fc6de42fda21ac2db7 download/php-5.2.9.tar.bz2
a450a46ce0ea9fd0c0abe432e750a873 download/php-bug-45557-fix.diff
-d3d68f5b6d71f13e5d9750dc14043287 download/php.ini.CSW
+550ae718308582e8eec40452190cae50 download/php.ini.CSW
6251f3adcefc6ffa61d6339ac6b2d1eb download/phpext
Deleted: csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh
===================================================================
--- csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh 2009-05-15
17:39:47 UTC (rev 4884)
+++ csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh 2009-05-16
00:12:25 UTC (rev 4885)
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_
-PHP_LIB=${PKG_INSTALL_ROOT}_PHPLIBDIR_
-PHP_BIN=${PKG_INSTALL_ROOT}_PHPBINDIR_
-PHP_EXTMGR=$PHP_BIN/phpext
-
-if [ -z "$PHPEXT" ]; then
- PHPEXT=`echo $PKGINST | sed -e 's,CSWphp5,,' -e 's,\..*,,'`
- PHPEXT=${PHPEXT:-${PKGINST}}
-fi
-
-# Bail if php.ini does not exist
-if [ ! -f $PHP_INI ]; then
- cat << END
-Cannot locate $PHP_INI -- Please disable $PHPEXT.so manually
-in the appropriate php.ini file using $PHP_EXTMGR
-
-END
-
- exit 0
-fi
-
-$PHP_EXTMGR -i $PHP_INI -d $PHPEXT
-if [ $? -ne 0 ]; then
- cat << END
-Failed to disable $PHPEXT support -- please examine
-$PHP_INI and disable the extension manually.
-END
-else
- echo "PHP extension $PHPEXT.so is disabled in $PHP_INI."
-fi
-
-exit 0
-
Deleted: csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh
===================================================================
--- csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh 2009-05-15 17:39:47 UTC
(rev 4884)
+++ csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh 2009-05-16 00:12:25 UTC
(rev 4885)
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_
-PHP_LIB=${PKG_INSTALL_ROOT}_PHPLIBFILE_
-PHP_BIN=${PKG_INSTALL_ROOT}_PHPBINFILE_
-PHP_EXTMGR=$PHP_BIN/phpext
-
-if [ -z "$PHPEXT" ]; then
- PHPEXT=`echo $PKGINST | sed -e 's,CSWphp5,,' -e 's,\..*,,'`
- PHPEXT=${PHPEXT:-${PKGINST}}
-fi
-
-# Bail if php.ini does not exist
-if [ ! -f $PHP_INI ]; then
- cat << END
-Cannot locate $PHP_INI -- Please enable $PHPEXT.so manually
-in the appropriate php.ini file using $PHP_EXTMGR
-
-END
-
- exit 0
-fi
-
-$PHP_EXTMGR -i $PHP_INI -e $PHPEXT
-if [ $? -ne 0 ]; then
- cat << END
-Failed to enable $PHPEXT support -- please examine
-$PHP_INI and enable the extension manually.
-END
-else
- echo "PHP extension $PHPEXT.so is enabled in $PHP_INI."
-fi
-
-exit 0
-
Modified: csw/mgar/pkg/php5/trunk/files/php.ini.CSW
===================================================================
--- csw/mgar/pkg/php5/trunk/files/php.ini.CSW 2009-05-15 17:39:47 UTC (rev
4884)
+++ csw/mgar/pkg/php5/trunk/files/php.ini.CSW 2009-05-16 00:12:25 UTC (rev
4885)
@@ -678,58 +678,6 @@
;extension=xsl.so
;extension=zip.so
-; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
-; extension folders as well as the separate PECL DLL download (PHP 5).
-; Be sure to appropriately set the extension_dir directive.
-
-;extension=php_bz2.dll
-;extension=php_curl.dll
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_exif.dll
-;extension=php_fdf.dll
-;extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_gmp.dll
-;extension=php_ifx.dll
-;extension=php_imap.dll
-;extension=php_interbase.dll
-;extension=php_ldap.dll
-;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_mime_magic.dll
-;extension=php_ming.dll
-;extension=php_msql.dll
-;extension=php_mssql.dll
-;extension=php_mysql.dll
-;extension=php_mysqli.dll
-;extension=php_oci8.dll
-;extension=php_openssl.dll
-;extension=php_pdo.dll
-;extension=php_pdo_firebird.dll
-;extension=php_pdo_mssql.dll
-;extension=php_pdo_mysql.dll
-;extension=php_pdo_oci.dll
-;extension=php_pdo_oci8.dll
-;extension=php_pdo_odbc.dll
-;extension=php_pdo_pgsql.dll
-;extension=php_pdo_sqlite.dll
-;extension=php_pgsql.dll
-;extension=php_pspell.dll
-;extension=php_shmop.dll
-;extension=php_snmp.dll
-;extension=php_soap.dll
-;extension=php_sockets.dll
-;extension=php_sqlite.dll
-;extension=php_sybase_ct.dll
-;extension=php_tidy.dll
-;extension=php_xmlrpc.dll
-;extension=php_xsl.dll
-;extension=php_zip.dll
-
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
