diff options
| -rw-r--r-- | www/apache13/Makefile | 15 | ||||
| -rw-r--r-- | www/apache13/pkg-plist | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile index dcbcf1be08ab..1f6e767bda68 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache PORTVERSION= 1.3.34 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= apache_${PORTVERSION} @@ -144,6 +145,16 @@ MAN1= dbmmanage.1 htdigest.1 htpasswd.1 MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \ ${SUEXEC_MAN} +.include <bsd.port.pre.mk> + +.if ${OSVERSION} > 700006 +RC_SCRIPT= apache +.else +RC_SCRIPT= apache.sh +.endif + +PLIST_SUB= RC_SCRIPT="${RC_SCRIPT}" + post-extract: @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/apache.sh > ${WRKSRC}/apache.sh @@ -153,10 +164,10 @@ pre-install: PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh + ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/${RC_SCRIPT} @${TOUCH} ${DOCUMENT_ROOT}-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING @${TOUCH} ${CGIBIN_ROOT}-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING @${CHMOD} a-w ${DOCUMENT_ROOT}-dist ${CGIBIN_ROOT}-dist @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist index 47568509881b..ac791bd03de8 100644 --- a/www/apache13/pkg-plist +++ b/www/apache13/pkg-plist @@ -18,7 +18,7 @@ etc/apache/mime.types-dist @unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf-dist; then rm -f %D/etc/apache/srm.conf; fi etc/apache/srm.conf-dist @exec [ -f %B/srm.conf ] || cp %B/%f %B/srm.conf -etc/rc.d/apache.sh +etc/rc.d/%%RC_SCRIPT%% include/apache/ap.h include/apache/ap_alloc.h include/apache/ap_compat.h |