import pkgsrc/www/apache into pkgsrc/www/apache6,

to make a IPv6-ready version of apache package.

18 files changed, 861 insertions, 0 deletions

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
new file mode 100644
index 00000000000..4571053b920
--- /dev/null
+++ b/www/apache6/Makefile
@@ -0,0 +1,104 @@
+# $NetBSD: Makefile,v 1.1.1.1 1999/07/23 17:53:29 itojun Exp $
+#
+# The fourth number in the PKGNAME version indicates a NetBSD pkg revision
+# (to indicate changes in the shipped third party patches such as the mod_ssl
+# EAPI when there has been no change to the Apache version number).
+#
+# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
+# code hooks that allow mod_ssl to be compiled separately later, if desired).
+#
+
+DISTNAME=		apache_1.3.6
+PKGNAME=		apache-1.3.6p0
+CATEGORIES=		www
+MASTER_SITES=		http://www.apache.org/dist/ \
+			ftp://ftp.modssl.org/source/ \
+			http://www.netbsd.org/images/logos/
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
+			${SSL_DISTNAME}${EXTRACT_SUFX} \
+			sitedrivenby.gif
+
+MAINTAINER=		cjs@netbsd.org
+HOMEPAGE=		http://www.apache.org/
+
+CONFLICTS=		apache-*modssl-*
+
+SSL_DISTNAME=		mod_ssl-2.2.8-1.3.6
+
+EXTRACT_ONLY=		${DISTFILES:N*.gif}
+HAS_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \
+			--runtimedir=/var/run --datadir=${PREFIX}/share/httpd \
+			--logfiledir=/var/log/httpd --sysconfdir=${PREFIX}/etc/httpd \
+			--proxycachedir=/var/spool/httpd/proxy \
+			--includedir=${PREFIX}/include/httpd \
+			--sbindir=${PREFIX}/sbin \
+			--enable-rule=EAPI --enable-module=most \
+			--disable-module=ssl --enable-module=auth_db \
+			--disable-module=auth_dbm \
+			--with-perl=${PREFIX}/bin/perl
+CONFIGURE_ENV+=		OPTIM="${OPTIM}"
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
+CONFIGURE_ARGS+=	--enable-suexec --suexec-caller=www \
+			--suexec-safepath='/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin'
+.endif
+
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
+CONFIGURE_ARGS+=	--disable-rule=STATUS
+OPTIM+=			-DBUFFERED_LOGS
+CFLAGS+=		-O6 -fomit-frame-pointer -fexpensive-optimizations
+.endif
+
+PLIST_SRC=		${WRKDIR}/PLIST
+
+# Note that there is NO static compile module hook here.  This is intentional.
+# Under Apache 1.3, modules can be compiled to link dynamically to the server
+# using the "apxs" program.  See apxs(8).
+
+post-extract:
+	@${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include/
+	@${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.c ${WRKSRC}/src/ap/
+	@${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.h ${WRKSRC}/src/include/
+
+pre-patch:
+	@cd ${WRKSRC} && ${CAT} \
+		../${SSL_DISTNAME}/pkg.eapi/eapi.patch \
+		../${SSL_DISTNAME}/pkg.sslcfg/sslcfg.patch \
+		../${SSL_DISTNAME}/pkg.sslmod/sslmod.patch \
+		../${SSL_DISTNAME}/pkg.sslsup/sslsup.patch \
+		| ${PATCH} ${PATCH_ARGS}
+	@cd ${WRKSRC} && tail +129 \
+		../${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \
+		| ${PATCH} ${PATCH_ARGS}
+
+post-patch:
+	@find ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM}
+
+post-build:
+	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/apache.sh \
+	  >${WRKDIR}/apache.sh
+
+post-install:
+	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif \
+	  ${PREFIX}/share/httpd/htdocs
+	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh
+	@${MV} ${PREFIX}/lib/httpd/libproxy.so \
+	  ${PREFIX}/lib/httpd/mod_proxy.so 2>/dev/null || \
+	  ${MKDIR} ${PREFIX}/lib/httpd
+	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+.for FILE in man/man8/suexec.8 sbin/suexec
+	@if [ -e ${PREFIX}/${FILE} ]; then \
+	  ${ECHO} ${FILE} >>${PLIST_SRC}; \
+	fi
+.endfor
+
+.include "../../mk/bsd.pkg.mk"
+
+.if !defined(NOPIC)
+CONFIGURE_ARGS+=	--enable-module=so --enable-shared=proxy
+.else
+CONFIGURE_ARGS+=	--disable-module=proxy
+.endif
diff --git a/www/apache6/files/ap_include_extern.h b/www/apache6/files/ap_include_extern.h
new file mode 100644
index 00000000000..02ff7fac6b3
--- /dev/null
+++ b/www/apache6/files/ap_include_extern.h
@@ -0,0 +1,83 @@
+/* $NetBSD: ap_include_extern.h,v 1.1.1.1 1999/07/23 17:53:29 itojun Exp $ */
+/* ====================================================================
+ * Copyright (c) 1998 The Apache Group.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Apache Group
+ *    for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * 4. The names "Apache Server" and "Apache Group" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Apache Group
+ *    for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Group and was originally based
+ * on public domain software written at the National Center for
+ * Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ * For more information on the Apache Group and the Apache HTTP server
+ * project, please see <http://www.apache.org/>.
+ *
+ */
+
+#ifndef AP_INCLUDE_EXTERN_H
+#define AP_INCLUDE_EXTERN_H
+
+/*
+ * XSSI extensibility hooks.
+ *
+ * This allows other modules to "hook" themselves into the Apache XSSI
+ * (mod_include) handler list without requiring modification to the
+ * mod_include source code.
+ */
+
+typedef int (*ap_include_extern_func)(FILE *fp, request_rec *r,
+				      const char *error, const char *timefmt);
+
+/* The const char * argument is the command word used to find this hook. */
+API_EXPORT(int) ap_include_register_extern(const char *, ap_include_extern_func);
+
+/* Formerly a static "get_tag()" in mod_include.c */
+API_EXPORT(char *) ap_include_get_tag(pool *, FILE *, char *, int, int);
+
+/* Formerly a static "parse_string()" in mod_include.c */
+API_EXPORT(void) ap_include_parse_string(request_rec *, const char *,
+					 char *, size_t, int);
+
+#endif
diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh
new file mode 100644
index 00000000000..6ea2b2567cb
--- /dev/null
+++ b/www/apache6/files/apache.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $NetBSD: apache.sh,v 1.1.1.1 1999/07/23 17:53:29 itojun Exp $
+#
+if [ -x @PREFIX@/sbin/httpd -a -f @PREFIX@/etc/httpd/httpd.conf ]
+then
+ @PREFIX@/sbin/apachectl start >/dev/null
+ echo -n ' apache'
+fi
+exit 0
diff --git a/www/apache6/files/md5 b/www/apache6/files/md5
new file mode 100644
index 00000000000..cd3a8787e56
--- /dev/null
+++ b/www/apache6/files/md5
@@ -0,0 +1,5 @@
+$NetBSD: md5,v 1.1.1.1 1999/07/23 17:53:29 itojun Exp $
+
+MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
+MD5 (mod_ssl-2.2.8-1.3.6.tar.gz) = 0aaf0ff78d38cc53ad10fe73cc42a0f5
+MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
diff --git a/www/apache6/files/patch-sum b/www/apache6/files/patch-sum
new file mode 100644
index 00000000000..885e874e36f
--- /dev/null
+++ b/www/apache6/files/patch-sum
@@ -0,0 +1,12 @@
+$NetBSD: patch-sum,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+MD5 (patch-aa) = 94caf42a041fc6d4d92eeffdb4492543
+MD5 (patch-ab) = 4b835238ed8e929366119786655a0ffc
+MD5 (patch-ae) = 2cd742f756f4cf2b9aa420ece607b069
+MD5 (patch-af) = cefef0d44750fcb5a32c893c9b33a3c2
+MD5 (patch-ag) = 05d7657a8048c3d64ce4843af547479b
+MD5 (patch-ah) = c3e3a232e0c5028a15dea4473bf39955
+MD5 (patch-aj) = e4878583ffc2957e50c25d3d22d1d4db
+MD5 (patch-ak) = 789f4a45ea6f9ee5b739db378326b3de
+MD5 (patch-al) = 392b4228824401ad7d1676d2054fa1d6
+MD5 (patch-am) = 0c970f2338262248f41fcd8ebfde0bce
diff --git a/www/apache6/patches/patch-aa b/www/apache6/patches/patch-aa
new file mode 100644
index 00000000000..ef599868f6b
--- /dev/null
+++ b/www/apache6/patches/patch-aa
@@ -0,0 +1,72 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- Makefile.tmpl.orig	Fri May  7 09:49:05 1999
++++ Makefile.tmpl	Fri May  7 09:52:16 1999
+@@ -114,7 +114,7 @@
+ datadir         = @datadir@
+ iconsdir        = $(datadir)/icons
+ htdocsdir       = $(datadir)/htdocs
+-cgidir          = $(datadir)/cgi-bin
++cgidir          = $(prefix)/libexec/cgi-bin
+ includedir      = @includedir@
+ localstatedir   = @localstatedir@
+ runtimedir      = @runtimedir@
+@@ -344,34 +344,6 @@
+ 			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
+ 			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
+ 			$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
+-			name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \
+-			if [ ".$$name" = .ssl_module ]; then \
+-				echo "<IfDefine SSL>" >>$(SRC)/.apaci.install.conf; \
+-			fi; \
+-			echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \
+-			modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \
+-			if [ ".$$name" = .ssl_module ]; then \
+-				echo "</IfDefine>" >>$(SRC)/.apaci.install.conf; \
+-			fi; \
+-		done; \
+-		echo "" >>$(SRC)/.apaci.install.conf; \
+-		echo "#  Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \
+-		echo "#  (static and shared ones) to achieve correct module execution order." >>$(SRC)/.apaci.install.conf; \
+-		echo "#  [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \
+-		echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \
+-		for mod in `egrep "^[ 	]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\
+-		            sed	-e 's:[ 	]*SharedModule::' \
+-		                -e 's:[ 	]*AddModule::' \
+-		                -e 's:modules/[^/]*/::' \
+-		                -e 's:[ 	]lib: mod_:' \
+-		                -e 's:\.[soam]*$$:.c:'`; do \
+-			if [ ".$$mod" = .mod_ssl.c ]; then \
+-				echo "<IfDefine SSL>" >>$(SRC)/.apaci.install.conf; \
+-			fi; \
+-			echo "AddModule $$mod" >>$(SRC)/.apaci.install.conf; \
+-			if [ ".$$mod" = .mod_ssl.c ]; then \
+-				echo "</IfDefine>" >>$(SRC)/.apaci.install.conf; \
+-			fi; \
+ 		done; \
+ 	fi
+ 	@echo "<=== [programs]"
+@@ -453,12 +425,13 @@
+ 		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+ 		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
+ 	fi
+-	-@if [ -f $(root)$(cgidir)/printenv ]; then \
++	-@if false; then \
+ 		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+ 	else \
+ 		for script in printenv test-cgi; do \
+ 			cat $(TOP)/cgi-bin/$${script} |\
+ 			sed -e 's;^#!/.*perl;#!$(PERL);' \
++			-e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
+ 			> $(TOP)/$(SRC)/.apaci.install.tmp; \
+ 			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
+ 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
+@@ -475,7 +448,7 @@
+ #   and initial config files while preserving existing ones.
+ install-config:
+ 	@echo "===> [config: Installing Apache configuration files]"
+-	-@for conf in httpd.conf access.conf srm.conf; do \
++	-@for conf in httpd.conf; do \
+ 		if [ .$$conf = .httpd.conf ]; then \
+ 			target_conf="$(TARGET).conf"; \
+ 		else \
diff --git a/www/apache6/patches/patch-ab b/www/apache6/patches/patch-ab
new file mode 100644
index 00000000000..3aa29ae1745
--- /dev/null
+++ b/www/apache6/patches/patch-ab
@@ -0,0 +1,34 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- htdocs/index.html.orig	Wed May 20 10:59:42 1998
++++ htdocs/index.html	Thu Dec  3 09:48:59 1998
+@@ -38,14 +38,26 @@
+   <A
+    HREF="manual/index.html"
+   >documentation</A>
+-  has been included with this distribution.
++  has been included with this distribution.<BR>
++  If the <STRONG>mod_ssl</STRONG> SSL extension has been installed, read the
++  <A
++   HREF="manual/mod/mod_ssl/index.html"
++  >SSL documentation</A>
++  carefully.
+   </P>
+   <P>
+-  The Webmaster of this site is free to use the image below on
+-  an Apache-powered Web server.  Thanks for using Apache!
++  Information on the NetBSD multiplatform operating system can be found
++  at <A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
++  </P>
++  <P>
++  The Webmaster of this site is free to use the images below on
++  an Apache/NetBSD-powered Web server.  Thanks for using <A HREF="http://www.apache.org/">Apache</A> on <A HREF="http://www.netbsd.org/">NetBSD</A>!
+   </P>
+   <DIV ALIGN="CENTER">
+    <IMG SRC="apache_pb.gif" ALT="">
++   <A HREF="http://www.netbsd.org/">
++        <IMG SRC="sitedrivenby.gif" border=0
++             ALT="Site driven by NetBSD - NetBSD rocks!"></A>
+   </DIV>
+  </BODY>
+ </HTML>
diff --git a/www/apache6/patches/patch-ae b/www/apache6/patches/patch-ae
new file mode 100644
index 00000000000..9332e5b2307
--- /dev/null
+++ b/www/apache6/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/support/apachectl.orig	Thu Dec  3 08:23:16 1998
++++ src/support/apachectl	Thu Dec  3 08:23:49 1998
+@@ -27,6 +27,9 @@
+ # the path to your httpd binary, including options if necessary
+ HTTPD='/usr/local/apache/src/httpd'
+ #
++# shared object search path
++LD_LIBRARY_PATH=
++export LD_LIBRARY_PATH
+ # a command that outputs a formatted text version of the HTML at the
+ # url given on the command line.  Designed for lynx, however other
+ # programs may work.  
diff --git a/www/apache6/patches/patch-af b/www/apache6/patches/patch-af
new file mode 100644
index 00000000000..f586fbd0f48
--- /dev/null
+++ b/www/apache6/patches/patch-af
@@ -0,0 +1,86 @@
+$NetBSD: patch-af,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/modules/standard/mod_include.c.orig	Thu Sep 24 10:06:42 1998
++++ src/modules/standard/mod_include.c	Mon Dec  7 11:17:39 1998
+@@ -92,7 +92,11 @@
+ #include "http_log.h"
+ #include "http_main.h"
+ #include "util_script.h"
++#include "ap_include_extern.h"
++#include "ap_hook.h"
+ #endif
++#define get_tag ap_include_get_tag
++#define parse_string ap_include_parse_string
+ 
+ #define STARTING_SEQUENCE "<!--#"
+ #define ENDING_SEQUENCE "-->"
+@@ -354,7 +358,8 @@
+  * the tag value is html decoded if dodecode is non-zero
+  */
+ 
+-static char *get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode)
++API_EXPORT(char *)
++ap_include_get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode)
+ {
+     char *t = tag, *tag_val, c, term;
+ 
+@@ -473,7 +478,7 @@
+ /*
+  * Do variable substitution on strings
+  */
+-static void parse_string(request_rec *r, const char *in, char *out,
++API_EXPORT(void) ap_include_parse_string(request_rec *r, const char *in, char *out,
+ 			size_t length, int leave_name)
+ {
+     char ch;
+@@ -666,7 +671,8 @@
+             parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
+             if (tag[0] == 'f') {
+                 /* be safe; only files in this directory or below allowed */
+-		if (!is_only_below(parsed_string)) {
++		if ((ap_allow_options(r) & OPT_INCNOEXEC) &&
++		    !is_only_below(parsed_string)) {
+                     error_fmt = "unable to include file \"%s\" "
+                         "in parsed file %s";
+                 }
+@@ -1010,7 +1016,8 @@
+     int ret=0;
+ 
+     if (!strcmp(tag, "file")) {
+-        ap_getparents(tag_val);    /* get rid of any nasties */
++	if (ap_allow_options(r) & OPT_INCNOEXEC)
++	    ap_getparents(tag_val);    /* get rid of any nasties */
+         
+         rr = ap_sub_req_lookup_file(tag_val, r);
+ 
+@@ -2090,6 +2097,16 @@
+     }
+ }
+ 
++API_EXPORT(int)
++ap_include_register_extern(const char *cmd, ap_include_extern_func func) {
++    char cmdbuf[40] = "include::";
++
++    strncat(cmdbuf, cmd, 30);
++    ap_hook_configure(cmdbuf, AP_HOOK_SIG5(int,ptr,ptr,ptr,ptr), AP_HOOK_TOPMOST);
++    ap_hook_register(cmdbuf, func, NULL);
++
++    return 0;
++}
+ 
+ 
+ /* -------------------------- The main function --------------------------- */
+@@ -2214,6 +2231,13 @@
+             }
+ #endif
+             else {
++		char cmdbuf[40] = "include::";
++
++		strncat(cmdbuf, directive, 30);
++		if ((ap_hook_status(cmdbuf) >= AP_HOOK_STATE_CONFIGURED) &&
++		    (ap_hook_call(cmdbuf, &ret, f, r, error, timefmt) == TRUE))
++		    continue;
++
+                 ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
+                             "httpd: unknown directive \"%s\" "
+                             "in parsed doc %s",
diff --git a/www/apache6/patches/patch-ag b/www/apache6/patches/patch-ag
new file mode 100644
index 00000000000..13eb9523c64
--- /dev/null
+++ b/www/apache6/patches/patch-ag
@@ -0,0 +1,29 @@
+$NetBSD: patch-ag,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/Configure.orig	Mon Apr 26 14:34:33 1999
++++ src/Configure	Mon Apr 26 15:10:13 1999
+@@ -974,16 +974,15 @@
+ 	    LDFLAGS_SHLIB_EXPORT=""
+ 	    SHLIB_SUFFIX_DEPTH=2
+ 	    ;;
+-	alpha-*-netbsd*|mips-*-netbsd*|powerpc-*-netbsd*)
+-	    CFLAGS_SHLIB="-fpic -DPIC"
+-	    LDFLAGS_SHLIB="-shared"
+-	    LDFLAGS_SHLIB_EXPORT=""
+-	    SHLIB_SUFFIX_DEPTH=2
+-	    ;;
+ 	*-netbsd*)
+-	    CFLAGS_SHLIB="-fpic -DPIC"
+-	    LDFLAGS_SHLIB="-Bshareable"
+-	    LDFLAGS_SHLIB_EXPORT=""
++	    CFLAGS_SHLIB="-fPIC -DPIC"
++	    if echo __ELF__ | ${CC} -E - | grep -q __ELF__; then
++		LDFLAGS_SHLIB="-Bshareable"
++		LDFLAGS_SHLIB_EXPORT=""
++	    else
++		LDFLAGS_SHLIB="-shared"
++		LDFLAGS_SHLIB_EXPORT="-Wl,-E"
++	    fi
+ 	    SHLIB_SUFFIX_DEPTH=2
+ 	    ;;
+ 	*-bsdi)
diff --git a/www/apache6/patches/patch-ah b/www/apache6/patches/patch-ah
new file mode 100644
index 00000000000..63ab3898194
--- /dev/null
+++ b/www/apache6/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/modules/standard/mod_so.c.orig	Sat Sep 19 08:27:24 1998
++++ src/modules/standard/mod_so.c	Thu Dec  3 07:59:19 1998
+@@ -289,6 +296,9 @@
+     void *handle;
+     char *file;
+ 
++/* XXX Hack: ask dlopen() without translating for ServerRoot. */
++    if (filename[0] == '!') file = filename + 1;
++    else
+     file = ap_server_root_relative(cmd->pool, filename);
+     
+     if (!(handle = ap_os_dso_load(file))) {
diff --git a/www/apache6/patches/patch-aj b/www/apache6/patches/patch-aj
new file mode 100644
index 00000000000..dcef27978de
--- /dev/null
+++ b/www/apache6/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- conf/httpd.conf-dist.orig	Thu Dec  3 11:05:29 1998
++++ conf/httpd.conf-dist	Thu Dec  3 11:07:26 1998
+@@ -18,7 +18,16 @@
+ # binary.
+ #
+ # Example:
+-# LoadModule foo_module libexec/mod_foo.so
++# LoadModule foo_module lib/httpd/mod_foo.so
++
++<IfDefine SSL>
++### Uncomment the following if you wish to use SSL and you need RSAREF: ###
++#LoadFile !librsaref.so.2
++LoadFile !libcrypto.so.1
++LoadFile !libssl.so.1
++LoadModule ssl_module lib/httpd/mod_ssl.so
++AddModule mod_ssl.c
++</IfDefine>
+ 
+ # ServerType is either inetd, or standalone.
+ 
diff --git a/www/apache6/patches/patch-ak b/www/apache6/patches/patch-ak
new file mode 100644
index 00000000000..a96f47f312d
--- /dev/null
+++ b/www/apache6/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/support/apxs.pl.orig	Fri Dec  4 11:34:17 1998
++++ src/support/apxs.pl	Fri Dec  4 11:36:26 1998
+@@ -383,8 +383,7 @@
+         }
+         my $t = $f;
+         $t =~ s|^.+/([^/]+)$|$1|;
+-        push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
+-        push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
++        push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t");
+ 
+         #   determine module symbolname and filename
+         my $filename = '';
diff --git a/www/apache6/patches/patch-al b/www/apache6/patches/patch-al
new file mode 100644
index 00000000000..8bee8a12e3c
--- /dev/null
+++ b/www/apache6/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/os/unix/os.c.orig	Fri Dec  4 18:53:48 1998
++++ src/os/unix/os.c	Fri Dec  4 18:54:00 1998
+@@ -119,7 +119,7 @@
+ #elif defined(RHAPSODY)
+     NSUnLinkModule(handle,FALSE);
+ 
+-#else
++#elif 0
+     dlclose(handle);
+ #endif
+ 
diff --git a/www/apache6/patches/patch-am b/www/apache6/patches/patch-am
new file mode 100644
index 00000000000..5725a4c584e
--- /dev/null
+++ b/www/apache6/patches/patch-am
@@ -0,0 +1,20 @@
+$NetBSD: patch-am,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+
+--- src/ap/ap_hook.c.orig	Mon Dec  7 10:31:53 1998
++++ src/ap/ap_hook.c	Mon Dec  7 10:32:48 1998
+@@ -705,6 +705,15 @@
+         *((int *)v_rc) = ((int(*)(void *, void *, void *, int))(hf->hf_ptr))(v1, v2, v3, v4);
+         rc = (*((int *)v_rc) != he->he_modeval.v_int);
+     }
++    else if (he->he_sig == AP_HOOK_SIG5(int, ptr, ptr, ptr, ptr)) {
++        /* Call: int func(ptr,ptr,ptr,ptr) */
++        void *v1 = va_arg(ap, va_type(ptr));
++        void *v2 = va_arg(ap, va_type(ptr));
++        void *v3 = va_arg(ap, va_type(ptr));
++        void *v4 = va_arg(ap, va_type(ptr));
++        *((int *)v_rc) = ((int(*)(void *, void *, void *, void *))(hf->hf_ptr))(v1, v2, v3, v4);
++        rc = (*((int *)v_rc) != he->he_modeval.v_int);
++    }
+     else if (he->he_sig == AP_HOOK_SIG6(int, ptr, ptr, ptr, ptr, int)) {
+         /* Call: int func(ptr,ptr,ptr,ptr,int) */
+         void *v1 = va_arg(ap, va_type(ptr));
diff --git a/www/apache6/pkg/COMMENT b/www/apache6/pkg/COMMENT
new file mode 100644
index 00000000000..ba3bcc3a11c
--- /dev/null
+++ b/www/apache6/pkg/COMMENT
@@ -0,0 +1 @@
+The Apache web server (http://www.apache.org/)
diff --git a/www/apache6/pkg/DESCR b/www/apache6/pkg/DESCR
new file mode 100644
index 00000000000..ec312aa9461
--- /dev/null
+++ b/www/apache6/pkg/DESCR
@@ -0,0 +1,7 @@
+The latest version of the most popular web server on the 'net.
+This compile includes proxy server support, as well as the ability
+to add modules that add many other features.
+
+You'll have to edit the configuration files in /usr/pkg/http/conf
+before you start it. The default root directory for documents is
+/usr/pkg/http/htdocs. You can start the server with `apachectl start'.
diff --git a/www/apache6/pkg/PLIST b/www/apache6/pkg/PLIST
new file mode 100644
index 00000000000..fe4e0f09b0b
--- /dev/null
+++ b/www/apache6/pkg/PLIST
@@ -0,0 +1,321 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+bin/dbmmanage
+bin/htdigest
+bin/htpasswd
+etc/httpd/httpd.conf.default
+@exec if [ ! -f %D/etc/httpd/httpd.conf ]; then cp -p %D/etc/httpd/httpd.conf.default %D/etc/httpd/httpd.conf; fi
+etc/httpd/magic.default
+@exec if [ ! -f %D/etc/httpd/magic ]; then cp -p %D/etc/httpd/magic.default %D/etc/httpd/magic; fi
+etc/httpd/mime.types.default
+@exec if [ ! -f %D/etc/httpd/mime.types ]; then cp -p %D/etc/httpd/mime.types.default %D/etc/httpd/mime.types; fi
+etc/rc.d/apache.sh
+include/httpd/alloc.h
+include/httpd/ap.h
+include/httpd/ap_compat.h
+include/httpd/ap_config.h
+include/httpd/ap_config_auto.h
+include/httpd/ap_ctx.h
+include/httpd/ap_ctype.h
+include/httpd/ap_hook.h
+include/httpd/ap_include_extern.h
+include/httpd/ap_md5.h
+include/httpd/ap_mmn.h
+include/httpd/buff.h
+include/httpd/compat.h
+include/httpd/conf.h
+include/httpd/explain.h
+include/httpd/fnmatch.h
+include/httpd/hsregex.h
+include/httpd/http_conf_globals.h
+include/httpd/http_config.h
+include/httpd/http_core.h
+include/httpd/http_log.h
+include/httpd/http_main.h
+include/httpd/http_protocol.h
+include/httpd/http_request.h
+include/httpd/http_vhost.h
+include/httpd/httpd.h
+include/httpd/multithread.h
+include/httpd/os.h
+include/httpd/os-inline.c
+include/httpd/rfc1413.h
+include/httpd/scoreboard.h
+include/httpd/util_date.h
+include/httpd/util_md5.h
+include/httpd/util_script.h
+include/httpd/util_uri.h
+lib/httpd/mod_proxy.so
+libexec/cgi-bin/printenv
+libexec/cgi-bin/test-cgi
+man/man1/dbmmanage.1
+man/man1/htdigest.1
+man/man1/htpasswd.1
+man/man8/ab.8
+man/man8/apachectl.8
+man/man8/apxs.8
+man/man8/httpd.8
+man/man8/logresolve.8
+man/man8/rotatelogs.8
+sbin/ab
+sbin/apachectl
+sbin/apxs
+sbin/httpd
+sbin/logresolve
+sbin/rotatelogs
+share/httpd/htdocs/apache_pb.gif
+share/httpd/htdocs/index.html
+share/httpd/htdocs/manual/LICENSE
+share/httpd/htdocs/manual/bind.html
+share/httpd/htdocs/manual/cgi_path.html
+share/httpd/htdocs/manual/content-negotiation.html
+share/httpd/htdocs/manual/custom-error.html
+share/httpd/htdocs/manual/dns-caveats.html
+share/httpd/htdocs/manual/dso.html
+share/httpd/htdocs/manual/ebcdic.html
+share/httpd/htdocs/manual/env.html
+share/httpd/htdocs/manual/footer.html
+share/httpd/htdocs/manual/handler.html
+share/httpd/htdocs/manual/header.html
+share/httpd/htdocs/manual/images/custom_errordocs.gif
+share/httpd/htdocs/manual/images/home.gif
+share/httpd/htdocs/manual/images/index.gif
+share/httpd/htdocs/manual/images/mod_rewrite_fig1.fig
+share/httpd/htdocs/manual/images/mod_rewrite_fig1.gif
+share/httpd/htdocs/manual/images/mod_rewrite_fig2.fig
+share/httpd/htdocs/manual/images/mod_rewrite_fig2.gif
+share/httpd/htdocs/manual/images/sub.gif
+share/httpd/htdocs/manual/index.html
+share/httpd/htdocs/manual/install.html
+share/httpd/htdocs/manual/install-tpf.html
+share/httpd/htdocs/manual/invoking.html
+share/httpd/htdocs/manual/keepalive.html
+share/httpd/htdocs/manual/location.html
+share/httpd/htdocs/manual/man-template.html
+share/httpd/htdocs/manual/misc/API.html
+share/httpd/htdocs/manual/misc/FAQ.html
+share/httpd/htdocs/manual/misc/HTTP_Features.tsv
+share/httpd/htdocs/manual/misc/client_block_api.html
+share/httpd/htdocs/manual/misc/compat_notes.html
+share/httpd/htdocs/manual/misc/custom_errordocs.html
+share/httpd/htdocs/manual/misc/descriptors.html
+share/httpd/htdocs/manual/misc/fin_wait_2.html
+share/httpd/htdocs/manual/misc/footer.html
+share/httpd/htdocs/manual/misc/header.html
+share/httpd/htdocs/manual/misc/howto.html
+share/httpd/htdocs/manual/misc/index.html
+share/httpd/htdocs/manual/misc/known_client_problems.html
+share/httpd/htdocs/manual/misc/nopgp.html
+share/httpd/htdocs/manual/misc/perf-bsd44.html
+share/httpd/htdocs/manual/misc/perf-dec.html
+share/httpd/htdocs/manual/misc/perf-hp.html
+share/httpd/htdocs/manual/misc/perf-tuning.html
+share/httpd/htdocs/manual/misc/perf.html
+share/httpd/htdocs/manual/misc/security_tips.html
+share/httpd/htdocs/manual/misc/vif-info.html
+share/httpd/htdocs/manual/misc/windoz_keepalive.html
+share/httpd/htdocs/manual/mod/core.html
+share/httpd/htdocs/manual/mod/directive-dict.html
+share/httpd/htdocs/manual/mod/directives.html
+share/httpd/htdocs/manual/mod/footer.html
+share/httpd/htdocs/manual/mod/header.html
+share/httpd/htdocs/manual/mod/index.html
+share/httpd/htdocs/manual/mod/mod_access.html
+share/httpd/htdocs/manual/mod/mod_actions.html
+share/httpd/htdocs/manual/mod/mod_alias.html
+share/httpd/htdocs/manual/mod/mod_asis.html
+share/httpd/htdocs/manual/mod/mod_auth.html
+share/httpd/htdocs/manual/mod/mod_auth_anon.html
+share/httpd/htdocs/manual/mod/mod_auth_db.html
+share/httpd/htdocs/manual/mod/mod_auth_dbm.html
+share/httpd/htdocs/manual/mod/mod_autoindex.html
+share/httpd/htdocs/manual/mod/mod_browser.html
+share/httpd/htdocs/manual/mod/mod_cern_meta.html
+share/httpd/htdocs/manual/mod/mod_cgi.html
+share/httpd/htdocs/manual/mod/mod_cookies.html
+share/httpd/htdocs/manual/mod/mod_digest.html
+share/httpd/htdocs/manual/mod/mod_dir.html
+share/httpd/htdocs/manual/mod/mod_dld.html
+share/httpd/htdocs/manual/mod/mod_dll.html
+share/httpd/htdocs/manual/mod/mod_env.html
+share/httpd/htdocs/manual/mod/mod_example.html
+share/httpd/htdocs/manual/mod/mod_expires.html
+share/httpd/htdocs/manual/mod/mod_headers.html
+share/httpd/htdocs/manual/mod/mod_imap.html
+share/httpd/htdocs/manual/mod/mod_include.html
+share/httpd/htdocs/manual/mod/mod_info.html
+share/httpd/htdocs/manual/mod/mod_isapi.html
+share/httpd/htdocs/manual/mod/mod_log_agent.html
+share/httpd/htdocs/manual/mod/mod_log_common.html
+share/httpd/htdocs/manual/mod/mod_log_config.html
+share/httpd/htdocs/manual/mod/mod_log_referer.html
+share/httpd/htdocs/manual/mod/mod_mime.html
+share/httpd/htdocs/manual/mod/mod_mime_magic.html
+share/httpd/htdocs/manual/mod/mod_mmap_static.html
+share/httpd/htdocs/manual/mod/mod_negotiation.html
+share/httpd/htdocs/manual/mod/mod_proxy.html
+share/httpd/htdocs/manual/mod/mod_rewrite.html
+share/httpd/htdocs/manual/mod/mod_setenvif.html
+share/httpd/htdocs/manual/mod/mod_so.html
+share/httpd/htdocs/manual/mod/mod_speling.html
+share/httpd/htdocs/manual/mod/mod_status.html
+share/httpd/htdocs/manual/mod/mod_unique_id.html
+share/httpd/htdocs/manual/mod/mod_userdir.html
+share/httpd/htdocs/manual/mod/mod_usertrack.html
+share/httpd/htdocs/manual/multilogs.html
+share/httpd/htdocs/manual/new_features_1_0.html
+share/httpd/htdocs/manual/new_features_1_1.html
+share/httpd/htdocs/manual/new_features_1_2.html
+share/httpd/htdocs/manual/new_features_1_3.html
+share/httpd/htdocs/manual/process-model.html
+share/httpd/htdocs/manual/readme-tpf.html
+share/httpd/htdocs/manual/search/manual-index.cgi
+share/httpd/htdocs/manual/sections.html
+share/httpd/htdocs/manual/sourcereorg.html
+share/httpd/htdocs/manual/stopping.html
+share/httpd/htdocs/manual/suexec.html
+share/httpd/htdocs/manual/suexec_1_2.html
+share/httpd/htdocs/manual/unixware.html
+share/httpd/htdocs/manual/upgrading_to_1_3.html
+share/httpd/htdocs/manual/vhosts/details.html
+share/httpd/htdocs/manual/vhosts/details_1_2.html
+share/httpd/htdocs/manual/vhosts/examples.html
+share/httpd/htdocs/manual/vhosts/fd-limits.html
+share/httpd/htdocs/manual/vhosts/footer.html
+share/httpd/htdocs/manual/vhosts/header.html
+share/httpd/htdocs/manual/vhosts/host.html
+share/httpd/htdocs/manual/vhosts/index.html
+share/httpd/htdocs/manual/vhosts/ip-based.html
+share/httpd/htdocs/manual/vhosts/mass.html
+share/httpd/htdocs/manual/vhosts/name-based.html
+share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html
+share/httpd/htdocs/manual/vhosts/virtual-host.html
+share/httpd/htdocs/manual/windows.html
+share/httpd/htdocs/sitedrivenby.gif
+share/httpd/icons/README
+share/httpd/icons/a.gif
+share/httpd/icons/alert.black.gif
+share/httpd/icons/alert.red.gif
+share/httpd/icons/apache_pb.gif
+share/httpd/icons/back.gif
+share/httpd/icons/ball.gray.gif
+share/httpd/icons/ball.red.gif
+share/httpd/icons/binary.gif
+share/httpd/icons/binhex.gif
+share/httpd/icons/blank.gif
+share/httpd/icons/bomb.gif
+share/httpd/icons/box1.gif
+share/httpd/icons/box2.gif
+share/httpd/icons/broken.gif
+share/httpd/icons/burst.gif
+share/httpd/icons/c.gif
+share/httpd/icons/comp.blue.gif
+share/httpd/icons/comp.gray.gif
+share/httpd/icons/compressed.gif
+share/httpd/icons/continued.gif
+share/httpd/icons/dir.gif
+share/httpd/icons/down.gif
+share/httpd/icons/dvi.gif
+share/httpd/icons/f.gif
+share/httpd/icons/folder.gif
+share/httpd/icons/folder.open.gif
+share/httpd/icons/folder.sec.gif
+share/httpd/icons/forward.gif
+share/httpd/icons/generic.gif
+share/httpd/icons/generic.red.gif
+share/httpd/icons/generic.sec.gif
+share/httpd/icons/hand.right.gif
+share/httpd/icons/hand.up.gif
+share/httpd/icons/icon.sheet.gif
+share/httpd/icons/image1.gif
+share/httpd/icons/image2.gif
+share/httpd/icons/image3.gif
+share/httpd/icons/index.gif
+share/httpd/icons/layout.gif
+share/httpd/icons/left.gif
+share/httpd/icons/link.gif
+share/httpd/icons/movie.gif
+share/httpd/icons/p.gif
+share/httpd/icons/patch.gif
+share/httpd/icons/pdf.gif
+share/httpd/icons/pie0.gif
+share/httpd/icons/pie1.gif
+share/httpd/icons/pie2.gif
+share/httpd/icons/pie3.gif
+share/httpd/icons/pie4.gif
+share/httpd/icons/pie5.gif
+share/httpd/icons/pie6.gif
+share/httpd/icons/pie7.gif
+share/httpd/icons/pie8.gif
+share/httpd/icons/portal.gif
+share/httpd/icons/ps.gif
+share/httpd/icons/quill.gif
+share/httpd/icons/right.gif
+share/httpd/icons/screw1.gif
+share/httpd/icons/screw2.gif
+share/httpd/icons/script.gif
+share/httpd/icons/small/README.txt
+share/httpd/icons/small/back.gif
+share/httpd/icons/small/binary.gif
+share/httpd/icons/small/binhex.gif
+share/httpd/icons/small/blank.gif
+share/httpd/icons/small/broken.gif
+share/httpd/icons/small/burst.gif
+share/httpd/icons/small/comp1.gif
+share/httpd/icons/small/comp2.gif
+share/httpd/icons/small/compressed.gif
+share/httpd/icons/small/continued.gif
+share/httpd/icons/small/dir.gif
+share/httpd/icons/small/dir2.gif
+share/httpd/icons/small/doc.gif
+share/httpd/icons/small/forward.gif
+share/httpd/icons/small/generic.gif
+share/httpd/icons/small/generic2.gif
+share/httpd/icons/small/generic3.gif
+share/httpd/icons/small/image.gif
+share/httpd/icons/small/image2.gif
+share/httpd/icons/small/index.gif
+share/httpd/icons/small/key.gif
+share/httpd/icons/small/movie.gif
+share/httpd/icons/small/patch.gif
+share/httpd/icons/small/ps.gif
+share/httpd/icons/small/rainbow.gif
+share/httpd/icons/small/sound.gif
+share/httpd/icons/small/sound2.gif
+share/httpd/icons/small/tar.gif
+share/httpd/icons/small/text.gif
+share/httpd/icons/small/transfer.gif
+share/httpd/icons/small/unknown.gif
+share/httpd/icons/small/uu.gif
+share/httpd/icons/sound1.gif
+share/httpd/icons/sound2.gif
+share/httpd/icons/sphere1.gif
+share/httpd/icons/sphere2.gif
+share/httpd/icons/tar.gif
+share/httpd/icons/tex.gif
+share/httpd/icons/text.gif
+share/httpd/icons/transfer.gif
+share/httpd/icons/unknown.gif
+share/httpd/icons/up.gif
+share/httpd/icons/uu.gif
+share/httpd/icons/uuencoded.gif
+share/httpd/icons/world1.gif
+share/httpd/icons/world2.gif
+@exec mkdir -p /var/log/httpd /var/spool/httpd/proxy %D/lib/httpd %D/etc/httpd/ssl.crt %D/etc/httpd/ssl.csr %D/etc/httpd/ssl.key
+@unexec rmdir /var/log/httpd /var/spool/httpd/proxy /var/spool/httpd 2>/dev/null || true
+@dirrm etc/httpd/ssl.crt
+@dirrm etc/httpd/ssl.csr
+@dirrm etc/httpd/ssl.key
+@unexec rmdir %D/etc/httpd 2>/dev/null || true
+@dirrm include/httpd
+@dirrm lib/httpd
+@dirrm libexec/cgi-bin
+@dirrm share/httpd/htdocs/manual/images
+@dirrm share/httpd/htdocs/manual/misc
+@dirrm share/httpd/htdocs/manual/mod
+@dirrm share/httpd/htdocs/manual/search
+@dirrm share/httpd/htdocs/manual/vhosts
+@dirrm share/httpd/htdocs/manual
+@dirrm share/httpd/htdocs
+@dirrm share/httpd/icons/small
+@dirrm share/httpd/icons
+@dirrm share/httpd