From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 24 00:00:05 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AF3D16A46E for ; Wed, 24 Oct 2007 00:00:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EC26F13C4AC for ; Wed, 24 Oct 2007 00:00:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l9O004Df003047 for ; Wed, 24 Oct 2007 00:00:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l9O004sv003046; Wed, 24 Oct 2007 00:00:04 GMT (envelope-from gnats) Resent-Date: Wed, 24 Oct 2007 00:00:04 GMT Resent-Message-Id: <200710240000.l9O004sv003046@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Philip M. Gollucci" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E6A616A418 for ; Tue, 23 Oct 2007 23:57:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 2F44213C4AC for ; Tue, 23 Oct 2007 23:57:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l9NNv4JX059690 for ; Tue, 23 Oct 2007 23:57:04 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.1/8.14.1/Submit) id l9NNv4mQ059687; Tue, 23 Oct 2007 23:57:04 GMT (envelope-from nobody) Message-Id: <200710232357.l9NNv4mQ059687@www.freebsd.org> Date: Tue, 23 Oct 2007 23:57:04 GMT From: "Philip M. Gollucci" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/117434: www/apache13-modperl: [PATCH]: portlint cleanups X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2007 00:00:05 -0000 >Number: 117434 >Category: ports >Synopsis: www/apache13-modperl: [PATCH]: portlint cleanups >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Oct 24 00:00:04 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 7.0-current >Organization: Riderway Inc. >Environment: FreeBSD philip.hq.rws 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Thu Jul 26 16:44:37 EDT 2007 root@philip.office.rws:/usr/obj/usr/src/sys/GENERIC i386 >Description: 1) Removed - from PORTNAME 2) Bumped PORTREVISION 3) Fixed caudium12 CONFLICTS pattern 4) PREFIX and RC_SUBR are automatically replaced with USE_RC_SUBR so removed 5) Implemented NOPORTDOC Note: new files/no_port_doc 6) use @dirrmtry instead of @unexec rmdir 7) used %D for PREFIX 8) Renamed one patch file (unchanged) files/patch-src:support:apxs.pl -> files/patch-src-support-apxs.pl 9) *** Claim maintainer -- if apache@ wants to keep it thats fine. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/apache13-modperl/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- Makefile 9 Sep 2007 16:57:14 -0000 1.21 +++ Makefile 17 Oct 2007 00:30:55 -0000 @@ -5,16 +5,18 @@ # $FreeBSD: ports/www/apache13-modperl/Makefile,v 1.21 2007/09/09 16:57:14 clement Exp $ # -PORTNAME= apache+mod_perl +PORTNAME= mod_perl PORTVERSION= ${VERSION_APACHE} +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD:S/$/:apache/} \ ${MASTER_SITE_PERL_CPAN:S/$/Apache\/:modperl/} +PKGNAMEPREFIX= apache- DISTNAME= apache_${VERSION_APACHE} DISTFILES= apache_${VERSION_APACHE}${EXTRACT_SUFX}:apache \ mod_perl-${VERSION_MODPERL}${EXTRACT_SUFX}:modperl -MAINTAINER= apache@FreeBSD.org +MAINTAINER= pgollucci@p6m7g8.com COMMENT= The Apache 1.3 webserver with a statically embedded perl interpreter LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2 @@ -25,7 +27,7 @@ apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \ apache+mod_ssl+mod_snmp+mod_accel-1.* \ apache+ipv6-1.* apache+ssl-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.* apache-*-2.* USE_PERL5= YES @@ -35,10 +37,9 @@ DOCUMENT_ROOT= ${DATADIR}/data DEFAULT_PATH= /bin:/usr/bin:${PREFIX}/bin -RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} - # Perl man pages go into section 3 MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +DOCSDIR= ${PREFIX}/share/doc/apache .include @@ -76,6 +77,12 @@ .endif # !SUEXEC +.if !defined(NOPORTDOC) +PLIST_SUB+= NODOCS="" +.else +PLIST_SUB+= NODOCS="@comment " +.endif + HAS_CONFIGURE= yes CONFIGURE_ARGS+=--prefix=${PREFIX} \ --server-uid=www \ @@ -147,6 +154,11 @@ MAN3+= Apache::MyConfig.3 .endif +post-patch: +.if defined(NOPORTDOC) + @(cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/no_port_doc) +.endif + pre-configure: @ cd ${WRKSRC_MODPERL}; \ ${PERL5} Makefile.PL EVERYTHING=1 APACHE_SRC=../apache_${VERSION_APACHE}\ Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/apache13-modperl/pkg-plist,v retrieving revision 1.8 diff -u -r1.8 pkg-plist --- pkg-plist 9 Sep 2007 16:57:14 -0000 1.8 +++ pkg-plist 17 Oct 2007 00:14:25 -0000 @@ -135,297 +135,297 @@ www/data-dist/index.html.ru.utf8 www/data-dist/index.html.se www/data-dist/index.html.zh-tw.big5 -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.fr -share/doc/apache/configuring.html.en -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.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.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.ja.jis -share/doc/apache/howto/header.html -share/doc/apache/howto/htaccess.html -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.ja.jis -share/doc/apache/install-tpf.html -share/doc/apache/install-ztpf.html -share/doc/apache/install.html.es -share/doc/apache/install.html.en -share/doc/apache/install.html.ja.jis -share/doc/apache/invoking.html.en -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/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.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.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_alias.html.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.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.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.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/server-wide.html.en -share/doc/apache/server-wide.html.ja.jis -share/doc/apache/sections.html.en -share/doc/apache/sections.html.html -share/doc/apache/sections.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/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.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 -share/doc/apache/mod/directive-dict.html.html -share/doc/apache/mod/mod_negotiation.html.html -share/doc/apache/mod/module-dict.html.html -share/doc/apache/configuring.html.html -share/doc/apache/custom-error.html.fr -share/doc/apache/custom-error.html.html -share/doc/apache/handler.html.html -share/doc/apache/index.html.fr -share/doc/apache/index.html.html -share/doc/apache/install.html.fr -share/doc/apache/install.html.html -share/doc/apache/invoking.html.fr -share/doc/apache/location.html.en -share/doc/apache/location.html.html -share/doc/apache/location.html.ja.jis -share/doc/apache/new_features_1_3.html.html -share/doc/apache/server-wide.html.fr -share/doc/apache/server-wide.html.html -share/doc/apache/howto/cgi.html.html -share/doc/apache/howto/footer.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/urlmapping.html -share/doc/apache/vhosts/index.html.html +%%NODOCS%%%%DOCSDIR%%/LICENSE +%%NODOCS%%%%DOCSDIR%%/bind.html.en +%%NODOCS%%%%DOCSDIR%%/bind.html.fr +%%NODOCS%%%%DOCSDIR%%/bind.html.html +%%NODOCS%%%%DOCSDIR%%/bind.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/configuring.html.fr +%%NODOCS%%%%DOCSDIR%%/configuring.html.en +%%NODOCS%%%%DOCSDIR%%/configuring.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/content-negotiation.html.en +%%NODOCS%%%%DOCSDIR%%/content-negotiation.html.html +%%NODOCS%%%%DOCSDIR%%/content-negotiation.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/custom-error.html.en +%%NODOCS%%%%DOCSDIR%%/custom-error.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/cygwin.html +%%NODOCS%%%%DOCSDIR%%/dns-caveats.html.en +%%NODOCS%%%%DOCSDIR%%/dns-caveats.html.fr +%%NODOCS%%%%DOCSDIR%%/dns-caveats.html.html +%%NODOCS%%%%DOCSDIR%%/dns-caveats.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/dso.html +%%NODOCS%%%%DOCSDIR%%/ebcdic.html +%%NODOCS%%%%DOCSDIR%%/env.html.en +%%NODOCS%%%%DOCSDIR%%/env.html.html +%%NODOCS%%%%DOCSDIR%%/env.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/footer.html +%%NODOCS%%%%DOCSDIR%%/handler.html.en +%%NODOCS%%%%DOCSDIR%%/handler.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/header.html +%%NODOCS%%%%DOCSDIR%%/howto/auth.html +%%NODOCS%%%%DOCSDIR%%/howto/cgi.html.en +%%NODOCS%%%%DOCSDIR%%/howto/cgi.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/howto/header.html +%%NODOCS%%%%DOCSDIR%%/howto/htaccess.html +%%NODOCS%%%%DOCSDIR%%/images/apache_header.gif +%%NODOCS%%%%DOCSDIR%%/images/custom_errordocs.gif +%%NODOCS%%%%DOCSDIR%%/images/home.gif +%%NODOCS%%%%DOCSDIR%%/images/index.gif +%%NODOCS%%%%DOCSDIR%%/images/mod_rewrite_fig1.fig +%%NODOCS%%%%DOCSDIR%%/images/mod_rewrite_fig1.gif +%%NODOCS%%%%DOCSDIR%%/images/mod_rewrite_fig2.fig +%%NODOCS%%%%DOCSDIR%%/images/mod_rewrite_fig2.gif +%%NODOCS%%%%DOCSDIR%%/images/pixel.gif +%%NODOCS%%%%DOCSDIR%%/images/sub.gif +%%NODOCS%%%%DOCSDIR%%/index.html.en +%%NODOCS%%%%DOCSDIR%%/index.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/install-tpf.html +%%NODOCS%%%%DOCSDIR%%/install-ztpf.html +%%NODOCS%%%%DOCSDIR%%/install.html.es +%%NODOCS%%%%DOCSDIR%%/install.html.en +%%NODOCS%%%%DOCSDIR%%/install.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/invoking.html.en +%%NODOCS%%%%DOCSDIR%%/invoking.html.html +%%NODOCS%%%%DOCSDIR%%/invoking.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/keepalive.html.en +%%NODOCS%%%%DOCSDIR%%/keepalive.html.html +%%NODOCS%%%%DOCSDIR%%/keepalive.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/logs.html +%%NODOCS%%%%DOCSDIR%%/man-template.html +%%NODOCS%%%%DOCSDIR%%/misc/API.html +%%NODOCS%%%%DOCSDIR%%/misc/FAQ.html +%%NODOCS%%%%DOCSDIR%%/misc/HTTP_Features.tsv +%%NODOCS%%%%DOCSDIR%%/misc/client_block_api.html +%%NODOCS%%%%DOCSDIR%%/misc/compat_notes.html +%%NODOCS%%%%DOCSDIR%%/misc/custom_errordocs.html +%%NODOCS%%%%DOCSDIR%%/misc/descriptors.html +%%NODOCS%%%%DOCSDIR%%/misc/fin_wait_2.html +%%NODOCS%%%%DOCSDIR%%/misc/footer.html +%%NODOCS%%%%DOCSDIR%%/misc/header.html +%%NODOCS%%%%DOCSDIR%%/misc/howto.html +%%NODOCS%%%%DOCSDIR%%/misc/index.html +%%NODOCS%%%%DOCSDIR%%/misc/known_client_problems.html +%%NODOCS%%%%DOCSDIR%%/misc/nopgp.html +%%NODOCS%%%%DOCSDIR%%/misc/perf-bsd44.html +%%NODOCS%%%%DOCSDIR%%/misc/perf-dec.html +%%NODOCS%%%%DOCSDIR%%/misc/perf-hp.html +%%NODOCS%%%%DOCSDIR%%/misc/perf-tuning.html +%%NODOCS%%%%DOCSDIR%%/misc/perf.html +%%NODOCS%%%%DOCSDIR%%/misc/rewriteguide.html +%%NODOCS%%%%DOCSDIR%%/misc/security_tips.html +%%NODOCS%%%%DOCSDIR%%/misc/tutorials.html +%%NODOCS%%%%DOCSDIR%%/misc/vif-info.html +%%NODOCS%%%%DOCSDIR%%/misc/windoz_keepalive.html +%%NODOCS%%%%DOCSDIR%%/mod/core.html.en +%%NODOCS%%%%DOCSDIR%%/mod/core.html.fr +%%NODOCS%%%%DOCSDIR%%/mod/core.html.html +%%NODOCS%%%%DOCSDIR%%/mod/core.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/directive-dict.html.en +%%NODOCS%%%%DOCSDIR%%/mod/directive-dict.html.fr +%%NODOCS%%%%DOCSDIR%%/mod/directive-dict.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/directives.html.de +%%NODOCS%%%%DOCSDIR%%/mod/directives.html.en +%%NODOCS%%%%DOCSDIR%%/mod/directives.html.fr +%%NODOCS%%%%DOCSDIR%%/mod/directives.html.html +%%NODOCS%%%%DOCSDIR%%/mod/directives.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/footer.html +%%NODOCS%%%%DOCSDIR%%/mod/header.html +%%NODOCS%%%%DOCSDIR%%/mod/index-bytype.html.en +%%NODOCS%%%%DOCSDIR%%/mod/index-bytype.html.fr +%%NODOCS%%%%DOCSDIR%%/mod/index-bytype.html.html +%%NODOCS%%%%DOCSDIR%%/mod/index-bytype.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/index.html.en +%%NODOCS%%%%DOCSDIR%%/mod/index.html.fr +%%NODOCS%%%%DOCSDIR%%/mod/index.html.html +%%NODOCS%%%%DOCSDIR%%/mod/index.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_access.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_access.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_access.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_actions.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_actions.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_actions.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_alias.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_alias.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_asis.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_asis.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_asis.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_auth.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_auth.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_auth.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_auth_anon.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_auth_db.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_auth_dbm.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_auth_digest.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_alias.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_autoindex.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_autoindex.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_autoindex.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_browser.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_cern_meta.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_cgi.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_cgi.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_cgi.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_cookies.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_digest.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_dir.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_dir.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_dir.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_dld.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_env.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_env.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_env.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_example.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_expires.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_headers.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_imap.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_include.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_info.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_info.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_info.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_isapi.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_log_agent.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_log_common.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_log_config.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_log_config.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_log_config.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_log_forensic.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_log_forensic.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_log_referer.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_mime.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_mime.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_mime.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_mime_magic.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_mmap_static.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_negotiation.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_negotiation.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_proxy.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_rewrite.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_rewrite.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_rewrite.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_setenvif.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_setenvif.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_setenvif.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_so.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_so.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_so.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_speling.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_speling.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_speling.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_status.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_unique_id.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_unique_id.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_unique_id.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_userdir.html.en +%%NODOCS%%%%DOCSDIR%%/mod/mod_userdir.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_userdir.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/mod_usertrack.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_vhost_alias.html +%%NODOCS%%%%DOCSDIR%%/mod/module-dict.html.en +%%NODOCS%%%%DOCSDIR%%/mod/module-dict.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mpeix.html +%%NODOCS%%%%DOCSDIR%%/multilogs.html +%%NODOCS%%%%DOCSDIR%%/netware.html +%%NODOCS%%%%DOCSDIR%%/new_features_1_0.html +%%NODOCS%%%%DOCSDIR%%/new_features_1_1.html +%%NODOCS%%%%DOCSDIR%%/new_features_1_2.html +%%NODOCS%%%%DOCSDIR%%/new_features_1_3.html.en +%%NODOCS%%%%DOCSDIR%%/new_features_1_3.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/process-model.html.en +%%NODOCS%%%%DOCSDIR%%/process-model.html.html +%%NODOCS%%%%DOCSDIR%%/process-model.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/programs/ab.html +%%NODOCS%%%%DOCSDIR%%/programs/apachectl.html.en +%%NODOCS%%%%DOCSDIR%%/programs/apachectl.html.html +%%NODOCS%%%%DOCSDIR%%/programs/apachectl.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/programs/apxs.html +%%NODOCS%%%%DOCSDIR%%/programs/dbmmanage.html +%%NODOCS%%%%DOCSDIR%%/programs/footer.html +%%NODOCS%%%%DOCSDIR%%/programs/header.html +%%NODOCS%%%%DOCSDIR%%/programs/htdigest.html +%%NODOCS%%%%DOCSDIR%%/programs/htpasswd.html.en +%%NODOCS%%%%DOCSDIR%%/programs/htpasswd.html.html +%%NODOCS%%%%DOCSDIR%%/programs/htpasswd.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/programs/httpd.html.en +%%NODOCS%%%%DOCSDIR%%/programs/httpd.html.html +%%NODOCS%%%%DOCSDIR%%/programs/httpd.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/programs/index.html.en +%%NODOCS%%%%DOCSDIR%%/programs/index.html.html +%%NODOCS%%%%DOCSDIR%%/programs/index.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/programs/logresolve.html +%%NODOCS%%%%DOCSDIR%%/programs/other.html +%%NODOCS%%%%DOCSDIR%%/programs/rotatelogs.html +%%NODOCS%%%%DOCSDIR%%/programs/suexec.html.en +%%NODOCS%%%%DOCSDIR%%/programs/suexec.html.html +%%NODOCS%%%%DOCSDIR%%/programs/suexec.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/readme-tpf.html +%%NODOCS%%%%DOCSDIR%%/server-wide.html.en +%%NODOCS%%%%DOCSDIR%%/server-wide.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/sections.html.en +%%NODOCS%%%%DOCSDIR%%/sections.html.html +%%NODOCS%%%%DOCSDIR%%/sections.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/sitemap.html +%%NODOCS%%%%DOCSDIR%%/sourcereorg.html +%%NODOCS%%%%DOCSDIR%%/stopping.html.en +%%NODOCS%%%%DOCSDIR%%/stopping.html.fr +%%NODOCS%%%%DOCSDIR%%/stopping.html.html +%%NODOCS%%%%DOCSDIR%%/suexec.html.en +%%NODOCS%%%%DOCSDIR%%/suexec.html.html +%%NODOCS%%%%DOCSDIR%%/suexec.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/suexec_1_2.html +%%NODOCS%%%%DOCSDIR%%/unixware.html +%%NODOCS%%%%DOCSDIR%%/upgrading_to_1_3.html +%%NODOCS%%%%DOCSDIR%%/vhosts/details.html +%%NODOCS%%%%DOCSDIR%%/vhosts/details_1_2.html +%%NODOCS%%%%DOCSDIR%%/vhosts/examples.html +%%NODOCS%%%%DOCSDIR%%/vhosts/fd-limits.html.en +%%NODOCS%%%%DOCSDIR%%/vhosts/fd-limits.html.html +%%NODOCS%%%%DOCSDIR%%/vhosts/fd-limits.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/vhosts/footer.html +%%NODOCS%%%%DOCSDIR%%/vhosts/header.html +%%NODOCS%%%%DOCSDIR%%/vhosts/host.html +%%NODOCS%%%%DOCSDIR%%/vhosts/index.html.en +%%NODOCS%%%%DOCSDIR%%/vhosts/index.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/vhosts/ip-based.html +%%NODOCS%%%%DOCSDIR%%/vhosts/mass.html +%%NODOCS%%%%DOCSDIR%%/vhosts/name-based.html.en +%%NODOCS%%%%DOCSDIR%%/vhosts/name-based.html.html +%%NODOCS%%%%DOCSDIR%%/vhosts/name-based.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/vhosts/vhosts-in-depth.html +%%NODOCS%%%%DOCSDIR%%/vhosts/virtual-host.html +%%NODOCS%%%%DOCSDIR%%/win_compiling.html.en +%%NODOCS%%%%DOCSDIR%%/win_compiling.html.html +%%NODOCS%%%%DOCSDIR%%/win_compiling.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/win_service.html.en +%%NODOCS%%%%DOCSDIR%%/win_service.html.html +%%NODOCS%%%%DOCSDIR%%/win_service.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/windows.html.en +%%NODOCS%%%%DOCSDIR%%/windows.html.html +%%NODOCS%%%%DOCSDIR%%/windows.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/mod/directive-dict.html.html +%%NODOCS%%%%DOCSDIR%%/mod/mod_negotiation.html.html +%%NODOCS%%%%DOCSDIR%%/mod/module-dict.html.html +%%NODOCS%%%%DOCSDIR%%/configuring.html.html +%%NODOCS%%%%DOCSDIR%%/custom-error.html.fr +%%NODOCS%%%%DOCSDIR%%/custom-error.html.html +%%NODOCS%%%%DOCSDIR%%/handler.html.html +%%NODOCS%%%%DOCSDIR%%/index.html.fr +%%NODOCS%%%%DOCSDIR%%/index.html.html +%%NODOCS%%%%DOCSDIR%%/install.html.fr +%%NODOCS%%%%DOCSDIR%%/install.html.html +%%NODOCS%%%%DOCSDIR%%/invoking.html.fr +%%NODOCS%%%%DOCSDIR%%/location.html.en +%%NODOCS%%%%DOCSDIR%%/location.html.html +%%NODOCS%%%%DOCSDIR%%/location.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/new_features_1_3.html.html +%%NODOCS%%%%DOCSDIR%%/server-wide.html.fr +%%NODOCS%%%%DOCSDIR%%/server-wide.html.html +%%NODOCS%%%%DOCSDIR%%/howto/cgi.html.html +%%NODOCS%%%%DOCSDIR%%/howto/footer.html +%%NODOCS%%%%DOCSDIR%%/howto/ssi.html.en +%%NODOCS%%%%DOCSDIR%%/howto/ssi.html.html +%%NODOCS%%%%DOCSDIR%%/howto/ssi.html.ja.jis +%%NODOCS%%%%DOCSDIR%%/urlmapping.html +%%NODOCS%%%%DOCSDIR%%/vhosts/index.html.html www/cgi-bin-dist/printenv @exec [ -d %D/www/cgi-bin/ ] || ln -fs %B %D/www/cgi-bin www/cgi-bin-dist/test-cgi @@ -650,17 +650,17 @@ @exec mkdir -p %D/www/proxy @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi -@unexec rmdir etc/apache 2>/dev/null || true +@dirrmtry %D/etc/apache 2>/dev/null || true @dirrm include/apache/xml @dirrm include/apache @dirrm libexec/apache -@dirrm share/doc/apache/vhosts -@dirrm share/doc/apache/mod -@dirrm share/doc/apache/misc -@dirrm share/doc/apache/images -@dirrm share/doc/apache/howto -@dirrm share/doc/apache/programs -@dirrm share/doc/apache +%%NODOCS%%@dirrm %%DOCSDIR%%/vhosts +%%NODOCS%%@dirrm %%DOCSDIR%%/mod +%%NODOCS%%@dirrm %%DOCSDIR%%/misc +%%NODOCS%%@dirrm %%DOCSDIR%%/images +%%NODOCS%%@dirrm %%DOCSDIR%%/howto +%%NODOCS%%@dirrm %%DOCSDIR%%/programs +%%NODOCS%%@dirrm %%DOCSDIR%% @dirrmtry www/data-dist @dirrmtry www/cgi-bin-dist @unexec rm -f %D/etc/apache/httpd.conf.bak 2> /dev/null || true cvs diff: files/no_port_doc is a new entry, no comparison available cvs diff: files/patch-src-support-apxs.pl is a new entry, no comparison available cvs diff: files/patch-src:support:apxs.pl was removed, no comparison available --- /dev/null 2007-10-16 20:33:02.000000000 -0400 +++ files/no_port_doc 2007-10-16 20:29:30.000000000 -0400 @@ -0,0 +1,22 @@ +--- Makefile.tmpl.orig 2007-10-16 20:29:06.000000000 -0400 ++++ Makefile.tmpl 2007-10-16 20:29:22.000000000 -0400 +@@ -228,7 +228,6 @@ + $(MKDIR) $(root)$(mandir)/man8 + $(MKDIR) $(root)$(sysconfdir) + $(MKDIR) $(root)$(htdocsdir)-dist +- $(MKDIR) $(root)$(manualdir) + $(MKDIR) $(root)$(iconsdir) + $(MKDIR) $(root)$(cgidir)-dist + $(MKDIR) $(root)$(includedir) +@@ -421,11 +420,6 @@ + (cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \ + find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \ + find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ; +- echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \ +- (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\ +- (cd $(root)$(manualdir)/ && $(TAR) -xf -); \ +- find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ +- find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; + if [ ! -d $(root)$(htdocsdir)/ ]; then \ + $(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \ + fi >Release-Note: >Audit-Trail: >Unformatted: