mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

- Update to 2.0.39, the emergency security update.

Browse Source 
- Unmark FORBIDDEN

PR:		ports/39477
Submitted by:	maintainer
This commit is contained in:
Patrick Li 2002-06-18 23:02:05 +00:00
parent ae4d5efa50
commit ea103f8b13
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=61532
36 changed files with 784 additions and 1004 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
www/apache2/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= apache
PORTVERSION= 2.0.36
PORTVERSION= 2.0.39
PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
@ -23,33 +23,31 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= perky@fallin.lv
FORBIDDEN= "Vulnerable to denial-of-service. See" \
"http://httpd.apache.org/info/security_bulletin_20020617.txt"
LATEST_LINK= apache2
WITH_MPM?= prefork # or worker, perchild (neither of them still has a problem on FreeBSD)
WITH_MPM?= prefork
HTTP_PORT?= 80
GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
USE_PERL5= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-layout=FreeBSD \
--with-perl=${PERL5} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
--libdir=${PREFIX}/lib/apache2 \
--includedir=${PREFIX}/include/apache2
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}"
LDFLAGS="${LDFLAGS}" EXPAT_PATHS="${EXPAT_PATHS}"
SHARED_MODULES= all cgid ext_filter bucketeer
RC_SUB= -e 's,@@PREFIX@@,${PREFIX},g' -e 's,@@DESTDIR@@,${DESTDIR},g'
PREFIX_RELDEST= ${PREFIX:S,${DESTDIR},,}
RC_SUB= -e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
PLIST_SUB+= DESTDIR=${DESTDIR}
.if defined(NOPORTDOCS)
MAKE_ENV+= NOPORTDOCS=YES
MAKE_ENV+= -DNOPORTDOCS
.endif
.if defined(WITH_BUNDLED_EXPAT)
@ -57,14 +55,10 @@ EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat
PLIST_SUB+= EXPAT=""
.else
LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${EXPATLIBPATH}
EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,${DESTDIR},,}
PLIST_SUB+= EXPAT="@comment "
.endif
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
.endif
.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
SHARED_MODULES+= ssl
PLIST_SUB+= MODSSL=""
@ -75,16 +69,16 @@ RC_SUB+= -e 's,@@SSL@@,,g'
.endif
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX}/www/data
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
CONFIGURE_ARGS+= --enable-suexec \
--with-suexec-caller=www \
--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
--with-suexec-userdir="${SUEXEC_USERDIR}" \
--with-suexec-docroot="${SUEXEC_DOCROOT}" \
--with-suexec-safepath="${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \
--with-suexec-logfile="${DESTDIR}/var/log/httpd-suexec.log" \
--with-suexec-bin="${PREFIX}/sbin/suexec"
--with-suexec-safepath="${PREFIX_RELDEST}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \
--with-suexec-logfile="/var/log/httpd-suexec.log" \
--with-suexec-bin="${PREFIX_RELDEST}/sbin/suexec"
PLIST_SUB+= SUEXEC=""
.else
PLIST_SUB+= SUEXEC="@comment "
@ -113,31 +107,37 @@ PLIST_SUB+= EXPERIMENTAL="@comment "
.if ${WITH_MPM} != "prefork"
PKGNAMESUFFIX= -${WITH_MPM}
.if !defined(WITH_THREADS)
IGNORE= "requires threads for ${WITH_MPM} mpm"
WITH_THREADS= yes
.if !defined(FORCE_THREADING_MPM)
FORBIDDEN= "doesn\'t work with threading MPMs on FreeBSD. If you are \
brave enough, make again with -DFORCE_THREADING_MPM"
.endif
.endif
CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
.endif
CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}" ${CONFIGURE_TARGET}
MAN1= dbmmanage.1 htdigest.1 htpasswd.1
MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
.include <bsd.port.pre.mk>
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 \
${REINPLACE_CMD} -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 {} \;
@${PERL} -pi -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,\$${EXPAT_PATHS},g' \
${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
pre-install:
PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
@ -147,7 +147,5 @@ post-install:
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
fi
@[ -d ${DESTDIR}/var/log ] || ${MKDIR} ${DESTDIR}/var/log
@[ -d ${DESTDIR}/var/run ] || ${MKDIR} ${DESTDIR}/var/run
.include <bsd.port.post.mk>
.include <bsd.port.mk>

2
www/apache2/distinfo
View File

@ -1,2 +1,2 @@
MD5 (httpd-2.0.36.tar.gz) = dc80f22608bccba6c49e1fe9f12f51c8
MD5 (httpd-2.0.39.tar.gz) = b821c6babca68b4859b9ba38d1b345af
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62

2
www/apache2/files/apache.sh
View File

@ -7,7 +7,7 @@ start)
[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && echo -n ' apache2'
;;
stop)
[ -r @@DESTDIR@@/var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2

2
www/apache2/files/config.layout
View File

@ -14,7 +14,7 @@
manualdir: ${prefix}/share/doc/apache2
cgidir: ${datadir}/cgi-bin
includedir: ${prefix}/include/apache2
localstatedir: @@DESTDIR@@/var
localstatedir: /var
runtimedir: ${localstatedir}/run
logfiledir: ${localstatedir}/log
proxycachedir: ${datadir}/proxy

77
www/apache2/files/patch-Makefile.in
View File

@ -1,13 +1,13 @@
--- Makefile.in.orig Sun Apr 28 16:41:25 2002
+++ Makefile.in Tue May 7 19:05:12 2002
@@ -33,23 +33,27 @@
@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
--- Makefile.in.orig Sat Jun 15 18:41:03 2002
+++ Makefile.in Tue Jun 18 22:37:19 2002
@@ -31,12 +31,14 @@
@test -d $(DESTDIR)$(sysconfdir) || $(MKINSTALLDIRS) $(DESTDIR)$(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); \
- $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ test -f $(DESTDIR)$(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ cp -f $$i $$i.default; \
+ $(INSTALL_DATA) $$i.default $(sysconfdir); \
+ $(INSTALL_DATA) $$i.default $(DESTDIR)$(sysconfdir); \
done; \
for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
cd $$j ; \
@ -17,58 +17,35 @@
( \
n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
sed -e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
+ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
-e '/@@LoadModule@@/d' \
< $$i; \
else \
sed -n -e '/@@LoadModule@@/q' \
-e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
+ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
-e 'p' \
< $$i; \
for j in $(DSO_MODULES) "^EOL^"; do \
@@ -57,7 +61,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,12 +110,14 @@
@@ -104,11 +106,14 @@
install-htdocs:
@echo Installing HTML documents
- @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
+ @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)
- @test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)
- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir))
+ @test -d $(DESTDIR)$(htdocsdir).default || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir).default
+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir).default)
+ @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir).default $(DESTDIR)$(htdocsdir)
+.if !defined(NOPORTDOCS)
@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
- @test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;
-
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
- -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf
+.endif
+ @test "x$(htdocsdir)" != "x" && cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;
+ -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf
install-error:
@echo Installing error documents
@test -d $(errordir) || $(MKINSTALLDIRS) $(errordir)
@@ -126,9 +132,10 @@
@@ -124,9 +129,10 @@
install-cgi:
@echo Installing CGIs
- @test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
- @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir)
- @test "x$(cgidir)" != "x" && cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;
+ @test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
+ @(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir).default)
+ @test -e $(cgidir) || ln -sf $(cgidir).default $(cgidir)
+ @test "x$(cgidir)" != "x" && cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;
- @test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)
- @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)
- -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf
+ @test -d $(DESTDIR)$(cgidir).default || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir).default
+ @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir).default
+ @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir).default $(DESTDIR)$(cgidir)
+ -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir).default && find . -name "CVS" -print | xargs rm -rf
install-other:
@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)

47
www/apache2/files/patch-docs:conf:ssl-std.conf
View File

@ -1,5 +1,5 @@
--- docs/conf/ssl-std.conf.orig Thu Nov 8 07:16:09 2001
+++ docs/conf/ssl-std.conf Sun Apr 7 09:26:02 2002
--- docs/conf/ssl-std.conf.orig Fri May 17 04:05:24 2002
+++ docs/conf/ssl-std.conf Tue Jun 18 23:15:32 2002
@@ -55,15 +55,15 @@
# Configure the SSL Session Cache: First the mechanism
# to use and second the expiring timeout (in seconds).
@ -7,29 +7,20 @@
-#SSLSessionCache shmht:logs/ssl_scache(512000)
-#SSLSessionCache shmcb:logs/ssl_scache(512000)
-SSLSessionCache dbm:logs/ssl_scache
+#SSLSessionCache shmht:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
+#SSLSessionCache shmcb:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
+SSLSessionCache dbm:@@DESTDIR@@/var/log/httpd-ssl_scache
+#SSLSessionCache shmht:/var/log/httpd-ssl_scache(512000)
+#SSLSessionCache shmcb:/var/log/httpd-ssl_scache(512000)
+SSLSessionCache dbm:/var/log/httpd-ssl_scache
SSLSessionCacheTimeout 300
# Semaphore:
# Configure the path to the mutual exclusion semaphore the
# SSL engine uses internally for inter-process synchronization.
-SSLMutex file:logs/ssl_mutex
+SSLMutex file:@@DESTDIR@@/var/log/httpd-ssl_mutex
+SSLMutex file:/var/log/httpd-ssl_mutex
# Pseudo Random Number Generator (PRNG):
# Configure one or more sources to seed the PRNG of the
@@ -89,7 +89,7 @@
# a real server (i.e. somewhere where only root can write).
# Log levels are (ascending order: higher ones include lower ones):
# none, error, warn, info, trace, debug.
-SSLLog logs/ssl_engine_log
+SSLLog @@DESTDIR@@/var/log/httpd-ssl_engine_log
SSLLogLevel info
##
@@ -99,11 +99,11 @@
@@ -89,11 +89,11 @@
<VirtualHost _default_:443>
# General setup for the virtual host
@ -39,15 +30,15 @@
ServerAdmin you@your.address
-ErrorLog logs/error_log
-TransferLog logs/access_log
+ErrorLog @@DESTDIR@@/var/log/httpd-error.log
+TransferLog @@DESTDIR@@/var/log/httpd-access.log
+ErrorLog /var/log/httpd-error.log
+TransferLog /var/log/httpd-access.log
# SSL Engine Switch:
# Enable/Disable SSL for this virtual host.
@@ -122,16 +122,16 @@
# built time. Keep in mind that if you've both a RSA and a DSA
# certificate you can configure both in parallel (to also allow
# the use of DSA ciphers, etc.)
@@ -111,16 +111,16 @@
# in mind that if you have both an RSA and a DSA certificate you
# can configure both in parallel (to also allow the use of DSA
# ciphers, etc.)
-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
+SSLCertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/server.crt
@ -65,7 +56,7 @@
# Server Certificate Chain:
# Point SSLCertificateChainFile at a file containing the
@@ -140,7 +140,7 @@
@@ -129,7 +129,7 @@
# the referenced file can be the same as SSLCertificateFile
# when the CA certificates are directly appended to the server
# certificate for convinience.
@ -74,7 +65,7 @@
# Certificate Authority (CA):
# Set the CA certificate verification path where to find CA
@@ -149,8 +149,8 @@
@@ -138,8 +138,8 @@
# Note: Inside SSLCACertificatePath you need hash symlinks
# to point to the certificate files. Use the provided
# Makefile to update the hash symlinks after changes.
@ -85,7 +76,7 @@
# Certificate Revocation Lists (CRL):
# Set the CA revocation path where to find CA CRLs for client
@@ -159,8 +159,8 @@
@@ -148,8 +148,8 @@
# Note: Inside SSLCARevocationPath you need hash symlinks
# to point to the certificate files. Use the provided
# Makefile to update the hash symlinks after changes.
@ -96,7 +87,7 @@
# Client Authentication (Type):
# Client certificate verification type and depth. Types are
@@ -220,7 +220,7 @@
@@ -209,7 +209,7 @@
<Files ~ "\.(cgi|shtml|phtml|php3?)$">
SSLOptions +StdEnvVars
</Files>
@ -105,12 +96,12 @@
SSLOptions +StdEnvVars
</Directory>
@@ -255,7 +255,7 @@
@@ -244,7 +244,7 @@
# Per-Server Logging:
# The home of a custom SSL log file. Use this when you want a
# compact non-error SSL logfile on a virtual host basis.
-CustomLog logs/ssl_request_log \
+CustomLog @@DESTDIR@@/var/log/httpd-ssl_request.log \
+CustomLog /var/log/httpd-ssl_request.log \
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</VirtualHost>

49
www/apache2/files/patch-support:apxs.in
View File

@ -1,49 +0,0 @@
--- support/apxs.in.orig Tue Apr 30 03:09:02 2002
+++ support/apxs.in Wed May 8 19:41:06 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/apache2/config_vars.mk",\%config_vars);
my $exec_prefix = get_vars("exec_prefix");
my $CFG_TARGET = get_vars("progname");
@@ -223,7 +223,7 @@
my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
$httpd = eval qq("$httpd");
$httpd = eval qq("$httpd");
-my $envvars = get_vars("bindir") . "/envvars";
+my $envvars = get_vars("sbindir") . "/envvars";
$envvars = eval qq("$envvars");
$envvars = eval qq("$envvars");
@@ -418,7 +418,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/apache2/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
unshift(@objs, $lo);
}
@@ -443,7 +443,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/apache2/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
# execute the commands
&execute_cmds(@cmds);
@@ -474,8 +474,8 @@
$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/apache2/instdso.sh SH_LIBTOOL='" .
+ "$prefix/share/apache2/libtool' $f $CFG_LIBEXECDIR");
push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
}

12
www/apache2/files/patch-support:log_server_status.in
View File

@ -1,6 +1,6 @@
--- support/log_server_status.in.orig Thu Mar 14 05:48:06 2002
+++ support/log_server_status.in Sun Apr 7 08:47:53 2002
@@ -63,10 +63,10 @@
--- support/log_server_status.in.orig Tue Jun 18 23:21:53 2002
+++ support/log_server_status.in Tue Jun 18 23:23:08 2002
@@ -63,7 +63,7 @@
#
require 'sys/socket.ph';
@ -8,11 +8,7 @@
+$wherelog = "@logfiledir@/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log"
$server = "localhost"; # Name of server, could be "www.foo.com"
$port = "80"; # Port on server
-$request = "/status/?auto"; # Request to send
+$request = "/status-status/?auto"; # Request to send
sub tcp_connect
{
$request = "/status/?auto"; # Request to send
@@ -96,7 +96,7 @@
chomp($date);
($day,$time)=split(/:/,$date);

194
www/apache2/pkg-plist
View File

@ -62,6 +62,7 @@ include/apache2/apr_sha1.h
include/apache2/apr_shm.h
include/apache2/apr_signal.h
include/apache2/apr_strings.h
include/apache2/apr_strmatch.h
include/apache2/apr_tables.h
include/apache2/apr_thread_cond.h
include/apache2/apr_thread_mutex.h
@ -208,12 +209,15 @@ share/apache2/program.mk
share/apache2/rules.mk
share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/LICENSE
%%PORTDOCS%%share/doc/apache2/bind.html
%%PORTDOCS%%share/doc/apache2/cgi_path.html
%%PORTDOCS%%share/doc/apache2/bind.html.en
%%PORTDOCS%%share/doc/apache2/bind.html.ja.jis
%%PORTDOCS%%share/doc/apache2/cgi_path.html.en
%%PORTDOCS%%share/doc/apache2/cgi_path.html.ja.jis
%%PORTDOCS%%share/doc/apache2/configuring.html.en
%%PORTDOCS%%share/doc/apache2/configuring.html.ja.jis
%%PORTDOCS%%share/doc/apache2/content-negotiation.html
%%PORTDOCS%%share/doc/apache2/custom-error.html
%%PORTDOCS%%share/doc/apache2/custom-error.html.en
%%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
%%PORTDOCS%%share/doc/apache2/developer/API.html
%%PORTDOCS%%share/doc/apache2/developer/debugging.html
%%PORTDOCS%%share/doc/apache2/developer/documenting.html
@ -227,15 +231,19 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/developer/request.html
%%PORTDOCS%%share/doc/apache2/dns-caveats.html
%%PORTDOCS%%share/doc/apache2/dso.html
%%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/ebcdic.html
%%PORTDOCS%%share/doc/apache2/env.html
%%PORTDOCS%%share/doc/apache2/env.html.en
%%PORTDOCS%%share/doc/apache2/env.html.ja.jis
%%PORTDOCS%%share/doc/apache2/faq/index.html
%%PORTDOCS%%share/doc/apache2/filter.html
%%PORTDOCS%%share/doc/apache2/filter.html.en
%%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
%%PORTDOCS%%share/doc/apache2/footer.html
%%PORTDOCS%%share/doc/apache2/handler.html.en
%%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
%%PORTDOCS%%share/doc/apache2/header.html
%%PORTDOCS%%share/doc/apache2/howto/auth.html
%%PORTDOCS%%share/doc/apache2/howto/auth.html.en
%%PORTDOCS%%share/doc/apache2/howto/auth.html.ja.jis
%%PORTDOCS%%share/doc/apache2/howto/cgi.html.en
%%PORTDOCS%%share/doc/apache2/howto/cgi.html.ja.jis
%%PORTDOCS%%share/doc/apache2/howto/footer.html
@ -263,8 +271,11 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/index.html.en
%%PORTDOCS%%share/doc/apache2/index.html.fr
%%PORTDOCS%%share/doc/apache2/index.html.ja.jis
%%PORTDOCS%%share/doc/apache2/install.html
%%PORTDOCS%%share/doc/apache2/invoking.html
%%PORTDOCS%%share/doc/apache2/install.html.en
%%PORTDOCS%%share/doc/apache2/install.html.ja.jis
%%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/invoking.html.en
%%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis
%%PORTDOCS%%share/doc/apache2/logs.html
%%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html
%%PORTDOCS%%share/doc/apache2/misc/descriptors.html
@ -277,124 +288,136 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
%%PORTDOCS%%share/doc/apache2/misc/security_tips.html
%%PORTDOCS%%share/doc/apache2/misc/tutorials.html
%%PORTDOCS%%share/doc/apache2/mod/allmodules.html.en
%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml
%%PORTDOCS%%share/doc/apache2/mod/core.html
%%PORTDOCS%%share/doc/apache2/mod/core.html.en
%%PORTDOCS%%share/doc/apache2/mod/core.xml
%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html
%%PORTDOCS%%share/doc/apache2/mod/directives.html
%%PORTDOCS%%share/doc/apache2/mod/directives.html.en
%%PORTDOCS%%share/doc/apache2/mod/directives.xml
%%PORTDOCS%%share/doc/apache2/mod/footer.html
%%PORTDOCS%%share/doc/apache2/mod/header.html
%%PORTDOCS%%share/doc/apache2/mod/index-bytype.html
%%PORTDOCS%%share/doc/apache2/mod/index.html
%%PORTDOCS%%share/doc/apache2/mod/index.html.en
%%PORTDOCS%%share/doc/apache2/mod/index.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_TEMPLATE.html
%%PORTDOCS%%share/doc/apache2/mod/mod_access.html
%%PORTDOCS%%share/doc/apache2/mod/mod_access.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html
%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html
%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html
%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_ldap.html
%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html
%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cache.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cache.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cache.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html
%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html
%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_env.html
%%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_env.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_example.html
%%PORTDOCS%%share/doc/apache2/mod/mod_example.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_example.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_expires.html
%%PORTDOCS%%share/doc/apache2/mod/mod_expires.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_expires.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.html
%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.html
%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_headers.html
%%PORTDOCS%%share/doc/apache2/mod/mod_headers.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_headers.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_imap.html
%%PORTDOCS%%share/doc/apache2/mod/mod_imap.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_imap.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_include.html
%%PORTDOCS%%share/doc/apache2/mod/mod_include.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_include.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_info.html
%%PORTDOCS%%share/doc/apache2/mod/mod_info.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_info.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html
%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_ldap.html
%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html
%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_mime.html
%%PORTDOCS%%share/doc/apache2/mod/mod_mime.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_mime.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html
%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_mmap_static.html
%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html
%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html
%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html
%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html
%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_so.html
%%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_so.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html
%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html
%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_status.html
%%PORTDOCS%%share/doc/apache2/mod/mod_status.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_status.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.html
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html
%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
%%PORTDOCS%%share/doc/apache2/mod/module-dict.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
%%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html.en
%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.xml
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.en
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml
%%PORTDOCS%%share/doc/apache2/mod/perchild.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/perchild.html.en
%%PORTDOCS%%share/doc/apache2/mod/perchild.xml
%%PORTDOCS%%share/doc/apache2/mod/prefork.html
%%PORTDOCS%%share/doc/apache2/mod/prefork.html.en
%%PORTDOCS%%share/doc/apache2/mod/prefork.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/prefork.xml
%%PORTDOCS%%share/doc/apache2/mod/worker.html
%%PORTDOCS%%share/doc/apache2/mod/prefork.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/worker.html.en
%%PORTDOCS%%share/doc/apache2/mod/worker.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/worker.xml
%%PORTDOCS%%share/doc/apache2/mpm.html
%%PORTDOCS%%share/doc/apache2/mod/worker.xml.ja
%%PORTDOCS%%share/doc/apache2/mpm.html.en
%%PORTDOCS%%share/doc/apache2/mpm.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mpm.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.de
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.en
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.fr
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ja.jis
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/platform/footer.html
%%PORTDOCS%%share/doc/apache2/platform/header.html
%%PORTDOCS%%share/doc/apache2/platform/netware.html
@ -417,13 +440,15 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/programs/rotatelogs.html
%%PORTDOCS%%share/doc/apache2/programs/suexec.html
%%PORTDOCS%%share/doc/apache2/search/manual-index.cgi
%%PORTDOCS%%share/doc/apache2/sections.html
%%PORTDOCS%%share/doc/apache2/sections.html.en
%%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
%%PORTDOCS%%share/doc/apache2/server-wide.html.en
%%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
%%PORTDOCS%%share/doc/apache2/sitemap.html
%%PORTDOCS%%share/doc/apache2/ssl/footer.html
%%PORTDOCS%%share/doc/apache2/ssl/header.html
%%PORTDOCS%%share/doc/apache2/ssl/index.html
%%PORTDOCS%%share/doc/apache2/ssl/index.html.en
%%PORTDOCS%%share/doc/apache2/ssl/index.html.ja.jis
%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html
%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg
%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_title.jpg
@ -438,27 +463,36 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-000000.gif
%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
%%PORTDOCS%%share/doc/apache2/stopping.html
%%PORTDOCS%%share/doc/apache2/style/Makefile
%%PORTDOCS%%share/doc/apache2/style/build.sh
%%PORTDOCS%%share/doc/apache2/style/build.xml
%%PORTDOCS%%share/doc/apache2/style/common.xsl
%%PORTDOCS%%share/doc/apache2/style/en.xml
%%PORTDOCS%%share/doc/apache2/style/ja.xml
%%PORTDOCS%%share/doc/apache2/style/manual.css
%%PORTDOCS%%share/doc/apache2/style/manual.xsl
%%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
%%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
%%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
%%PORTDOCS%%share/doc/apache2/style/settings.xsl
%%PORTDOCS%%share/doc/apache2/style/sv.xml
%%PORTDOCS%%share/doc/apache2/suexec.html
%%PORTDOCS%%share/doc/apache2/suexec.html.en
%%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis
%%PORTDOCS%%share/doc/apache2/upgrading.html.en
%%PORTDOCS%%share/doc/apache2/upgrading.html.fr
%%PORTDOCS%%share/doc/apache2/upgrading.html.ja.jis
%%PORTDOCS%%share/doc/apache2/upgrading.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/urlmapping.html
%%PORTDOCS%%share/doc/apache2/vhosts/details.html
%%PORTDOCS%%share/doc/apache2/vhosts/examples.html
%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html
%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.ja.jis
%%PORTDOCS%%share/doc/apache2/vhosts/footer.html
%%PORTDOCS%%share/doc/apache2/vhosts/header.html
%%PORTDOCS%%share/doc/apache2/vhosts/index.html
%%PORTDOCS%%share/doc/apache2/vhosts/index.html.en
%%PORTDOCS%%share/doc/apache2/vhosts/index.html.ja.jis
%%PORTDOCS%%share/doc/apache2/vhosts/ip-based.html
%%PORTDOCS%%share/doc/apache2/vhosts/mass.html
%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html
%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.en
%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.ja.jis
@exec mkdir -p %D/www
@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
@ -485,9 +519,8 @@ www/data.default/index.html.he.iso8859-8
www/data.default/index.html.hr.iso8859-2
www/data.default/index.html.it
www/data.default/index.html.ja.iso2022-jp
www/data.default/index.html.kr.iso2022-kr
www/data.default/index.html.ltz.utf8
www/data.default/index.html.lu.utf8
www/data.default/index.html.ko.euc-kr
www/data.default/index.html.lb.utf8
www/data.default/index.html.nl
www/data.default/index.html.nn
www/data.default/index.html.no
@ -500,9 +533,8 @@ www/data.default/index.html.ru.iso-ru
www/data.default/index.html.ru.koi8-r
www/data.default/index.html.ru.utf8
www/data.default/index.html.se
www/data.default/index.html.tw
www/data.default/index.html.tw.Big5
www/data.default/index.html.var
www/data.default/index.html.zh
www/error/HTTP_BAD_GATEWAY.html.var
www/error/HTTP_BAD_REQUEST.html.var
www/error/HTTP_FORBIDDEN.html.var
@ -572,6 +604,8 @@ www/icons/continued.gif
www/icons/continued.png
www/icons/dir.gif
www/icons/dir.png
www/icons/diskimg.gif
www/icons/diskimg.png
www/icons/down.gif
www/icons/down.png
www/icons/dvi.gif
@ -771,5 +805,3 @@ www/icons/world2.png
@dirrm lib/apache2
@dirrm include/apache2
@dirrm etc/apache2
@exec [ -d %%DESTDIR%%/var/log ] || mkdir -p %%DESTDIR%%/var/log
@exec [ -d %%DESTDIR%%/var/run ] || mkdir -p %%DESTDIR%%/var/run

62
www/apache20/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= apache
PORTVERSION= 2.0.36
PORTVERSION= 2.0.39
PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
@ -23,33 +23,31 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= perky@fallin.lv
FORBIDDEN= "Vulnerable to denial-of-service. See" \
"http://httpd.apache.org/info/security_bulletin_20020617.txt"
LATEST_LINK= apache2
WITH_MPM?= prefork # or worker, perchild (neither of them still has a problem on FreeBSD)
WITH_MPM?= prefork
HTTP_PORT?= 80
GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
USE_PERL5= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-layout=FreeBSD \
--with-perl=${PERL5} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
--libdir=${PREFIX}/lib/apache2 \
--includedir=${PREFIX}/include/apache2
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}"
LDFLAGS="${LDFLAGS}" EXPAT_PATHS="${EXPAT_PATHS}"
SHARED_MODULES= all cgid ext_filter bucketeer
RC_SUB= -e 's,@@PREFIX@@,${PREFIX},g' -e 's,@@DESTDIR@@,${DESTDIR},g'
PREFIX_RELDEST= ${PREFIX:S,${DESTDIR},,}
RC_SUB= -e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
PLIST_SUB+= DESTDIR=${DESTDIR}
.if defined(NOPORTDOCS)
MAKE_ENV+= NOPORTDOCS=YES
MAKE_ENV+= -DNOPORTDOCS
.endif
.if defined(WITH_BUNDLED_EXPAT)
@ -57,14 +55,10 @@ EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat
PLIST_SUB+= EXPAT=""
.else
LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${EXPATLIBPATH}
EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,${DESTDIR},,}
PLIST_SUB+= EXPAT="@comment "
.endif
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
.endif
.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
SHARED_MODULES+= ssl
PLIST_SUB+= MODSSL=""
@ -75,16 +69,16 @@ RC_SUB+= -e 's,@@SSL@@,,g'
.endif
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX}/www/data
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
CONFIGURE_ARGS+= --enable-suexec \
--with-suexec-caller=www \
--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
--with-suexec-userdir="${SUEXEC_USERDIR}" \
--with-suexec-docroot="${SUEXEC_DOCROOT}" \
--with-suexec-safepath="${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \
--with-suexec-logfile="${DESTDIR}/var/log/httpd-suexec.log" \
--with-suexec-bin="${PREFIX}/sbin/suexec"
--with-suexec-safepath="${PREFIX_RELDEST}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \
--with-suexec-logfile="/var/log/httpd-suexec.log" \
--with-suexec-bin="${PREFIX_RELDEST}/sbin/suexec"
PLIST_SUB+= SUEXEC=""
.else
PLIST_SUB+= SUEXEC="@comment "
@ -113,31 +107,37 @@ PLIST_SUB+= EXPERIMENTAL="@comment "
.if ${WITH_MPM} != "prefork"
PKGNAMESUFFIX= -${WITH_MPM}
.if !defined(WITH_THREADS)
IGNORE= "requires threads for ${WITH_MPM} mpm"
WITH_THREADS= yes
.if !defined(FORCE_THREADING_MPM)
FORBIDDEN= "doesn\'t work with threading MPMs on FreeBSD. If you are \
brave enough, make again with -DFORCE_THREADING_MPM"
.endif
.endif
CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
.endif
CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}" ${CONFIGURE_TARGET}
MAN1= dbmmanage.1 htdigest.1 htpasswd.1
MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
.include <bsd.port.pre.mk>
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 \
${REINPLACE_CMD} -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 {} \;
@${PERL} -pi -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,\$${EXPAT_PATHS},g' \
${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
pre-install:
PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
@ -147,7 +147,5 @@ post-install:
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
fi
@[ -d ${DESTDIR}/var/log ] || ${MKDIR} ${DESTDIR}/var/log
@[ -d ${DESTDIR}/var/run ] || ${MKDIR} ${DESTDIR}/var/run
.include <bsd.port.post.mk>
.include <bsd.port.mk>

2
www/apache20/distinfo
View File

@ -1,2 +1,2 @@
MD5 (httpd-2.0.36.tar.gz) = dc80f22608bccba6c49e1fe9f12f51c8
MD5 (httpd-2.0.39.tar.gz) = b821c6babca68b4859b9ba38d1b345af
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62

2
www/apache20/files/apache.sh
View File

@ -7,7 +7,7 @@ start)
[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && echo -n ' apache2'
;;
stop)
[ -r @@DESTDIR@@/var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2

2
www/apache20/files/config.layout
View File

@ -14,7 +14,7 @@
manualdir: ${prefix}/share/doc/apache2
cgidir: ${datadir}/cgi-bin
includedir: ${prefix}/include/apache2
localstatedir: @@DESTDIR@@/var
localstatedir: /var
runtimedir: ${localstatedir}/run
logfiledir: ${localstatedir}/log
proxycachedir: ${datadir}/proxy

77
www/apache20/files/patch-Makefile.in
View File

@ -1,13 +1,13 @@
--- Makefile.in.orig Sun Apr 28 16:41:25 2002
+++ Makefile.in Tue May 7 19:05:12 2002
@@ -33,23 +33,27 @@
@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
--- Makefile.in.orig Sat Jun 15 18:41:03 2002
+++ Makefile.in Tue Jun 18 22:37:19 2002
@@ -31,12 +31,14 @@
@test -d $(DESTDIR)$(sysconfdir) || $(MKINSTALLDIRS) $(DESTDIR)$(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); \
- $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ test -f $(DESTDIR)$(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ cp -f $$i $$i.default; \
+ $(INSTALL_DATA) $$i.default $(sysconfdir); \
+ $(INSTALL_DATA) $$i.default $(DESTDIR)$(sysconfdir); \
done; \
for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
cd $$j ; \
@ -17,58 +17,35 @@
( \
n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
sed -e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
+ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
-e '/@@LoadModule@@/d' \
< $$i; \
else \
sed -n -e '/@@LoadModule@@/q' \
-e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
+ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
-e 'p' \
< $$i; \
for j in $(DSO_MODULES) "^EOL^"; do \
@@ -57,7 +61,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,12 +110,14 @@
@@ -104,11 +106,14 @@
install-htdocs:
@echo Installing HTML documents
- @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
+ @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)
- @test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)
- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir))
+ @test -d $(DESTDIR)$(htdocsdir).default || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir).default
+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir).default)
+ @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir).default $(DESTDIR)$(htdocsdir)
+.if !defined(NOPORTDOCS)
@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
- @test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;
-
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
- -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf
+.endif
+ @test "x$(htdocsdir)" != "x" && cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;
+ -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf
install-error:
@echo Installing error documents
@test -d $(errordir) || $(MKINSTALLDIRS) $(errordir)
@@ -126,9 +132,10 @@
@@ -124,9 +129,10 @@
install-cgi:
@echo Installing CGIs
- @test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
- @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir)
- @test "x$(cgidir)" != "x" && cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;
+ @test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
+ @(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir).default)
+ @test -e $(cgidir) || ln -sf $(cgidir).default $(cgidir)
+ @test "x$(cgidir)" != "x" && cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;
- @test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)
- @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)
- -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf
+ @test -d $(DESTDIR)$(cgidir).default || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir).default
+ @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir).default
+ @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir).default $(DESTDIR)$(cgidir)
+ -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir).default && find . -name "CVS" -print | xargs rm -rf
install-other:
@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)

47
www/apache20/files/patch-docs:conf:ssl-std.conf
View File

@ -1,5 +1,5 @@
--- docs/conf/ssl-std.conf.orig Thu Nov 8 07:16:09 2001
+++ docs/conf/ssl-std.conf Sun Apr 7 09:26:02 2002
--- docs/conf/ssl-std.conf.orig Fri May 17 04:05:24 2002
+++ docs/conf/ssl-std.conf Tue Jun 18 23:15:32 2002
@@ -55,15 +55,15 @@
# Configure the SSL Session Cache: First the mechanism
# to use and second the expiring timeout (in seconds).
@ -7,29 +7,20 @@
-#SSLSessionCache shmht:logs/ssl_scache(512000)
-#SSLSessionCache shmcb:logs/ssl_scache(512000)
-SSLSessionCache dbm:logs/ssl_scache
+#SSLSessionCache shmht:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
+#SSLSessionCache shmcb:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
+SSLSessionCache dbm:@@DESTDIR@@/var/log/httpd-ssl_scache
+#SSLSessionCache shmht:/var/log/httpd-ssl_scache(512000)
+#SSLSessionCache shmcb:/var/log/httpd-ssl_scache(512000)
+SSLSessionCache dbm:/var/log/httpd-ssl_scache
SSLSessionCacheTimeout 300
# Semaphore:
# Configure the path to the mutual exclusion semaphore the
# SSL engine uses internally for inter-process synchronization.
-SSLMutex file:logs/ssl_mutex
+SSLMutex file:@@DESTDIR@@/var/log/httpd-ssl_mutex
+SSLMutex file:/var/log/httpd-ssl_mutex
# Pseudo Random Number Generator (PRNG):
# Configure one or more sources to seed the PRNG of the
@@ -89,7 +89,7 @@
# a real server (i.e. somewhere where only root can write).
# Log levels are (ascending order: higher ones include lower ones):
# none, error, warn, info, trace, debug.
-SSLLog logs/ssl_engine_log
+SSLLog @@DESTDIR@@/var/log/httpd-ssl_engine_log
SSLLogLevel info
##
@@ -99,11 +99,11 @@
@@ -89,11 +89,11 @@
<VirtualHost _default_:443>
# General setup for the virtual host
@ -39,15 +30,15 @@
ServerAdmin you@your.address
-ErrorLog logs/error_log
-TransferLog logs/access_log
+ErrorLog @@DESTDIR@@/var/log/httpd-error.log
+TransferLog @@DESTDIR@@/var/log/httpd-access.log
+ErrorLog /var/log/httpd-error.log
+TransferLog /var/log/httpd-access.log
# SSL Engine Switch:
# Enable/Disable SSL for this virtual host.
@@ -122,16 +122,16 @@
# built time. Keep in mind that if you've both a RSA and a DSA
# certificate you can configure both in parallel (to also allow
# the use of DSA ciphers, etc.)
@@ -111,16 +111,16 @@
# in mind that if you have both an RSA and a DSA certificate you
# can configure both in parallel (to also allow the use of DSA
# ciphers, etc.)
-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
+SSLCertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/server.crt
@ -65,7 +56,7 @@
# Server Certificate Chain:
# Point SSLCertificateChainFile at a file containing the
@@ -140,7 +140,7 @@
@@ -129,7 +129,7 @@
# the referenced file can be the same as SSLCertificateFile
# when the CA certificates are directly appended to the server
# certificate for convinience.
@ -74,7 +65,7 @@
# Certificate Authority (CA):
# Set the CA certificate verification path where to find CA
@@ -149,8 +149,8 @@
@@ -138,8 +138,8 @@
# Note: Inside SSLCACertificatePath you need hash symlinks
# to point to the certificate files. Use the provided
# Makefile to update the hash symlinks after changes.
@ -85,7 +76,7 @@
# Certificate Revocation Lists (CRL):
# Set the CA revocation path where to find CA CRLs for client
@@ -159,8 +159,8 @@
@@ -148,8 +148,8 @@
# Note: Inside SSLCARevocationPath you need hash symlinks
# to point to the certificate files. Use the provided
# Makefile to update the hash symlinks after changes.
@ -96,7 +87,7 @@
# Client Authentication (Type):
# Client certificate verification type and depth. Types are
@@ -220,7 +220,7 @@
@@ -209,7 +209,7 @@
<Files ~ "\.(cgi|shtml|phtml|php3?)$">
SSLOptions +StdEnvVars
</Files>
@ -105,12 +96,12 @@
SSLOptions +StdEnvVars
</Directory>
@@ -255,7 +255,7 @@
@@ -244,7 +244,7 @@
# Per-Server Logging:
# The home of a custom SSL log file. Use this when you want a
# compact non-error SSL logfile on a virtual host basis.
-CustomLog logs/ssl_request_log \
+CustomLog @@DESTDIR@@/var/log/httpd-ssl_request.log \
+CustomLog /var/log/httpd-ssl_request.log \
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</VirtualHost>

49
www/apache20/files/patch-support:apxs.in
View File

@ -1,49 +0,0 @@
--- support/apxs.in.orig Tue Apr 30 03:09:02 2002
+++ support/apxs.in Wed May 8 19:41:06 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/apache2/config_vars.mk",\%config_vars);
my $exec_prefix = get_vars("exec_prefix");
my $CFG_TARGET = get_vars("progname");
@@ -223,7 +223,7 @@
my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
$httpd = eval qq("$httpd");
$httpd = eval qq("$httpd");
-my $envvars = get_vars("bindir") . "/envvars";
+my $envvars = get_vars("sbindir") . "/envvars";
$envvars = eval qq("$envvars");
$envvars = eval qq("$envvars");
@@ -418,7 +418,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/apache2/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
unshift(@objs, $lo);
}
@@ -443,7 +443,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/apache2/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
# execute the commands
&execute_cmds(@cmds);
@@ -474,8 +474,8 @@
$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/apache2/instdso.sh SH_LIBTOOL='" .
+ "$prefix/share/apache2/libtool' $f $CFG_LIBEXECDIR");
push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
}

12
www/apache20/files/patch-support:log_server_status.in
View File

@ -1,6 +1,6 @@
--- support/log_server_status.in.orig Thu Mar 14 05:48:06 2002
+++ support/log_server_status.in Sun Apr 7 08:47:53 2002
@@ -63,10 +63,10 @@
--- support/log_server_status.in.orig Tue Jun 18 23:21:53 2002
+++ support/log_server_status.in Tue Jun 18 23:23:08 2002
@@ -63,7 +63,7 @@
#
require 'sys/socket.ph';
@ -8,11 +8,7 @@
+$wherelog = "@logfiledir@/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log"
$server = "localhost"; # Name of server, could be "www.foo.com"
$port = "80"; # Port on server
-$request = "/status/?auto"; # Request to send
+$request = "/status-status/?auto"; # Request to send
sub tcp_connect
{
$request = "/status/?auto"; # Request to send
@@ -96,7 +96,7 @@
chomp($date);
($day,$time)=split(/:/,$date);

194
www/apache20/pkg-plist
View File

@ -62,6 +62,7 @@ include/apache2/apr_sha1.h
include/apache2/apr_shm.h
include/apache2/apr_signal.h
include/apache2/apr_strings.h
include/apache2/apr_strmatch.h
include/apache2/apr_tables.h
include/apache2/apr_thread_cond.h
include/apache2/apr_thread_mutex.h
@ -208,12 +209,15 @@ share/apache2/program.mk
share/apache2/rules.mk
share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/LICENSE
%%PORTDOCS%%share/doc/apache2/bind.html
%%PORTDOCS%%share/doc/apache2/cgi_path.html
%%PORTDOCS%%share/doc/apache2/bind.html.en
%%PORTDOCS%%share/doc/apache2/bind.html.ja.jis
%%PORTDOCS%%share/doc/apache2/cgi_path.html.en
%%PORTDOCS%%share/doc/apache2/cgi_path.html.ja.jis
%%PORTDOCS%%share/doc/apache2/configuring.html.en
%%PORTDOCS%%share/doc/apache2/configuring.html.ja.jis
%%PORTDOCS%%share/doc/apache2/content-negotiation.html
%%PORTDOCS%%share/doc/apache2/custom-error.html
%%PORTDOCS%%share/doc/apache2/custom-error.html.en
%%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
%%PORTDOCS%%share/doc/apache2/developer/API.html
%%PORTDOCS%%share/doc/apache2/developer/debugging.html
%%PORTDOCS%%share/doc/apache2/developer/documenting.html
@ -227,15 +231,19 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/developer/request.html
%%PORTDOCS%%share/doc/apache2/dns-caveats.html
%%PORTDOCS%%share/doc/apache2/dso.html
%%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/ebcdic.html
%%PORTDOCS%%share/doc/apache2/env.html
%%PORTDOCS%%share/doc/apache2/env.html.en
%%PORTDOCS%%share/doc/apache2/env.html.ja.jis
%%PORTDOCS%%share/doc/apache2/faq/index.html
%%PORTDOCS%%share/doc/apache2/filter.html
%%PORTDOCS%%share/doc/apache2/filter.html.en
%%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
%%PORTDOCS%%share/doc/apache2/footer.html
%%PORTDOCS%%share/doc/apache2/handler.html.en
%%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
%%PORTDOCS%%share/doc/apache2/header.html
%%PORTDOCS%%share/doc/apache2/howto/auth.html
%%PORTDOCS%%share/doc/apache2/howto/auth.html.en
%%PORTDOCS%%share/doc/apache2/howto/auth.html.ja.jis
%%PORTDOCS%%share/doc/apache2/howto/cgi.html.en
%%PORTDOCS%%share/doc/apache2/howto/cgi.html.ja.jis
%%PORTDOCS%%share/doc/apache2/howto/footer.html
@ -263,8 +271,11 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/index.html.en
%%PORTDOCS%%share/doc/apache2/index.html.fr
%%PORTDOCS%%share/doc/apache2/index.html.ja.jis
%%PORTDOCS%%share/doc/apache2/install.html
%%PORTDOCS%%share/doc/apache2/invoking.html
%%PORTDOCS%%share/doc/apache2/install.html.en
%%PORTDOCS%%share/doc/apache2/install.html.ja.jis
%%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/invoking.html.en
%%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis
%%PORTDOCS%%share/doc/apache2/logs.html
%%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html
%%PORTDOCS%%share/doc/apache2/misc/descriptors.html
@ -277,124 +288,136 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
%%PORTDOCS%%share/doc/apache2/misc/security_tips.html
%%PORTDOCS%%share/doc/apache2/misc/tutorials.html
%%PORTDOCS%%share/doc/apache2/mod/allmodules.html.en
%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml
%%PORTDOCS%%share/doc/apache2/mod/core.html
%%PORTDOCS%%share/doc/apache2/mod/core.html.en
%%PORTDOCS%%share/doc/apache2/mod/core.xml
%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html
%%PORTDOCS%%share/doc/apache2/mod/directives.html
%%PORTDOCS%%share/doc/apache2/mod/directives.html.en
%%PORTDOCS%%share/doc/apache2/mod/directives.xml
%%PORTDOCS%%share/doc/apache2/mod/footer.html
%%PORTDOCS%%share/doc/apache2/mod/header.html
%%PORTDOCS%%share/doc/apache2/mod/index-bytype.html
%%PORTDOCS%%share/doc/apache2/mod/index.html
%%PORTDOCS%%share/doc/apache2/mod/index.html.en
%%PORTDOCS%%share/doc/apache2/mod/index.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_TEMPLATE.html
%%PORTDOCS%%share/doc/apache2/mod/mod_access.html
%%PORTDOCS%%share/doc/apache2/mod/mod_access.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html
%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html
%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html
%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_ldap.html
%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html
%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cache.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cache.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cache.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html
%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html
%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_env.html
%%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_env.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_example.html
%%PORTDOCS%%share/doc/apache2/mod/mod_example.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_example.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_expires.html
%%PORTDOCS%%share/doc/apache2/mod/mod_expires.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_expires.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.html
%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.html
%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_headers.html
%%PORTDOCS%%share/doc/apache2/mod/mod_headers.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_headers.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_imap.html
%%PORTDOCS%%share/doc/apache2/mod/mod_imap.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_imap.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_include.html
%%PORTDOCS%%share/doc/apache2/mod/mod_include.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_include.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_info.html
%%PORTDOCS%%share/doc/apache2/mod/mod_info.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_info.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html
%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_ldap.html
%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html
%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_mime.html
%%PORTDOCS%%share/doc/apache2/mod/mod_mime.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_mime.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html
%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_mmap_static.html
%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html
%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html
%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html
%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html
%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_so.html
%%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_so.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html
%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html
%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_status.html
%%PORTDOCS%%share/doc/apache2/mod/mod_status.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_status.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.html
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html
%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
%%PORTDOCS%%share/doc/apache2/mod/module-dict.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
%%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html.en
%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.xml
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.en
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml
%%PORTDOCS%%share/doc/apache2/mod/perchild.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/perchild.html.en
%%PORTDOCS%%share/doc/apache2/mod/perchild.xml
%%PORTDOCS%%share/doc/apache2/mod/prefork.html
%%PORTDOCS%%share/doc/apache2/mod/prefork.html.en
%%PORTDOCS%%share/doc/apache2/mod/prefork.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/prefork.xml
%%PORTDOCS%%share/doc/apache2/mod/worker.html
%%PORTDOCS%%share/doc/apache2/mod/prefork.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/worker.html.en
%%PORTDOCS%%share/doc/apache2/mod/worker.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/worker.xml
%%PORTDOCS%%share/doc/apache2/mpm.html
%%PORTDOCS%%share/doc/apache2/mod/worker.xml.ja
%%PORTDOCS%%share/doc/apache2/mpm.html.en
%%PORTDOCS%%share/doc/apache2/mpm.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mpm.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.de
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.en
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.fr
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ja.jis
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/platform/footer.html
%%PORTDOCS%%share/doc/apache2/platform/header.html
%%PORTDOCS%%share/doc/apache2/platform/netware.html
@ -417,13 +440,15 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/programs/rotatelogs.html
%%PORTDOCS%%share/doc/apache2/programs/suexec.html
%%PORTDOCS%%share/doc/apache2/search/manual-index.cgi
%%PORTDOCS%%share/doc/apache2/sections.html
%%PORTDOCS%%share/doc/apache2/sections.html.en
%%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
%%PORTDOCS%%share/doc/apache2/server-wide.html.en
%%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
%%PORTDOCS%%share/doc/apache2/sitemap.html
%%PORTDOCS%%share/doc/apache2/ssl/footer.html
%%PORTDOCS%%share/doc/apache2/ssl/header.html
%%PORTDOCS%%share/doc/apache2/ssl/index.html
%%PORTDOCS%%share/doc/apache2/ssl/index.html.en
%%PORTDOCS%%share/doc/apache2/ssl/index.html.ja.jis
%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html
%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg
%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_title.jpg
@ -438,27 +463,36 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-000000.gif
%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
%%PORTDOCS%%share/doc/apache2/stopping.html
%%PORTDOCS%%share/doc/apache2/style/Makefile
%%PORTDOCS%%share/doc/apache2/style/build.sh
%%PORTDOCS%%share/doc/apache2/style/build.xml
%%PORTDOCS%%share/doc/apache2/style/common.xsl
%%PORTDOCS%%share/doc/apache2/style/en.xml
%%PORTDOCS%%share/doc/apache2/style/ja.xml
%%PORTDOCS%%share/doc/apache2/style/manual.css
%%PORTDOCS%%share/doc/apache2/style/manual.xsl
%%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
%%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
%%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
%%PORTDOCS%%share/doc/apache2/style/settings.xsl
%%PORTDOCS%%share/doc/apache2/style/sv.xml
%%PORTDOCS%%share/doc/apache2/suexec.html
%%PORTDOCS%%share/doc/apache2/suexec.html.en
%%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis
%%PORTDOCS%%share/doc/apache2/upgrading.html.en
%%PORTDOCS%%share/doc/apache2/upgrading.html.fr
%%PORTDOCS%%share/doc/apache2/upgrading.html.ja.jis
%%PORTDOCS%%share/doc/apache2/upgrading.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/urlmapping.html
%%PORTDOCS%%share/doc/apache2/vhosts/details.html
%%PORTDOCS%%share/doc/apache2/vhosts/examples.html
%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html
%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.ja.jis
%%PORTDOCS%%share/doc/apache2/vhosts/footer.html
%%PORTDOCS%%share/doc/apache2/vhosts/header.html
%%PORTDOCS%%share/doc/apache2/vhosts/index.html
%%PORTDOCS%%share/doc/apache2/vhosts/index.html.en
%%PORTDOCS%%share/doc/apache2/vhosts/index.html.ja.jis
%%PORTDOCS%%share/doc/apache2/vhosts/ip-based.html
%%PORTDOCS%%share/doc/apache2/vhosts/mass.html
%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html
%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.en
%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.ja.jis
@exec mkdir -p %D/www
@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
@ -485,9 +519,8 @@ www/data.default/index.html.he.iso8859-8
www/data.default/index.html.hr.iso8859-2
www/data.default/index.html.it
www/data.default/index.html.ja.iso2022-jp
www/data.default/index.html.kr.iso2022-kr
www/data.default/index.html.ltz.utf8
www/data.default/index.html.lu.utf8
www/data.default/index.html.ko.euc-kr
www/data.default/index.html.lb.utf8
www/data.default/index.html.nl
www/data.default/index.html.nn
www/data.default/index.html.no
@ -500,9 +533,8 @@ www/data.default/index.html.ru.iso-ru
www/data.default/index.html.ru.koi8-r
www/data.default/index.html.ru.utf8
www/data.default/index.html.se
www/data.default/index.html.tw
www/data.default/index.html.tw.Big5
www/data.default/index.html.var
www/data.default/index.html.zh
www/error/HTTP_BAD_GATEWAY.html.var
www/error/HTTP_BAD_REQUEST.html.var
www/error/HTTP_FORBIDDEN.html.var
@ -572,6 +604,8 @@ www/icons/continued.gif
www/icons/continued.png
www/icons/dir.gif
www/icons/dir.png
www/icons/diskimg.gif
www/icons/diskimg.png
www/icons/down.gif
www/icons/down.png
www/icons/dvi.gif
@ -771,5 +805,3 @@ www/icons/world2.png
@dirrm lib/apache2
@dirrm include/apache2
@dirrm etc/apache2
@exec [ -d %%DESTDIR%%/var/log ] || mkdir -p %%DESTDIR%%/var/log
@exec [ -d %%DESTDIR%%/var/run ] || mkdir -p %%DESTDIR%%/var/run

62
www/apache21/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= apache
PORTVERSION= 2.0.36
PORTVERSION= 2.0.39
PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
@ -23,33 +23,31 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= perky@fallin.lv
FORBIDDEN= "Vulnerable to denial-of-service. See" \
"http://httpd.apache.org/info/security_bulletin_20020617.txt"
LATEST_LINK= apache2
WITH_MPM?= prefork # or worker, perchild (neither of them still has a problem on FreeBSD)
WITH_MPM?= prefork
HTTP_PORT?= 80
GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
USE_PERL5= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-layout=FreeBSD \
--with-perl=${PERL5} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
--libdir=${PREFIX}/lib/apache2 \
--includedir=${PREFIX}/include/apache2
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}"
LDFLAGS="${LDFLAGS}" EXPAT_PATHS="${EXPAT_PATHS}"
SHARED_MODULES= all cgid ext_filter bucketeer
RC_SUB= -e 's,@@PREFIX@@,${PREFIX},g' -e 's,@@DESTDIR@@,${DESTDIR},g'
PREFIX_RELDEST= ${PREFIX:S,${DESTDIR},,}
RC_SUB= -e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
PLIST_SUB+= DESTDIR=${DESTDIR}
.if defined(NOPORTDOCS)
MAKE_ENV+= NOPORTDOCS=YES
MAKE_ENV+= -DNOPORTDOCS
.endif
.if defined(WITH_BUNDLED_EXPAT)
@ -57,14 +55,10 @@ EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat
PLIST_SUB+= EXPAT=""
.else
LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${EXPATLIBPATH}
EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,${DESTDIR},,}
PLIST_SUB+= EXPAT="@comment "
.endif
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
.endif
.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
SHARED_MODULES+= ssl
PLIST_SUB+= MODSSL=""
@ -75,16 +69,16 @@ RC_SUB+= -e 's,@@SSL@@,,g'
.endif
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX}/www/data
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
CONFIGURE_ARGS+= --enable-suexec \
--with-suexec-caller=www \
--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
--with-suexec-userdir="${SUEXEC_USERDIR}" \
--with-suexec-docroot="${SUEXEC_DOCROOT}" \
--with-suexec-safepath="${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \
--with-suexec-logfile="${DESTDIR}/var/log/httpd-suexec.log" \
--with-suexec-bin="${PREFIX}/sbin/suexec"
--with-suexec-safepath="${PREFIX_RELDEST}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \
--with-suexec-logfile="/var/log/httpd-suexec.log" \
--with-suexec-bin="${PREFIX_RELDEST}/sbin/suexec"
PLIST_SUB+= SUEXEC=""
.else
PLIST_SUB+= SUEXEC="@comment "
@ -113,31 +107,37 @@ PLIST_SUB+= EXPERIMENTAL="@comment "
.if ${WITH_MPM} != "prefork"
PKGNAMESUFFIX= -${WITH_MPM}
.if !defined(WITH_THREADS)
IGNORE= "requires threads for ${WITH_MPM} mpm"
WITH_THREADS= yes
.if !defined(FORCE_THREADING_MPM)
FORBIDDEN= "doesn\'t work with threading MPMs on FreeBSD. If you are \
brave enough, make again with -DFORCE_THREADING_MPM"
.endif
.endif
CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
.endif
CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}" ${CONFIGURE_TARGET}
MAN1= dbmmanage.1 htdigest.1 htpasswd.1
MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
.include <bsd.port.pre.mk>
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 \
${REINPLACE_CMD} -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 {} \;
@${PERL} -pi -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,\$${EXPAT_PATHS},g' \
${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
pre-install:
PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
@ -147,7 +147,5 @@ post-install:
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
fi
@[ -d ${DESTDIR}/var/log ] || ${MKDIR} ${DESTDIR}/var/log
@[ -d ${DESTDIR}/var/run ] || ${MKDIR} ${DESTDIR}/var/run
.include <bsd.port.post.mk>
.include <bsd.port.mk>

2
www/apache21/distinfo
View File

@ -1,2 +1,2 @@
MD5 (httpd-2.0.36.tar.gz) = dc80f22608bccba6c49e1fe9f12f51c8
MD5 (httpd-2.0.39.tar.gz) = b821c6babca68b4859b9ba38d1b345af
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62

2
www/apache21/files/apache.sh
View File

@ -7,7 +7,7 @@ start)
[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && echo -n ' apache2'
;;
stop)
[ -r @@DESTDIR@@/var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2

2
www/apache21/files/config.layout
View File

@ -14,7 +14,7 @@
manualdir: ${prefix}/share/doc/apache2
cgidir: ${datadir}/cgi-bin
includedir: ${prefix}/include/apache2
localstatedir: @@DESTDIR@@/var
localstatedir: /var
runtimedir: ${localstatedir}/run
logfiledir: ${localstatedir}/log
proxycachedir: ${datadir}/proxy

77
www/apache21/files/patch-Makefile.in
View File

@ -1,13 +1,13 @@
--- Makefile.in.orig Sun Apr 28 16:41:25 2002
+++ Makefile.in Tue May 7 19:05:12 2002
@@ -33,23 +33,27 @@
@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
--- Makefile.in.orig Sat Jun 15 18:41:03 2002
+++ Makefile.in Tue Jun 18 22:37:19 2002
@@ -31,12 +31,14 @@
@test -d $(DESTDIR)$(sysconfdir) || $(MKINSTALLDIRS) $(DESTDIR)$(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); \
- $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ test -f $(DESTDIR)$(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ cp -f $$i $$i.default; \
+ $(INSTALL_DATA) $$i.default $(sysconfdir); \
+ $(INSTALL_DATA) $$i.default $(DESTDIR)$(sysconfdir); \
done; \
for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
cd $$j ; \
@ -17,58 +17,35 @@
( \
n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
sed -e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
+ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
-e '/@@LoadModule@@/d' \
< $$i; \
else \
sed -n -e '/@@LoadModule@@/q' \
-e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
+ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
-e 'p' \
< $$i; \
for j in $(DSO_MODULES) "^EOL^"; do \
@@ -57,7 +61,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,12 +110,14 @@
@@ -104,11 +106,14 @@
install-htdocs:
@echo Installing HTML documents
- @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
+ @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)
- @test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)
- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir))
+ @test -d $(DESTDIR)$(htdocsdir).default || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir).default
+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir).default)
+ @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir).default $(DESTDIR)$(htdocsdir)
+.if !defined(NOPORTDOCS)
@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
- @test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;
-
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
- -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf
+.endif
+ @test "x$(htdocsdir)" != "x" && cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;
+ -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf
install-error:
@echo Installing error documents
@test -d $(errordir) || $(MKINSTALLDIRS) $(errordir)
@@ -126,9 +132,10 @@
@@ -124,9 +129,10 @@
install-cgi:
@echo Installing CGIs
- @test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
- @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir)
- @test "x$(cgidir)" != "x" && cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;
+ @test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
+ @(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir).default)
+ @test -e $(cgidir) || ln -sf $(cgidir).default $(cgidir)
+ @test "x$(cgidir)" != "x" && cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;
- @test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)
- @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)
- -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf
+ @test -d $(DESTDIR)$(cgidir).default || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir).default
+ @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir).default
+ @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir).default $(DESTDIR)$(cgidir)
+ -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir).default && find . -name "CVS" -print | xargs rm -rf
install-other:
@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)

47
www/apache21/files/patch-docs:conf:ssl-std.conf
View File

@ -1,5 +1,5 @@
--- docs/conf/ssl-std.conf.orig Thu Nov 8 07:16:09 2001
+++ docs/conf/ssl-std.conf Sun Apr 7 09:26:02 2002
--- docs/conf/ssl-std.conf.orig Fri May 17 04:05:24 2002
+++ docs/conf/ssl-std.conf Tue Jun 18 23:15:32 2002
@@ -55,15 +55,15 @@
# Configure the SSL Session Cache: First the mechanism
# to use and second the expiring timeout (in seconds).
@ -7,29 +7,20 @@
-#SSLSessionCache shmht:logs/ssl_scache(512000)
-#SSLSessionCache shmcb:logs/ssl_scache(512000)
-SSLSessionCache dbm:logs/ssl_scache
+#SSLSessionCache shmht:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
+#SSLSessionCache shmcb:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
+SSLSessionCache dbm:@@DESTDIR@@/var/log/httpd-ssl_scache
+#SSLSessionCache shmht:/var/log/httpd-ssl_scache(512000)
+#SSLSessionCache shmcb:/var/log/httpd-ssl_scache(512000)
+SSLSessionCache dbm:/var/log/httpd-ssl_scache
SSLSessionCacheTimeout 300
# Semaphore:
# Configure the path to the mutual exclusion semaphore the
# SSL engine uses internally for inter-process synchronization.
-SSLMutex file:logs/ssl_mutex
+SSLMutex file:@@DESTDIR@@/var/log/httpd-ssl_mutex
+SSLMutex file:/var/log/httpd-ssl_mutex
# Pseudo Random Number Generator (PRNG):
# Configure one or more sources to seed the PRNG of the
@@ -89,7 +89,7 @@
# a real server (i.e. somewhere where only root can write).
# Log levels are (ascending order: higher ones include lower ones):
# none, error, warn, info, trace, debug.
-SSLLog logs/ssl_engine_log
+SSLLog @@DESTDIR@@/var/log/httpd-ssl_engine_log
SSLLogLevel info
##
@@ -99,11 +99,11 @@
@@ -89,11 +89,11 @@
<VirtualHost _default_:443>
# General setup for the virtual host
@ -39,15 +30,15 @@
ServerAdmin you@your.address
-ErrorLog logs/error_log
-TransferLog logs/access_log
+ErrorLog @@DESTDIR@@/var/log/httpd-error.log
+TransferLog @@DESTDIR@@/var/log/httpd-access.log
+ErrorLog /var/log/httpd-error.log
+TransferLog /var/log/httpd-access.log
# SSL Engine Switch:
# Enable/Disable SSL for this virtual host.
@@ -122,16 +122,16 @@
# built time. Keep in mind that if you've both a RSA and a DSA
# certificate you can configure both in parallel (to also allow
# the use of DSA ciphers, etc.)
@@ -111,16 +111,16 @@
# in mind that if you have both an RSA and a DSA certificate you
# can configure both in parallel (to also allow the use of DSA
# ciphers, etc.)
-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
+SSLCertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/server.crt
@ -65,7 +56,7 @@
# Server Certificate Chain:
# Point SSLCertificateChainFile at a file containing the
@@ -140,7 +140,7 @@
@@ -129,7 +129,7 @@
# the referenced file can be the same as SSLCertificateFile
# when the CA certificates are directly appended to the server
# certificate for convinience.
@ -74,7 +65,7 @@
# Certificate Authority (CA):
# Set the CA certificate verification path where to find CA
@@ -149,8 +149,8 @@
@@ -138,8 +138,8 @@
# Note: Inside SSLCACertificatePath you need hash symlinks
# to point to the certificate files. Use the provided
# Makefile to update the hash symlinks after changes.
@ -85,7 +76,7 @@
# Certificate Revocation Lists (CRL):
# Set the CA revocation path where to find CA CRLs for client
@@ -159,8 +159,8 @@
@@ -148,8 +148,8 @@
# Note: Inside SSLCARevocationPath you need hash symlinks
# to point to the certificate files. Use the provided
# Makefile to update the hash symlinks after changes.
@ -96,7 +87,7 @@
# Client Authentication (Type):
# Client certificate verification type and depth. Types are
@@ -220,7 +220,7 @@
@@ -209,7 +209,7 @@
<Files ~ "\.(cgi|shtml|phtml|php3?)$">
SSLOptions +StdEnvVars
</Files>
@ -105,12 +96,12 @@
SSLOptions +StdEnvVars
</Directory>
@@ -255,7 +255,7 @@
@@ -244,7 +244,7 @@
# Per-Server Logging:
# The home of a custom SSL log file. Use this when you want a
# compact non-error SSL logfile on a virtual host basis.
-CustomLog logs/ssl_request_log \
+CustomLog @@DESTDIR@@/var/log/httpd-ssl_request.log \
+CustomLog /var/log/httpd-ssl_request.log \
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</VirtualHost>

49
www/apache21/files/patch-support:apxs.in
View File

@ -1,49 +0,0 @@
--- support/apxs.in.orig Tue Apr 30 03:09:02 2002
+++ support/apxs.in Wed May 8 19:41:06 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/apache2/config_vars.mk",\%config_vars);
my $exec_prefix = get_vars("exec_prefix");
my $CFG_TARGET = get_vars("progname");
@@ -223,7 +223,7 @@
my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
$httpd = eval qq("$httpd");
$httpd = eval qq("$httpd");
-my $envvars = get_vars("bindir") . "/envvars";
+my $envvars = get_vars("sbindir") . "/envvars";
$envvars = eval qq("$envvars");
$envvars = eval qq("$envvars");
@@ -418,7 +418,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/apache2/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
unshift(@objs, $lo);
}
@@ -443,7 +443,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/apache2/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
# execute the commands
&execute_cmds(@cmds);
@@ -474,8 +474,8 @@
$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/apache2/instdso.sh SH_LIBTOOL='" .
+ "$prefix/share/apache2/libtool' $f $CFG_LIBEXECDIR");
push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
}

12
www/apache21/files/patch-support:log_server_status.in
View File

@ -1,6 +1,6 @@
--- support/log_server_status.in.orig Thu Mar 14 05:48:06 2002
+++ support/log_server_status.in Sun Apr 7 08:47:53 2002
@@ -63,10 +63,10 @@
--- support/log_server_status.in.orig Tue Jun 18 23:21:53 2002
+++ support/log_server_status.in Tue Jun 18 23:23:08 2002
@@ -63,7 +63,7 @@
#
require 'sys/socket.ph';
@ -8,11 +8,7 @@
+$wherelog = "@logfiledir@/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log"
$server = "localhost"; # Name of server, could be "www.foo.com"
$port = "80"; # Port on server
-$request = "/status/?auto"; # Request to send
+$request = "/status-status/?auto"; # Request to send
sub tcp_connect
{
$request = "/status/?auto"; # Request to send
@@ -96,7 +96,7 @@
chomp($date);
($day,$time)=split(/:/,$date);

194
www/apache21/pkg-plist
View File

@ -62,6 +62,7 @@ include/apache2/apr_sha1.h
include/apache2/apr_shm.h
include/apache2/apr_signal.h
include/apache2/apr_strings.h
include/apache2/apr_strmatch.h
include/apache2/apr_tables.h
include/apache2/apr_thread_cond.h
include/apache2/apr_thread_mutex.h
@ -208,12 +209,15 @@ share/apache2/program.mk
share/apache2/rules.mk
share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/LICENSE
%%PORTDOCS%%share/doc/apache2/bind.html
%%PORTDOCS%%share/doc/apache2/cgi_path.html
%%PORTDOCS%%share/doc/apache2/bind.html.en
%%PORTDOCS%%share/doc/apache2/bind.html.ja.jis
%%PORTDOCS%%share/doc/apache2/cgi_path.html.en
%%PORTDOCS%%share/doc/apache2/cgi_path.html.ja.jis
%%PORTDOCS%%share/doc/apache2/configuring.html.en
%%PORTDOCS%%share/doc/apache2/configuring.html.ja.jis
%%PORTDOCS%%share/doc/apache2/content-negotiation.html
%%PORTDOCS%%share/doc/apache2/custom-error.html
%%PORTDOCS%%share/doc/apache2/custom-error.html.en
%%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
%%PORTDOCS%%share/doc/apache2/developer/API.html
%%PORTDOCS%%share/doc/apache2/developer/debugging.html
%%PORTDOCS%%share/doc/apache2/developer/documenting.html
@ -227,15 +231,19 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/developer/request.html
%%PORTDOCS%%share/doc/apache2/dns-caveats.html
%%PORTDOCS%%share/doc/apache2/dso.html
%%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/ebcdic.html
%%PORTDOCS%%share/doc/apache2/env.html
%%PORTDOCS%%share/doc/apache2/env.html.en
%%PORTDOCS%%share/doc/apache2/env.html.ja.jis
%%PORTDOCS%%share/doc/apache2/faq/index.html
%%PORTDOCS%%share/doc/apache2/filter.html
%%PORTDOCS%%share/doc/apache2/filter.html.en
%%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
%%PORTDOCS%%share/doc/apache2/footer.html
%%PORTDOCS%%share/doc/apache2/handler.html.en
%%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
%%PORTDOCS%%share/doc/apache2/header.html
%%PORTDOCS%%share/doc/apache2/howto/auth.html
%%PORTDOCS%%share/doc/apache2/howto/auth.html.en
%%PORTDOCS%%share/doc/apache2/howto/auth.html.ja.jis
%%PORTDOCS%%share/doc/apache2/howto/cgi.html.en
%%PORTDOCS%%share/doc/apache2/howto/cgi.html.ja.jis
%%PORTDOCS%%share/doc/apache2/howto/footer.html
@ -263,8 +271,11 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/index.html.en
%%PORTDOCS%%share/doc/apache2/index.html.fr
%%PORTDOCS%%share/doc/apache2/index.html.ja.jis
%%PORTDOCS%%share/doc/apache2/install.html
%%PORTDOCS%%share/doc/apache2/invoking.html
%%PORTDOCS%%share/doc/apache2/install.html.en
%%PORTDOCS%%share/doc/apache2/install.html.ja.jis
%%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/invoking.html.en
%%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis
%%PORTDOCS%%share/doc/apache2/logs.html
%%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html
%%PORTDOCS%%share/doc/apache2/misc/descriptors.html
@ -277,124 +288,136 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
%%PORTDOCS%%share/doc/apache2/misc/security_tips.html
%%PORTDOCS%%share/doc/apache2/misc/tutorials.html
%%PORTDOCS%%share/doc/apache2/mod/allmodules.html.en
%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml
%%PORTDOCS%%share/doc/apache2/mod/core.html
%%PORTDOCS%%share/doc/apache2/mod/core.html.en
%%PORTDOCS%%share/doc/apache2/mod/core.xml
%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html
%%PORTDOCS%%share/doc/apache2/mod/directives.html
%%PORTDOCS%%share/doc/apache2/mod/directives.html.en
%%PORTDOCS%%share/doc/apache2/mod/directives.xml
%%PORTDOCS%%share/doc/apache2/mod/footer.html
%%PORTDOCS%%share/doc/apache2/mod/header.html
%%PORTDOCS%%share/doc/apache2/mod/index-bytype.html
%%PORTDOCS%%share/doc/apache2/mod/index.html
%%PORTDOCS%%share/doc/apache2/mod/index.html.en
%%PORTDOCS%%share/doc/apache2/mod/index.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_TEMPLATE.html
%%PORTDOCS%%share/doc/apache2/mod/mod_access.html
%%PORTDOCS%%share/doc/apache2/mod/mod_access.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html
%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html
%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html
%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_ldap.html
%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html
%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cache.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cache.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cache.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html
%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html
%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_env.html
%%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_env.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_example.html
%%PORTDOCS%%share/doc/apache2/mod/mod_example.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_example.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_expires.html
%%PORTDOCS%%share/doc/apache2/mod/mod_expires.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_expires.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.html
%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.html
%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_headers.html
%%PORTDOCS%%share/doc/apache2/mod/mod_headers.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_headers.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_imap.html
%%PORTDOCS%%share/doc/apache2/mod/mod_imap.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_imap.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_include.html
%%PORTDOCS%%share/doc/apache2/mod/mod_include.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_include.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_info.html
%%PORTDOCS%%share/doc/apache2/mod/mod_info.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_info.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html
%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_ldap.html
%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html
%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_mime.html
%%PORTDOCS%%share/doc/apache2/mod/mod_mime.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_mime.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html
%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_mmap_static.html
%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html
%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html
%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html
%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html
%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_so.html
%%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_so.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html
%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html
%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_status.html
%%PORTDOCS%%share/doc/apache2/mod/mod_status.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_status.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.html
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html
%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
%%PORTDOCS%%share/doc/apache2/mod/module-dict.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
%%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html.en
%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.xml
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.en
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml
%%PORTDOCS%%share/doc/apache2/mod/perchild.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/perchild.html.en
%%PORTDOCS%%share/doc/apache2/mod/perchild.xml
%%PORTDOCS%%share/doc/apache2/mod/prefork.html
%%PORTDOCS%%share/doc/apache2/mod/prefork.html.en
%%PORTDOCS%%share/doc/apache2/mod/prefork.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/prefork.xml
%%PORTDOCS%%share/doc/apache2/mod/worker.html
%%PORTDOCS%%share/doc/apache2/mod/prefork.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/worker.html.en
%%PORTDOCS%%share/doc/apache2/mod/worker.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/worker.xml
%%PORTDOCS%%share/doc/apache2/mpm.html
%%PORTDOCS%%share/doc/apache2/mod/worker.xml.ja
%%PORTDOCS%%share/doc/apache2/mpm.html.en
%%PORTDOCS%%share/doc/apache2/mpm.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mpm.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.de
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.en
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.fr
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ja.jis
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/platform/footer.html
%%PORTDOCS%%share/doc/apache2/platform/header.html
%%PORTDOCS%%share/doc/apache2/platform/netware.html
@ -417,13 +440,15 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/programs/rotatelogs.html
%%PORTDOCS%%share/doc/apache2/programs/suexec.html
%%PORTDOCS%%share/doc/apache2/search/manual-index.cgi
%%PORTDOCS%%share/doc/apache2/sections.html
%%PORTDOCS%%share/doc/apache2/sections.html.en
%%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
%%PORTDOCS%%share/doc/apache2/server-wide.html.en
%%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
%%PORTDOCS%%share/doc/apache2/sitemap.html
%%PORTDOCS%%share/doc/apache2/ssl/footer.html
%%PORTDOCS%%share/doc/apache2/ssl/header.html
%%PORTDOCS%%share/doc/apache2/ssl/index.html
%%PORTDOCS%%share/doc/apache2/ssl/index.html.en
%%PORTDOCS%%share/doc/apache2/ssl/index.html.ja.jis
%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html
%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg
%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_title.jpg
@ -438,27 +463,36 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-000000.gif
%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
%%PORTDOCS%%share/doc/apache2/stopping.html
%%PORTDOCS%%share/doc/apache2/style/Makefile
%%PORTDOCS%%share/doc/apache2/style/build.sh
%%PORTDOCS%%share/doc/apache2/style/build.xml
%%PORTDOCS%%share/doc/apache2/style/common.xsl
%%PORTDOCS%%share/doc/apache2/style/en.xml
%%PORTDOCS%%share/doc/apache2/style/ja.xml
%%PORTDOCS%%share/doc/apache2/style/manual.css
%%PORTDOCS%%share/doc/apache2/style/manual.xsl
%%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
%%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
%%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
%%PORTDOCS%%share/doc/apache2/style/settings.xsl
%%PORTDOCS%%share/doc/apache2/style/sv.xml
%%PORTDOCS%%share/doc/apache2/suexec.html
%%PORTDOCS%%share/doc/apache2/suexec.html.en
%%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis
%%PORTDOCS%%share/doc/apache2/upgrading.html.en
%%PORTDOCS%%share/doc/apache2/upgrading.html.fr
%%PORTDOCS%%share/doc/apache2/upgrading.html.ja.jis
%%PORTDOCS%%share/doc/apache2/upgrading.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/urlmapping.html
%%PORTDOCS%%share/doc/apache2/vhosts/details.html
%%PORTDOCS%%share/doc/apache2/vhosts/examples.html
%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html
%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.ja.jis
%%PORTDOCS%%share/doc/apache2/vhosts/footer.html
%%PORTDOCS%%share/doc/apache2/vhosts/header.html
%%PORTDOCS%%share/doc/apache2/vhosts/index.html
%%PORTDOCS%%share/doc/apache2/vhosts/index.html.en
%%PORTDOCS%%share/doc/apache2/vhosts/index.html.ja.jis
%%PORTDOCS%%share/doc/apache2/vhosts/ip-based.html
%%PORTDOCS%%share/doc/apache2/vhosts/mass.html
%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html
%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.en
%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.ja.jis
@exec mkdir -p %D/www
@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
@ -485,9 +519,8 @@ www/data.default/index.html.he.iso8859-8
www/data.default/index.html.hr.iso8859-2
www/data.default/index.html.it
www/data.default/index.html.ja.iso2022-jp
www/data.default/index.html.kr.iso2022-kr
www/data.default/index.html.ltz.utf8
www/data.default/index.html.lu.utf8
www/data.default/index.html.ko.euc-kr
www/data.default/index.html.lb.utf8
www/data.default/index.html.nl
www/data.default/index.html.nn
www/data.default/index.html.no
@ -500,9 +533,8 @@ www/data.default/index.html.ru.iso-ru
www/data.default/index.html.ru.koi8-r
www/data.default/index.html.ru.utf8
www/data.default/index.html.se
www/data.default/index.html.tw
www/data.default/index.html.tw.Big5
www/data.default/index.html.var
www/data.default/index.html.zh
www/error/HTTP_BAD_GATEWAY.html.var
www/error/HTTP_BAD_REQUEST.html.var
www/error/HTTP_FORBIDDEN.html.var
@ -572,6 +604,8 @@ www/icons/continued.gif
www/icons/continued.png
www/icons/dir.gif
www/icons/dir.png
www/icons/diskimg.gif
www/icons/diskimg.png
www/icons/down.gif
www/icons/down.png
www/icons/dvi.gif
@ -771,5 +805,3 @@ www/icons/world2.png
@dirrm lib/apache2
@dirrm include/apache2
@dirrm etc/apache2
@exec [ -d %%DESTDIR%%/var/log ] || mkdir -p %%DESTDIR%%/var/log
@exec [ -d %%DESTDIR%%/var/run ] || mkdir -p %%DESTDIR%%/var/run

62
www/apache22/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= apache
PORTVERSION= 2.0.36
PORTVERSION= 2.0.39
PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
@ -23,33 +23,31 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= perky@fallin.lv
FORBIDDEN= "Vulnerable to denial-of-service. See" \
"http://httpd.apache.org/info/security_bulletin_20020617.txt"
LATEST_LINK= apache2
WITH_MPM?= prefork # or worker, perchild (neither of them still has a problem on FreeBSD)
WITH_MPM?= prefork
HTTP_PORT?= 80
GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
USE_PERL5= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-layout=FreeBSD \
--with-perl=${PERL5} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
--libdir=${PREFIX}/lib/apache2 \
--includedir=${PREFIX}/include/apache2
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}"
LDFLAGS="${LDFLAGS}" EXPAT_PATHS="${EXPAT_PATHS}"
SHARED_MODULES= all cgid ext_filter bucketeer
RC_SUB= -e 's,@@PREFIX@@,${PREFIX},g' -e 's,@@DESTDIR@@,${DESTDIR},g'
PREFIX_RELDEST= ${PREFIX:S,${DESTDIR},,}
RC_SUB= -e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
PLIST_SUB+= DESTDIR=${DESTDIR}
.if defined(NOPORTDOCS)
MAKE_ENV+= NOPORTDOCS=YES
MAKE_ENV+= -DNOPORTDOCS
.endif
.if defined(WITH_BUNDLED_EXPAT)
@ -57,14 +55,10 @@ EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat
PLIST_SUB+= EXPAT=""
.else
LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${EXPATLIBPATH}
EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,${DESTDIR},,}
PLIST_SUB+= EXPAT="@comment "
.endif
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
.endif
.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
SHARED_MODULES+= ssl
PLIST_SUB+= MODSSL=""
@ -75,16 +69,16 @@ RC_SUB+= -e 's,@@SSL@@,,g'
.endif
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX}/www/data
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
CONFIGURE_ARGS+= --enable-suexec \
--with-suexec-caller=www \
--with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
--with-suexec-userdir="${SUEXEC_USERDIR}" \
--with-suexec-docroot="${SUEXEC_DOCROOT}" \
--with-suexec-safepath="${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \
--with-suexec-logfile="${DESTDIR}/var/log/httpd-suexec.log" \
--with-suexec-bin="${PREFIX}/sbin/suexec"
--with-suexec-safepath="${PREFIX_RELDEST}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \
--with-suexec-logfile="/var/log/httpd-suexec.log" \
--with-suexec-bin="${PREFIX_RELDEST}/sbin/suexec"
PLIST_SUB+= SUEXEC=""
.else
PLIST_SUB+= SUEXEC="@comment "
@ -113,31 +107,37 @@ PLIST_SUB+= EXPERIMENTAL="@comment "
.if ${WITH_MPM} != "prefork"
PKGNAMESUFFIX= -${WITH_MPM}
.if !defined(WITH_THREADS)
IGNORE= "requires threads for ${WITH_MPM} mpm"
WITH_THREADS= yes
.if !defined(FORCE_THREADING_MPM)
FORBIDDEN= "doesn\'t work with threading MPMs on FreeBSD. If you are \
brave enough, make again with -DFORCE_THREADING_MPM"
.endif
.endif
CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
.if defined(WITH_THREADS)
CONFIGURE_ARGS+= --enable-threads
.endif
CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}" ${CONFIGURE_TARGET}
MAN1= dbmmanage.1 htdigest.1 htpasswd.1
MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
.include <bsd.port.pre.mk>
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 \
${REINPLACE_CMD} -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 {} \;
@${PERL} -pi -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,\$${EXPAT_PATHS},g' \
${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
pre-install:
PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
@ -147,7 +147,5 @@ post-install:
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
fi
@[ -d ${DESTDIR}/var/log ] || ${MKDIR} ${DESTDIR}/var/log
@[ -d ${DESTDIR}/var/run ] || ${MKDIR} ${DESTDIR}/var/run
.include <bsd.port.post.mk>
.include <bsd.port.mk>

2
www/apache22/distinfo
View File

@ -1,2 +1,2 @@
MD5 (httpd-2.0.36.tar.gz) = dc80f22608bccba6c49e1fe9f12f51c8
MD5 (httpd-2.0.39.tar.gz) = b821c6babca68b4859b9ba38d1b345af
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62

2
www/apache22/files/apache.sh
View File

@ -7,7 +7,7 @@ start)
[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && echo -n ' apache2'
;;
stop)
[ -r @@DESTDIR@@/var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2

2
www/apache22/files/config.layout
View File

@ -14,7 +14,7 @@
manualdir: ${prefix}/share/doc/apache2
cgidir: ${datadir}/cgi-bin
includedir: ${prefix}/include/apache2
localstatedir: @@DESTDIR@@/var
localstatedir: /var
runtimedir: ${localstatedir}/run
logfiledir: ${localstatedir}/log
proxycachedir: ${datadir}/proxy

77
www/apache22/files/patch-Makefile.in
View File

@ -1,13 +1,13 @@
--- Makefile.in.orig Sun Apr 28 16:41:25 2002
+++ Makefile.in Tue May 7 19:05:12 2002
@@ -33,23 +33,27 @@
@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
--- Makefile.in.orig Sat Jun 15 18:41:03 2002
+++ Makefile.in Tue Jun 18 22:37:19 2002
@@ -31,12 +31,14 @@
@test -d $(DESTDIR)$(sysconfdir) || $(MKINSTALLDIRS) $(DESTDIR)$(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); \
- $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ test -f $(DESTDIR)$(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ cp -f $$i $$i.default; \
+ $(INSTALL_DATA) $$i.default $(sysconfdir); \
+ $(INSTALL_DATA) $$i.default $(DESTDIR)$(sysconfdir); \
done; \
for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
cd $$j ; \
@ -17,58 +17,35 @@
( \
n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
sed -e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
+ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
-e '/@@LoadModule@@/d' \
< $$i; \
else \
sed -n -e '/@@LoadModule@@/q' \
-e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
+ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
-e 'p' \
< $$i; \
for j in $(DSO_MODULES) "^EOL^"; do \
@@ -57,7 +61,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,12 +110,14 @@
@@ -104,11 +106,14 @@
install-htdocs:
@echo Installing HTML documents
- @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
+ @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)
- @test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)
- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir))
+ @test -d $(DESTDIR)$(htdocsdir).default || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir).default
+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir).default)
+ @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir).default $(DESTDIR)$(htdocsdir)
+.if !defined(NOPORTDOCS)
@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
- @test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;
-
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
- -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf
+.endif
+ @test "x$(htdocsdir)" != "x" && cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;
+ -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf
install-error:
@echo Installing error documents
@test -d $(errordir) || $(MKINSTALLDIRS) $(errordir)
@@ -126,9 +132,10 @@
@@ -124,9 +129,10 @@
install-cgi:
@echo Installing CGIs
- @test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
- @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir)
- @test "x$(cgidir)" != "x" && cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;
+ @test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
+ @(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir).default)
+ @test -e $(cgidir) || ln -sf $(cgidir).default $(cgidir)
+ @test "x$(cgidir)" != "x" && cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;
- @test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)
- @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)
- -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf
+ @test -d $(DESTDIR)$(cgidir).default || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir).default
+ @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir).default
+ @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir).default $(DESTDIR)$(cgidir)
+ -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir).default && find . -name "CVS" -print | xargs rm -rf
install-other:
@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)

47
www/apache22/files/patch-docs:conf:ssl-std.conf
View File

@ -1,5 +1,5 @@
--- docs/conf/ssl-std.conf.orig Thu Nov 8 07:16:09 2001
+++ docs/conf/ssl-std.conf Sun Apr 7 09:26:02 2002
--- docs/conf/ssl-std.conf.orig Fri May 17 04:05:24 2002
+++ docs/conf/ssl-std.conf Tue Jun 18 23:15:32 2002
@@ -55,15 +55,15 @@
# Configure the SSL Session Cache: First the mechanism
# to use and second the expiring timeout (in seconds).
@ -7,29 +7,20 @@
-#SSLSessionCache shmht:logs/ssl_scache(512000)
-#SSLSessionCache shmcb:logs/ssl_scache(512000)
-SSLSessionCache dbm:logs/ssl_scache
+#SSLSessionCache shmht:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
+#SSLSessionCache shmcb:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
+SSLSessionCache dbm:@@DESTDIR@@/var/log/httpd-ssl_scache
+#SSLSessionCache shmht:/var/log/httpd-ssl_scache(512000)
+#SSLSessionCache shmcb:/var/log/httpd-ssl_scache(512000)
+SSLSessionCache dbm:/var/log/httpd-ssl_scache
SSLSessionCacheTimeout 300
# Semaphore:
# Configure the path to the mutual exclusion semaphore the
# SSL engine uses internally for inter-process synchronization.
-SSLMutex file:logs/ssl_mutex
+SSLMutex file:@@DESTDIR@@/var/log/httpd-ssl_mutex
+SSLMutex file:/var/log/httpd-ssl_mutex
# Pseudo Random Number Generator (PRNG):
# Configure one or more sources to seed the PRNG of the
@@ -89,7 +89,7 @@
# a real server (i.e. somewhere where only root can write).
# Log levels are (ascending order: higher ones include lower ones):
# none, error, warn, info, trace, debug.
-SSLLog logs/ssl_engine_log
+SSLLog @@DESTDIR@@/var/log/httpd-ssl_engine_log
SSLLogLevel info
##
@@ -99,11 +99,11 @@
@@ -89,11 +89,11 @@
<VirtualHost _default_:443>
# General setup for the virtual host
@ -39,15 +30,15 @@
ServerAdmin you@your.address
-ErrorLog logs/error_log
-TransferLog logs/access_log
+ErrorLog @@DESTDIR@@/var/log/httpd-error.log
+TransferLog @@DESTDIR@@/var/log/httpd-access.log
+ErrorLog /var/log/httpd-error.log
+TransferLog /var/log/httpd-access.log
# SSL Engine Switch:
# Enable/Disable SSL for this virtual host.
@@ -122,16 +122,16 @@
# built time. Keep in mind that if you've both a RSA and a DSA
# certificate you can configure both in parallel (to also allow
# the use of DSA ciphers, etc.)
@@ -111,16 +111,16 @@
# in mind that if you have both an RSA and a DSA certificate you
# can configure both in parallel (to also allow the use of DSA
# ciphers, etc.)
-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
+SSLCertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/server.crt
@ -65,7 +56,7 @@
# Server Certificate Chain:
# Point SSLCertificateChainFile at a file containing the
@@ -140,7 +140,7 @@
@@ -129,7 +129,7 @@
# the referenced file can be the same as SSLCertificateFile
# when the CA certificates are directly appended to the server
# certificate for convinience.
@ -74,7 +65,7 @@
# Certificate Authority (CA):
# Set the CA certificate verification path where to find CA
@@ -149,8 +149,8 @@
@@ -138,8 +138,8 @@
# Note: Inside SSLCACertificatePath you need hash symlinks
# to point to the certificate files. Use the provided
# Makefile to update the hash symlinks after changes.
@ -85,7 +76,7 @@
# Certificate Revocation Lists (CRL):
# Set the CA revocation path where to find CA CRLs for client
@@ -159,8 +159,8 @@
@@ -148,8 +148,8 @@
# Note: Inside SSLCARevocationPath you need hash symlinks
# to point to the certificate files. Use the provided
# Makefile to update the hash symlinks after changes.
@ -96,7 +87,7 @@
# Client Authentication (Type):
# Client certificate verification type and depth. Types are
@@ -220,7 +220,7 @@
@@ -209,7 +209,7 @@
<Files ~ "\.(cgi|shtml|phtml|php3?)$">
SSLOptions +StdEnvVars
</Files>
@ -105,12 +96,12 @@
SSLOptions +StdEnvVars
</Directory>
@@ -255,7 +255,7 @@
@@ -244,7 +244,7 @@
# Per-Server Logging:
# The home of a custom SSL log file. Use this when you want a
# compact non-error SSL logfile on a virtual host basis.
-CustomLog logs/ssl_request_log \
+CustomLog @@DESTDIR@@/var/log/httpd-ssl_request.log \
+CustomLog /var/log/httpd-ssl_request.log \
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</VirtualHost>

49
www/apache22/files/patch-support:apxs.in
View File

@ -1,49 +0,0 @@
--- support/apxs.in.orig Tue Apr 30 03:09:02 2002
+++ support/apxs.in Wed May 8 19:41:06 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/apache2/config_vars.mk",\%config_vars);
my $exec_prefix = get_vars("exec_prefix");
my $CFG_TARGET = get_vars("progname");
@@ -223,7 +223,7 @@
my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
$httpd = eval qq("$httpd");
$httpd = eval qq("$httpd");
-my $envvars = get_vars("bindir") . "/envvars";
+my $envvars = get_vars("sbindir") . "/envvars";
$envvars = eval qq("$envvars");
$envvars = eval qq("$envvars");
@@ -418,7 +418,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/apache2/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
unshift(@objs, $lo);
}
@@ -443,7 +443,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/apache2/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
# execute the commands
&execute_cmds(@cmds);
@@ -474,8 +474,8 @@
$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/apache2/instdso.sh SH_LIBTOOL='" .
+ "$prefix/share/apache2/libtool' $f $CFG_LIBEXECDIR");
push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
}

12
www/apache22/files/patch-support:log_server_status.in
View File

@ -1,6 +1,6 @@
--- support/log_server_status.in.orig Thu Mar 14 05:48:06 2002
+++ support/log_server_status.in Sun Apr 7 08:47:53 2002
@@ -63,10 +63,10 @@
--- support/log_server_status.in.orig Tue Jun 18 23:21:53 2002
+++ support/log_server_status.in Tue Jun 18 23:23:08 2002
@@ -63,7 +63,7 @@
#
require 'sys/socket.ph';
@ -8,11 +8,7 @@
+$wherelog = "@logfiledir@/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log"
$server = "localhost"; # Name of server, could be "www.foo.com"
$port = "80"; # Port on server
-$request = "/status/?auto"; # Request to send
+$request = "/status-status/?auto"; # Request to send
sub tcp_connect
{
$request = "/status/?auto"; # Request to send
@@ -96,7 +96,7 @@
chomp($date);
($day,$time)=split(/:/,$date);

194
www/apache22/pkg-plist
View File

@ -62,6 +62,7 @@ include/apache2/apr_sha1.h
include/apache2/apr_shm.h
include/apache2/apr_signal.h
include/apache2/apr_strings.h
include/apache2/apr_strmatch.h
include/apache2/apr_tables.h
include/apache2/apr_thread_cond.h
include/apache2/apr_thread_mutex.h
@ -208,12 +209,15 @@ share/apache2/program.mk
share/apache2/rules.mk
share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/LICENSE
%%PORTDOCS%%share/doc/apache2/bind.html
%%PORTDOCS%%share/doc/apache2/cgi_path.html
%%PORTDOCS%%share/doc/apache2/bind.html.en
%%PORTDOCS%%share/doc/apache2/bind.html.ja.jis
%%PORTDOCS%%share/doc/apache2/cgi_path.html.en
%%PORTDOCS%%share/doc/apache2/cgi_path.html.ja.jis
%%PORTDOCS%%share/doc/apache2/configuring.html.en
%%PORTDOCS%%share/doc/apache2/configuring.html.ja.jis
%%PORTDOCS%%share/doc/apache2/content-negotiation.html
%%PORTDOCS%%share/doc/apache2/custom-error.html
%%PORTDOCS%%share/doc/apache2/custom-error.html.en
%%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
%%PORTDOCS%%share/doc/apache2/developer/API.html
%%PORTDOCS%%share/doc/apache2/developer/debugging.html
%%PORTDOCS%%share/doc/apache2/developer/documenting.html
@ -227,15 +231,19 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/developer/request.html
%%PORTDOCS%%share/doc/apache2/dns-caveats.html
%%PORTDOCS%%share/doc/apache2/dso.html
%%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/ebcdic.html
%%PORTDOCS%%share/doc/apache2/env.html
%%PORTDOCS%%share/doc/apache2/env.html.en
%%PORTDOCS%%share/doc/apache2/env.html.ja.jis
%%PORTDOCS%%share/doc/apache2/faq/index.html
%%PORTDOCS%%share/doc/apache2/filter.html
%%PORTDOCS%%share/doc/apache2/filter.html.en
%%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
%%PORTDOCS%%share/doc/apache2/footer.html
%%PORTDOCS%%share/doc/apache2/handler.html.en
%%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
%%PORTDOCS%%share/doc/apache2/header.html
%%PORTDOCS%%share/doc/apache2/howto/auth.html
%%PORTDOCS%%share/doc/apache2/howto/auth.html.en
%%PORTDOCS%%share/doc/apache2/howto/auth.html.ja.jis
%%PORTDOCS%%share/doc/apache2/howto/cgi.html.en
%%PORTDOCS%%share/doc/apache2/howto/cgi.html.ja.jis
%%PORTDOCS%%share/doc/apache2/howto/footer.html
@ -263,8 +271,11 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/index.html.en
%%PORTDOCS%%share/doc/apache2/index.html.fr
%%PORTDOCS%%share/doc/apache2/index.html.ja.jis
%%PORTDOCS%%share/doc/apache2/install.html
%%PORTDOCS%%share/doc/apache2/invoking.html
%%PORTDOCS%%share/doc/apache2/install.html.en
%%PORTDOCS%%share/doc/apache2/install.html.ja.jis
%%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/invoking.html.en
%%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis
%%PORTDOCS%%share/doc/apache2/logs.html
%%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html
%%PORTDOCS%%share/doc/apache2/misc/descriptors.html
@ -277,124 +288,136 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
%%PORTDOCS%%share/doc/apache2/misc/security_tips.html
%%PORTDOCS%%share/doc/apache2/misc/tutorials.html
%%PORTDOCS%%share/doc/apache2/mod/allmodules.html.en
%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml
%%PORTDOCS%%share/doc/apache2/mod/core.html
%%PORTDOCS%%share/doc/apache2/mod/core.html.en
%%PORTDOCS%%share/doc/apache2/mod/core.xml
%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html
%%PORTDOCS%%share/doc/apache2/mod/directives.html
%%PORTDOCS%%share/doc/apache2/mod/directives.html.en
%%PORTDOCS%%share/doc/apache2/mod/directives.xml
%%PORTDOCS%%share/doc/apache2/mod/footer.html
%%PORTDOCS%%share/doc/apache2/mod/header.html
%%PORTDOCS%%share/doc/apache2/mod/index-bytype.html
%%PORTDOCS%%share/doc/apache2/mod/index.html
%%PORTDOCS%%share/doc/apache2/mod/index.html.en
%%PORTDOCS%%share/doc/apache2/mod/index.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_TEMPLATE.html
%%PORTDOCS%%share/doc/apache2/mod/mod_access.html
%%PORTDOCS%%share/doc/apache2/mod/mod_access.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html
%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html
%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html
%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_auth_ldap.html
%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html
%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cache.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cache.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cache.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html
%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html
%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html
%%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html
%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_env.html
%%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_env.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_example.html
%%PORTDOCS%%share/doc/apache2/mod/mod_example.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_example.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_expires.html
%%PORTDOCS%%share/doc/apache2/mod/mod_expires.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_expires.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.html
%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.html
%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_headers.html
%%PORTDOCS%%share/doc/apache2/mod/mod_headers.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_headers.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_imap.html
%%PORTDOCS%%share/doc/apache2/mod/mod_imap.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_imap.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_include.html
%%PORTDOCS%%share/doc/apache2/mod/mod_include.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_include.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_info.html
%%PORTDOCS%%share/doc/apache2/mod/mod_info.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_info.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html
%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_ldap.html
%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html
%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_mime.html
%%PORTDOCS%%share/doc/apache2/mod/mod_mime.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_mime.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html
%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_mmap_static.html
%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html
%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html
%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html
%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html
%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_so.html
%%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_so.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html
%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html
%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_status.html
%%PORTDOCS%%share/doc/apache2/mod/mod_status.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_status.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html
%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.html
%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.xml
%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html
%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html.en
%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
%%PORTDOCS%%share/doc/apache2/mod/module-dict.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
%%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html.en
%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.xml
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.en
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml
%%PORTDOCS%%share/doc/apache2/mod/perchild.html
%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/perchild.html.en
%%PORTDOCS%%share/doc/apache2/mod/perchild.xml
%%PORTDOCS%%share/doc/apache2/mod/prefork.html
%%PORTDOCS%%share/doc/apache2/mod/prefork.html.en
%%PORTDOCS%%share/doc/apache2/mod/prefork.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/prefork.xml
%%PORTDOCS%%share/doc/apache2/mod/worker.html
%%PORTDOCS%%share/doc/apache2/mod/prefork.xml.ja
%%PORTDOCS%%share/doc/apache2/mod/worker.html.en
%%PORTDOCS%%share/doc/apache2/mod/worker.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mod/worker.xml
%%PORTDOCS%%share/doc/apache2/mpm.html
%%PORTDOCS%%share/doc/apache2/mod/worker.xml.ja
%%PORTDOCS%%share/doc/apache2/mpm.html.en
%%PORTDOCS%%share/doc/apache2/mpm.html.ja.jis
%%PORTDOCS%%share/doc/apache2/mpm.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.de
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.en
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.fr
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ja.jis
%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/platform/footer.html
%%PORTDOCS%%share/doc/apache2/platform/header.html
%%PORTDOCS%%share/doc/apache2/platform/netware.html
@ -417,13 +440,15 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/programs/rotatelogs.html
%%PORTDOCS%%share/doc/apache2/programs/suexec.html
%%PORTDOCS%%share/doc/apache2/search/manual-index.cgi
%%PORTDOCS%%share/doc/apache2/sections.html
%%PORTDOCS%%share/doc/apache2/sections.html.en
%%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
%%PORTDOCS%%share/doc/apache2/server-wide.html.en
%%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
%%PORTDOCS%%share/doc/apache2/sitemap.html
%%PORTDOCS%%share/doc/apache2/ssl/footer.html
%%PORTDOCS%%share/doc/apache2/ssl/header.html
%%PORTDOCS%%share/doc/apache2/ssl/index.html
%%PORTDOCS%%share/doc/apache2/ssl/index.html.en
%%PORTDOCS%%share/doc/apache2/ssl/index.html.ja.jis
%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html
%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg
%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_title.jpg
@ -438,27 +463,36 @@ share/apache2/special.mk
%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-000000.gif
%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
%%PORTDOCS%%share/doc/apache2/stopping.html
%%PORTDOCS%%share/doc/apache2/style/Makefile
%%PORTDOCS%%share/doc/apache2/style/build.sh
%%PORTDOCS%%share/doc/apache2/style/build.xml
%%PORTDOCS%%share/doc/apache2/style/common.xsl
%%PORTDOCS%%share/doc/apache2/style/en.xml
%%PORTDOCS%%share/doc/apache2/style/ja.xml
%%PORTDOCS%%share/doc/apache2/style/manual.css
%%PORTDOCS%%share/doc/apache2/style/manual.xsl
%%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
%%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
%%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
%%PORTDOCS%%share/doc/apache2/style/settings.xsl
%%PORTDOCS%%share/doc/apache2/style/sv.xml
%%PORTDOCS%%share/doc/apache2/suexec.html
%%PORTDOCS%%share/doc/apache2/suexec.html.en
%%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis
%%PORTDOCS%%share/doc/apache2/upgrading.html.en
%%PORTDOCS%%share/doc/apache2/upgrading.html.fr
%%PORTDOCS%%share/doc/apache2/upgrading.html.ja.jis
%%PORTDOCS%%share/doc/apache2/upgrading.html.ko.euc-kr
%%PORTDOCS%%share/doc/apache2/urlmapping.html
%%PORTDOCS%%share/doc/apache2/vhosts/details.html
%%PORTDOCS%%share/doc/apache2/vhosts/examples.html
%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html
%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.ja.jis
%%PORTDOCS%%share/doc/apache2/vhosts/footer.html
%%PORTDOCS%%share/doc/apache2/vhosts/header.html
%%PORTDOCS%%share/doc/apache2/vhosts/index.html
%%PORTDOCS%%share/doc/apache2/vhosts/index.html.en
%%PORTDOCS%%share/doc/apache2/vhosts/index.html.ja.jis
%%PORTDOCS%%share/doc/apache2/vhosts/ip-based.html
%%PORTDOCS%%share/doc/apache2/vhosts/mass.html
%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html
%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.en
%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.ja.jis
@exec mkdir -p %D/www
@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
@ -485,9 +519,8 @@ www/data.default/index.html.he.iso8859-8
www/data.default/index.html.hr.iso8859-2
www/data.default/index.html.it
www/data.default/index.html.ja.iso2022-jp
www/data.default/index.html.kr.iso2022-kr
www/data.default/index.html.ltz.utf8
www/data.default/index.html.lu.utf8
www/data.default/index.html.ko.euc-kr
www/data.default/index.html.lb.utf8
www/data.default/index.html.nl
www/data.default/index.html.nn
www/data.default/index.html.no
@ -500,9 +533,8 @@ www/data.default/index.html.ru.iso-ru
www/data.default/index.html.ru.koi8-r
www/data.default/index.html.ru.utf8
www/data.default/index.html.se
www/data.default/index.html.tw
www/data.default/index.html.tw.Big5
www/data.default/index.html.var
www/data.default/index.html.zh
www/error/HTTP_BAD_GATEWAY.html.var
www/error/HTTP_BAD_REQUEST.html.var
www/error/HTTP_FORBIDDEN.html.var
@ -572,6 +604,8 @@ www/icons/continued.gif
www/icons/continued.png
www/icons/dir.gif
www/icons/dir.png
www/icons/diskimg.gif
www/icons/diskimg.png
www/icons/down.gif
www/icons/down.png
www/icons/dvi.gif
@ -771,5 +805,3 @@ www/icons/world2.png
@dirrm lib/apache2
@dirrm include/apache2
@dirrm etc/apache2
@exec [ -d %%DESTDIR%%/var/log ] || mkdir -p %%DESTDIR%%/var/log
@exec [ -d %%DESTDIR%%/var/run ] || mkdir -p %%DESTDIR%%/var/run