Attachment #20418 for bug #36040

View | Details | Raw Unified | Return to bug 36040
Collapse All | Expand All




#

PORTNAME=	apache
PORTVERSION=	2.0.32
PORTREVISION=	5
CATEGORIES=	www ipv6
MASTER_SITES=	http://www.apache.org/dist/httpd/ \
		http://www.freebsd.org/gifs/ \
		http://apache.mirrorcentral.com/dist/httpd/ \
		http://www2.freebsd.org/gifs/ \
		http://apache.missouri.edu/dist/httpd/ \
		http://ftp.epix.net/apache/dist/httpd/ \
		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/
DISTNAME=	httpd-${PORTVERSION}-beta
DISTFILES=	${DISTNAME}.tar.gz powerlogo.gif
EXTRACT_ONLY=	${DISTNAME}.tar.gz
PATCHFILES=	${PORTNAME}-${PORTVERSION}_1.diff

MAINTAINER?=	perky@fallin.lv

LATEST_LINK=	apache2

WRKSRC=		${WRKDIR}/httpd-${PORTVERSION}
WITH_MPM?=	prefork # or worker, perchild (neither of them is working yet)

WITH_MPM?=	prefork # or perchild, threaded
HTTP_PORT?=	80

GNU_CONFIGURE=	yes

		--with-suexec-docroot=${PREFIX}/www/data \
		--with-mpm=${WITH_MPM} \
		--with-port=${HTTP_PORT} \
		--libdir=${PREFIX}/lib/apache \
		--includedir=${PREFIX}/include/apache
CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
		LDFLAGS="${LDFLAGS}"
SHARED_MODULES=	all cgid cache file-cache disk-cache proxy proxy-connect \
		proxy-ftp proxy-http

.if defined(NOPORTDOCS)
MAKE_ENV+=	NOPORTDOCS=YES

PLIST_SUB+=	SSLOPT="@comment "
.endif

.if ${WITH_MPM} != "prefork"
CONFIGURE_ARGS+= --enable-threads
SHARED_MODULES+= mem-cache
PLIST_SUB+=	THREADONLY=""
PKGNAMESUFFIX=	-${WITH_MPM}
.endif

.if !defined(WITHOUT_CACHE)
SHARED_MODULES+= cache mem-cache file-cache #disk-cache
PLIST_SUB+=	CACHEOPT=""
.else
PLIST_SUB+=	THREADONLY="@comment "
.endif

CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"

	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
.endif

post-extract:
	@${CP} ${DISTDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif

post-patch:
	@cd ${WRKSRC}/docs/docroot && \
	 for f in index.html.*; do (\
	  ${PERL} -pi -e 's,apache_pb,icons/freebsd.gif" ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
	 ); done
	@${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;

pre-install:
	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL

Lines 1-2 Link Here

(-)apache2/distinfo (-2 / +2 lines)
1	MD5 (httpd-2_0_28-beta.tar.gz) = 99a10290773221f16fd86383c598da0e	1	MD5 (httpd-2.0.32-beta.tar.gz) = 61914c52d997c7a957a101399fe4eaff
2	MD5 (apache-2.0.28_1.diff) = d7a181ea6259f072f571f3736711112c	2	MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62




--- Makefile.in.orig	Wed Jan 23 16:10:16 2002
+++ Makefile.in	Fri Feb 22 03:32:58 2002
@@ -32,7 +32,9 @@
 	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
 	@cd $(top_srcdir)/docs/conf; \
 	for i in mime.types magic; do \
-		$(INSTALL_DATA) $$i $(sysconfdir); \
+		test -f $(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(sysconfdir); \
+		cp -f $$i $$i.default; \
+		$(INSTALL_DATA) $$i.default $(sysconfdir); \
 	done; \
 	for i in *-std* ssl.conf; do \
 		[ -f $$i ] || continue; \
@@ -54,7 +56,7 @@
 						echo "<IfDefine SSL>"; \
 					fi; \
 					if test $$j != "^EOL^"; then \
-						echo "LoadModule $${j}_module modules/mod_$${j}.so"; \
+						echo "LoadModule $${j}_module ${libexecdir:S|^${prefix}/||}/mod_$${j}.so"; \
 					fi; \
 					if test "x$$j" = "xssl"; then \
 						echo "</IfDefine>"; \
@@ -106,11 +108,14 @@
 
 install-htdocs:
 	@echo Installing HTML documents
-	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
-	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
-	@test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual
-	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual)
-	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+	@test -d $(htdocsdir).default || $(MKINSTALLDIRS) $(htdocsdir).default
+	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir).default)
+	@test -e $(htdocsdir) || ln -sf $(htdocsdir).default $(htdocsdir)
+.if !defined(NOPORTDOCS)
 	@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
 	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
-	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+.endif
+	@(cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
 
 install-error:
 	@echo Installing error documents
@@ -126,9 +131,10 @@
 
 install-cgi:
 	@echo Installing CGIs




--- config.layout.orig	Thu Feb 21 03:02:06 2002
+++ config.layout	Thu Feb 21 03:04:56 2002
@@ -307,3 +307,26 @@
     infodir:       $exec_prefix/share/info
     installbuilddir: $prefix/etc/apache2/build
 </Layout>
+
+<Layout FreeBSD>

+    sbindir:       $exec_prefix/sbin
+    libexecdir:    $exec_prefix/libexec/apache
+    mandir:        $prefix/man
+    sysconfdir:    $prefix/etc/apache2
+    datadir:       $prefix/www
+    installbuilddir: $prefix/share/apache
+    errordir:      $datadir/error
+    iconsdir:      $datadir/icons
+    htdocsdir:     $datadir/data
+    manualdir:     $prefix/share/doc/apache
+    cgidir:        $datadir/cgi-bin
+    includedir:    $prefix/include/apache
+    localstatedir: /var
+    runtimedir:    $localstatedir/run
+    logfiledir:    $localstatedir/log
+    proxycachedir: $datadir/proxy
+    infodir:       $exec_prefix/share/info
+</Layout>




--- configure.orig	Fri Feb 22 03:43:38 2002
+++ configure	Fri Feb 22 03:44:56 2002
@@ -11095,7 +11095,10 @@
   esac
 
   # The eval makes quoting arguments work.
-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix $disable_shared"
+  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "$apache_apr_flags --prefix=$prefix $disable_shared"
   then :
     echo "srclib/apr configured properly"
   else
@@ -1175,7 +1175,7 @@
   esac
 
   # The eval makes quoting arguments work.
-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix $disable_shared"
+  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "--with-apr=../apr --prefix=$prefix $disable_shared"
   then :
     echo "srclib/apr-util configured properly"
   else
@@ -10508,7 +10508,10 @@
 EOF
 
 cat >> confdefs.h <<EOF
-#define SERVER_CONFIG_FILE "conf/$progname.conf"
+#define SERVER_CONFIG_FILE "etc/apache2/$progname.conf"
+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
+#define AP_TYPES_CONFIG_FILE "etc/apache2/mime.types"
+#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"
 EOF
 




--- docs/conf/httpd-std.conf.orig	Fri Jan 25 09:24:47 2002
+++ docs/conf/httpd-std.conf	Fri Feb 22 02:32:28 2002
@@ -66,7 +66,7 @@
 #
 <IfModule !mpm_netware.c>
 <IfModule !perchild.c>
-ScoreBoardFile logs/apache_runtime_status
+ScoreBoardFile /var/run/apache_runtime_status
 </IfModule>
 </IfModule>
 
@@ -76,7 +76,7 @@
 # PidFile: The file in which the server should record its process
 # identification number when it starts.
 #
 <IfModule !mpm_netware.c>
-PidFile logs/httpd.pid
+PidFile /var/run/httpd.pid
 </IfModule>
 
 #
@@ -248,8 +248,8 @@
@@ -229,8 +229,8 @@
 #  when the value of (unsigned)Group is above 60000; 
 #  don't use Group #-1 on these systems!
 #

+User www
+Group www
 </IfModule>
 </IfModule>
 
@@ -279,7 +279,7 @@
@@ -259,7 +259,7 @@
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #

+DocumentRoot "@@ServerRoot@@/www/data"
 
 #
 # Each directory to which Apache has access can be configured with respect
@@ -304,7 +304,7 @@
 #
 # This should be changed to whatever you set DocumentRoot to.
 #

+<Directory "@@ServerRoot@@/www/data">
 
 #
 # Possible values for the Options directive are "None", "All",
@@ -397,7 +397,7 @@
 # TypesConfig describes where the mime.types file (or equivalent) is
 # to be found.
 #
-TypesConfig conf/mime.types
+TypesConfig etc/apache2/mime.types
 
 #
 # DefaultType is the default MIME type the server will use for a document
@@ -416,7 +416,7 @@
 # directive tells the module where the hint definitions are located.
 #
 <IfModule mod_mime_magic.c>
-    MIMEMagicFile conf/magic
+    MIMEMagicFile etc/apache2/magic
 </IfModule>
 
 #
@@ -436,7 +436,7 @@
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #

 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -461,20 +461,20 @@
 # define per-<VirtualHost> access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-CustomLog logs/access_log common
+#CustomLog /var/log/httpd-access_log common
 
 #
 # If you would like to have agent and referer logfiles, uncomment the
 # following directives.
 #
-#CustomLog logs/referer_log referer
-#CustomLog logs/agent_log agent
+#CustomLog /var/log/httpd-referer_log referer
+#CustomLog /var/log/httpd-agent_log agent
 
 #
 # If you prefer a single logfile with access, agent, and referer information
 # (Combined Logfile Format) you can use the following directive.
 #

 
 #
 # Optionally add a line containing the server version and virtual host
@@ -498,9 +498,9 @@
 # We include the /icons/ alias for FancyIndexed directory listings.  If you
 # do not use FancyIndexing, you may comment this out.
 #

     Options Indexes MultiViews
     AllowOverride None
     Order allow,deny
@@ -512,9 +512,9 @@
 # the manual, even if you choose to move your DocumentRoot.  You may comment
 # this out if you do not care for the documentation.
 #

     Options Indexes FollowSymLinks MultiViews
     AllowOverride None
     Order allow,deny
@@ -529,21 +529,21 @@
 # The same rules about trailing "/" apply to ScriptAlias directives as to
 # Alias.
 #

     AllowOverride None
     Options None
     Order allow,deny
@@ -859,9 +859,9 @@
 #
 
 <IfModule mod_negotiation.c>
 <IfModule mod_include.c>
-    Alias /error/ "@@ServerRoot@@/error/"
+    Alias /error/ "@@ServerRoot@@/www/error/"

         AllowOverride None
         Options IncludesNoExec
         AddOutputFilter Includes html
@@ -974,7 +974,7 @@
 # Bring in additional module-specific configurations
 #
 <IfModule mod_ssl.c>
-    Include conf/ssl.conf
+    Include etc/apache2/ssl.conf
 </IfModule>
 
 

Lines 1-14 Link Here

(-)apache2/files/patch-docs:conf:ssl-std.conf (-14 / +34 lines)
1	--- docs/conf/ssl-std.conf.orig Fri Nov 16 21:56:55 2001	1	--- docs/conf/ssl-std.conf.orig Thu Nov 8 07:16:09 2001
2	+++ docs/conf/ssl-std.conf Fri Nov 16 22:00:27 2001	2	+++ docs/conf/ssl-std.conf Fri Feb 22 02:37:27 2002
3	@@ -57,7 +57,7 @@	3	@@ -55,15 +55,15 @@
		4	# Configure the SSL Session Cache: First the mechanism
		5	# to use and second the expiring timeout (in seconds).
4	#SSLSessionCache none	6	#SSLSessionCache none
5	#SSLSessionCache shmht:logs/ssl_scache(512000)	7	-#SSLSessionCache shmht:logs/ssl_scache(512000)
6	#SSLSessionCache shmcb:logs/ssl_scache(512000)	8	-#SSLSessionCache shmcb:logs/ssl_scache(512000)
7	-SSLSessionCache dbm:logs/ssl_scache	9	-SSLSessionCache dbm:logs/ssl_scache
		10	+#SSLSessionCache shmht:/var/log/httpd-ssl_scache(512000)
		11	+#SSLSessionCache shmcb:/var/log/httpd-ssl_scache(512000)
8	+SSLSessionCache dbm:/var/log/httpd-ssl_scache	12	+SSLSessionCache dbm:/var/log/httpd-ssl_scache
9	SSLSessionCacheTimeout 300	13	SSLSessionCacheTimeout 300
10		14
11	# Semaphore:	15	# Semaphore:
		16	# Configure the path to the mutual exclusion semaphore the
		17	# SSL engine uses internally for inter-process synchronization.
		18	-SSLMutex file:logs/ssl_mutex
		19	+SSLMutex file:/var/log/httpd-ssl_mutex
		20
		21	# Pseudo Random Number Generator (PRNG):
		22	# Configure one or more sources to seed the PRNG of the
		23	@@ -89,7 +89,7 @@
		24	# a real server (i.e. somewhere where only root can write).
		25	# Log levels are (ascending order: higher ones include lower ones):
		26	# none, error, warn, info, trace, debug.
		27	-SSLLog logs/ssl_engine_log
		28	+SSLLog /var/log/httpd-ssl_engine_log
		29	SSLLogLevel info
		30
		31	##
12	@@ -99,11 +99,11 @@	32	@@ -99,11 +99,11 @@
13	<VirtualHost _default_:443>	33	<VirtualHost _default_:443>
14		34
Lines 30-37 Link Here
30	# the use of DSA ciphers, etc.)	50	# the use of DSA ciphers, etc.)
31	-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt	51	-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
32	-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt	52	-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
33	+SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server.crt	53	+SSLCertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/server.crt
34	+#SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server-dsa.crt	54	+#SSLCertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/server-dsa.crt
35		55
36	# Server Private Key:	56	# Server Private Key:
37	# If the key is not combined with the certificate, use this	57	# If the key is not combined with the certificate, use this
Lines 40-47 Link Here
40	# both in parallel (to also allow the use of DSA ciphers, etc.)	60	# both in parallel (to also allow the use of DSA ciphers, etc.)
41	-SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server.key	61	-SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server.key
42	-#SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server-dsa.key	62	-#SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server-dsa.key
43	+SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server.key	63	+SSLCertificateKeyFile @@ServerRoot@@/etc/apache2/ssl.key/server.key
44	+#SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server-dsa.key	64	+#SSLCertificateKeyFile @@ServerRoot@@/etc/apache2/ssl.key/server-dsa.key
45		65
46	# Server Certificate Chain:	66	# Server Certificate Chain:
47	# Point SSLCertificateChainFile at a file containing the	67	# Point SSLCertificateChainFile at a file containing the
Lines 50-56 Link Here
50	# when the CA certificates are directly appended to the server	70	# when the CA certificates are directly appended to the server
51	# certificate for convinience.	71	# certificate for convinience.
52	-#SSLCertificateChainFile @@ServerRoot@@/conf/ssl.crt/ca.crt	72	-#SSLCertificateChainFile @@ServerRoot@@/conf/ssl.crt/ca.crt
53	+#SSLCertificateChainFile @@ServerRoot@@/etc/apache/ssl.crt/ca.crt	73	+#SSLCertificateChainFile @@ServerRoot@@/etc/apache2/ssl.crt/ca.crt
54		74
55	# Certificate Authority (CA):	75	# Certificate Authority (CA):
56	# Set the CA certificate verification path where to find CA	76	# Set the CA certificate verification path where to find CA
Lines 60-67 Link Here
60	# Makefile to update the hash symlinks after changes.	80	# Makefile to update the hash symlinks after changes.
61	-#SSLCACertificatePath @@ServerRoot@@/conf/ssl.crt	81	-#SSLCACertificatePath @@ServerRoot@@/conf/ssl.crt
62	-#SSLCACertificateFile @@ServerRoot@@/conf/ssl.crt/ca-bundle.crt	82	-#SSLCACertificateFile @@ServerRoot@@/conf/ssl.crt/ca-bundle.crt
63	+#SSLCACertificatePath @@ServerRoot@@/etc/apache/ssl.crt	83	+#SSLCACertificatePath @@ServerRoot@@/etc/apache2/ssl.crt
64	+#SSLCACertificateFile @@ServerRoot@@/etc/apache/ssl.crt/ca-bundle.crt	84	+#SSLCACertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/ca-bundle.crt
65		85
66	# Certificate Revocation Lists (CRL):	86	# Certificate Revocation Lists (CRL):
67	# Set the CA revocation path where to find CA CRLs for client	87	# Set the CA revocation path where to find CA CRLs for client
Lines 71-78 Link Here
71	# Makefile to update the hash symlinks after changes.	91	# Makefile to update the hash symlinks after changes.
72	-#SSLCARevocationPath @@ServerRoot@@/conf/ssl.crl	92	-#SSLCARevocationPath @@ServerRoot@@/conf/ssl.crl
73	-#SSLCARevocationFile @@ServerRoot@@/conf/ssl.crl/ca-bundle.crl	93	-#SSLCARevocationFile @@ServerRoot@@/conf/ssl.crl/ca-bundle.crl
74	+#SSLCARevocationPath @@ServerRoot@@/etc/apache/ssl.crl	94	+#SSLCARevocationPath @@ServerRoot@@/etc/apache2/ssl.crl
75	+#SSLCARevocationFile @@ServerRoot@@/etc/apache/ssl.crl/ca-bundle.crl	95	+#SSLCARevocationFile @@ServerRoot@@/etc/apache2/ssl.crl/ca-bundle.crl
76		96
77	# Client Authentication (Type):	97	# Client Authentication (Type):
78	# Client certificate verification type and depth. Types are	98	# Client certificate verification type and depth. Types are

Line 0 Link Here

(-)apache2/files/patch-srclib:apr-util:configure (+11 lines)
	1	--- srclib/apr-util/configure.orig Fri Feb 22 02:55:35 2002
	2	+++ srclib/apr-util/configure Fri Feb 22 02:56:03 2002
	3	@@ -5770,7 +5770,7 @@
	4
	5
	6	if test -z "$expat_include_dir"; then
	7	- for d in /usr /usr/local xml/expat-cvs xml/expat $srcdir/xml/expat ; do
	8	+ for d in xml/expat-cvs xml/expat $srcdir/xml/expat ; do
	9
	10	echo $ac_n "checking for Expat in $d""... $ac_c" 1>&6
	11	echo "configure:5777: checking for Expat in $d" >&5

Lines 1-6 Link Here

(-)apache2/files/patch-support:apachectl.in (-7 / +7 lines)
1	--- support/apachectl.in.orig Fri Nov 16 21:22:36 2001	1	--- support/apachectl.in.orig Sat Dec 15 22:56:36 2001
2	+++ support/apachectl.in Fri Nov 16 22:07:31 2001	2	+++ support/apachectl.in Fri Feb 22 02:40:03 2002
3	@@ -25,10 +25,10 @@	3	@@ -26,10 +26,10 @@
4	# -------------------- --------------------	4	# -------------------- --------------------
5	#	5	#
6	# the path to your PID file	6	# the path to your PID file
Lines 11-23 Link Here
11	-HTTPD='@prefix@/bin/@progname@'	11	-HTTPD='@prefix@/bin/@progname@'
12	+HTTPD='@prefix@/sbin/@progname@'	12	+HTTPD='@prefix@/sbin/@progname@'
13	#	13	#
14	# a command that outputs a formatted text version of the HTML at the	14	# pick up any necessary environment variables
15	# url given on the command line. Designed for lynx, however other	15	if test -f @prefix@/bin/envvars; then
16	@@ -41,6 +41,7 @@	16	@@ -47,6 +47,7 @@
17	#	17	#
18	# -------------------- --------------------	18	# -------------------- --------------------
19	# \|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\| END CONFIGURATION SECTION \|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|	19	# \|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\| END CONFIGURATION SECTION \|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|
20	+eval `limits -e -C daemon` >/dev/null 2>&1	20	+eval `limits -e -C daemon` >/dev/null 2>&1
21		21
22	ERROR=0	22	ERROR=0
23	ARGV="$@"	23	if [ "x$ARGV" = "x" ] ; then




--- support/apxs.in.orig	Sat Feb  2 04:25:14 2002
+++ support/apxs.in	Fri Feb 22 02:49:11 2002
@@ -66,7 +66,7 @@
 
 # read the configuration variables once
 my %config_vars = ();
-get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
+get_config_vars("$prefix/share/apache/config_vars.mk",\%config_vars);
 
 my $exec_prefix    = get_vars("exec_prefix");
 my $CFG_TARGET     = get_vars("progname");
@@ -414,7 +414,7 @@
 ##
 ##  Initial shared object support check
 ##
-my $httpd = get_vars("bindir") . "/" . get_vars("progname");
+my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
 $httpd = eval qq("$httpd");
 $httpd = eval qq("$httpd");
 
@@ -412,7 +412,7 @@
         $la =~ s|\.c$|.la|;
         my $o = $s;
         $o =~ s|\.c$|.o|;
-        push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
+        push(@cmds, "$prefix/share/apache/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
         unshift(@objs, $lo);
     }
 
@@ -439,7 +439,7 @@
         $opt .= " -l$opt_l";
     }
 
-    push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
+    push(@cmds, "$prefix/share/apache/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
 
     #   execute the commands
     &execute_cmds(@cmds);
@@ -470,8 +470,8 @@
         my $t = $f;
         $t =~ s|^.+/([^/]+)$|$1|;
         $t =~ s|\.la$|\.so|;
         if ($opt_i) {
-	    push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" .
-                 "$prefix/build/libtool' $f $CFG_LIBEXECDIR");
+	    push(@cmds, "$prefix/share/apache/instdso.sh SH_LIBTOOL='" .
+                 "$prefix/share/apache/libtool' $f $CFG_LIBEXECDIR");
 	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
         }
 

Lines 1-5 Link Here

(-)apache2/files/patch-support:log_server_status.in (-2 / +2 lines)
1	--- support/log_server_status.in.orig Fri Nov 16 22:11:16 2001	1	--- support/log_server_status.in.orig Mon Mar 12 08:40:47 2001
2	+++ support/log_server_status.in Fri Nov 16 22:13:50 2001	2	+++ support/log_server_status.in Fri Feb 22 02:50:20 2002
3	@@ -63,10 +63,10 @@	3	@@ -63,10 +63,10 @@
4	#	4	#
5	require 'sys/socket.ph';	5	require 'sys/socket.ph';




bin/apr-config
bin/apu-config
@unexec if cmp -s %D/etc/apache2/highperformance.conf %D/etc/apache2/highperformance-std.conf; then rm -f %D/etc/apache2/highperformance.conf; fi
etc/apache2/highperformance-std.conf
@exec [ -f %B/highperformance.conf ] || cp %B/%f %B/highperformance.conf
@unexec if cmp -s %D/etc/apache2/httpd.conf %D/etc/apache2/httpd-std.conf; then rm -f %D/etc/apache2/httpd.conf; fi
etc/apache2/httpd-std.conf
@exec [ -f %B/httpd.conf ] || cp %B/%f %B/httpd.conf
@unexec if cmp -s %D/etc/apache2/magic %D/etc/apache2/magic.default; then rm -f %D/etc/apache2/magic; fi
etc/apache2/magic.default
@exec [ -f %B/magic ] || cp %B/%f %B/magic
@unexec if cmp -s %D/etc/apache2/mime.types %D/etc/apache2/mime.types.default; then rm -f %D/etc/apache2/mime.types; fi
etc/apache2/mime.types.default
@exec [ -f %B/mime.types ] || cp %B/%f %B/mime.types
@unexec if cmp -s %D/etc/apache2/ssl.conf %D/etc/apache2/ssl-std.conf; then rm -f %D/etc/apache2/ssl.conf; fi
etc/apache2/ssl-std.conf
@exec [ -f %B/ssl.conf ] || cp %B/%f %B/ssl.conf
etc/rc.d/apache.sh
include/apache/ap_compat.h
include/apache/ap_config.h

include/apache/ap_mpm.h
include/apache/ap_release.h
include/apache/apr.h
include/apache/apr_anylock.h
include/apache/apr_base64.h
include/apache/apr_buckets.h
include/apache/apr_compat.h

include/apache/apr_portable.h
include/apache/apr_proc_mutex.h
include/apache/apr_ring.h
include/apache/apr_rmm.h
include/apache/apr_sdbm.h
include/apache/apr_sha1.h
include/apache/apr_shm.h
include/apache/apr_signal.h
include/apache/apr_strings.h
include/apache/apr_tables.h

include/apache/apr_uri.h
include/apache/apr_user.h
include/apache/apr_uuid.h
include/apache/apr_version.h
include/apache/apr_want.h
include/apache/apr_xlate.h
include/apache/apr_xml.h
include/apache/apu.h
include/apache/apu_compat.h
include/apache/config.h
include/apache/expat.h
include/apache/http_config.h
include/apache/http_connection.h

include/apache/http_request.h
include/apache/http_vhost.h
include/apache/httpd.h
include/apache/internal.h
include/apache/mod_cgi.h
include/apache/mod_core.h
include/apache/mod_dav.h

include/apache/util_script.h
include/apache/util_time.h
include/apache/util_xml.h
lib/apache/APRVARS
lib/apache/apr.exp
lib/apache/aprutil.exp
lib/apache/libapr.a
lib/apache/libapr.la
lib/apache/libapr.so.0
@unexec rm -f %D/lib/apache/libapr.so
@exec ln -fs libapr.so.0 %D/lib/apache/libapr.so
lib/apache/libaprutil.a
lib/apache/libaprutil.la
lib/apache/libaprutil.so.0
@unexec rm -f %D/lib/apache/libaprutil.so
@exec ln -fs libaprutil.so.0 %D/lib/apache/libaprutil.so
lib/apache/libexpat.a
lib/apache/libexpat.la
lib/apache/libexpat.so.1
@unexec rm -f %D/lib/apache/libexpat.so
@exec ln -fs libexpat.so.1 %D/lib/apache/libexpat.so
libexec/apache/httpd.exp
libexec/apache/mod_access.la
libexec/apache/mod_access.so
libexec/apache/mod_actions.la
libexec/apache/mod_actions.so
libexec/apache/mod_alias.la
libexec/apache/mod_alias.so
libexec/apache/mod_asis.la
libexec/apache/mod_asis.so
libexec/apache/mod_auth.la
libexec/apache/mod_auth.so
libexec/apache/mod_auth_anon.la
libexec/apache/mod_auth_anon.so
libexec/apache/mod_auth_db.la
libexec/apache/mod_auth_db.so
libexec/apache/mod_auth_dbm.la
libexec/apache/mod_auth_dbm.so
libexec/apache/mod_auth_digest.la
libexec/apache/mod_auth_digest.so
libexec/apache/mod_autoindex.la
libexec/apache/mod_autoindex.so
libexec/apache/mod_cache.so
%%CACHEOPT%%libexec/apache/mod_cache.so
libexec/apache/mod_cern_meta.la
libexec/apache/mod_cern_meta.so
libexec/apache/mod_cgi.la
libexec/apache/mod_cgi.so
libexec/apache/mod_cgid.la
libexec/apache/mod_cgid.so
libexec/apache/mod_dav.la
libexec/apache/mod_dav.so
libexec/apache/mod_dav_fs.la
libexec/apache/mod_dav_fs.so
libexec/apache/mod_dir.la
libexec/apache/mod_dir.so
libexec/apache/mod_disk_cache.so
libexec/apache/mod_env.so
libexec/apache/mod_expires.la
libexec/apache/mod_expires.so
libexec/apache/mod_file_cache.so
%%CACHEOPT%%libexec/apache/mod_file_cache.so
libexec/apache/mod_headers.la
libexec/apache/mod_headers.so
libexec/apache/mod_imap.la
libexec/apache/mod_imap.so
libexec/apache/mod_include.la
libexec/apache/mod_include.so
libexec/apache/mod_info.la
libexec/apache/mod_info.so
libexec/apache/mod_log_config.la
libexec/apache/mod_log_config.so
%%THREADONLY%%libexec/apache/mod_mem_cache.so
%%CACHEOPT%%libexec/apache/mod_mem_cache.so
libexec/apache/mod_mime.la
libexec/apache/mod_mime.so
libexec/apache/mod_mime_magic.la
libexec/apache/mod_mime_magic.so
libexec/apache/mod_negotiation.la
libexec/apache/mod_negotiation.so
libexec/apache/mod_proxy.so
libexec/apache/mod_proxy_connect.so
libexec/apache/mod_proxy_ftp.so
libexec/apache/mod_proxy_http.so
%%PROXYOPT%%libexec/apache/mod_proxy_ftp.la
%%PROXYOPT%%libexec/apache/mod_proxy_ftp.so
%%PROXYOPT%%libexec/apache/mod_proxy_http.la
%%PROXYOPT%%libexec/apache/mod_proxy_http.so
libexec/apache/mod_rewrite.la
libexec/apache/mod_rewrite.so
libexec/apache/mod_setenvif.la
libexec/apache/mod_setenvif.so
libexec/apache/mod_speling.la
libexec/apache/mod_speling.so
%%SSLOPT%%libexec/apache/mod_ssl.la
%%SSLOPT%%libexec/apache/mod_ssl.so
libexec/apache/mod_status.la
libexec/apache/mod_status.so
libexec/apache/mod_unique_id.la
libexec/apache/mod_unique_id.so
libexec/apache/mod_userdir.la
libexec/apache/mod_userdir.so
libexec/apache/mod_usertrack.la
libexec/apache/mod_usertrack.so
libexec/apache/mod_vhost_alias.la
libexec/apache/mod_vhost_alias.so
@dirrm libexec/apache
sbin/ab
sbin/apachectl
sbin/apxs
sbin/checkgid
sbin/dbmmanage
sbin/envvars
sbin/envvars-std
sbin/htdbm
sbin/htdigest
sbin/htpasswd
sbin/httpd
sbin/logresolve
sbin/rotatelogs
share/apache/config_vars.mk
share/apache/instdso.sh
share/apache/library.mk
share/apache/libtool
share/apache/ltlib.mk
share/apache/program.mk
share/apache/rules.mk
share/apache/special.mk
%%PORTDOCS%%share/doc/apache/LICENSE
%%PORTDOCS%%share/doc/apache/bind.html
%%PORTDOCS%%share/doc/apache/cgi_path.html

%%PORTDOCS%%share/doc/apache/dso.html
%%PORTDOCS%%share/doc/apache/ebcdic.html
%%PORTDOCS%%share/doc/apache/env.html
%%PORTDOCS%%share/doc/apache/faq/footer.html
%%PORTDOCS%%share/doc/apache/faq/header.html
%%PORTDOCS%%share/doc/apache/faq/index.html
%%PORTDOCS%%share/doc/apache/faq/support.html
%%PORTDOCS%%share/doc/apache/filter.html
%%PORTDOCS%%share/doc/apache/footer.html
%%PORTDOCS%%share/doc/apache/handler.html.en

%%PORTDOCS%%share/doc/apache/mod/mod_asis.html
%%PORTDOCS%%share/doc/apache/mod/mod_auth.html
%%PORTDOCS%%share/doc/apache/mod/mod_auth_anon.html
%%PORTDOCS%%share/doc/apache/mod/mod_auth_db.html
%%PORTDOCS%%share/doc/apache/mod/mod_auth_dbm.html
%%PORTDOCS%%share/doc/apache/mod/mod_auth_digest.html
%%PORTDOCS%%share/doc/apache/mod/mod_auth_ldap.html

%%PORTDOCS%%share/doc/apache/mod/mod_vhost_alias.html
%%PORTDOCS%%share/doc/apache/mod/module-dict.html
%%PORTDOCS%%share/doc/apache/mod/mpm_common.html
%%PORTDOCS%%share/doc/apache/mod/mpm_netware.html
%%PORTDOCS%%share/doc/apache/mod/mpm_winnt.html
%%PORTDOCS%%share/doc/apache/mod/perchild.html
%%PORTDOCS%%share/doc/apache/mod/prefork.html
%%PORTDOCS%%share/doc/apache/mod/worker.html
%%PORTDOCS%%share/doc/apache/mpm.html
%%PORTDOCS%%share/doc/apache/new_features_2_0.html.de
%%PORTDOCS%%share/doc/apache/new_features_2_0.html.en
%%PORTDOCS%%share/doc/apache/new_features_2_0.html.fr
%%PORTDOCS%%share/doc/apache/platform/footer.html
%%PORTDOCS%%share/doc/apache/platform/header.html
%%PORTDOCS%%share/doc/apache/platform/netware.html
%%PORTDOCS%%share/doc/apache/platform/perf-hp.html
%%PORTDOCS%%share/doc/apache/platform/win_compiling.html
%%PORTDOCS%%share/doc/apache/platform/win_service.html

%%PORTDOCS%%share/doc/apache/sections.html
%%PORTDOCS%%share/doc/apache/server-wide.html.en
%%PORTDOCS%%share/doc/apache/server-wide.html.ja.jis
%%PORTDOCS%%share/doc/apache/sitemap.html
%%PORTDOCS%%share/doc/apache/ssl/Makefile
%%PORTDOCS%%share/doc/apache/ssl/footer.html
%%PORTDOCS%%share/doc/apache/ssl/header.html

%%PORTDOCS%%share/doc/apache/vhosts/ip-based.html
%%PORTDOCS%%share/doc/apache/vhosts/mass.html
%%PORTDOCS%%share/doc/apache/vhosts/name-based.html
%%PORTDOCS%%@dirrm share/doc/apache/vhosts
%%PORTDOCS%%@dirrm share/doc/apache/ssl
%%PORTDOCS%%@dirrm share/doc/apache/search
%%PORTDOCS%%@dirrm share/doc/apache/programs
%%PORTDOCS%%@dirrm share/doc/apache/platform
%%PORTDOCS%%@dirrm share/doc/apache/mod
%%PORTDOCS%%@dirrm share/doc/apache/misc
%%PORTDOCS%%@dirrm share/doc/apache/images
%%PORTDOCS%%@dirrm share/doc/apache/howto
%%PORTDOCS%%@dirrm share/doc/apache/faq
%%PORTDOCS%%@dirrm share/doc/apache/developer
%%PORTDOCS%%@dirrm share/doc/apache
share/mk/apache/config_vars.mk
share/mk/apache/library.mk
share/mk/apache/libtool
share/mk/apache/ltlib.mk
share/mk/apache/program.mk
share/mk/apache/rules.mk
share/mk/apache/special.mk
@dirrm share/mk/apache
@dirrm share/mk
@exec mkdir -p %D/www
@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
www/cgi-bin.default/printenv
www/cgi-bin.default/test-cgi
www/cgi-bin.default/test-cgi.bat
@exec [ ! -d %D/www/data ] && ln -fs %D/www/data.default %D/www/data
@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
@exec [ ! -d %D/www/data ] && ln -fs %D/www/data.default %D/www/data
www/data.default/apache_pb.gif
www/data.default/apache_pb.png
www/data.default/apache_pb2.gif
www/data.default/apache_pb2.png
www/data.default/apache_pb2_ani.gif
www/data.default/error.README
www/data.default/index.html.ca
www/data.default/index.html.cz.iso8859-2
www/data.default/index.html.de

www/data.default/index.html.tw
www/data.default/index.html.tw.Big5
www/data.default/index.html.var
@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
www/error/HTTP_BAD_GATEWAY.html.var
www/error/HTTP_BAD_REQUEST.html.var
www/error/HTTP_FORBIDDEN.html.var

www/error/HTTP_UNAUTHORIZED.html.var
www/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
www/error/HTTP_VARIANT_ALSO_VARIES.html.var
www/error/README
www/error/contact.html.var
www/error/include/bottom.html
www/error/include/spacer.html

www/icons/folder.sec.png
www/icons/forward.gif
www/icons/forward.png
www/icons/freebsd.gif
www/icons/generic.gif
www/icons/generic.png
www/icons/generic.red.gif

@dirrm www/data.default
@dirrm www/cgi-bin.default
@dirrm www
%%PORTDOCS%%@dirrm share/doc/apache/vhosts
%%PORTDOCS%%@dirrm share/doc/apache/ssl
%%PORTDOCS%%@dirrm share/doc/apache/search
%%PORTDOCS%%@dirrm share/doc/apache/programs
%%PORTDOCS%%@dirrm share/doc/apache/platform
%%PORTDOCS%%@dirrm share/doc/apache/mod
%%PORTDOCS%%@dirrm share/doc/apache/misc
%%PORTDOCS%%@dirrm share/doc/apache/images
%%PORTDOCS%%@dirrm share/doc/apache/howto
%%PORTDOCS%%@dirrm share/doc/apache/faq
%%PORTDOCS%%@dirrm share/doc/apache/developer
%%PORTDOCS%%@dirrm share/doc/apache
@dirrm share/apache
@dirrm libexec/apache
@dirrm lib/apache
@dirrm include/apache
@dirrm etc/apache

Return to bug 36040

Lines 6-33 Link Here

(-)apache2/Makefile (-24 / +26 lines)
6	#	6	#
7		7
8	PORTNAME= apache	8	PORTNAME= apache
9	PORTVERSION= 2.0.28	9	PORTVERSION= 2.0.32
10	PORTREVISION= 5
11	CATEGORIES= www ipv6	10	CATEGORIES= www ipv6
12	MASTER_SITES= http://www.apache.org/dist/httpd/ \	11	MASTER_SITES= http://www.apache.org/dist/httpd/ \
		12	http://www.freebsd.org/gifs/ \
13	http://apache.mirrorcentral.com/dist/httpd/ \	13	http://apache.mirrorcentral.com/dist/httpd/ \
		14	http://www2.freebsd.org/gifs/ \
14	http://apache.missouri.edu/dist/httpd/ \	15	http://apache.missouri.edu/dist/httpd/ \
15	http://ftp.epix.net/apache/dist/httpd/ \	16	http://ftp.epix.net/apache/dist/httpd/ \
16	ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \	17	ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
17	ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/	18	ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/
18	DISTNAME= httpd-${PORTVERSION:S/./_/g}-beta	19	DISTNAME= httpd-${PORTVERSION}-beta
19		20	DISTFILES= ${DISTNAME}.tar.gz powerlogo.gif
20	PATCH_SITES= http://fallin.lv/distfiles/	21	EXTRACT_ONLY= ${DISTNAME}.tar.gz
21	PATCHFILES= ${PORTNAME}-${PORTVERSION}_1.diff
22		22
23	MAINTAINER?= perky@fallin.lv	23	MAINTAINER?= perky@fallin.lv
24		24
25	LATEST_LINK= apache2	25	LATEST_LINK= apache2
26		26
27	WRKSRC= ${WRKDIR}/httpd-${PORTVERSION:S/./_/g}	27	WRKSRC= ${WRKDIR}/httpd-${PORTVERSION}
28	FIND= find	28	WITH_MPM?= prefork # or worker, perchild (neither of them is working yet)
29
30	WITH_MPM?= prefork # or perchild, threaded
31	HTTP_PORT?= 80	29	HTTP_PORT?= 80
32		30
33	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
Lines 38-47 Link Here
38	--with-suexec-docroot=${PREFIX}/www/data \	36	--with-suexec-docroot=${PREFIX}/www/data \
39	--with-mpm=${WITH_MPM} \	37	--with-mpm=${WITH_MPM} \
40	--with-port=${HTTP_PORT} \	38	--with-port=${HTTP_PORT} \
41	--includedir=${PREFIX}/include/apache # for apr, apr-util	39	--libdir=${PREFIX}/lib/apache \
		40	--includedir=${PREFIX}/include/apache
42	CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \	41	CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
43	LDFLAGS="${LDFLAGS}"	42	LDFLAGS="${LDFLAGS}"
44	SHARED_MODULES= all cgid	43	SHARED_MODULES= all cgid cache file-cache disk-cache proxy proxy-connect \
		44	proxy-ftp proxy-http
45		45
46	.if defined(NOPORTDOCS)	46	.if defined(NOPORTDOCS)
47	MAKE_ENV+= NOPORTDOCS=YES	47	MAKE_ENV+= NOPORTDOCS=YES
Lines 54-71 Link Here
54	PLIST_SUB+= SSLOPT="@comment "	54	PLIST_SUB+= SSLOPT="@comment "
55	.endif	55	.endif
56		56
57	.if !defined(WITHOUT_PROXY)	57	.if ${WITH_MPM} != "prefork"
58	SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http	58	CONFIGURE_ARGS+= --enable-threads
59	PLIST_SUB+= PROXYOPT=""	59	SHARED_MODULES+= mem-cache
60	.else	60	PLIST_SUB+= THREADONLY=""
61	PLIST_SUB+= PROXYOPT="@comment "	61	PKGNAMESUFFIX= -${WITH_MPM}
62	.endif
63
64	.if !defined(WITHOUT_CACHE)
65	SHARED_MODULES+= cache mem-cache file-cache #disk-cache
66	PLIST_SUB+= CACHEOPT=""
67	.else	62	.else
68	PLIST_SUB+= CACHEOPT="@comment "	63	PLIST_SUB+= THREADONLY="@comment "
69	.endif	64	.endif
70		65
71	CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"	66	CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
Lines 78-85 Link Here
78	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."	73	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
79	.endif	74	.endif
80		75
		76	post-extract:
		77	@${CP} ${DISTDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
		78
81	post-patch:	79	post-patch:
82	@${FIND} ${WRKSRC} -name "*.orig" -exec rm -f {} \;	80	@cd ${WRKSRC}/docs/docroot && \
		81	for f in index.html.*; do (\
		82	${PERL} -pi -e 's,apache_pb,icons/freebsd.gif" ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
		83	); done
		84	@${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
83		85
84	pre-install:	86	pre-install:
85	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL	87	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL

Lines 1-44 Link Here

(-)apache2/files/patch-Makefile.in (-15 / +15 lines)
1	--- Makefile.in.orig Mon Oct 22 21:46:29 2001	1	--- Makefile.in.orig Wed Jan 23 16:10:16 2002
2	+++ Makefile.in Tue Jan 22 19:02:30 2002	2	+++ Makefile.in Fri Feb 22 03:32:58 2002
3	@@ -32,7 +32,7 @@	3	@@ -32,7 +32,9 @@
4	@test -d $(sysconfdir) \|\| $(MKINSTALLDIRS) $(sysconfdir)	4	@test -d $(sysconfdir) \|\| $(MKINSTALLDIRS) $(sysconfdir)
5	@cd $(top_srcdir)/docs/conf; \	5	@cd $(top_srcdir)/docs/conf; \
6	for i in mime.types magic; do \	6	for i in mime.types magic; do \
7	- $(INSTALL_DATA) $$i $(sysconfdir); \	7	- $(INSTALL_DATA) $$i $(sysconfdir); \
8	+ test -f $(sysconfdir)/$$i \|\| $(INSTALL_DATA) $$i $(sysconfdir); \	8	+ test -f $(sysconfdir)/$$i \|\| $(INSTALL_DATA) $$i $(sysconfdir); \
		9	+ cp -f $$i $$i.default; \
		10	+ $(INSTALL_DATA) $$i.default $(sysconfdir); \
9	done; \	11	done; \
10	for i in -std ssl.conf; do \	12	for i in -std ssl.conf; do \
11	[ -f $$i ] \|\| continue; \	13	[ -f $$i ] \|\| continue; \
12	@@ -51,7 +51,7 @@	14	@@ -54,7 +56,7 @@
13	< $$i; \	15	echo "<IfDefine SSL>"; \
14	for j in $(DSO_MODULES) "^EOL^"; do \	16	fi; \
15	if test $$j != "^EOL^"; then \	17	if test $$j != "^EOL^"; then \
16	- echo "LoadModule $${j}_module modules/mod_$${j}.so"; \	18	- echo "LoadModule $${j}_module modules/mod_$${j}.so"; \
17	+ echo "LoadModule $${j}_module ${libexecdir:S\|^${prefix}/\|\|}/mod_$${j}.so"; \	19	+ echo "LoadModule $${j}_module ${libexecdir:S\|^${prefix}/\|\|}/mod_$${j}.so"; \
18	fi; \	20	fi; \
19	done; \	21	if test "x$$j" = "xssl"; then \
20	sed -e '1,/@@LoadModule@@/d' \	22	echo "</IfDefine>"; \
21	@@ -93,11 +93,14 @@	23	@@ -106,11 +108,14 @@
22		24
23	install-htdocs:	25	install-htdocs:
24	@echo Installing HTML documents	26	@echo Installing HTML documents
25	- @test -d $(htdocsdir) \|\| $(MKINSTALLDIRS) $(htdocsdir)	27	- @test -d $(htdocsdir) \|\| $(MKINSTALLDIRS) $(htdocsdir)
26	- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))	28	- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
27	- @test -d $(prefix)/manual \|\| $(MKINSTALLDIRS) $(prefix)/manual
28	- @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual)
29	- @(cd $(htdocsdir) && find . -name "CVS" -print \| xargs rm -rf {} \;)
30	+ @test -d $(htdocsdir).default \|\| $(MKINSTALLDIRS) $(htdocsdir).default	29	+ @test -d $(htdocsdir).default \|\| $(MKINSTALLDIRS) $(htdocsdir).default
31	+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir).default)	30	+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir).default)
32	+ @test -e $(htdocsdir) \|\| ln -sf $(htdocsdir).default $(htdocsdir)	31	+ @test -e $(htdocsdir) \|\| ln -sf $(htdocsdir).default $(htdocsdir)
33	+.if !defined(NOPORTDOCS)	32	+.if !defined(NOPORTDOCS)
34	+ @test -d $(manualdir) \|\| $(MKINSTALLDIRS) $(manualdir)	33	@test -d $(manualdir) \|\| $(MKINSTALLDIRS) $(manualdir)
35	+ @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))	34	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
		35	- @(cd $(htdocsdir) && find . -name "CVS" -print \| xargs rm -rf {} \;)
36	+.endif	36	+.endif
37	+ @(cd $(htdocsdir).default && find . -name "CVS" -print \| xargs rm -rf {} \;)	37	+ @(cd $(htdocsdir).default && find . -name "CVS" -print \| xargs rm -rf {} \;)
38		38
39	install-error:	39	install-error:
40	@echo Installing error documents	40	@echo Installing error documents
41	@@ -113,9 +116,10 @@	41	@@ -126,9 +131,10 @@
42		42
43	install-cgi:	43	install-cgi:
44	@echo Installing CGIs	44	@echo Installing CGIs

Lines 1-8 Link Here

(-)apache2/files/patch-config.layout (-8 / +9 lines)
1	--- config.layout.orig Fri Oct 26 11:59:26 2001	1	--- config.layout.orig Thu Feb 21 03:02:06 2002
2	+++ config.layout Fri Nov 16 18:36:14 2001	2	+++ config.layout Thu Feb 21 03:04:56 2002
3	@@ -285,3 +285,25 @@	3	@@ -307,3 +307,26 @@
4	logfiledir: $prefix/logs	4	infodir: $exec_prefix/share/info
5	proxycachedir: $prefix/proxy	5	installbuilddir: $prefix/etc/apache2/build
6	</Layout>	6	</Layout>
7	+	7	+
8	+<Layout FreeBSD>	8	+<Layout FreeBSD>
Lines 12-28 Link Here
12	+ sbindir: $exec_prefix/sbin	12	+ sbindir: $exec_prefix/sbin
13	+ libexecdir: $exec_prefix/libexec/apache	13	+ libexecdir: $exec_prefix/libexec/apache
14	+ mandir: $prefix/man	14	+ mandir: $prefix/man
15	+ sysconfdir: $prefix/etc/apache	15	+ sysconfdir: $prefix/etc/apache2
16	+ datadir: $prefix/www	16	+ datadir: $prefix/www
17	+ installbuilddir: $prefix/share/mk/apache	17	+ installbuilddir: $prefix/share/apache
18	+ errordir: $datadir/error	18	+ errordir: $datadir/error
19	+ iconsdir: $datadir/icons	19	+ iconsdir: $datadir/icons
20	+ htdocsdir: $datadir/data	20	+ htdocsdir: $datadir/data
21	+ manualdir: ${prefix}/share/doc/apache	21	+ manualdir: $prefix/share/doc/apache
22	+ cgidir: $datadir/cgi-bin	22	+ cgidir: $datadir/cgi-bin
23	+ includedir: $prefix/include/apache	23	+ includedir: $prefix/include/apache
24	+ localstatedir: /var	24	+ localstatedir: /var
25	+ runtimedir: $localstatedir/run	25	+ runtimedir: $localstatedir/run
26	+ logfiledir: $localstatedir/log	26	+ logfiledir: $localstatedir/log
27	+ proxycachedir: $datadir/proxy	27	+ proxycachedir: $datadir/proxy
		28	+ infodir: $exec_prefix/share/info
28	+</Layout>	29	+</Layout>

Lines 1-31 Link Here

(-)apache2/files/patch-configure (-23 / +5 lines)
1	--- configure.orig Tue Nov 13 04:07:39 2001	1	--- configure.orig Fri Feb 22 03:43:38 2002
2	+++ configure Fri Nov 16 23:32:52 2001	2	+++ configure Fri Feb 22 03:44:56 2002
3	@@ -1084,7 +1084,7 @@	3	@@ -11095,7 +11095,10 @@
4	esac
5
6	# The eval makes quoting arguments work.
7	- if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix $disable_shared"
8	+ if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "$apache_apr_flags --prefix=$prefix $disable_shared"
9	then :
10	echo "srclib/apr configured properly"
11	else
12	@@ -1175,7 +1175,7 @@
13	esac
14
15	# The eval makes quoting arguments work.
16	- if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix $disable_shared"
17	+ if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "--with-apr=../apr --prefix=$prefix $disable_shared"
18	then :
19	echo "srclib/apr-util configured properly"
20	else
21	@@ -10508,7 +10508,10 @@
22	EOF	4	EOF
23		5
24	cat >> confdefs.h <<EOF	6	cat >> confdefs.h <<EOF
25	-#define SERVER_CONFIG_FILE "conf/$progname.conf"	7	-#define SERVER_CONFIG_FILE "conf/$progname.conf"
26	+#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"	8	+#define SERVER_CONFIG_FILE "etc/apache2/$progname.conf"
27	+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"	9	+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
28	+#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"	10	+#define AP_TYPES_CONFIG_FILE "etc/apache2/mime.types"
29	+#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"	11	+#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"
30	EOF	12	EOF
31		13

Lines 1-24 Link Here

(-)apache2/files/patch-docs:conf:httpd-std.conf (-28 / +35 lines)
1	--- docs/conf/httpd-std.conf.orig Fri Nov 9 07:31:28 2001	1	--- docs/conf/httpd-std.conf.orig Fri Jan 25 09:24:47 2002
2	+++ docs/conf/httpd-std.conf Sat Nov 17 01:49:29 2001	2	+++ docs/conf/httpd-std.conf Fri Feb 22 02:32:28 2002
3	@@ -64,7 +64,7 @@	3	@@ -66,7 +66,7 @@
4	#	4	#
5	<IfModule !mpm_winnt.c>	5	<IfModule !mpm_netware.c>
6	<IfModule !perchild.c>	6	<IfModule !perchild.c>
7	-ScoreBoardFile logs/apache_runtime_status	7	-ScoreBoardFile logs/apache_runtime_status
8	+ScoreBoardFile /var/run/apache_runtime_status	8	+ScoreBoardFile /var/run/apache_runtime_status
9	</IfModule>	9	</IfModule>
10	</IfModule>	10	</IfModule>
11		11
12	@@ -73,7 +73,7 @@	12	@@ -76,7 +76,7 @@
13	# PidFile: The file in which the server should record its process
14	# identification number when it starts.	13	# identification number when it starts.
15	#	14	#
		15	<IfModule !mpm_netware.c>
16	-PidFile logs/httpd.pid	16	-PidFile logs/httpd.pid
17	+PidFile /var/run/httpd.pid	17	+PidFile /var/run/httpd.pid
		18	</IfModule>
18		19
19	#	20	#
20	# Timeout: The number of seconds before receives and sends time out.	21	@@ -248,8 +248,8 @@
21	@@ -229,8 +229,8 @@
22	# when the value of (unsigned)Group is above 60000;	22	# when the value of (unsigned)Group is above 60000;
23	# don't use Group #-1 on these systems!	23	# don't use Group #-1 on these systems!
24	#	24	#
Lines 27-35 Link Here
27	+User www	27	+User www
28	+Group www	28	+Group www
29	</IfModule>	29	</IfModule>
		30	</IfModule>
30		31
31	#	32	@@ -279,7 +279,7 @@
32	@@ -259,7 +259,7 @@
33	# documents. By default, all requests are taken from this directory, but	33	# documents. By default, all requests are taken from this directory, but
34	# symbolic links and aliases may be used to point to other locations.	34	# symbolic links and aliases may be used to point to other locations.
35	#	35	#
Lines 37-44 Link Here
37	+DocumentRoot "@@ServerRoot@@/www/data"	37	+DocumentRoot "@@ServerRoot@@/www/data"
38		38
39	#	39	#
40	# Each directory to which Apache has access, can be configured with respect	40	# Each directory to which Apache has access can be configured with respect
41	@@ -284,7 +284,7 @@	41	@@ -304,7 +304,7 @@
42	#	42	#
43	# This should be changed to whatever you set DocumentRoot to.	43	# This should be changed to whatever you set DocumentRoot to.
44	#	44	#
Lines 46-71 Link Here
46	+<Directory "@@ServerRoot@@/www/data">	46	+<Directory "@@ServerRoot@@/www/data">
47		47
48	#	48	#
49	# This may also be "None", "All", or any combination of "Indexes",	49	# Possible values for the Options directive are "None", "All",
50	@@ -377,7 +377,7 @@	50	@@ -397,7 +397,7 @@
51	# TypesConfig describes where the mime.types file (or equivalent) is	51	# TypesConfig describes where the mime.types file (or equivalent) is
52	# to be found.	52	# to be found.
53	#	53	#
54	-TypesConfig conf/mime.types	54	-TypesConfig conf/mime.types
55	+TypesConfig etc/apache/mime.types	55	+TypesConfig etc/apache2/mime.types
56		56
57	#	57	#
58	# DefaultType is the default MIME type the server will use for a document	58	# DefaultType is the default MIME type the server will use for a document
59	@@ -396,7 +396,7 @@	59	@@ -416,7 +416,7 @@
60	# directive tells the module where the hint definitions are located.	60	# directive tells the module where the hint definitions are located.
61	#	61	#
62	<IfModule mod_mime_magic.c>	62	<IfModule mod_mime_magic.c>
63	- MIMEMagicFile conf/magic	63	- MIMEMagicFile conf/magic
64	+ MIMEMagicFile etc/apache/magic	64	+ MIMEMagicFile etc/apache2/magic
65	</IfModule>	65	</IfModule>
66		66
67	#	67	#
68	@@ -416,7 +416,7 @@	68	@@ -436,7 +436,7 @@
69	# logged here. If you do define an error logfile for a <VirtualHost>	69	# logged here. If you do define an error logfile for a <VirtualHost>
70	# container, that host's errors will be logged there and not here.	70	# container, that host's errors will be logged there and not here.
71	#	71	#
Lines 74-89 Link Here
74		74
75	#	75	#
76	# LogLevel: Control the number of messages logged to the error_log.	76	# LogLevel: Control the number of messages logged to the error_log.
77	@@ -441,7 +441,7 @@	77	@@ -461,20 +461,20 @@
78	# define per-<VirtualHost> access logfiles, transactions will be	78	# define per-<VirtualHost> access logfiles, transactions will be
79	# logged therein and not in this file.	79	# logged therein and not in this file.
80	#	80	#
81	-CustomLog logs/access_log common	81	-CustomLog logs/access_log common
82	+#CustomLog logs/access_log common	82	+#CustomLog /var/log/httpd-access_log common
83		83
84	#	84	#
85	# If you would like to have agent and referer logfiles, uncomment the	85	# If you would like to have agent and referer logfiles, uncomment the
86	@@ -454,7 +454,7 @@	86	# following directives.
		87	#
		88	-#CustomLog logs/referer_log referer
		89	-#CustomLog logs/agent_log agent
		90	+#CustomLog /var/log/httpd-referer_log referer
		91	+#CustomLog /var/log/httpd-agent_log agent
		92
		93	#
87	# If you prefer a single logfile with access, agent, and referer information	94	# If you prefer a single logfile with access, agent, and referer information
88	# (Combined Logfile Format) you can use the following directive.	95	# (Combined Logfile Format) you can use the following directive.
89	#	96	#
Lines 92-98 Link Here
92		99
93	#	100	#
94	# Optionally add a line containing the server version and virtual host	101	# Optionally add a line containing the server version and virtual host
95	@@ -478,9 +478,9 @@	102	@@ -498,9 +498,9 @@
96	# We include the /icons/ alias for FancyIndexed directory listings. If you	103	# We include the /icons/ alias for FancyIndexed directory listings. If you
97	# do not use FancyIndexing, you may comment this out.	104	# do not use FancyIndexing, you may comment this out.
98	#	105	#
Lines 104-110 Link Here
104	Options Indexes MultiViews	111	Options Indexes MultiViews
105	AllowOverride None	112	AllowOverride None
106	Order allow,deny	113	Order allow,deny
107	@@ -492,9 +492,9 @@	114	@@ -512,9 +512,9 @@
108	# the manual, even if you choose to move your DocumentRoot. You may comment	115	# the manual, even if you choose to move your DocumentRoot. You may comment
109	# this out if you do not care for the documentation.	116	# this out if you do not care for the documentation.
110	#	117	#
Lines 116-122 Link Here
116	Options Indexes FollowSymLinks MultiViews	123	Options Indexes FollowSymLinks MultiViews
117	AllowOverride None	124	AllowOverride None
118	Order allow,deny	125	Order allow,deny
119	@@ -509,21 +509,21 @@	126	@@ -529,21 +529,21 @@
120	# The same rules about trailing "/" apply to ScriptAlias directives as to	127	# The same rules about trailing "/" apply to ScriptAlias directives as to
121	# Alias.	128	# Alias.
122	#	129	#
Lines 141-149 Link Here
141	AllowOverride None	148	AllowOverride None
142	Options None	149	Options None
143	Order allow,deny	150	Order allow,deny
144	@@ -851,9 +851,9 @@	151	@@ -859,9 +859,9 @@
145	#
146		152
		153	<IfModule mod_negotiation.c>
147	<IfModule mod_include.c>	154	<IfModule mod_include.c>
148	- Alias /error/ "@@ServerRoot@@/error/"	155	- Alias /error/ "@@ServerRoot@@/error/"
149	+ Alias /error/ "@@ServerRoot@@/www/error/"	156	+ Alias /error/ "@@ServerRoot@@/www/error/"
Lines 153-164 Link Here
153	AllowOverride None	160	AllowOverride None
154	Options IncludesNoExec	161	Options IncludesNoExec
155	AddOutputFilter Includes html	162	AddOutputFilter Includes html
156	@@ -964,7 +964,7 @@	163	@@ -974,7 +974,7 @@
157	# Bring in additional module-specific configurations	164	# Bring in additional module-specific configurations
158	#	165	#
159	<IfModule mod_ssl.c>	166	<IfModule mod_ssl.c>
160	- Include conf/ssl.conf	167	- Include conf/ssl.conf
161	+ Include etc/apache/ssl.conf	168	+ Include etc/apache2/ssl.conf
162	</IfModule>	169	</IfModule>
163		170
164		171

Lines 1-47 Link Here

(-)apache2/files/patch-support:apxs.in (-22 / +15 lines)
1	--- support/apxs.in.orig Sat Nov 3 05:09:20 2001	1	--- support/apxs.in.orig Sat Feb 2 04:25:14 2002
2	+++ support/apxs.in Sun Dec 9 14:47:57 2001	2	+++ support/apxs.in Fri Feb 22 02:49:11 2002
3	@@ -66,7 +66,7 @@	3	@@ -66,7 +66,7 @@
4		4
5	# read the configuration variables once	5	# read the configuration variables once
6	my %config_vars = ();	6	my %config_vars = ();
7	-get_config_vars("$prefix/build/config_vars.mk",\%config_vars);	7	-get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
8	+get_config_vars("$prefix/share/mk/apache/config_vars.mk",\%config_vars);	8	+get_config_vars("$prefix/share/apache/config_vars.mk",\%config_vars);
9		9
10	my $exec_prefix = get_vars("exec_prefix");	10	my $exec_prefix = get_vars("exec_prefix");
11	my $CFG_TARGET = get_vars("progname");	11	my $CFG_TARGET = get_vars("progname");
12	@@ -218,7 +218,7 @@	12	@@ -414,7 +414,7 @@
13	##
14	## Initial shared object support check
15	##
16	-my $httpd = get_vars("bindir") . "/" . get_vars("progname");
17	+my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
18	$httpd = eval qq("$httpd");
19	$httpd = eval qq("$httpd");
20
21	@@ -412,7 +412,7 @@
22	$la =~ s\|\.c$\|.la\|;	13	$la =~ s\|\.c$\|.la\|;
23	my $o = $s;	14	my $o = $s;
24	$o =~ s\|\.c$\|.o\|;	15	$o =~ s\|\.c$\|.o\|;
25	- push(@cmds, "$prefix/build/libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");	16	- push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
26	+ push(@cmds, "$prefix/share/mk/apache/libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");	17	+ push(@cmds, "$prefix/share/apache/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
27	unshift(@objs, $lo);	18	unshift(@objs, $lo);
28	}	19	}
29		20
30	@@ -437,7 +437,7 @@	21	@@ -439,7 +439,7 @@
31	$opt .= " -l$opt_l";	22	$opt .= " -l$opt_l";
32	}	23	}
33		24
34	- push(@cmds, "$prefix/build/libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");	25	- push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
35	+ push(@cmds, "$prefix/share/mk/apache/libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");	26	+ push(@cmds, "$prefix/share/apache/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
36		27
37	# execute the commands	28	# execute the commands
38	&execute_cmds(@cmds);	29	&execute_cmds(@cmds);
39	@@ -467,7 +467,7 @@	30	@@ -470,8 +470,8 @@
40	my $t = $f;
41	$t =~ s\|^.+/([^/]+)$\|$1\|;	31	$t =~ s\|^.+/([^/]+)$\|$1\|;
		32	$t =~ s\|\.la$\|\.so\|;
42	if ($opt_i) {	33	if ($opt_i) {
43	- push(@cmds, "$prefix/build/libtool --mode=install cp $f $CFG_LIBEXECDIR/$t");	34	- push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" .
44	+ push(@cmds, "$prefix/share/mk/apache/libtool --mode=install cp $f $CFG_LIBEXECDIR/$t");	35	- "$prefix/build/libtool' $f $CFG_LIBEXECDIR");
		36	+ push(@cmds, "$prefix/share/apache/instdso.sh SH_LIBTOOL='" .
		37	+ "$prefix/share/apache/libtool' $f $CFG_LIBEXECDIR");
45	push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");	38	push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
46	}	39	}
47		40

Lines 1-12 Link Here

(-)apache2/pkg-plist (-111 / +84 lines)
1	etc/apache/highperformance-std.conf	1	bin/apr-config
2	etc/apache/highperformance.conf	2	bin/apu-config
3	etc/apache/httpd-std.conf	3	@unexec if cmp -s %D/etc/apache2/highperformance.conf %D/etc/apache2/highperformance-std.conf; then rm -f %D/etc/apache2/highperformance.conf; fi
4	etc/apache/httpd.conf	4	etc/apache2/highperformance-std.conf
5	etc/apache/magic	5	@exec [ -f %B/highperformance.conf ] \|\| cp %B/%f %B/highperformance.conf
6	etc/apache/mime.types	6	@unexec if cmp -s %D/etc/apache2/httpd.conf %D/etc/apache2/httpd-std.conf; then rm -f %D/etc/apache2/httpd.conf; fi
7	etc/apache/ssl-std.conf	7	etc/apache2/httpd-std.conf
8	etc/apache/ssl.conf	8	@exec [ -f %B/httpd.conf ] \|\| cp %B/%f %B/httpd.conf
9	@dirrm etc/apache	9	@unexec if cmp -s %D/etc/apache2/magic %D/etc/apache2/magic.default; then rm -f %D/etc/apache2/magic; fi
		10	etc/apache2/magic.default
		11	@exec [ -f %B/magic ] \|\| cp %B/%f %B/magic
		12	@unexec if cmp -s %D/etc/apache2/mime.types %D/etc/apache2/mime.types.default; then rm -f %D/etc/apache2/mime.types; fi
		13	etc/apache2/mime.types.default
		14	@exec [ -f %B/mime.types ] \|\| cp %B/%f %B/mime.types
		15	@unexec if cmp -s %D/etc/apache2/ssl.conf %D/etc/apache2/ssl-std.conf; then rm -f %D/etc/apache2/ssl.conf; fi
		16	etc/apache2/ssl-std.conf
		17	@exec [ -f %B/ssl.conf ] \|\| cp %B/%f %B/ssl.conf
10	etc/rc.d/apache.sh	18	etc/rc.d/apache.sh
11	include/apache/ap_compat.h	19	include/apache/ap_compat.h
12	include/apache/ap_config.h	20	include/apache/ap_config.h
Lines 16-21 Link Here
16	include/apache/ap_mpm.h	24	include/apache/ap_mpm.h
17	include/apache/ap_release.h	25	include/apache/ap_release.h
18	include/apache/apr.h	26	include/apache/apr.h
		27	include/apache/apr_anylock.h
19	include/apache/apr_base64.h	28	include/apache/apr_base64.h
20	include/apache/apr_buckets.h	29	include/apache/apr_buckets.h
21	include/apache/apr_compat.h	30	include/apache/apr_compat.h
Lines 44-52 Link Here
44	include/apache/apr_portable.h	53	include/apache/apr_portable.h
45	include/apache/apr_proc_mutex.h	54	include/apache/apr_proc_mutex.h
46	include/apache/apr_ring.h	55	include/apache/apr_ring.h
		56	include/apache/apr_rmm.h
47	include/apache/apr_sdbm.h	57	include/apache/apr_sdbm.h
48	include/apache/apr_sha1.h	58	include/apache/apr_sha1.h
49	include/apache/apr_shmem.h	59	include/apache/apr_shm.h
50	include/apache/apr_signal.h	60	include/apache/apr_signal.h
51	include/apache/apr_strings.h	61	include/apache/apr_strings.h
52	include/apache/apr_tables.h	62	include/apache/apr_tables.h
Lines 58-69 Link Here
58	include/apache/apr_uri.h	68	include/apache/apr_uri.h
59	include/apache/apr_user.h	69	include/apache/apr_user.h
60	include/apache/apr_uuid.h	70	include/apache/apr_uuid.h
		71	include/apache/apr_version.h
61	include/apache/apr_want.h	72	include/apache/apr_want.h
62	include/apache/apr_xlate.h	73	include/apache/apr_xlate.h
63	include/apache/apr_xml.h	74	include/apache/apr_xml.h
64	include/apache/apu.h	75	include/apache/apu.h
65	include/apache/apu_compat.h	76	include/apache/apu_compat.h
66	include/apache/config.h
67	include/apache/expat.h	77	include/apache/expat.h
68	include/apache/http_config.h	78	include/apache/http_config.h
69	include/apache/http_connection.h	79	include/apache/http_connection.h
Lines 74-80 Link Here
74	include/apache/http_request.h	84	include/apache/http_request.h
75	include/apache/http_vhost.h	85	include/apache/http_vhost.h
76	include/apache/httpd.h	86	include/apache/httpd.h
77	include/apache/internal.h
78	include/apache/mod_cgi.h	87	include/apache/mod_cgi.h
79	include/apache/mod_core.h	88	include/apache/mod_core.h
80	include/apache/mod_dav.h	89	include/apache/mod_dav.h
Lines 103-221 Link Here
103	include/apache/util_script.h	112	include/apache/util_script.h
104	include/apache/util_time.h	113	include/apache/util_time.h
105	include/apache/util_xml.h	114	include/apache/util_xml.h
106	@dirrm include/apache	115	lib/apache/APRVARS
107	lib/APRVARS	116	lib/apache/apr.exp
108	lib/libapr.a	117	lib/apache/aprutil.exp
109	lib/libapr.la	118	lib/apache/libapr.a
110	lib/libapr.so.0	119	lib/apache/libapr.la
111	lib/libaprutil.a	120	lib/apache/libapr.so.0
112	lib/libaprutil.la	121	@unexec rm -f %D/lib/apache/libapr.so
113	lib/libaprutil.so.0	122	@exec ln -fs libapr.so.0 %D/lib/apache/libapr.so
114	lib/libexpat.a	123	lib/apache/libaprutil.a
115	lib/libexpat.la	124	lib/apache/libaprutil.la
116	lib/libexpat.so.1	125	lib/apache/libaprutil.so.0
117	@exec ln -fs libapr.so.0 %D/lib/libapr.so	126	@unexec rm -f %D/lib/apache/libaprutil.so
118	@exec ln -fs libaprutil.so.0 %D/lib/libaprutil.so	127	@exec ln -fs libaprutil.so.0 %D/lib/apache/libaprutil.so
119	@exec ln -fs libexpat.so.1 %D/lib/libexpat.so	128	lib/apache/libexpat.a
120	@unexec rm -f %D/lib/libapr.so	129	lib/apache/libexpat.la
121	@unexec rm -f %D/lib/libaprutil.so	130	lib/apache/libexpat.so.1
122	@unexec rm -f %D/lib/libexpat.so	131	@unexec rm -f %D/lib/apache/libexpat.so
		132	@exec ln -fs libexpat.so.1 %D/lib/apache/libexpat.so
123	libexec/apache/httpd.exp	133	libexec/apache/httpd.exp
124	libexec/apache/mod_access.la
125	libexec/apache/mod_access.so	134	libexec/apache/mod_access.so
126	libexec/apache/mod_actions.la
127	libexec/apache/mod_actions.so	135	libexec/apache/mod_actions.so
128	libexec/apache/mod_alias.la
129	libexec/apache/mod_alias.so	136	libexec/apache/mod_alias.so
130	libexec/apache/mod_asis.la
131	libexec/apache/mod_asis.so	137	libexec/apache/mod_asis.so
132	libexec/apache/mod_auth.la
133	libexec/apache/mod_auth.so	138	libexec/apache/mod_auth.so
134	libexec/apache/mod_auth_anon.la
135	libexec/apache/mod_auth_anon.so	139	libexec/apache/mod_auth_anon.so
136	libexec/apache/mod_auth_db.la
137	libexec/apache/mod_auth_db.so
138	libexec/apache/mod_auth_dbm.la
139	libexec/apache/mod_auth_dbm.so	140	libexec/apache/mod_auth_dbm.so
140	libexec/apache/mod_auth_digest.la
141	libexec/apache/mod_auth_digest.so	141	libexec/apache/mod_auth_digest.so
142	libexec/apache/mod_autoindex.la
143	libexec/apache/mod_autoindex.so	142	libexec/apache/mod_autoindex.so
144	%%CACHEOPT%%libexec/apache/mod_cache.la	143	libexec/apache/mod_cache.so
145	%%CACHEOPT%%libexec/apache/mod_cache.so
146	libexec/apache/mod_cern_meta.la
147	libexec/apache/mod_cern_meta.so	144	libexec/apache/mod_cern_meta.so
148	libexec/apache/mod_cgi.la
149	libexec/apache/mod_cgi.so	145	libexec/apache/mod_cgi.so
150	libexec/apache/mod_cgid.la
151	libexec/apache/mod_cgid.so	146	libexec/apache/mod_cgid.so
152	libexec/apache/mod_dav.la
153	libexec/apache/mod_dav.so	147	libexec/apache/mod_dav.so
154	libexec/apache/mod_dav_fs.la
155	libexec/apache/mod_dav_fs.so	148	libexec/apache/mod_dav_fs.so
156	libexec/apache/mod_dir.la
157	libexec/apache/mod_dir.so	149	libexec/apache/mod_dir.so
158	libexec/apache/mod_env.la	150	libexec/apache/mod_disk_cache.so
159	libexec/apache/mod_env.so	151	libexec/apache/mod_env.so
160	libexec/apache/mod_expires.la
161	libexec/apache/mod_expires.so	152	libexec/apache/mod_expires.so
162	%%CACHEOPT%%libexec/apache/mod_file_cache.la	153	libexec/apache/mod_file_cache.so
163	%%CACHEOPT%%libexec/apache/mod_file_cache.so
164	libexec/apache/mod_headers.la
165	libexec/apache/mod_headers.so	154	libexec/apache/mod_headers.so
166	libexec/apache/mod_imap.la
167	libexec/apache/mod_imap.so	155	libexec/apache/mod_imap.so
168	libexec/apache/mod_include.la
169	libexec/apache/mod_include.so	156	libexec/apache/mod_include.so
170	libexec/apache/mod_info.la
171	libexec/apache/mod_info.so	157	libexec/apache/mod_info.so
172	libexec/apache/mod_log_config.la
173	libexec/apache/mod_log_config.so	158	libexec/apache/mod_log_config.so
174	%%CACHEOPT%%libexec/apache/mod_mem_cache.la	159	%%THREADONLY%%libexec/apache/mod_mem_cache.so
175	%%CACHEOPT%%libexec/apache/mod_mem_cache.so
176	libexec/apache/mod_mime.la
177	libexec/apache/mod_mime.so	160	libexec/apache/mod_mime.so
178	libexec/apache/mod_mime_magic.la
179	libexec/apache/mod_mime_magic.so	161	libexec/apache/mod_mime_magic.so
180	libexec/apache/mod_negotiation.la
181	libexec/apache/mod_negotiation.so	162	libexec/apache/mod_negotiation.so
182	%%PROXYOPT%%libexec/apache/mod_proxy.la	163	libexec/apache/mod_proxy.so
183	%%PROXYOPT%%libexec/apache/mod_proxy.so	164	libexec/apache/mod_proxy_connect.so
184	%%PROXYOPT%%libexec/apache/mod_proxy_connect.la	165	libexec/apache/mod_proxy_ftp.so
185	%%PROXYOPT%%libexec/apache/mod_proxy_connect.so	166	libexec/apache/mod_proxy_http.so
186	%%PROXYOPT%%libexec/apache/mod_proxy_ftp.la
187	%%PROXYOPT%%libexec/apache/mod_proxy_ftp.so
188	%%PROXYOPT%%libexec/apache/mod_proxy_http.la
189	%%PROXYOPT%%libexec/apache/mod_proxy_http.so
190	libexec/apache/mod_rewrite.la
191	libexec/apache/mod_rewrite.so	167	libexec/apache/mod_rewrite.so
192	libexec/apache/mod_setenvif.la
193	libexec/apache/mod_setenvif.so	168	libexec/apache/mod_setenvif.so
194	libexec/apache/mod_speling.la
195	libexec/apache/mod_speling.so	169	libexec/apache/mod_speling.so
196	%%SSLOPT%%libexec/apache/mod_ssl.la
197	%%SSLOPT%%libexec/apache/mod_ssl.so	170	%%SSLOPT%%libexec/apache/mod_ssl.so
198	libexec/apache/mod_status.la
199	libexec/apache/mod_status.so	171	libexec/apache/mod_status.so
200	libexec/apache/mod_unique_id.la
201	libexec/apache/mod_unique_id.so	172	libexec/apache/mod_unique_id.so
202	libexec/apache/mod_userdir.la
203	libexec/apache/mod_userdir.so	173	libexec/apache/mod_userdir.so
204	libexec/apache/mod_usertrack.la
205	libexec/apache/mod_usertrack.so	174	libexec/apache/mod_usertrack.so
206	libexec/apache/mod_vhost_alias.la
207	libexec/apache/mod_vhost_alias.so	175	libexec/apache/mod_vhost_alias.so
208	@dirrm libexec/apache
209	sbin/ab	176	sbin/ab
210	sbin/apachectl	177	sbin/apachectl
211	sbin/apxs	178	sbin/apxs
212	sbin/checkgid	179	sbin/checkgid
213	sbin/dbmmanage	180	sbin/dbmmanage
		181	sbin/envvars
		182	sbin/envvars-std
		183	sbin/htdbm
214	sbin/htdigest	184	sbin/htdigest
215	sbin/htpasswd	185	sbin/htpasswd
216	sbin/httpd	186	sbin/httpd
217	sbin/logresolve	187	sbin/logresolve
218	sbin/rotatelogs	188	sbin/rotatelogs
		189	share/apache/config_vars.mk
		190	share/apache/instdso.sh
		191	share/apache/library.mk
		192	share/apache/libtool
		193	share/apache/ltlib.mk
		194	share/apache/program.mk
		195	share/apache/rules.mk
		196	share/apache/special.mk
219	%%PORTDOCS%%share/doc/apache/LICENSE	197	%%PORTDOCS%%share/doc/apache/LICENSE
220	%%PORTDOCS%%share/doc/apache/bind.html	198	%%PORTDOCS%%share/doc/apache/bind.html
221	%%PORTDOCS%%share/doc/apache/cgi_path.html	199	%%PORTDOCS%%share/doc/apache/cgi_path.html
Lines 237-246 Link Here
237	%%PORTDOCS%%share/doc/apache/dso.html	215	%%PORTDOCS%%share/doc/apache/dso.html
238	%%PORTDOCS%%share/doc/apache/ebcdic.html	216	%%PORTDOCS%%share/doc/apache/ebcdic.html
239	%%PORTDOCS%%share/doc/apache/env.html	217	%%PORTDOCS%%share/doc/apache/env.html
240	%%PORTDOCS%%share/doc/apache/faq/footer.html
241	%%PORTDOCS%%share/doc/apache/faq/header.html
242	%%PORTDOCS%%share/doc/apache/faq/index.html	218	%%PORTDOCS%%share/doc/apache/faq/index.html
243	%%PORTDOCS%%share/doc/apache/faq/support.html
244	%%PORTDOCS%%share/doc/apache/filter.html	219	%%PORTDOCS%%share/doc/apache/filter.html
245	%%PORTDOCS%%share/doc/apache/footer.html	220	%%PORTDOCS%%share/doc/apache/footer.html
246	%%PORTDOCS%%share/doc/apache/handler.html.en	221	%%PORTDOCS%%share/doc/apache/handler.html.en
Lines 302-308 Link Here
302	%%PORTDOCS%%share/doc/apache/mod/mod_asis.html	277	%%PORTDOCS%%share/doc/apache/mod/mod_asis.html
303	%%PORTDOCS%%share/doc/apache/mod/mod_auth.html	278	%%PORTDOCS%%share/doc/apache/mod/mod_auth.html
304	%%PORTDOCS%%share/doc/apache/mod/mod_auth_anon.html	279	%%PORTDOCS%%share/doc/apache/mod/mod_auth_anon.html
305	%%PORTDOCS%%share/doc/apache/mod/mod_auth_db.html
306	%%PORTDOCS%%share/doc/apache/mod/mod_auth_dbm.html	280	%%PORTDOCS%%share/doc/apache/mod/mod_auth_dbm.html
307	%%PORTDOCS%%share/doc/apache/mod/mod_auth_digest.html	281	%%PORTDOCS%%share/doc/apache/mod/mod_auth_digest.html
308	%%PORTDOCS%%share/doc/apache/mod/mod_auth_ldap.html	282	%%PORTDOCS%%share/doc/apache/mod/mod_auth_ldap.html
Lines 343-357 Link Here
343	%%PORTDOCS%%share/doc/apache/mod/mod_vhost_alias.html	317	%%PORTDOCS%%share/doc/apache/mod/mod_vhost_alias.html
344	%%PORTDOCS%%share/doc/apache/mod/module-dict.html	318	%%PORTDOCS%%share/doc/apache/mod/module-dict.html
345	%%PORTDOCS%%share/doc/apache/mod/mpm_common.html	319	%%PORTDOCS%%share/doc/apache/mod/mpm_common.html
		320	%%PORTDOCS%%share/doc/apache/mod/mpm_netware.html
346	%%PORTDOCS%%share/doc/apache/mod/mpm_winnt.html	321	%%PORTDOCS%%share/doc/apache/mod/mpm_winnt.html
347	%%PORTDOCS%%share/doc/apache/mod/perchild.html	322	%%PORTDOCS%%share/doc/apache/mod/perchild.html
348	%%PORTDOCS%%share/doc/apache/mod/prefork.html	323	%%PORTDOCS%%share/doc/apache/mod/prefork.html
349	%%PORTDOCS%%share/doc/apache/mod/threaded.html	324	%%PORTDOCS%%share/doc/apache/mod/worker.html
350	%%PORTDOCS%%share/doc/apache/mpm.html	325	%%PORTDOCS%%share/doc/apache/mpm.html
		326	%%PORTDOCS%%share/doc/apache/new_features_2_0.html.de
351	%%PORTDOCS%%share/doc/apache/new_features_2_0.html.en	327	%%PORTDOCS%%share/doc/apache/new_features_2_0.html.en
352	%%PORTDOCS%%share/doc/apache/new_features_2_0.html.fr	328	%%PORTDOCS%%share/doc/apache/new_features_2_0.html.fr
353	%%PORTDOCS%%share/doc/apache/platform/footer.html	329	%%PORTDOCS%%share/doc/apache/platform/footer.html
354	%%PORTDOCS%%share/doc/apache/platform/header.html	330	%%PORTDOCS%%share/doc/apache/platform/header.html
		331	%%PORTDOCS%%share/doc/apache/platform/netware.html
355	%%PORTDOCS%%share/doc/apache/platform/perf-hp.html	332	%%PORTDOCS%%share/doc/apache/platform/perf-hp.html
356	%%PORTDOCS%%share/doc/apache/platform/win_compiling.html	333	%%PORTDOCS%%share/doc/apache/platform/win_compiling.html
357	%%PORTDOCS%%share/doc/apache/platform/win_service.html	334	%%PORTDOCS%%share/doc/apache/platform/win_service.html
Lines 374-379 Link Here
374	%%PORTDOCS%%share/doc/apache/sections.html	351	%%PORTDOCS%%share/doc/apache/sections.html
375	%%PORTDOCS%%share/doc/apache/server-wide.html.en	352	%%PORTDOCS%%share/doc/apache/server-wide.html.en
376	%%PORTDOCS%%share/doc/apache/server-wide.html.ja.jis	353	%%PORTDOCS%%share/doc/apache/server-wide.html.ja.jis
		354	%%PORTDOCS%%share/doc/apache/sitemap.html
377	%%PORTDOCS%%share/doc/apache/ssl/Makefile	355	%%PORTDOCS%%share/doc/apache/ssl/Makefile
378	%%PORTDOCS%%share/doc/apache/ssl/footer.html	356	%%PORTDOCS%%share/doc/apache/ssl/footer.html
379	%%PORTDOCS%%share/doc/apache/ssl/header.html	357	%%PORTDOCS%%share/doc/apache/ssl/header.html
Lines 447-487 Link Here
447	%%PORTDOCS%%share/doc/apache/vhosts/ip-based.html	425	%%PORTDOCS%%share/doc/apache/vhosts/ip-based.html
448	%%PORTDOCS%%share/doc/apache/vhosts/mass.html	426	%%PORTDOCS%%share/doc/apache/vhosts/mass.html
449	%%PORTDOCS%%share/doc/apache/vhosts/name-based.html	427	%%PORTDOCS%%share/doc/apache/vhosts/name-based.html
450	%%PORTDOCS%%@dirrm share/doc/apache/vhosts
451	%%PORTDOCS%%@dirrm share/doc/apache/ssl
452	%%PORTDOCS%%@dirrm share/doc/apache/search
453	%%PORTDOCS%%@dirrm share/doc/apache/programs
454	%%PORTDOCS%%@dirrm share/doc/apache/platform
455	%%PORTDOCS%%@dirrm share/doc/apache/mod
456	%%PORTDOCS%%@dirrm share/doc/apache/misc
457	%%PORTDOCS%%@dirrm share/doc/apache/images
458	%%PORTDOCS%%@dirrm share/doc/apache/howto
459	%%PORTDOCS%%@dirrm share/doc/apache/faq
460	%%PORTDOCS%%@dirrm share/doc/apache/developer
461	%%PORTDOCS%%@dirrm share/doc/apache
462	share/mk/apache/config_vars.mk
463	share/mk/apache/library.mk
464	share/mk/apache/libtool
465	share/mk/apache/ltlib.mk
466	share/mk/apache/program.mk
467	share/mk/apache/rules.mk
468	share/mk/apache/special.mk
469	@dirrm share/mk/apache
470	@dirrm share/mk
471	@exec mkdir -p %D/www	428	@exec mkdir -p %D/www
472	@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
473	@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi	429	@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
		430	@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
474	www/cgi-bin.default/printenv	431	www/cgi-bin.default/printenv
475	www/cgi-bin.default/test-cgi	432	www/cgi-bin.default/test-cgi
476	www/cgi-bin.default/test-cgi.bat
477	@exec [ ! -d %D/www/data ] && ln -fs %D/www/data.default %D/www/data
478	@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi	433	@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
		434	@exec [ ! -d %D/www/data ] && ln -fs %D/www/data.default %D/www/data
479	www/data.default/apache_pb.gif	435	www/data.default/apache_pb.gif
480	www/data.default/apache_pb.png	436	www/data.default/apache_pb.png
481	www/data.default/apache_pb2.gif	437	www/data.default/apache_pb2.gif
482	www/data.default/apache_pb2.png	438	www/data.default/apache_pb2.png
483	www/data.default/apache_pb2_ani.gif	439	www/data.default/apache_pb2_ani.gif
484	www/data.default/error.README
485	www/data.default/index.html.ca	440	www/data.default/index.html.ca
486	www/data.default/index.html.cz.iso8859-2	441	www/data.default/index.html.cz.iso8859-2
487	www/data.default/index.html.de	442	www/data.default/index.html.de
Lines 514-520 Link Here
514	www/data.default/index.html.tw	469	www/data.default/index.html.tw
515	www/data.default/index.html.tw.Big5	470	www/data.default/index.html.tw.Big5
516	www/data.default/index.html.var	471	www/data.default/index.html.var
517	@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
518	www/error/HTTP_BAD_GATEWAY.html.var	472	www/error/HTTP_BAD_GATEWAY.html.var
519	www/error/HTTP_BAD_REQUEST.html.var	473	www/error/HTTP_BAD_REQUEST.html.var
520	www/error/HTTP_FORBIDDEN.html.var	474	www/error/HTTP_FORBIDDEN.html.var
Lines 533-538 Link Here
533	www/error/HTTP_UNAUTHORIZED.html.var	487	www/error/HTTP_UNAUTHORIZED.html.var
534	www/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var	488	www/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
535	www/error/HTTP_VARIANT_ALSO_VARIES.html.var	489	www/error/HTTP_VARIANT_ALSO_VARIES.html.var
		490	www/error/README
536	www/error/contact.html.var	491	www/error/contact.html.var
537	www/error/include/bottom.html	492	www/error/include/bottom.html
538	www/error/include/spacer.html	493	www/error/include/spacer.html
Lines 597-602 Link Here
597	www/icons/folder.sec.png	552	www/icons/folder.sec.png
598	www/icons/forward.gif	553	www/icons/forward.gif
599	www/icons/forward.png	554	www/icons/forward.png
		555	www/icons/freebsd.gif
600	www/icons/generic.gif	556	www/icons/generic.gif
601	www/icons/generic.png	557	www/icons/generic.png
602	www/icons/generic.red.gif	558	www/icons/generic.red.gif
Lines 763-765 Link Here
763	@dirrm www/data.default	719	@dirrm www/data.default
764	@dirrm www/cgi-bin.default	720	@dirrm www/cgi-bin.default
765	@dirrm www	721	@dirrm www
		722	%%PORTDOCS%%@dirrm share/doc/apache/vhosts
		723	%%PORTDOCS%%@dirrm share/doc/apache/ssl
		724	%%PORTDOCS%%@dirrm share/doc/apache/search
		725	%%PORTDOCS%%@dirrm share/doc/apache/programs
		726	%%PORTDOCS%%@dirrm share/doc/apache/platform
		727	%%PORTDOCS%%@dirrm share/doc/apache/mod
		728	%%PORTDOCS%%@dirrm share/doc/apache/misc
		729	%%PORTDOCS%%@dirrm share/doc/apache/images
		730	%%PORTDOCS%%@dirrm share/doc/apache/howto
		731	%%PORTDOCS%%@dirrm share/doc/apache/faq
		732	%%PORTDOCS%%@dirrm share/doc/apache/developer
		733	%%PORTDOCS%%@dirrm share/doc/apache
		734	@dirrm share/apache
		735	@dirrm libexec/apache
		736	@dirrm lib/apache
		737	@dirrm include/apache
		738	@dirrm etc/apache