[PC-BSD Commits] r3451 - in pbibuild/modules/apache22: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-02-13 11:04:57 -0800 (Fri, 13 Feb 2009)
New Revision: 3451

Modified:
   pbibuild/modules/apache22/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/apache22/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/apache22/pbi.conf
Log:

Updated apache to use /Programs for rc.d scripts



Modified: pbibuild/modules/apache22/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/apache22/overlay-dir/PBI.RemoveScript.sh	2009-02-13 17:13:03 UTC (rev 3450)
+++ pbibuild/modules/apache22/overlay-dir/PBI.RemoveScript.sh	2009-02-13 19:04:57 UTC (rev 3451)
@@ -7,18 +7,22 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-/usr/local/etc/rc.d/apache22 stop
+/Programs/rc.d/apache22 stop
 killall -9 httpd
 
 cd /usr/local/sbin
-rm -Rf htcacheclean htdbm        htdigest     htpasswd     httpd        httxt2dbm
-cd-
+rm htcacheclean 
+rm htdbm
+rm htdigest
+rm htpasswd
+rm httpd
+rm httxt2dbm
 
 rm -Rf /PCBSD/Services/apache22
 rm -Rf /usr/local/libexec/apache22
 rm -Rf /usr/local/etc/apache22
-rm -Rf /usr/local/etc/rc.d/apache22
-rm -Rf /usr/local/etc/rc.d/htcacheclean
+rm -Rf /Programs/rc.d/apache22
+rm -Rf /Programs/rc.d/htcacheclean
 
 cat /etc/rc.conf | grep -v "apache22_enable=" > /tmp/.rc.conf
 mv /tmp/.rc.conf /etc/rc.conf

Modified: pbibuild/modules/apache22/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/apache22/overlay-dir/PBI.SetupScript.sh	2009-02-13 17:13:03 UTC (rev 3450)
+++ pbibuild/modules/apache22/overlay-dir/PBI.SetupScript.sh	2009-02-13 19:04:57 UTC (rev 3451)
@@ -18,8 +18,8 @@
 ln -s /Programs/${PROGDIR}/etc/apache22 /usr/local/etc/apache22
 ln -s /Programs/${PROGDIR}/libexec/apache22 /usr/local/libexec/apache22
 ln -s /Programs/${PROGDIR}/services/apache22 /PCBSD/Services/apache22
-ln -s /Programs/${PROGDIR}/etc/rc.d/apache22 /usr/local/etc/rc.d/apache22
-ln -s /Programs/${PROGDIR}/etc/rc.d/htcacheclean /usr/local/etc/rc.d/htcacheclean
+ln -s /Programs/${PROGDIR}/etc/rc.d/apache22 /Programs/rc.d/apache22
+ln -s /Programs/${PROGDIR}/etc/rc.d/htcacheclean /Programs/rc.d/htcacheclean
 
 ln -s /Programs/${PROGDIR}/sbin/htcacheclean /usr/local/sbin/htcacheclean
 ln -s /Programs/${PROGDIR}/sbin/htdbm /usr/local/sbin/htdbm
@@ -45,7 +45,7 @@
 
 echo "SETSETPS: 4"
 echo "MSG: Starting apache service"
-/usr/local/etc/rc.d/apache22 start
+/Programs/rc.d/apache22 start
 
 echo "MSG: Finished!"
 echo "SETSETPS: 5"

Modified: pbibuild/modules/apache22/pbi.conf
===================================================================
--- pbibuild/modules/apache22/pbi.conf	2009-02-13 17:13:03 UTC (rev 3450)
+++ pbibuild/modules/apache22/pbi.conf	2009-02-13 19:04:57 UTC (rev 3451)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="