From 39d022265942f5a6bedf3623382ee2e4b2ee74d4 Mon Sep 17 00:00:00 2001 From: Munechika SUMIKAWA Date: Wed, 9 Jun 2004 17:04:00 +0000 Subject: [PATCH] Sync with www/apache13. --- www/apache13+ipv6/Makefile | 36 +++++++++++++++++++-------- www/apache13+ipv6/distinfo | 2 ++ www/apache13+ipv6/files/apache.sh | 41 ++++++++++++++++++++++--------- www/apache13+ipv6/pkg-message | 4 +++ www/apache13+ipv6/pkg-plist | 12 ++++----- 5 files changed, 67 insertions(+), 28 deletions(-) diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile index c996073595e9..3dce67e5c7de 100644 --- a/www/apache13+ipv6/Makefile +++ b/www/apache13+ipv6/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache+ipv6 PORTVERSION= 1.3.29 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= apache_${PORTVERSION} @@ -25,10 +25,25 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* caudium-devel-1.* caudium10-1.* caudium12-* \ ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* USE_PERL5= yes +USE_RC_SUBR= yes -DATADIR=${PREFIX}/www -DOCUMENT_ROOT=${DATADIR}/data +.if defined(APACHE_DATADIR) +DATADIR= ${APACHE_DATADIR} +.else +DATADIR= ${PREFIX}/www +.endif +.if defined(APACHE_DOCUMENT_ROOT) +DOCUMENT_ROOT= ${APACHE_DOCUMENT_ROOT} +.else +DOCUMENT_ROOT= ${DATADIR}/data +.endif +.if defined(APACHE_CGIBIN_ROOT) +CGIBIN_ROOT= ${APACHE_CGIBIN_ROOT} +.else +CGIBIN_ROOT= ${DATADIR}/cgi-bin +.endif DEFAULT_PATH=/bin:/usr/bin:${PREFIX}/bin +RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} .if defined(WITHOUT_APACHE_EXPAT) && ${WITHOUT_APACHE_EXPAT} == yes EXPAT_CONF+= --disable-rule=EXPAT @@ -82,6 +97,9 @@ CONFIGURE_ARGS+= \ --server-gid=www \ --with-perl=${PERL} \ --with-layout=FreeBSD \ + --datadir=${DATADIR} \ + --htdocsdir=${DOCUMENT_ROOT} \ + --cgidir=${CGIBIN_ROOT} \ --without-confadjust \ --enable-rule=INET6 \ --enable-module=most \ @@ -127,18 +145,16 @@ MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \ ${SUEXEC_MAN} post-extract: - @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/apache.sh \ - > ${WRKSRC}/apache.sh + @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${FILESDIR}/apache.sh > ${WRKSRC}/apache.sh pre-install: PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - ${INSTALL_DATA} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh-dist - @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ - ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ - ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \ - fi + ${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 @${CAT} ${PKGMESSAGE} .include diff --git a/www/apache13+ipv6/distinfo b/www/apache13+ipv6/distinfo index 6ef08a318426..0b1b7424fd82 100644 --- a/www/apache13+ipv6/distinfo +++ b/www/apache13+ipv6/distinfo @@ -1,2 +1,4 @@ MD5 (apache_1.3.29.tar.gz) = e97fe9bf51dc2c9c233d53f63b1347e3 +SIZE (apache_1.3.29.tar.gz) = 2435809 MD5 (apache-1.3.29-v6-20031112.diff.gz) = f00f41fd04250125dd35d585ad489dd7 +SIZE (apache-1.3.29-v6-20031112.diff.gz) = 37452 diff --git a/www/apache13+ipv6/files/apache.sh b/www/apache13+ipv6/files/apache.sh index da657b5307ba..03e31dd16321 100644 --- a/www/apache13+ipv6/files/apache.sh +++ b/www/apache13+ipv6/files/apache.sh @@ -1,15 +1,32 @@ #!/bin/sh +# $FreeBSD$ -case "$1" in -start) - [ -x %%PREFIX%%/sbin/apachectl ] && %%PREFIX%%/sbin/apachectl start > /dev/null && echo -n ' apache' - ;; -stop) - [ -r /var/run/httpd.pid ] && %%PREFIX%%/sbin/apachectl stop > /dev/null && echo -n ' apache' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac +# PROVIDE: apache +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: FreeBSD shutdown -exit 0 +# Define these apache_* variables in one of these files: +# /etc/rc.conf +# /etc/rc.conf.local +# /etc/rc.conf.d/apache +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# +apache_enable="NO" +apache_flags="" +apache_pidfile="/var/run/httpd.pid" + +. %%RC_SUBR%% + +name="apache" +rcvar=`set_rcvar` +command="%%PREFIX%%/sbin/httpd" + +load_rc_config $name + +pidfile="${apache_pidfile}" + +start_precmd="`/usr/bin/limits -e -U www`" + +run_rc_command "$1" diff --git a/www/apache13+ipv6/pkg-message b/www/apache13+ipv6/pkg-message index 76b79ba42849..99f901ee1fa3 100644 --- a/www/apache13+ipv6/pkg-message +++ b/www/apache13+ipv6/pkg-message @@ -2,3 +2,7 @@ As of version 1.3.24, the RedirectMatch directive requires an absolute URL target location per RFC 2068. Uses of RedirectMatch that specify a relative URL will fail and must be corrected to function. + +===> BE CAREFULL HOW TO BOOT on 1.3.29_2 or after: + To run apache www server from startup, add apache_enable="YES" + in your /etc/rc.conf. diff --git a/www/apache13+ipv6/pkg-plist b/www/apache13+ipv6/pkg-plist index ea7f610234ea..8c4ae745b158 100644 --- a/www/apache13+ipv6/pkg-plist +++ b/www/apache13+ipv6/pkg-plist @@ -1,4 +1,4 @@ -@comment $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-plist,v 1.19 2004-06-09 06:16:00 kris Exp $ +@comment $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-plist,v 1.20 2004-06-09 17:04:00 sumikawa Exp $ bin/checkgid bin/dbmmanage bin/htdigest @@ -18,9 +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 -@unexec if cmp -s %D/etc/rc.d/apache.sh %D/etc/rc.d/apache.sh-dist; then rm -f %D/etc/rc.d/apache.sh; fi -etc/rc.d/apache.sh-dist -@exec [ -f %B/apache.sh ] || ( cp %B/%f %B/apache.sh; chmod 755 %B/apache.sh ) +etc/rc.d/apache.sh include/apache/ap.h include/apache/ap_alloc.h include/apache/ap_compat.h @@ -108,8 +106,9 @@ sbin/httpd sbin/logresolve sbin/rotatelogs %%SUB_SUEXEC%%sbin/suexec -www/data-dist/apache_pb.gif +www/data-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING @exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data +www/data-dist/apache_pb.gif www/data-dist/index.html.ca www/data-dist/index.html.cz www/data-dist/index.html.de @@ -427,8 +426,9 @@ share/doc/apache/win_service.html.html share/doc/apache/win_service.html.ja.jis share/doc/apache/windows.html.en share/doc/apache/windows.html.ja.jis -www/cgi-bin-dist/printenv +www/cgi-bin-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING @exec [ -d %D/www/cgi-bin/ ] || ln -fs %B %D/www/cgi-bin +www/cgi-bin-dist/printenv www/cgi-bin-dist/test-cgi www/icons/README www/icons/a.gif