[csw-devel] SF.net SVN: gar:[14480] csw/mgar/pkg/php5/trunk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Sun May 1 20:07:22 CEST 2011
Revision: 14480
http://gar.svn.sourceforge.net/gar/?rev=14480&view=rev
Author: bdwalton
Date: 2011-05-01 18:07:22 +0000 (Sun, 01 May 2011)
Log Message:
-----------
php5/trunk: remove a pile of old cruft from the php5 postinstall
Modified Paths:
--------------
csw/mgar/pkg/php5/trunk/Makefile
csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall
Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile 2011-05-01 16:35:35 UTC (rev 14479)
+++ csw/mgar/pkg/php5/trunk/Makefile 2011-05-01 18:07:22 UTC (rev 14480)
@@ -314,8 +314,9 @@
endif
# Disable Tests (report submitted to PHP QA)
-SKIPTEST = 1
+#SKIPTEST = 1
#ENABLE_CHECK = 0
+TEST_TARGET = test
include gar/category.mk
Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall
===================================================================
--- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2011-05-01 16:35:35 UTC (rev 14479)
+++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2011-05-01 18:07:22 UTC (rev 14480)
@@ -2,153 +2,13 @@
PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin
-if [ ! -f _PHPETCDIR_/pear.conf ]; then
- cp -p _PHPETCDIR_/pear.conf.CSW _PHPETCDIR_/pear.conf
- _PHPBINDIR_/pear config-set php_ini _PHPINIFILE_
-else
- echo "_PHPETCDIR_/pear.conf already exists."
- echo "Updateing _PHPETCDIR_/pear.conf with current directories"
- _PHPBINDIR_/pear config-set php_ini _PHPINIFILE_
- _PHPBINDIR_/pear config-set php_bin _PHPBINDIR_
- _PHPBINDIR_/pear config-set php_doc _PHPLIBDIR_/doc
- _PHPBINDIR_/pear config-set cfg_dir _PHPLIBDIR_/cfg
- _PHPBINDIR_/pear config-set data_dir _PHPLIBDIR_/data
- _PHPBINDIR_/pear config-set test_dir _PHPLIBDIR_/test
- _PHPBINDIR_/pear config-set www_dir _PHPLIBDIR_/htdocs
- _PHPBINDIR_/pear config-set sig_keydir _PHPETCDIR_/htdocs
- _PHPBINDIR_/pear config-set php_dir _PHPLIBDIR_
- _PHPBINDIR_/pear config-set php_ext _PHPEXTDIR_
-fi
-if [ ! -f _PHPINIFILE_ ]; then
- cp -p _PHPINIFILE_.CSW _PHPINIFILE_
-else
- echo "_PHPINIFILE_ already exists"
- extdir="_PHPEXTDIR_"
- curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' _PHPINIFILE_`
+extdir="no-debug-non-zts-20060613"
+curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' /etc/opt/csw/php5/php.ini`
- if [ "_PHPEXTDIR_" != "$curextdir" ]; then
- echo "updating extension_dir..."
- perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,_PHPEXTDIR_," _PHPINIFILE_
-
- old_list="`sed -ne 's/^extension=\(.*\)\.so/\1/p' _PHPINIFILE_`"
- new_pkgs=''
- non_pkgs=''
- for ext in `echo ${old_list}`; do
- if grep "extension=$ext" _PHPINIFILE_.CSW; then
- new_pkgs="${new_pkgs} php5_${ext}"
- else
- non_pkgs="${non_pkgs} ${ext}"
- fi
- done
-
- cat << _EOT_
-
-******************************************************************************
-* NOTICE: The existing _PHPINIFILE_ file is from an older version of PHP5.
-*
-* ************* PLEASE READ *************
-*
-* Starting with php5-5.2.9,REV=2009.04.29 the CSW php5 suite has been
-* broken out into seperate packages for the modules.
-*
-_EOT_
-if [ -n "${new_pkgs}" ]; then
- cat << _EOT_
-* ************* PLEASE READ *************
-*
-* Your existing config contains the following extensions
-* that now have become external packages:
-*
-_EOT_
-cnt=1
-for name in `echo ${new_pkgs}`; do
- if [ ${cnt} -eq 1 ]; then
- echo "* \c"
- fi
- if [ `expr ${cnt} % 4` -ne 0 ]; then
- echo "${name} \c"
- cnt=`expr ${cnt} + 1`
- else
- echo "${name}"
- cnt=1
- fi
-done
-if [ ${cnt} -ne 1 ]; then
- echo
+if [ "no-debug-non-zts-20060613" != "$curextdir" ]; then
+ echo "updating extension_dir..."
+ perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,no-debug-non-zts-20060613," /etc/opt/csw/php5/php.ini
fi
-cat << _EOT_
-*
-* to keep the same functionality as the original install
-* you will need to install them using pkg-get
-*
-* If you have issues with missing extensions, Please check
-* the catalog for the missing extension before filing a bug report
-*
-_EOT_
-else
- cat << _EOT_
-* ************* PLEASE READ *************
-*
-* Your existing config does not contain any shared extensions
-* that are now packages. If you have issues with missing extensions,
-* Please Check the catalog for the missing extension before
-* filing a bug report.
-*
-_EOT_
-fi
-if [ -n "${non_pkgs}" ]; then
- cat << _EOT_
-* ************* PLEASE READ *************
-*
-* Your existing config contains the following extensions
-* that are not part of CSW build:
-*
-_EOT_
-cnt=1
-for name in `echo ${non_pkgs}`; do
- if [ ${cnt} -eq 1 ]; then
- echo "* \c"
- fi
- if [ `expr ${cnt} % 4` -ne 0 ]; then
- echo "${name} \c"
- cnt=`expr ${cnt} + 1`
- else
- echo "${name}"
- cnt=1
- fi
-done
-if [ ${cnt} -ne 1 ]; then
- echo
-fi
-cat << _EOT_
-*
-* Please verify they are still working after this upgrade.
-*
-_EOT_
-fi
-cat << _EOT_
-******************************************************************************
-******************************************************************************
-* WARNING: Short open tag support in this release of CSWphp5 is DISABLED by
-* default. If you rely on short open tag (<? vs <?php) behavior, set
-* short_open_tag to On in _PHPINIFILE_ right away.
-******************************************************************************
-_EOT_
- fi
-fi
-if [ ! -d _PHPEXTDIR_ ]; then
- mkdir -p _PHPEXTDIR_
- for dir in `_PHPBINDIR_/php -i |grep extension_dir |\
- awk -F'/' '{print $(NF-1), $NF}'`; do
- chown -R root:bin ${dir}
- chmod -R 0755 ${dir}
- installf ${PKGINST} ${dir}
- done
- installf -f ${PKGINST}
-fi
-
-echo "PHP5 configuration: _PHPINIFILE_"
-
exit 0
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