diff options
| author | dinoex <dinoex@FreeBSD.org> | 2009-07-07 11:56:52 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2009-07-07 11:56:52 +0800 |
| commit | ba19b961ffb85c618081d4fece9fe49c5b521096 (patch) | |
| tree | 39d2bb3c27e5414f638cd9e36eead30b3e636f0f | |
| parent | fc68751cbf236d218239a743ceaf3810b5f3d82d (diff) | |
| download | freebsd-ports-gnome-ba19b961ffb85c618081d4fece9fe49c5b521096.tar.gz freebsd-ports-gnome-ba19b961ffb85c618081d4fece9fe49c5b521096.tar.zst freebsd-ports-gnome-ba19b961ffb85c618081d4fece9fe49c5b521096.zip | |
- drop option WITHOUT_RC_SUBR
| -rw-r--r-- | www/apache13-modssl/Makefile | 14 | ||||
| -rw-r--r-- | www/apache13-modssl/files/apache.sh | 16 |
2 files changed, 1 insertions, 29 deletions
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile index 24675c1e1a63..5a523b4ce2b8 100644 --- a/www/apache13-modssl/Makefile +++ b/www/apache13-modssl/Makefile @@ -57,9 +57,7 @@ MODSSL_FILE= mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX} MODSNMP_FILE= mod_snmp_${VERSION_MODSNMP}${EXTRACT_SUFX} RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -.if !defined(WITHOUT_RC_SUBR) USE_RC_SUBR= yes -.endif .include <bsd.port.pre.mk> @@ -91,11 +89,7 @@ check-depends:: @${FALSE} .endif -.if exists(${PREFIX}/etc/rc.d/apache.sh) || !defined(USE_RC_SUBR) -APACHE_SH?= etc/rc.d/apache.sh.sample -.else -APACHE_SH?= etc/rc.d/apache.sh -.endif +APACHE_SH?= etc/rc.d/apache PLIST_FILES+= ${APACHE_SH} @@ -388,8 +382,6 @@ pre-fetch: post-extract: @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/rcng.sh > ${WRKSRC}/rcng.sh - @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/apache.sh \ - > ${WRKSRC}/apache.sh @${REINPLACE_CMD} -e 's|echo aout|echo elf|' \ ${WRKSRC}/src/Configure .if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP) @@ -436,11 +428,7 @@ pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: -.if defined(USE_RC_SUBR) ${INSTALL_SCRIPT} ${WRKSRC}/rcng.sh ${PREFIX}/${APACHE_SH} -.else - ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/${APACHE_SH} -.endif .if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP) @${MKDIR} ${DATADIR}/buckets @${CHOWN} www:www ${DATADIR}/buckets diff --git a/www/apache13-modssl/files/apache.sh b/www/apache13-modssl/files/apache.sh deleted file mode 100644 index f8cec279900c..000000000000 --- a/www/apache13-modssl/files/apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -case "$1" in -start) - [ -x %%PREFIX%%/sbin/apachectl ] && %%PREFIX%%/sbin/apachectl startssl > /dev/null && echo -n ' apache' - ;; -stop) - [ -r /var/run/httpd.pid ] && %%PREFIX%%/sbin/apachectl stop > /dev/null && echo -n ' apache' - ;; -*) - echo "Usage: ${0##*/} { start | stop }" >&2 - exit 64 - ;; -esac - -exit 0 |