Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7666

Modified Files:
        php4.info php5.info 
Log Message:
Hopefully working scripts, not sure why they work for me but not others

Index: php4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/php4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- php4.info   24 Jun 2006 00:10:48 -0000      1.2
+++ php4.info   24 Jun 2006 17:34:17 -0000      1.3
@@ -1,6 +1,6 @@
 Package: php4
 Version: 4.4.2
-Revision: 11
+Revision: 12
 ###
 BuildDepends: aprutil-dev, apr-dev (>= 0.9.12-10), libtool14, libgettext3-dev, 
libiconv-dev, gd2, mysql15-dev, postgresql80-unified-dev, libcurl3-unified, 
expat, libmhash, libmcve, libmcrypt, libxml2 (>= 2.6.1-1), libxslt (>= 
1.1.0-1), openldap23-dev, libsablot-dev, ming, t1lib5, pcre, libpng3, 
apache2-dev (>= 2.0.58-10), unixodbc2 | unixodbc2-nox, gdbm3, net-snmp-ssl-dev, 
db44-aes, libtiff, pdflib, system-java15-dev, recode-dev, gmp, 
mnogosearch1-dev, uw-imap-c-client (>= 2004e-10), libjpeg, cyrus-sasl2-dev, 
system-openssl-dev
 Replaces: php4-apache2-ssl
@@ -264,13 +264,13 @@
   PostInstScript: <<
 set -e
 
-if [ "$1" != "configure" ]; then
-  exit 0
-fi
+echo "Enabling mod_php4..."
+%p/sbin/a2enmod php4
 
-if [ "$2" = "<unknown>" -o -z "$2" ]; then
-  %p/sbin/a2enmod php4
-  %p/sbin/apache2ctl restart
+if [ -f /Library/StartupItems/daemonic-apache2/daemonic-apache2 ]
+then
+       echo "Restarting apache2..."
+       %p/sbin/apache2ctl restart
 fi
 
 exit 0
@@ -278,9 +278,18 @@
   PreRmScript: <<
 set -e
 
-if [ "$1" = "remove" -o "$1" = "purge" ]; then
-  %p/sbin/a2dismod php4
-  %p/sbin/apache2ctl restart
+if [ "$1" != "remove" -a "$1" != "purge" ]
+then
+       exit 0
+fi
+
+echo "Disabling mod_php4..."
+%p/sbin/a2dismod php4
+
+if [ -f /Library/StartupItems/daemonic-apache2/daemonic-apache2 ]
+then
+       echo "Restarting apache2..."
+       %p/sbin/apache2ctl restart
 fi
 
 exit 0

Index: php5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/php5.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- php5.info   24 Jun 2006 00:10:48 -0000      1.12
+++ php5.info   24 Jun 2006 17:34:17 -0000      1.13
@@ -1,6 +1,6 @@
 Package: php5
 Version: 5.1.4
-Revision: 13
+Revision: 14
 ###
 BuildDepends: aprutil-dev, apr-dev (>= 0.9.12-10), libtool14, libgettext3-dev, 
libiconv-dev, gd2, mysql15-dev, sqlite-dev, postgresql80-unified-dev (>= 
8.0.6-1026), libcurl3-unified, expat, libmhash (>= 0.8.18-2), libmcrypt, 
libxml2, libxslt, openldap23-dev (>= 2.3.11-1002), ming, t1lib5, libpng3, 
apache2-dev (>= 2.0.58-10), unixodbc2 (>= 2.2.11-1010) | unixodbc2-nox (>= 
2.2.11-1010), gdbm3, net-snmp-ssl (>= 5.0.7-2), net-snmp-ssl-dev (>= 5.0.7-2), 
db44-aes, libtiff, x11-dev, gmp (>= 4.1.4-1), libmpfr1, uw-imap-c-client (>=  
2004e-10), libjpeg, cyrus-sasl2-dev, system-openssl-dev
 Replaces: php5-apache2-ssl
@@ -283,13 +283,13 @@
   PostInstScript: <<
 set -e
 
-if [ "$1" != "configure" ]; then
-  exit 0
-fi
+echo "Enabling mod_php5..."
+%p/sbin/a2enmod php5
 
-if [ "$2" = "<unknown>" -o -z "$2" ]; then
-  %p/sbin/a2enmod php5
-  %p/sbin/apache2ctl restart
+if [ -f /Library/StartupItems/daemonic-apache2/daemonic-apache2 ]
+then
+       echo "Restarting apache2..."
+       %p/sbin/apache2ctl restart
 fi
 
 exit 0
@@ -297,9 +297,18 @@
   PreRmScript: <<
 set -e
 
-if [ "$1" = "remove" -o "$1" = "purge" ]; then
-  %p/sbin/a2dismod php5
-  %p/sbin/apache2ctl restart
+if [ "$1" != "remove" -a "$1" != "purge" ]
+then
+       exit 0
+fi
+
+echo "Disabling mod_php5..."
+%p/sbin/a2dismod php5
+
+if [ -f /Library/StartupItems/daemonic-apache2/daemonic-apache2 ]
+then
+       echo "Restarting apache2..."
+       %p/sbin/apache2ctl restart
 fi
 
 exit 0


Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to