o startup script:

- Use apache{2,21}flags variable in apache{2,21}_checkconfig().
  It fixes restart when apache2ssl_enable is set to YES in rc.conf
  and httpd.conf is "old" (i.e. non -DSSL safe) [1]

o Makefile
- split post-install target to add install-startup-script:
  User can now upgrade startup script without reinstalling apache2.
  NOTE: this is NOT package-safe and NOT supported, even if in most of
  cases they're no risk.

Noticed by:     many [1]

8 files changed, 54 insertions, 22 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 9f5fe18..5c21853 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -219,13 +219,22 @@ post-configure:
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-post-install:
-	@${MKDIR} ${PREFIX}/etc/apache2/envvars.d
-	@${MKDIR} ${PREFIX}/etc/apache2/Includes
+install-startup-script:
+.if !exists(${WRKDIR}/apache2libs.sh) || !exists(${WRKDIR}/apache2.sh)
+	@${MKDIR} ${WRKDIR}
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/apache2libs.sh > ${WRKDIR}/apache2libs.sh
+.endif
 	@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup script."
-	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh
+	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh
 	@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/apache2.sh startup script."
-	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh
+	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh
+
+post-install: install-startup-script
+	@${MKDIR} ${PREFIX}/etc/apache2/envvars.d
+	@${MKDIR} ${PREFIX}/etc/apache2/Includes
 	@${ECHO_CMD} ""
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh
index fc71c28..e3e6d66 100644
--- a/www/apache2/files/apache.sh
+++ b/www/apache2/files/apache.sh
@@ -49,7 +49,7 @@ checkyesno apache2ssl_enable && \
 apache2_checkconfig()
 {
 	echo "Performing sanity check on apache2 configuration:"
-	${command} -t
+	${command} ${apache2_flags} -t
 }
 
 apache2_precmd() 
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 9f5fe18..5c21853 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -219,13 +219,22 @@ post-configure:
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-post-install:
-	@${MKDIR} ${PREFIX}/etc/apache2/envvars.d
-	@${MKDIR} ${PREFIX}/etc/apache2/Includes
+install-startup-script:
+.if !exists(${WRKDIR}/apache2libs.sh) || !exists(${WRKDIR}/apache2.sh)
+	@${MKDIR} ${WRKDIR}
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/apache2libs.sh > ${WRKDIR}/apache2libs.sh
+.endif
 	@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup script."
-	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh
+	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh
 	@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/apache2.sh startup script."
-	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh
+	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh
+
+post-install: install-startup-script
+	@${MKDIR} ${PREFIX}/etc/apache2/envvars.d
+	@${MKDIR} ${PREFIX}/etc/apache2/Includes
 	@${ECHO_CMD} ""
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/www/apache20/files/apache.sh b/www/apache20/files/apache.sh
index fc71c28..e3e6d66 100644
--- a/www/apache20/files/apache.sh
+++ b/www/apache20/files/apache.sh
@@ -49,7 +49,7 @@ checkyesno apache2ssl_enable && \
 apache2_checkconfig()
 {
 	echo "Performing sanity check on apache2 configuration:"
-	${command} -t
+	${command} ${apache2_flags} -t
 }
 
 apache2_precmd() 
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 8195f5c..afa43f3 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -210,10 +210,17 @@ post-configure:
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-post-install:
-	@${MKDIR} ${PREFIX}/etc/apache21/Includes
+install-startup-script:
+.if !exists(${WRKDIR}/apache21.sh)
+	@${MKDIR} ${WRKDIR}
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/apache.sh > ${WRKDIR}/apache21.sh
+.endif
 	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache21.sh startup script."
-	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache21.sh ${PREFIX}/etc/rc.d/apache21.sh
+	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache21.sh ${PREFIX}/etc/rc.d/apache21.sh
+
+post-install: install-startup-script
+	@${MKDIR} ${PREFIX}/etc/apache21/Includes
 	@@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/apache21/files/apache.sh b/www/apache21/files/apache.sh
index 87300ba..42a4dca 100644
--- a/www/apache21/files/apache.sh
+++ b/www/apache21/files/apache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/www/apache21/files/Attic/apache.sh,v 1.7 2004-12-11 18:06:04 clement Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/apache21/files/Attic/apache.sh,v 1.8 2005-01-11 13:45:05 clement Exp $
 #
 
 # PROVIDE: apache21
@@ -49,7 +49,7 @@ checkyesno apache21ssl_enable && \
 apache21_checkconfig()
 {
 	echo "Performing sanity check on apache21 configuration:"
-	${command} -t
+	${command} ${apache21_flags} -t
 }
 
 apache21_precmd() 
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 8195f5c..afa43f3 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -210,10 +210,17 @@ post-configure:
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-post-install:
-	@${MKDIR} ${PREFIX}/etc/apache21/Includes
+install-startup-script:
+.if !exists(${WRKDIR}/apache21.sh)
+	@${MKDIR} ${WRKDIR}
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/apache.sh > ${WRKDIR}/apache21.sh
+.endif
 	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache21.sh startup script."
-	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache21.sh ${PREFIX}/etc/rc.d/apache21.sh
+	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache21.sh ${PREFIX}/etc/rc.d/apache21.sh
+
+post-install: install-startup-script
+	@${MKDIR} ${PREFIX}/etc/apache21/Includes
 	@@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/apache22/files/apache.sh b/www/apache22/files/apache.sh
index ecc4de8..f305bf5 100644
--- a/www/apache22/files/apache.sh
+++ b/www/apache22/files/apache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache.sh,v 1.7 2004-12-11 18:06:04 clement Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache.sh,v 1.8 2005-01-11 13:45:05 clement Exp $
 #
 
 # PROVIDE: apache21
@@ -49,7 +49,7 @@ checkyesno apache21ssl_enable && \
 apache21_checkconfig()
 {
 	echo "Performing sanity check on apache21 configuration:"
-	${command} -t
+	${command} ${apache21_flags} -t
 }
 
 apache21_precmd()