Back out rc transition, now all script executed in the subshell
This commit is contained in:
parent
4609f887f4
commit
a742ba759e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=150445
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= apache
|
||||
PORTVERSION= 1.3.34
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
|
||||
DISTNAME= apache_${PORTVERSION}
|
||||
@ -145,16 +145,6 @@ 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
|
||||
@ -164,10 +154,10 @@ pre-install:
|
||||
PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
|
||||
|
||||
post-install:
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/${RC_SCRIPT}
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh
|
||||
@${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.post.mk>
|
||||
.include <bsd.port.mk>
|
||||
|
@ -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/%%RC_SCRIPT%%
|
||||
etc/rc.d/apache.sh
|
||||
include/apache/ap.h
|
||||
include/apache/ap_alloc.h
|
||||
include/apache/ap_compat.h
|
||||
|
Loading…
Reference in New Issue
Block a user