summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Laforet <clement@FreeBSD.org>2005-01-11 13:45:05 +0000
committerClement Laforet <clement@FreeBSD.org>2005-01-11 13:45:05 +0000
commit4e80ec5376deeec3778cd3347e3ae4b716488507 (patch)
treee1220bd15d70999277d9caedcc9df15cf27aadd1
parent- Utilize MASTER_SITE_MYSQL instead of tons urls (diff)
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]
Notes
Notes: svn path=/head/; revision=126134
Diffstat
-rw-r--r--www/apache2/Makefile19
-rw-r--r--www/apache2/files/apache.sh2
-rw-r--r--www/apache20/Makefile19
-rw-r--r--www/apache20/files/apache.sh2
-rw-r--r--www/apache21/Makefile13
-rw-r--r--www/apache21/files/apache.sh4
-rw-r--r--www/apache22/Makefile13
-rw-r--r--www/apache22/files/apache.sh4
8 files changed, 54 insertions, 22 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 9f5fe1850521..5c2185379271 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 fc71c2890619..e3e6d6611af7 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 9f5fe1850521..5c2185379271 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 fc71c2890619..e3e6d6611af7 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 8195f5c957bd..afa43f37f6e7 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 87300ba82a54..42a4dca6f1b0 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 8195f5c957bd..afa43f37f6e7 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 ecc4de893edf..f305bf576143 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()
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-11 00:17:35 +0000