Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/apache13+ipv6/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- Makefile	11 Sep 2007 21:16:17 -0000	1.57
+++ Makefile	24 Oct 2007 18:42:38 -0000
@@ -5,16 +5,17 @@
 # $FreeBSD: ports/www/apache13+ipv6/Makefile,v 1.57 2007/09/11 21:16:17 tmclaugh Exp $
 #
 
-PORTNAME=	apache+ipv6
+PORTNAME=	apache
 PORTVERSION=	1.3.39
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
+PKGNAMESUFFIX=	+ipv6
 DISTNAME=	apache_${PORTVERSION}
 
 PATCH_SITES=	http://www.don.to/arc/
 PATCHFILES=	apache-1.3.39-v6-20070911.diff.gz
-PATCH_DIST_STRIP= -p1
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	The extremely popular Apache http server. Very fast, very clean
@@ -23,10 +24,10 @@
 		apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
 		apache+mod_ssl+mod_snmp+mod_accel-1.* \
 		apache+ssl-1.* apache-1.* apache-2.* apache_fp-1.* \
-		caudium-devel-1.* caudium10-1.* caudium12-* \
+		caudium-devel-1.* caudium10-1.* caudium12-1.* \
 		ru-apache+mod_ssl-1.* ru-apache-1.*
 USE_PERL5=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	apache
 
 .if defined(APACHE_DATADIR)
 DATADIR=${APACHE_DATADIR}
@@ -90,6 +91,12 @@
 
 .endif  # !SUEXEC
 
+.if !defined(NOPORTDOC)
+PLIST_SUB+=	NODOCS=""
+.else
+PLIST_SUB+=	NODOCS="@comment "
+.endif
+
 HAS_CONFIGURE=	yes
 # += for child ports
 CONFIGURE_ARGS+=	\
@@ -145,16 +152,17 @@
 MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
 		${SUEXEC_MAN}
 
-post-extract:
-	@${SED}	${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache.sh > ${WRKSRC}/apache.sh
+DOCSDIR=	${PREFIX}/share/doc
+
+post-patch:
+.if defined(NOPORTDOC)
+	@(cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/no_port_doc)
+.endif
 
 pre-install:
-	-@${CHMOD} u+w ${DOCUMENT_ROOT}-dist ${CGIBIN_ROOT}-dist
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	${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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/apache13+ipv6/pkg-plist,v
retrieving revision 1.25
diff -u -r1.25 pkg-plist
--- pkg-plist	11 Sep 2007 02:52:45 -0000	1.25
+++ pkg-plist	11 Oct 2007 22:21:55 -0000
@@ -18,7 +18,6 @@
 @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
 include/apache/ap.h
 include/apache/ap_alloc.h
 include/apache/ap_compat.h
@@ -143,297 +142,297 @@
 www/data-dist/index.html.se
 www/data-dist/index.html.zh-tw.big5
 @exec chmod a-w %D/www/data-dist
-share/doc/apache/LICENSE
-share/doc/apache/bind.html.en
-share/doc/apache/bind.html.fr
-share/doc/apache/bind.html.html
-share/doc/apache/bind.html.ja.jis
-share/doc/apache/configuring.html.en
-share/doc/apache/configuring.html.fr
-share/doc/apache/configuring.html.html
-share/doc/apache/configuring.html.ja.jis
-share/doc/apache/content-negotiation.html.en
-share/doc/apache/content-negotiation.html.html
-share/doc/apache/content-negotiation.html.ja.jis
-share/doc/apache/custom-error.html.en
-share/doc/apache/custom-error.html.fr
-share/doc/apache/custom-error.html.html
-share/doc/apache/custom-error.html.ja.jis
-share/doc/apache/cygwin.html
-share/doc/apache/dns-caveats.html.en
-share/doc/apache/dns-caveats.html.fr
-share/doc/apache/dns-caveats.html.html
-share/doc/apache/dns-caveats.html.ja.jis
-share/doc/apache/dso.html
-share/doc/apache/ebcdic.html
-share/doc/apache/env.html.en
-share/doc/apache/env.html.html
-share/doc/apache/env.html.ja.jis
-share/doc/apache/footer.html
-share/doc/apache/handler.html.en
-share/doc/apache/handler.html.html
-share/doc/apache/handler.html.ja.jis
-share/doc/apache/header.html
-share/doc/apache/howto/auth.html
-share/doc/apache/howto/cgi.html.en
-share/doc/apache/howto/cgi.html.html
-share/doc/apache/howto/cgi.html.ja.jis
-share/doc/apache/howto/footer.html
-share/doc/apache/howto/header.html
-share/doc/apache/howto/htaccess.html
-share/doc/apache/howto/ssi.html.en
-share/doc/apache/howto/ssi.html.html
-share/doc/apache/howto/ssi.html.ja.jis
-share/doc/apache/images/apache_header.gif
-share/doc/apache/images/custom_errordocs.gif
-share/doc/apache/images/home.gif
-share/doc/apache/images/index.gif
-share/doc/apache/images/mod_rewrite_fig1.fig
-share/doc/apache/images/mod_rewrite_fig1.gif
-share/doc/apache/images/mod_rewrite_fig2.fig
-share/doc/apache/images/mod_rewrite_fig2.gif
-share/doc/apache/images/pixel.gif
-share/doc/apache/images/sub.gif
-share/doc/apache/index.html.en
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.html
-share/doc/apache/index.html.ja.jis
-share/doc/apache/install-tpf.html
-share/doc/apache/install-ztpf.html
-share/doc/apache/install.html.en
-share/doc/apache/install.html.es
-share/doc/apache/install.html.fr
-share/doc/apache/install.html.html
-share/doc/apache/install.html.ja.jis
-share/doc/apache/invoking.html.en
-share/doc/apache/invoking.html.fr
-share/doc/apache/invoking.html.html
-share/doc/apache/invoking.html.ja.jis
-share/doc/apache/keepalive.html.en
-share/doc/apache/keepalive.html.html
-share/doc/apache/keepalive.html.ja.jis
-share/doc/apache/location.html.en
-share/doc/apache/location.html.html
-share/doc/apache/location.html.ja.jis
-share/doc/apache/logs.html
-share/doc/apache/man-template.html
-share/doc/apache/misc/API.html
-share/doc/apache/misc/FAQ.html
-share/doc/apache/misc/HTTP_Features.tsv
-share/doc/apache/misc/client_block_api.html
-share/doc/apache/misc/compat_notes.html
-share/doc/apache/misc/custom_errordocs.html
-share/doc/apache/misc/descriptors.html
-share/doc/apache/misc/fin_wait_2.html
-share/doc/apache/misc/footer.html
-share/doc/apache/misc/header.html
-share/doc/apache/misc/howto.html
-share/doc/apache/misc/index.html
-share/doc/apache/misc/known_client_problems.html
-share/doc/apache/misc/nopgp.html
-share/doc/apache/misc/perf-bsd44.html
-share/doc/apache/misc/perf-dec.html
-share/doc/apache/misc/perf-hp.html
-share/doc/apache/misc/perf-tuning.html
-share/doc/apache/misc/perf.html
-share/doc/apache/misc/rewriteguide.html
-share/doc/apache/misc/security_tips.html
-share/doc/apache/misc/tutorials.html
-share/doc/apache/misc/vif-info.html
-share/doc/apache/misc/windoz_keepalive.html
-share/doc/apache/mod/core.html.en
-share/doc/apache/mod/core.html.fr
-share/doc/apache/mod/core.html.html
-share/doc/apache/mod/core.html.ja.jis
-share/doc/apache/mod/directive-dict.html.en
-share/doc/apache/mod/directive-dict.html.fr
-share/doc/apache/mod/directive-dict.html.html
-share/doc/apache/mod/directive-dict.html.ja.jis
-share/doc/apache/mod/directives.html.de
-share/doc/apache/mod/directives.html.en
-share/doc/apache/mod/directives.html.fr
-share/doc/apache/mod/directives.html.html
-share/doc/apache/mod/directives.html.ja.jis
-share/doc/apache/mod/footer.html
-share/doc/apache/mod/header.html
-share/doc/apache/mod/index-bytype.html.en
-share/doc/apache/mod/index-bytype.html.fr
-share/doc/apache/mod/index-bytype.html.html
-share/doc/apache/mod/index-bytype.html.ja.jis
-share/doc/apache/mod/index.html.en
-share/doc/apache/mod/index.html.fr
-share/doc/apache/mod/index.html.html
-share/doc/apache/mod/index.html.ja.jis
-share/doc/apache/mod/mod_access.html.en
-share/doc/apache/mod/mod_access.html.html
-share/doc/apache/mod/mod_access.html.ja.jis
-share/doc/apache/mod/mod_actions.html.en
-share/doc/apache/mod/mod_actions.html.html
-share/doc/apache/mod/mod_actions.html.ja.jis
-share/doc/apache/mod/mod_alias.html.en
-share/doc/apache/mod/mod_alias.html.html
-share/doc/apache/mod/mod_alias.html.ja.jis
-share/doc/apache/mod/mod_asis.html.en
-share/doc/apache/mod/mod_asis.html.html
-share/doc/apache/mod/mod_asis.html.ja.jis
-share/doc/apache/mod/mod_auth.html.en
-share/doc/apache/mod/mod_auth.html.html
-share/doc/apache/mod/mod_auth.html.ja.jis
-share/doc/apache/mod/mod_auth_anon.html
-share/doc/apache/mod/mod_auth_db.html
-share/doc/apache/mod/mod_auth_dbm.html
-share/doc/apache/mod/mod_auth_digest.html
-share/doc/apache/mod/mod_autoindex.html.en
-share/doc/apache/mod/mod_autoindex.html.html
-share/doc/apache/mod/mod_autoindex.html.ja.jis
-share/doc/apache/mod/mod_browser.html
-share/doc/apache/mod/mod_cern_meta.html
-share/doc/apache/mod/mod_cgi.html.en
-share/doc/apache/mod/mod_cgi.html.html
-share/doc/apache/mod/mod_cgi.html.ja.jis
-share/doc/apache/mod/mod_cookies.html
-share/doc/apache/mod/mod_digest.html
-share/doc/apache/mod/mod_dir.html.en
-share/doc/apache/mod/mod_dir.html.html
-share/doc/apache/mod/mod_dir.html.ja.jis
-share/doc/apache/mod/mod_dld.html
-share/doc/apache/mod/mod_env.html.en
-share/doc/apache/mod/mod_env.html.html
-share/doc/apache/mod/mod_env.html.ja.jis
-share/doc/apache/mod/mod_example.html
-share/doc/apache/mod/mod_expires.html
-share/doc/apache/mod/mod_headers.html
-share/doc/apache/mod/mod_imap.html
-share/doc/apache/mod/mod_include.html
-share/doc/apache/mod/mod_info.html.en
-share/doc/apache/mod/mod_info.html.html
-share/doc/apache/mod/mod_info.html.ja.jis
-share/doc/apache/mod/mod_isapi.html
-share/doc/apache/mod/mod_log_agent.html
-share/doc/apache/mod/mod_log_common.html
-share/doc/apache/mod/mod_log_config.html.en
-share/doc/apache/mod/mod_log_config.html.html
-share/doc/apache/mod/mod_log_config.html.ja.jis
-share/doc/apache/mod/mod_log_forensic.html.en
-share/doc/apache/mod/mod_log_forensic.html.html
-share/doc/apache/mod/mod_log_referer.html
-share/doc/apache/mod/mod_mime.html.en
-share/doc/apache/mod/mod_mime.html.html
-share/doc/apache/mod/mod_mime.html.ja.jis
-share/doc/apache/mod/mod_mime_magic.html
-share/doc/apache/mod/mod_mmap_static.html
-share/doc/apache/mod/mod_negotiation.html.en
-share/doc/apache/mod/mod_negotiation.html.html
-share/doc/apache/mod/mod_negotiation.html.ja.jis
-share/doc/apache/mod/mod_proxy.html
-share/doc/apache/mod/mod_rewrite.html.en
-share/doc/apache/mod/mod_rewrite.html.html
-share/doc/apache/mod/mod_rewrite.html.ja.jis
-share/doc/apache/mod/mod_setenvif.html.en
-share/doc/apache/mod/mod_setenvif.html.html
-share/doc/apache/mod/mod_setenvif.html.ja.jis
-share/doc/apache/mod/mod_so.html.en
-share/doc/apache/mod/mod_so.html.html
-share/doc/apache/mod/mod_so.html.ja.jis
-share/doc/apache/mod/mod_speling.html.en
-share/doc/apache/mod/mod_speling.html.html
-share/doc/apache/mod/mod_speling.html.ja.jis
-share/doc/apache/mod/mod_status.html
-share/doc/apache/mod/mod_unique_id.html.en
-share/doc/apache/mod/mod_unique_id.html.html
-share/doc/apache/mod/mod_unique_id.html.ja.jis
-share/doc/apache/mod/mod_userdir.html.en
-share/doc/apache/mod/mod_userdir.html.html
-share/doc/apache/mod/mod_userdir.html.ja.jis
-share/doc/apache/mod/mod_usertrack.html
-share/doc/apache/mod/mod_vhost_alias.html
-share/doc/apache/mod/module-dict.html.en
-share/doc/apache/mod/module-dict.html.html
-share/doc/apache/mod/module-dict.html.ja.jis
-share/doc/apache/mpeix.html
-share/doc/apache/multilogs.html
-share/doc/apache/netware.html
-share/doc/apache/new_features_1_0.html
-share/doc/apache/new_features_1_1.html
-share/doc/apache/new_features_1_2.html
-share/doc/apache/new_features_1_3.html.en
-share/doc/apache/new_features_1_3.html.html
-share/doc/apache/new_features_1_3.html.ja.jis
-share/doc/apache/process-model.html.en
-share/doc/apache/process-model.html.html
-share/doc/apache/process-model.html.ja.jis
-share/doc/apache/programs/ab.html
-share/doc/apache/programs/apachectl.html.en
-share/doc/apache/programs/apachectl.html.html
-share/doc/apache/programs/apachectl.html.ja.jis
-share/doc/apache/programs/apxs.html
-share/doc/apache/programs/dbmmanage.html
-share/doc/apache/programs/footer.html
-share/doc/apache/programs/header.html
-share/doc/apache/programs/htdigest.html
-share/doc/apache/programs/htpasswd.html.en
-share/doc/apache/programs/htpasswd.html.html
-share/doc/apache/programs/htpasswd.html.ja.jis
-share/doc/apache/programs/httpd.html.en
-share/doc/apache/programs/httpd.html.html
-share/doc/apache/programs/httpd.html.ja.jis
-share/doc/apache/programs/index.html.en
-share/doc/apache/programs/index.html.html
-share/doc/apache/programs/index.html.ja.jis
-share/doc/apache/programs/logresolve.html
-share/doc/apache/programs/other.html
-share/doc/apache/programs/rotatelogs.html
-share/doc/apache/programs/suexec.html.en
-share/doc/apache/programs/suexec.html.html
-share/doc/apache/programs/suexec.html.ja.jis
-share/doc/apache/readme-tpf.html
-share/doc/apache/sections.html.en
-share/doc/apache/sections.html.html
-share/doc/apache/sections.html.ja.jis
-share/doc/apache/server-wide.html.en
-share/doc/apache/server-wide.html.fr
-share/doc/apache/server-wide.html.html
-share/doc/apache/server-wide.html.ja.jis
-share/doc/apache/sitemap.html
-share/doc/apache/sourcereorg.html
-share/doc/apache/stopping.html.en
-share/doc/apache/stopping.html.fr
-share/doc/apache/stopping.html.html
-share/doc/apache/suexec.html.en
-share/doc/apache/suexec.html.html
-share/doc/apache/suexec.html.ja.jis
-share/doc/apache/suexec_1_2.html
-share/doc/apache/unixware.html
-share/doc/apache/upgrading_to_1_3.html
-share/doc/apache/urlmapping.html
-share/doc/apache/vhosts/details.html
-share/doc/apache/vhosts/details_1_2.html
-share/doc/apache/vhosts/examples.html
-share/doc/apache/vhosts/fd-limits.html.en
-share/doc/apache/vhosts/fd-limits.html.html
-share/doc/apache/vhosts/fd-limits.html.ja.jis
-share/doc/apache/vhosts/footer.html
-share/doc/apache/vhosts/header.html
-share/doc/apache/vhosts/host.html
-share/doc/apache/vhosts/index.html.en
-share/doc/apache/vhosts/index.html.html
-share/doc/apache/vhosts/index.html.ja.jis
-share/doc/apache/vhosts/ip-based.html
-share/doc/apache/vhosts/mass.html
-share/doc/apache/vhosts/name-based.html.en
-share/doc/apache/vhosts/name-based.html.html
-share/doc/apache/vhosts/name-based.html.ja.jis
-share/doc/apache/vhosts/vhosts-in-depth.html
-share/doc/apache/vhosts/virtual-host.html
-share/doc/apache/win_compiling.html.en
-share/doc/apache/win_compiling.html.html
-share/doc/apache/win_compiling.html.ja.jis
-share/doc/apache/win_service.html.en
-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.html
-share/doc/apache/windows.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/LICENSE
+%%NODOCS%%%%DOCSDIR%%/apache/bind.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/bind.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/bind.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/bind.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/configuring.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/configuring.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/configuring.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/configuring.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/content-negotiation.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/content-negotiation.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/content-negotiation.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/custom-error.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/custom-error.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/custom-error.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/custom-error.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/cygwin.html
+%%NODOCS%%%%DOCSDIR%%/apache/dns-caveats.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/dns-caveats.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/dns-caveats.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/dns-caveats.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/dso.html
+%%NODOCS%%%%DOCSDIR%%/apache/ebcdic.html
+%%NODOCS%%%%DOCSDIR%%/apache/env.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/env.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/env.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/footer.html
+%%NODOCS%%%%DOCSDIR%%/apache/handler.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/handler.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/handler.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/header.html
+%%NODOCS%%%%DOCSDIR%%/apache/howto/auth.html
+%%NODOCS%%%%DOCSDIR%%/apache/howto/cgi.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/howto/cgi.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/howto/cgi.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/howto/footer.html
+%%NODOCS%%%%DOCSDIR%%/apache/howto/header.html
+%%NODOCS%%%%DOCSDIR%%/apache/howto/htaccess.html
+%%NODOCS%%%%DOCSDIR%%/apache/howto/ssi.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/howto/ssi.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/howto/ssi.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/images/apache_header.gif
+%%NODOCS%%%%DOCSDIR%%/apache/images/custom_errordocs.gif
+%%NODOCS%%%%DOCSDIR%%/apache/images/home.gif
+%%NODOCS%%%%DOCSDIR%%/apache/images/index.gif
+%%NODOCS%%%%DOCSDIR%%/apache/images/mod_rewrite_fig1.fig
+%%NODOCS%%%%DOCSDIR%%/apache/images/mod_rewrite_fig1.gif
+%%NODOCS%%%%DOCSDIR%%/apache/images/mod_rewrite_fig2.fig
+%%NODOCS%%%%DOCSDIR%%/apache/images/mod_rewrite_fig2.gif
+%%NODOCS%%%%DOCSDIR%%/apache/images/pixel.gif
+%%NODOCS%%%%DOCSDIR%%/apache/images/sub.gif
+%%NODOCS%%%%DOCSDIR%%/apache/index.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/index.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/index.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/index.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/install-tpf.html
+%%NODOCS%%%%DOCSDIR%%/apache/install-ztpf.html
+%%NODOCS%%%%DOCSDIR%%/apache/install.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/install.html.es
+%%NODOCS%%%%DOCSDIR%%/apache/install.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/install.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/install.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/invoking.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/invoking.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/invoking.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/invoking.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/keepalive.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/keepalive.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/keepalive.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/location.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/location.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/location.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/logs.html
+%%NODOCS%%%%DOCSDIR%%/apache/man-template.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/API.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/FAQ.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/HTTP_Features.tsv
+%%NODOCS%%%%DOCSDIR%%/apache/misc/client_block_api.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/compat_notes.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/custom_errordocs.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/descriptors.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/fin_wait_2.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/footer.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/header.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/howto.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/index.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/known_client_problems.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/nopgp.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/perf-bsd44.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/perf-dec.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/perf-hp.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/perf-tuning.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/perf.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/rewriteguide.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/security_tips.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/tutorials.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/vif-info.html
+%%NODOCS%%%%DOCSDIR%%/apache/misc/windoz_keepalive.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/core.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/core.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/mod/core.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/core.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/directive-dict.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/directive-dict.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/mod/directive-dict.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/directive-dict.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/directives.html.de
+%%NODOCS%%%%DOCSDIR%%/apache/mod/directives.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/directives.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/mod/directives.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/directives.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/footer.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/header.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/index-bytype.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/index-bytype.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/mod/index-bytype.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/index-bytype.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/index.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/index.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/mod/index.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/index.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_access.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_access.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_access.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_actions.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_actions.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_actions.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_alias.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_alias.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_alias.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_asis.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_asis.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_asis.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_auth.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_auth.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_auth.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_auth_anon.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_auth_db.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_auth_dbm.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_auth_digest.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_autoindex.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_autoindex.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_autoindex.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_browser.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_cern_meta.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_cgi.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_cgi.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_cgi.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_cookies.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_digest.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_dir.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_dir.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_dir.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_dld.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_env.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_env.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_env.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_example.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_expires.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_headers.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_imap.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_include.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_info.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_info.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_info.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_isapi.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_log_agent.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_log_common.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_log_config.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_log_config.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_log_config.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_log_forensic.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_log_forensic.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_log_referer.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_mime.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_mime.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_mime.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_mime_magic.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_mmap_static.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_negotiation.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_negotiation.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_negotiation.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_proxy.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_rewrite.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_rewrite.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_rewrite.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_setenvif.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_setenvif.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_setenvif.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_so.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_so.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_so.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_speling.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_speling.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_speling.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_status.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_unique_id.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_unique_id.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_unique_id.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_userdir.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_userdir.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_userdir.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_usertrack.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/mod_vhost_alias.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/module-dict.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/mod/module-dict.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/mod/module-dict.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/mpeix.html
+%%NODOCS%%%%DOCSDIR%%/apache/multilogs.html
+%%NODOCS%%%%DOCSDIR%%/apache/netware.html
+%%NODOCS%%%%DOCSDIR%%/apache/new_features_1_0.html
+%%NODOCS%%%%DOCSDIR%%/apache/new_features_1_1.html
+%%NODOCS%%%%DOCSDIR%%/apache/new_features_1_2.html
+%%NODOCS%%%%DOCSDIR%%/apache/new_features_1_3.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/new_features_1_3.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/new_features_1_3.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/process-model.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/process-model.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/process-model.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/programs/ab.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/apachectl.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/programs/apachectl.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/apachectl.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/programs/apxs.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/dbmmanage.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/footer.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/header.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/htdigest.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/htpasswd.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/programs/htpasswd.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/htpasswd.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/programs/httpd.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/programs/httpd.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/httpd.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/programs/index.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/programs/index.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/index.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/programs/logresolve.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/other.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/rotatelogs.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/suexec.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/programs/suexec.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/programs/suexec.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/readme-tpf.html
+%%NODOCS%%%%DOCSDIR%%/apache/sections.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/sections.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/sections.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/server-wide.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/server-wide.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/server-wide.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/server-wide.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/sitemap.html
+%%NODOCS%%%%DOCSDIR%%/apache/sourcereorg.html
+%%NODOCS%%%%DOCSDIR%%/apache/stopping.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/stopping.html.fr
+%%NODOCS%%%%DOCSDIR%%/apache/stopping.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/suexec.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/suexec.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/suexec.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/suexec_1_2.html
+%%NODOCS%%%%DOCSDIR%%/apache/unixware.html
+%%NODOCS%%%%DOCSDIR%%/apache/upgrading_to_1_3.html
+%%NODOCS%%%%DOCSDIR%%/apache/urlmapping.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/details.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/details_1_2.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/examples.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/fd-limits.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/fd-limits.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/fd-limits.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/footer.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/header.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/host.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/index.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/index.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/index.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/ip-based.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/mass.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/name-based.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/name-based.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/name-based.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/vhosts-in-depth.html
+%%NODOCS%%%%DOCSDIR%%/apache/vhosts/virtual-host.html
+%%NODOCS%%%%DOCSDIR%%/apache/win_compiling.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/win_compiling.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/win_compiling.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/win_service.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/win_service.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/win_service.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/apache/windows.html.en
+%%NODOCS%%%%DOCSDIR%%/apache/windows.html.html
+%%NODOCS%%%%DOCSDIR%%/apache/windows.html.ja.jis
 @exec mkdir -p -m 755 %D/www/cgi-bin-dist
 @unexec chmod u+w %D/www/cgi-bin-dist
 www/cgi-bin-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
@@ -667,13 +666,13 @@
 @dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm share/doc/apache/howto
-@dirrm share/doc/apache/images
-@dirrm share/doc/apache/misc
-@dirrm share/doc/apache/mod
-@dirrm share/doc/apache/programs
-@dirrm share/doc/apache/vhosts
-@dirrm share/doc/apache
+%%NODOCS%%@dirrm %%DOCSDIR%%/apache/howto
+%%NODOCS%%@dirrm %%DOCSDIR%%/apache/images
+%%NODOCS%%@dirrm %%DOCSDIR%%/apache/misc
+%%NODOCS%%@dirrm %%DOCSDIR%%/apache/mod
+%%NODOCS%%@dirrm %%DOCSDIR%%/apache/programs
+%%NODOCS%%@dirrm %%DOCSDIR%%/apache/vhosts
+%%NODOCS%%@dirrm %%DOCSDIR%%/apache
 @dirrm www/data-dist
 @dirrm www/cgi-bin-dist
 @dirrm www/icons/small
cvs diff: files/apache.in is a new entry, no comparison available
cvs diff: files/apache.sh was removed, no comparison available
cvs diff: files/no_port_doc is a new entry, no comparison available
Index: UPDATING
===================================================================
RCS file: /home/ncvs/ports/UPDATING,v
retrieving revision 1.559
diff -u -r1.559 UPDATING
--- UPDATING	20 Oct 2007 10:41:09 -0000	1.559
+++ UPDATING	24 Oct 2007 18:44:51 -0000
@@ -6,6 +6,15 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20071016:
+  AFFECTS: users of www/apache13+ipv6
+  AUTHOR: pgollucci@p6m7g8.com
+
+  The www/apache13+ipv6 port was updated to use the USE_RC_SUBR
+  system in ports.  As a result the rc.d script has been renamed
+  from apache.sh to apache.  This matches www/apache13 and
+  other ports.
+
 20071009:
   AFFECTS: users of mail/vpopmail
   AUTHOR: roam@FreeBSD.org