diff options
| author | Bill Fumerola <billf@FreeBSD.org> | 1998-11-25 20:49:02 +0000 |
|---|---|---|
| committer | Bill Fumerola <billf@FreeBSD.org> | 1998-11-25 20:49:02 +0000 |
| commit | e7edc0755352346788644cdb5e39aec8e42260e5 (patch) | |
| tree | 095358725359b71e314062ba8fb0f03c0c265e59 /www | |
| parent | Added patch-aa so this didn't break in -CURRENT (diff) | |
Update bug where a non-existant ${PREFIX}/www/data will make the install
fail.
PR: ports/8857
Submitted by: maintainer (hetzels@westbend.net)
Notes
Notes:
svn path=/head/; revision=14901
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache13-fp/Makefile | 16 | ||||
| -rw-r--r-- | www/apache13-fp/files/patch-ab | 2 | ||||
| -rw-r--r-- | www/apache13-fp/pkg-plist | 1 |
3 files changed, 5 insertions, 14 deletions
diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile index fd2536fc1f38..1b4c585aa6df 100644 --- a/www/apache13-fp/Makefile +++ b/www/apache13-fp/Makefile @@ -3,7 +3,7 @@ # Date created: Sat Oct 31 16:30:00 CDT 1997 # Whom: hetzels@westbend.net # -# $Id: Makefile,v 1.3 1998/11/10 01:55:55 steve Exp $ +# $Id: Makefile,v 1.4 1998/11/19 22:48:42 billf Exp $ # DISTNAME= apache_1.3.3 @@ -106,19 +106,11 @@ pre-patch: @${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/http_protocol.patch post-install: - @${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh.tmpl file." + @${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh file." @${CAT} ${FILESDIR}/apache.sh.tmpl | \ ${SED} -e 's;PREFIX;${PREFIX};' -e 's;PERL5;${PERL};' \ - > ${PREFIX}/etc/rc.d/apache.sh.tmpl - @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ - ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ - ${CP} ${PREFIX}/etc/rc.d/apache.sh.tmpl ${PREFIX}/etc/rc.d/apache.sh; \ - chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \ - else \ - ${ECHO} "apache.sh exists, please compare with apache.sh.tmpl."; \ - ${ECHO} "The template will regenerate the FrontPage suidkey"; \ - ${ECHO} "file when the apache server is started/restarted."; \ - fi + > ${PREFIX}/etc/rc.d/apache.sh + @chmod 751 ${PREFIX}/etc/rc.d/apache.sh @${SH} ${WRKSRC}/${FPINSTALL} @${INSTALL_FILE} ${WRKSRC}/${FPINSTALL} ${PREFIX}/${FPINSTALL} @${INSTALL_FILE} ${WRKSRC}/${CHANGESERVER} ${PREFIX}/${CHANGESERVER} diff --git a/www/apache13-fp/files/patch-ab b/www/apache13-fp/files/patch-ab index 875c96ac7a82..9bf6caa7ab4d 100644 --- a/www/apache13-fp/files/patch-ab +++ b/www/apache13-fp/files/patch-ab @@ -91,7 +91,7 @@ ! find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \ ! # fi ! if [ ! -d $(root)$(datadir)/data ]; then \ -! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \ +! $(CP) -rp $(root)$(doc_prefix) $(root)$(datadir)/data; \ fi ! $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default ! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ diff --git a/www/apache13-fp/pkg-plist b/www/apache13-fp/pkg-plist index af7db72aba77..34bbb2543f28 100644 --- a/www/apache13-fp/pkg-plist +++ b/www/apache13-fp/pkg-plist @@ -7,7 +7,6 @@ etc/apache/magic.default etc/apache/mime.types.default etc/apache/srm.conf.default etc/rc.d/apache.sh -etc/rc.d/apache.sh.tmpl include/apache/alloc.h include/apache/ap.h include/apache/ap_compat.h |