Retire Apache 1.3 and 2.0.

author: joerg <joerg@pkgsrc.org> 2014-06-10 15:22:13 +0000
committer: joerg <joerg@pkgsrc.org> 2014-06-10 15:22:13 +0000
commit: 9611c157d010938e53b1714e3f7f317facf558c0 (patch)
tree: 2feb1f410c493c9e7cc492d5a0165cd0c95d68b8
parent: 4b76c8f2e9956fd11677f6e5d815fdc0a154e0d8 (diff)
download: pkgsrc-9611c157d010938e53b1714e3f7f317facf558c0.tar.gz
244 files changed, 108 insertions, 8344 deletions
diff --git a/devel/Makefile b/devel/Makefile
index 7b45714df01..f1830060faf 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1926 2014/06/05 05:06:45 obache Exp $
+# $NetBSD: Makefile,v 1.1927 2014/06/10 15:22:13 joerg Exp $
 #
 
 COMMENT=	Development utilities
@@ -42,7 +42,6 @@ SUBDIR+=	apel
 SUBDIR+=	appdata-tools
 SUBDIR+=	apr
 SUBDIR+=	apr-util
-SUBDIR+=	apr0
 SUBDIR+=	arena
 SUBDIR+=	argp
 SUBDIR+=	argtable
diff --git a/devel/apr0/DESCR b/devel/apr0/DESCR
deleted file mode 100644
index 4961cf68f32..00000000000
--- a/devel/apr0/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The Apache Portable Run-time mission is to provide a library of
-routines that allows programmers to write a program once and be
-able to compile it anywhere.
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
deleted file mode 100644
index 2d67828561b..00000000000
--- a/devel/apr0/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2014/02/12 23:17:45 tron Exp $
-
-.include "../../www/apache2/Makefile.common"
-
-PKGNAME=	apr-${APR_VERSION}.${APACHE_VERSION}
-PKGREVISION=	1
-CATEGORIES=	devel
-
-HOMEPAGE=	http://apr.apache.org/
-COMMENT=	Apache Portable Runtime
-LICENSE=	apache-2.0
-
-# Don't bump this when apache upgrades; it is only apache2-2.0.45 and
-# under that includes its own apr.  apr was split out in 2.0.45nb1.
-CONFLICTS=		apache2<=2.0.45
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-WRKSRC=			${WRKDIR}/${DISTNAME}/srclib
-BUILD_DIRS=		apr apr-util
-
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		LIBS=${LIBS:M*:Q}
-LIBS.SunOS+=		-lnsl
-
-INSTALLATION_DIRS+=	include/apr-0/arch/unix
-
-APR_CONFIGURE_ARGS= \
-		--prefix=${PREFIX} \
-		--with-devrandom=/dev/urandom \
-		--with-installbuilddir=${PREFIX}/libexec/apr
-
-APU_CONFIGURE_ARGS= \
-		--prefix=${PREFIX} \
-		--with-apr=${WRKSRC}/apr \
-		--with-expat=${BUILDLINK_PREFIX.expat} \
-		--without-gdbm
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "options.mk"
-
-SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	pre-configure
-SUBST_FILES.conf=	apr/config.layout apr-util/config.layout
-SUBST_SED.conf=		-e "s,@PREFIX@,${PREFIX},g"
-SUBST_MESSAGE.conf=	Fixing hardcoded paths.
-
-.if !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
-APR_CONFIGURE_ARGS+=	--without-sendfile
-.endif
-
-TEST_TARGET=		check
-
-do-configure:
-	cd ${WRKSRC}/apr && ${SETENV} ${CONFIGURE_ENV} ./configure \
-		${APR_CONFIGURE_ARGS}
-	cd ${WRKSRC}/apr-util && ${SETENV} ${CONFIGURE_ENV} ./configure \
-		${APU_CONFIGURE_ARGS}
-
-post-install:
-	${RM} ${DESTDIR}${PREFIX}/libexec/apr/libtool
-	${INSTALL_SCRIPT} ${PKG_LIBTOOL} ${DESTDIR}${PREFIX}/libexec/apr/libtool
-	${INSTALL_DATA} ${WRKSRC}/apr/include/arch/*.h ${DESTDIR}${PREFIX}/include/apr-0/arch
-	${INSTALL_DATA} ${WRKSRC}/apr/include/arch/unix/*.h ${DESTDIR}${PREFIX}/include/apr-0/arch/unix/
-	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/apr-0/*.h
-	${CHMOD} ${PKGDIRMODE} ${DESTDIR}${PREFIX}/include/apr-0
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/include/apr-0/
-
-.include "../../converters/libiconv/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/apr0/PLIST b/devel/apr0/PLIST
deleted file mode 100644
index 3477b278a0e..00000000000
--- a/devel/apr0/PLIST
+++ /dev/null
@@ -1,89 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:33 joerg Exp $
-bin/apr-config
-bin/apu-config
-include/apr-0/apr.h
-include/apr-0/apr_allocator.h
-include/apr-0/apr_anylock.h
-include/apr-0/apr_atomic.h
-include/apr-0/apr_base64.h
-include/apr-0/apr_buckets.h
-include/apr-0/apr_compat.h
-include/apr-0/apr_date.h
-include/apr-0/apr_dbm.h
-include/apr-0/apr_dso.h
-include/apr-0/apr_env.h
-include/apr-0/apr_errno.h
-include/apr-0/apr_file_info.h
-include/apr-0/apr_file_io.h
-include/apr-0/apr_fnmatch.h
-include/apr-0/apr_general.h
-include/apr-0/apr_getopt.h
-include/apr-0/apr_global_mutex.h
-include/apr-0/apr_hash.h
-include/apr-0/apr_hooks.h
-include/apr-0/apr_inherit.h
-include/apr-0/apr_ldap.h
-include/apr-0/apr_ldap_url.h
-include/apr-0/apr_lib.h
-include/apr-0/apr_md4.h
-include/apr-0/apr_md5.h
-include/apr-0/apr_mmap.h
-include/apr-0/apr_network_io.h
-include/apr-0/apr_optional.h
-include/apr-0/apr_optional_hooks.h
-include/apr-0/apr_poll.h
-include/apr-0/apr_pools.h
-include/apr-0/apr_portable.h
-include/apr-0/apr_proc_mutex.h
-include/apr-0/apr_queue.h
-include/apr-0/apr_reslist.h
-include/apr-0/apr_ring.h
-include/apr-0/apr_rmm.h
-include/apr-0/apr_sdbm.h
-include/apr-0/apr_sha1.h
-include/apr-0/apr_shm.h
-include/apr-0/apr_signal.h
-include/apr-0/apr_strings.h
-include/apr-0/apr_strmatch.h
-include/apr-0/apr_support.h
-include/apr-0/apr_tables.h
-include/apr-0/apr_thread_cond.h
-include/apr-0/apr_thread_mutex.h
-include/apr-0/apr_thread_proc.h
-include/apr-0/apr_thread_rwlock.h
-include/apr-0/apr_time.h
-include/apr-0/apr_uri.h
-include/apr-0/apr_user.h
-include/apr-0/apr_uuid.h
-include/apr-0/apr_version.h
-include/apr-0/apr_want.h
-include/apr-0/apr_xlate.h
-include/apr-0/apr_xml.h
-include/apr-0/apu.h
-include/apr-0/apu_compat.h
-include/apr-0/apu_version.h
-include/apr-0/apu_want.h
-include/apr-0/arch/apr_private_common.h
-include/apr-0/arch/unix/apr_arch_dso.h
-include/apr-0/arch/unix/apr_arch_file_io.h
-include/apr-0/arch/unix/apr_arch_global_mutex.h
-include/apr-0/arch/unix/apr_arch_inherit.h
-include/apr-0/arch/unix/apr_arch_internal_time.h
-include/apr-0/arch/unix/apr_arch_misc.h
-include/apr-0/arch/unix/apr_arch_networkio.h
-include/apr-0/arch/unix/apr_arch_proc_mutex.h
-include/apr-0/arch/unix/apr_arch_shm.h
-include/apr-0/arch/unix/apr_arch_thread_cond.h
-include/apr-0/arch/unix/apr_arch_thread_mutex.h
-include/apr-0/arch/unix/apr_arch_thread_rwlock.h
-include/apr-0/arch/unix/apr_arch_threadproc.h
-include/apr-0/arch/unix/apr_private.h
-lib/apr.exp
-lib/aprutil.exp
-lib/libapr-0.la
-lib/libaprutil-0.la
-libexec/apr/apr_rules.mk
-libexec/apr/libtool
-libexec/apr/make_exports.awk
-libexec/apr/make_var_export.awk
-libexec/apr/mkdir.sh
diff --git a/devel/apr0/buildlink3.mk b/devel/apr0/buildlink3.mk
deleted file mode 100644
index 75a36517429..00000000000
--- a/devel/apr0/buildlink3.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.14 2014/02/12 23:17:45 tron Exp $
-
-BUILDLINK_TREE+=	apr
-
-.if !defined(APR_BUILDLINK3_MK)
-APR_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.apr+=	apr-0.9.* apr>=0.9.5.2.0.51nb1
-BUILDLINK_ABI_DEPENDS.apr+=	apr>=0.9.20.2.0.65nb1
-BUILDLINK_PKGSRCDIR.apr?=	../../devel/apr0
-BUILDLINK_INCDIRS.apr?=		include/apr-0
-
-WRAPPER_REORDER_CMDS+=	reorder:l:aprutil-0:crypt
-
-BUILDLINK_FILES.apr+=	bin/apr-config
-BUILDLINK_FILES.apr+=	bin/apu-config
-BUILDLINK_FILES.apr+=	lib/*.exp
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-pkgbase := apr
-.include "../../mk/pkg-build-options.mk"
-
-.if !empty(PKG_BUILD_OPTIONS.apr:Mdb4)
-.  include "../../databases/db4/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.apr:Mldap)
-.  include "../../databases/openldap-client/buildlink3.mk"
-.endif
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.endif # APR_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-apr
diff --git a/devel/apr0/distinfo b/devel/apr0/distinfo
deleted file mode 100644
index 3a3cd86023d..00000000000
--- a/devel/apr0/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.9 2014/03/10 13:55:25 jperkin Exp $
-
-SHA1 (httpd-2.0.65.tar.bz2) = 0183866df73c7877ba9275a075a2ece7a67f6c95
-RMD160 (httpd-2.0.65.tar.bz2) = 1f0142a843486a53ba184ceb9214dc78f071e17e
-Size (httpd-2.0.65.tar.bz2) = 4999802 bytes
-SHA1 (patch-aa) = c84bdb6bcb14bf6bc7ea0d8f13334dd8c3ef2ef9
-SHA1 (patch-an) = 76d9ac0cdddec7c0f41535baee63bf0aa26ed596
-SHA1 (patch-ao) = 4cbfa00dfe2ff515cbe6e94068ba7678f02fab89
-SHA1 (patch-ap) = 357776c7208407936e09891ae87d23b112a12756
-SHA1 (patch-apr-util_configure) = 9600956ce050f5289a95da266c7ab33383badecd
-SHA1 (patch-aq) = 6cc1fb879fb5d9280f543ebe068a441e2e6560f3
-SHA1 (patch-ar) = defa2be14ec057e1c41151b8cd1edc0ffb219694
-SHA1 (patch-as) = 37e70ff8b1a3344e47bcd2fe2b145a6e3e6a4562
-SHA1 (patch-at) = 9935c308ba96a8c92dedd3288429a989f9d643f5
-SHA1 (patch-au) = b05a774430ee3c4e8b67f8b77ccb57dde98a92b2
diff --git a/devel/apr0/options.mk b/devel/apr0/options.mk
deleted file mode 100644
index ae563a237d7..00000000000
--- a/devel/apr0/options.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2007/01/24 19:31:24 epg Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.apr
-PKG_SUPPORTED_OPTIONS=	db4 ldap
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdb4)
-APU_CONFIGURE_ARGS+=	\
-	--with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE}
-.  include "../../databases/db4/buildlink3.mk"
-.else
-APU_CONFIGURE_ARGS+=	--with-dbm=sdbm
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-APU_CONFIGURE_ARGS+=	--with-ldap
-APR_CONFIGURE_ARGS+=	--with-ldap
-.  include "../../databases/openldap-client/buildlink3.mk"
-.endif
diff --git a/devel/apr0/patches/patch-aa b/devel/apr0/patches/patch-aa
deleted file mode 100644
index ee12fc5bf51..00000000000
--- a/devel/apr0/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/01/24 19:31:24 epg Exp $
-
---- apr/threadproc/unix/signals.c.orig	2005-02-04 15:36:31.000000000 -0500
-+++ apr/threadproc/unix/signals.c
-@@ -49,7 +49,7 @@ APR_DECLARE(apr_status_t) apr_proc_kill(
- 
- #if APR_HAVE_SIGACTION
- 
--#ifdef DARWIN
-+#if defined(__NetBSD__) || defined(DARWIN)
- static void avoid_zombies(int signo)
- {
-     int exit_status;
-@@ -85,7 +85,7 @@ APR_DECLARE(apr_sigfunc_t *) apr_signal(
-         act.sa_flags |= SA_NOCLDWAIT;
-     }
- #endif
--#ifdef DARWIN
-+#if defined(__NetBSD__) || defined(DARWIN)
-     /* ignoring SIGCHLD or leaving the default disposition doesn't avoid zombies,
-      * and there is no SA_NOCLDWAIT flag, so catch the signal and reap status in 
-      * the handler to avoid zombies
diff --git a/devel/apr0/patches/patch-an b/devel/apr0/patches/patch-an
deleted file mode 100644
index 1a98fdbeabf..00000000000
--- a/devel/apr0/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2007/01/24 19:31:24 epg Exp $
-
---- apr/configure.in.orig	2005-02-04 16:58:13.000000000 +0000
-+++ apr/configure.in
-@@ -1679,7 +1679,7 @@ if test "$rand" != "1"; then
-   if test "$apr_devrandom" = "yes"; then
-     # /dev/random on OpenBSD doesn't provide random data, so
-     # prefer /dev/arandom, which does; see random(4).
--    for f in /dev/arandom /dev/random /dev/urandom; do
-+    for f in /dev/arandom /dev/urandom /dev/random; do
-       if test -r $f; then
-         apr_devrandom=$f
-         rand=1
diff --git a/devel/apr0/patches/patch-ao b/devel/apr0/patches/patch-ao
deleted file mode 100644
index 0cce8c85244..00000000000
--- a/devel/apr0/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2014/03/10 13:44:37 jperkin Exp $
-
---- apr/configure.orig	2013-06-28 17:48:51.000000000 +0000
-+++ apr/configure
-@@ -30440,7 +30440,7 @@ fi
-   if test "$apr_devrandom" = "yes"; then
-     # /dev/random on OpenBSD doesn't provide random data, so
-     # prefer /dev/arandom, which does; see random(4).
--    for f in /dev/arandom /dev/random /dev/urandom; do
-+    for f in /dev/arandom /dev/urandom /dev/random; do
-       if test -r $f; then
-         apr_devrandom=$f
-         rand=1
diff --git a/devel/apr0/patches/patch-ap b/devel/apr0/patches/patch-ap
deleted file mode 100644
index d1cc35c0576..00000000000
--- a/devel/apr0/patches/patch-ap
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2007/01/24 19:31:24 epg Exp $
-
---- apr-util/config.layout.orig	Thu Apr  3 17:15:08 2003
-+++ apr-util/config.layout	Thu Apr  3 17:14:15 2003
-@@ -229,3 +229,17 @@
-     infodir:       ${exec_prefix}/share/info
-     libsuffix     -${APRUTIL_MAJOR_VERSION}
- </Layout>
-+
-+#   NetBSD (pkgsrc) layout
-+<Layout NetBSD>
-+    prefix:        @PREFIX@
-+    exec_prefix:   ${prefix}
-+    bindir:        ${exec_prefix}/bin
-+    sbindir:       ${exec_prefix}/sbin
-+    libexecdir:    ${exec_prefix}/lib/httpd
-+    mandir:        ${prefix}/man
-+    datadir:       ${prefix}/share/httpd
-+    includedir:    ${prefix}/include/apr
-+    localstatedir: /var
-+    runtimedir:    ${localstatedir}/run
-+</Layout>
diff --git a/devel/apr0/patches/patch-apr-util_configure b/devel/apr0/patches/patch-apr-util_configure
deleted file mode 100644
index 90dcef4b9ae..00000000000
--- a/devel/apr0/patches/patch-apr-util_configure
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-apr-util_configure,v 1.2 2014/03/10 13:55:25 jperkin Exp $
-
-Search for builtin expat in /usr/lib64 and support .dylib.
-
---- apr-util/configure.orig	2013-06-28 17:48:52.000000000 +0000
-+++ apr-util/configure
-@@ -23132,6 +23132,16 @@ $as_echo_n "checking for Expat in $withv
-             expat_include_dir="$abs_expatdir/include"
-     expat_ldflags="-L$abs_expatdir/lib"
-     expat_libs="-lexpat"
-+  elif test -r "$abs_expatdir/include/expat.h" -a \
-+    -r "$abs_expatdir/lib64/libexpat.a"; then
-+            expat_include_dir="$abs_expatdir/include"
-+    expat_ldflags="-L$abs_expatdir/lib64"
-+    expat_libs="-lexpat"
-+  elif test -r "$abs_expatdir/include/expat.h" -a \
-+    -r "$abs_expatdir/lib/libexpat.dylib"; then
-+            expat_include_dir="$abs_expatdir/include"
-+    expat_ldflags="-L$abs_expatdir/lib"
-+    expat_libs="-lexpat"
-   elif test -r "$abs_expatdir/xmlparse.h"; then
-         expat_include_dir="$abs_expatdir"
-     expat_ldflags="-L$abs_expatdir"
diff --git a/devel/apr0/patches/patch-aq b/devel/apr0/patches/patch-aq
deleted file mode 100644
index 45fb735afa6..00000000000
--- a/devel/apr0/patches/patch-aq
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aq,v 1.1.1.1 2007/01/24 19:31:24 epg Exp $
-
---- apr/config.layout.orig	Thu Apr  3 17:14:54 2003
-+++ apr/config.layout	Thu Apr  3 17:14:01 2003
-@@ -229,3 +229,17 @@
-     infodir:       ${exec_prefix}/share/info
-     libsuffix:    -${APR_MAJOR_VERSION}
- </Layout>
-+
-+#   NetBSD (pkgsrc) layout
-+<Layout NetBSD>
-+    prefix:        @PREFIX@
-+    exec_prefix:   ${prefix}
-+    bindir:        ${exec_prefix}/bin
-+    sbindir:       ${exec_prefix}/sbin
-+    libexecdir:    ${exec_prefix}/lib/httpd
-+    mandir:        ${prefix}/man
-+    datadir:       ${prefix}/share/httpd
-+    includedir:    ${prefix}/include/apr
-+    localstatedir: /var
-+    runtimedir:    ${localstatedir}/run
-+</Layout>
diff --git a/devel/apr0/patches/patch-ar b/devel/apr0/patches/patch-ar
deleted file mode 100644
index f46aa506aee..00000000000
--- a/devel/apr0/patches/patch-ar
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2007/01/24 19:31:24 epg Exp $
-
---- apr/network_io/unix/sendrecv.c.orig	2005-07-15 15:11:22.000000000 +0000
-+++ apr/network_io/unix/sendrecv.c
-@@ -372,11 +372,13 @@ do_select:
-     return rv < 0 ? errno : APR_SUCCESS;
- }
- 
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 
- static int include_hdrs_in_length(void)
- {
--#ifdef HAVE_SYS_SYSCTL_H
-+#ifdef __DragonFly__
-+	return(0);
-+#elif defined(HAVE_SYS_SYSCTL_H)
- /* this assumes: 
-  *   if the header exists, so does the sysctlbyname() syscall, and 
-  *   if the header doesn't exist, the kernel is really old
diff --git a/devel/apr0/patches/patch-as b/devel/apr0/patches/patch-as
deleted file mode 100644
index 7587f4866d1..00000000000
--- a/devel/apr0/patches/patch-as
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-as,v 1.1.1.1 2007/01/24 19:31:24 epg Exp $
-
---- apr/include/apr_atomic.h.orig	2005-07-15 15:16:55.000000000 +0000
-+++ apr/include/apr_atomic.h
-@@ -28,7 +28,7 @@
- /* Platform includes for atomics */
- #if defined(NETWARE) || defined(__MVS__) /* OS/390 */
- #include <stdlib.h>
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #include <machine/atomic.h>
- #endif
- 
-@@ -159,7 +159,7 @@ inline void *apr_atomic_casptr(void **me
-     return (void*)atomic_cmpxchg((unsigned long *)mem,(unsigned long)cmp,(unsigned long)with);
- }
- 
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 
- #define apr_atomic_t apr_uint32_t
- #define apr_atomic_add(mem, val)     (atomic_add_int(mem,val),mem)
diff --git a/devel/apr0/patches/patch-at b/devel/apr0/patches/patch-at
deleted file mode 100644
index 47e06bbae3b..00000000000
--- a/devel/apr0/patches/patch-at
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-at,v 1.1.1.1 2007/01/24 19:31:24 epg Exp $
-
---- apr/build/apr_hints.m4.orig	2005-07-15 15:19:19.000000000 +0000
-+++ apr/build/apr_hints.m4
-@@ -140,6 +140,12 @@ dnl	       # Not a problem in 10.20.  Ot
-         # fcntl() lies about O_NONBLOCK on an accept()ed socket (PR kern/26950)
-         APR_SETIFNULL(ac_cv_o_nonblock_inherited, [yes])
- 	;;
-+    *-dragonfly*)
-+	APR_ADDTO(CFLAGS, [-funsigned-char])
-+	APR_SETIFNULL(enable_threads, [no])
-+        APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
-+	APR_ADDTO(CPPFLAGS, [-D_REENTRANT])
-+	;;
-     *-freebsd*)
- 	case $host in
- 	    *freebsd[2345]*)
diff --git a/devel/apr0/patches/patch-au b/devel/apr0/patches/patch-au
deleted file mode 100644
index 3a866842404..00000000000
--- a/devel/apr0/patches/patch-au
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-au,v 1.2 2010/11/01 18:03:04 adam Exp $
-
-NetBSD 3.0 does not have pthread_setconcurrency().
-
---- apr/test/testatomic.c.orig	2005-02-04 21:36:31.000000000 +0100
-+++ apr/test/testatomic.c	2006-10-04 22:30:21.000000000 +0200
-@@ -231,7 +231,7 @@ int main(int argc, char**argv)
-     }
- 
-     printf("APR Atomic Test\n===============\n\n");
--#if !(defined WIN32) && !(defined NETWARE) && !(defined __MVS__) && !(defined DARWIN)
-+#if !(defined WIN32) && !(defined NETWARE) && !(defined __MVS__) && !(defined DARWIN) && !defined(__NetBSD__)
-     pthread_setconcurrency(8);
- #endif
-     printf("%-60s", "Initializing the context"); 
diff --git a/mk/apache.mk b/mk/apache.mk
index b8a873b5400..6166ed12946 100644
--- a/mk/apache.mk
+++ b/mk/apache.mk
@@ -1,4 +1,4 @@
-# $NetBSD: apache.mk,v 1.27 2012/04/14 12:58:19 adam Exp $
+# $NetBSD: apache.mk,v 1.28 2014/06/10 15:22:13 joerg Exp $
 #
 # This file is meant to be included by packages that require an apache
 # web server.
@@ -9,7 +9,7 @@
 #	The default apache server to use and install. If there already
 #	is an apache installed, this will have no effect.
 #
-#	Possible values: apache13 apache2 apache22 apache24
+#	Possible values: apache22 apache24
 #
 # Package-settable variables:
 #
@@ -20,9 +20,8 @@
 #	Possible values: (see PKG_APACHE_DEFAULT)
 #
 # USE_APR
-#	If apache2 is chosen by this file and this variable is set to
-#	"yes", a full dependency to the Apache Portable Runtime library
-#	will be added.
+#	If this variable is set to "yes", a full dependency to the
+#	Apache Portable Runtime library will be added.
 #
 # Variables defined by this file:
 #
@@ -34,7 +33,7 @@
 # APACHE_PKG_PREFIX
 #	The package name prefix for apache modules.
 #
-#	Possible values: ap13 ap2 ap22 ap24
+#	Possible values: ap22 ap24
 #
 
 .if !defined(APACHE_MK)
@@ -56,15 +55,7 @@ PKG_APACHE_ACCEPTED?=		${_PKG_APACHES}
 USE_APR?=			no
 
 # The available apache packages:
-_PKG_APACHES=			apache13 apache2 apache22 apache24
-
-_APACHE_PKGBASE.apache13=	apache-1*
-_APACHE_PKG_PREFIX.apache13=	ap13
-_APACHE_PKGSRCDIR.apache13=	../../www/apache
-
-_APACHE_PKGBASE.apache2=	apache-2.0*
-_APACHE_PKG_PREFIX.apache2=	ap2
-_APACHE_PKGSRCDIR.apache2=	../../www/apache2
+_PKG_APACHES=			apache22 apache24
 
 _APACHE_PKGBASE.apache22=	apache-2.[23]*
 _APACHE_PKG_PREFIX.apache22=	ap22
@@ -80,7 +71,7 @@ _APACHE_PKGSRCDIR.apache24=	../../www/apache24
 
 .if empty(_PKG_APACHES:M${PKG_APACHE_DEFAULT})
 PKG_FAIL_REASON+=		"[apache.mk] Invalid apache package \""${PKG_APACHE_DEFAULT:Q}"\" in PKG_APACHE_DEFAULT."
-PKG_APACHE_DEFAULT=		apache2
+PKG_APACHE_DEFAULT=		apache22
 .endif
 
 .for _ap_ in ${PKG_APACHE_ACCEPTED}
@@ -132,9 +123,7 @@ PKG_APACHE=		none
 
 APACHE_PKG_PREFIX=	${_APACHE_PKG_PREFIX.${PKG_APACHE}}
 
-.if (${PKG_APACHE} == "apache2") && !empty(USE_APR:M[yY][eE][sS])
-.  include "../../devel/apr0/buildlink3.mk"
-.elif (${PKG_APACHE} != "apache13") && !empty(USE_APR:M[Yy][Ee][Ss])
+.if !empty(USE_APR:M[Yy][Ee][Ss])
 .  include "../../devel/apr/buildlink3.mk"
 .  include "../../devel/apr-util/buildlink3.mk"
 .endif
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 899cd224e35..fcd37905a06 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.240 2014/06/01 16:56:47 wiz Exp $
+# $NetBSD: mk.conf,v 1.241 2014/06/10 15:22:13 joerg Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -654,27 +654,27 @@ AMANDA_VAR?=	${VARBASE}/amanda
 # Default: not defined
 
 APACHE_USER?=	www
-# Used in apache, apache2, isap, and smb2www to specify the user
+# Used in apache22, apache24, isap, and smb2www to specify the user
 # allowed to execute the `suexec' wrapper.  Expected to be the user the
 # httpd server normally runs as.
 # Possible: any user name
 # Default: www
 
 APACHE_GROUP?=	www
-# Used in apache, apache2, squirrelmail, and iasp to specify
+# Used in apache22, apache24, squirrelmail, and iasp to specify
 # the default group of the user allowed to execute the `suexec' wrapper.
 # Expected to be the group the httpd server normally runs as.
 # Possible: any group name
 # Default: www
 
 #APACHE_SUEXEC_CONFIGURE_ARGS=	--suexec-uidmin=1000
-# Used in apache and apache2 to specify additional suexec options
+# Used in apache22 and apache24 to specify additional suexec options
 # to be passed to the configure script.
 # Possible: any --suexec-* options recognized by the Apache configure script.
 # Default: not defined
 
 APACHE_SUEXEC_DOCROOT?=	${LOCALBASE}/share/httpd/htdocs
-# Used in apache and apache2 to specify the document space in
+# Used in apache22 and apache24 to specify the document space in
 # which suexec will be allowed to work.
 # Possible: Any valid directory
 # Default: ${LOCALBASE}/share/httpd/htdocs
diff --git a/mk/pbulk/pbulk-index.mk b/mk/pbulk/pbulk-index.mk
index 81dca3285ac..60d50e23198 100644
--- a/mk/pbulk/pbulk-index.mk
+++ b/mk/pbulk/pbulk-index.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: pbulk-index.mk,v 1.19 2013/10/30 06:18:34 dholland Exp $
+#	$NetBSD: pbulk-index.mk,v 1.20 2014/06/10 15:22:14 joerg Exp $
 
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to the parallel bulk build
@@ -78,7 +78,7 @@ pbulk-index: pbulk-index-item
 # Use an ODE for loop to compute the carthesian product of
 # the support settings.  This expands to something like
 #
-#	for apache in apache13 apache2; do \
+#	for apache in apache22 apache24; do \
 #		_PBULK_MULTI_VALUE.apache=$apache; \
 #		export _PBULK_MULTI_VALUE.apache; \
 #		PKG_APACHE=$apache; \
diff --git a/net/netdisco/MESSAGE b/net/netdisco/MESSAGE
index 93680b52bb0..4ce3759096a 100644
--- a/net/netdisco/MESSAGE
+++ b/net/netdisco/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/05/25 17:06:49 bouyer Exp $
+$NetBSD: MESSAGE,v 1.2 2014/06/10 15:22:14 joerg Exp $
 
 Here is a summary of the steps needed to complete the netdisco setup.
 Please look at the documentation in ${PREFIX}/doc/ for details.
@@ -22,8 +22,8 @@ Please look at the documentation in ${PREFIX}/doc/ for details.
   can be inclued in the httpd.conf to make netdisco available though
   http://your.host.name/netdisco/
   You will have to set the database password in netdisco_apache_dir.conf.
-  If you are using apache2, make sure you load mod_apreq.so in addition
-  to mod_perl.so, and that you have "PerlModule Apache::compat"
+  Make sure you load mod_apreq.so in addition to mod_perl.so, and that
+  you have "PerlModule Apache::compat"
 - Make netdisco discover one of your devices:
   ${PREFIX}/netdisco/netdisco -d devicename
 - Make netdisco discover your network topology, if supported by your
diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index fd98c443a78..a127a768d94 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/05/29 23:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2014/06/10 15:22:14 joerg Exp $
 #
 
 DISTNAME=		netdisco-1.1_with_mibs
@@ -115,17 +115,10 @@ RCD_SCRIPT_SRC.netdisco=	${WRKSRC:Q}/bin/netdisco_daemon
 
 .include "../../mk/apache.mk"
 
-.if ${PKG_APACHE} == "apache13"
-SUBST_STAGE.apachevers=	pre-configure
-SUBST_FILES.apachevers=	netdisco_apache.conf
-SUBST_SED.apachevers=	-e "s|@APACHE2@|\#uncomment for apache2|g"
-SUBST_MESSAGE.apachevers= Fixing config files for apache-1.3
-.elif ${PKG_APACHE} == "apache2"
 SUBST_STAGE.apachevers=	pre-configure
 SUBST_FILES.apachevers=	netdisco_apache.conf
 SUBST_SED.apachevers=	-e "s|@APACHE2@||g"
 SUBST_MESSAGE.apachevers= Fixing config files for apache-2
-.endif
 
 do-build:
 	${RM} -f ${WRKSRC:Q}/html/doc/ChangeLog.txt
diff --git a/security/ap-modsecurity/Makefile b/security/ap-modsecurity/Makefile
index ba97532f25c..2c87b5ea75a 100644
--- a/security/ap-modsecurity/Makefile
+++ b/security/ap-modsecurity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/23 18:16:21 asau Exp $
+# $NetBSD: Makefile,v 1.11 2014/06/10 15:22:14 joerg Exp $
 #
 
 DISTNAME=	modsecurity-apache_1.9.4
@@ -13,17 +13,12 @@ COMMENT=	Intrusion detection and prevention engine for web applications
 USE_TOOLS+=	pax
 
 # does not compile with apache24
-PKG_APACHE_ACCEPTED=	apache13 apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 .include "../../mk/apache.mk"
 
-.if ${PKG_APACHE} != "apache13"
 APACHE_DIR=	apache2
 MOD_EXTN=	la
-.else
-APACHE_DIR=	apache1
-MOD_EXTN=	so
-.endif
 
 PTHREAD_OPTS+=	require
 
diff --git a/www/Makefile b/www/Makefile
index fb7484a397a..34697567cb3 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1042 2014/06/09 00:51:48 rodent Exp $
+# $NetBSD: Makefile,v 1.1043 2014/06/10 15:22:14 joerg Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -11,41 +11,16 @@ SUBDIR+=	album
 SUBDIR+=	album_themes
 SUBDIR+=	amaya
 SUBDIR+=	analog
-SUBDIR+=	ap-Embperl
-SUBDIR+=	ap-access-referer
-SUBDIR+=	ap-auth-cookie
 SUBDIR+=	ap-auth-external
 SUBDIR+=	ap-auth-kerb
-SUBDIR+=	ap-auth-ldap
 SUBDIR+=	ap-auth-mysql
-SUBDIR+=	ap-auth-ntlm
-SUBDIR+=	ap-auth-pam
-SUBDIR+=	ap-auth-pgsql
-SUBDIR+=	ap-auth-postgresql
-SUBDIR+=	ap-auth-radius
-SUBDIR+=	ap-auth-script
-SUBDIR+=	ap-bandwidth
-SUBDIR+=	ap-dav
-SUBDIR+=	ap-dtcl
 SUBDIR+=	ap-fastcgi
 SUBDIR+=	ap-geoip2
-SUBDIR+=	ap-gzip
-SUBDIR+=	ap-jk
-SUBDIR+=	ap-layout
 SUBDIR+=	ap-mono
-SUBDIR+=	ap-mp3
-SUBDIR+=	ap-perl
 SUBDIR+=	ap-php
-SUBDIR+=	ap-python
-SUBDIR+=	ap-rivet
 SUBDIR+=	ap-rpaf
 SUBDIR+=	ap-ruby
 SUBDIR+=	ap-scgi
-SUBDIR+=	ap-ssl
-SUBDIR+=	ap-throttle
-SUBDIR+=	ap-xslt
-SUBDIR+=	ap2-auth-external
-SUBDIR+=	ap2-auth-ldap
 SUBDIR+=	ap2-auth-mellon
 SUBDIR+=	ap2-auth-mysql
 SUBDIR+=	ap2-auth-ntlm
@@ -55,8 +30,6 @@ SUBDIR+=	ap2-auth-xradius
 SUBDIR+=	ap2-authn-otp
 SUBDIR+=	ap2-bw
 SUBDIR+=	ap2-cband
-SUBDIR+=	ap2-chroot
-SUBDIR+=	ap2-fastcgi
 SUBDIR+=	ap2-fcgid
 SUBDIR+=	ap2-jk
 SUBDIR+=	ap2-perl
@@ -66,19 +39,16 @@ SUBDIR+=	ap2-suphp
 SUBDIR+=	ap2-transform
 SUBDIR+=	ap2-wsgi
 SUBDIR+=	ap2-xsendfile
-SUBDIR+=	ap2-xslt2
 SUBDIR+=	ap22-authn-sasl
 SUBDIR+=	ap22-authnz-external
 SUBDIR+=	ap22-authz-ldap
 SUBDIR+=	ap22-dnssd
 SUBDIR+=	ap22-limitipconn
 SUBDIR+=	ap22-vhost-ldap
-SUBDIR+=	apache
 SUBDIR+=	apache-roller
 SUBDIR+=	apache-tomcat55
 SUBDIR+=	apache-tomcat6
 SUBDIR+=	apache-tomcat7
-SUBDIR+=	apache2
 SUBDIR+=	apache22
 SUBDIR+=	apache24
 SUBDIR+=	apachetop
@@ -235,14 +205,12 @@ SUBDIR+=	p5-AnyEvent-HTTPD
 SUBDIR+=	p5-AnyEvent-ReverseHTTP
 SUBDIR+=	p5-AnyEvent-SCGI
 SUBDIR+=	p5-Apache-ASP
-SUBDIR+=	p5-Apache-AuthCookie
 SUBDIR+=	p5-Apache-AuthCookieDBI
 SUBDIR+=	p5-Apache-DBILogConfig
 SUBDIR+=	p5-Apache-DBILogger
 SUBDIR+=	p5-Apache-Filter
 SUBDIR+=	p5-Apache-Gallery
 SUBDIR+=	p5-Apache-LogFormat-Compiler
-SUBDIR+=	p5-Apache-Reload
 SUBDIR+=	p5-Apache-SSI
 SUBDIR+=	p5-Apache-Session
 SUBDIR+=	p5-Apache-Session-SharedMem
diff --git a/www/ap-Embperl/DESCR b/www/ap-Embperl/DESCR
deleted file mode 100644
index bbf79f9dd18..00000000000
--- a/www/ap-Embperl/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-  Embperl gives you the power to embed Perl code in your HTML
-documents.  Using Perl means being able to use a very
-elaborate programming language, which is widely used for
-WWW purposes. You can also use hundreds of Perl modules
-which have already been written - including DBI - for
-database access to a growing number of database systems.
-
-  While this could also be done with other packages, Embperl
-has several features especially for HTML: dynamic tables,
-formfield-processing, escaping/unescaping and more.
-
-  Embperl is a server-side tool, which means it's
-browser-independent.  It can run in various ways: Under
-mod_perl, as a cgi script, or offline.
-
-  There is also a module for Database access within Embperl,
-look at DBIx::Recordset.
diff --git a/www/ap-Embperl/Makefile b/www/ap-Embperl/Makefile
deleted file mode 100644
index 6c2049e9552..00000000000
--- a/www/ap-Embperl/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2014/05/29 23:37:55 wiz Exp $
-#
-
-DISTNAME=	HTML-Embperl-1.2.0
-PKGNAME=	ap13-Embperl-1.2.0
-PKGREVISION=	6
-CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTML/} \
-		ftp://ftp.dev.ecos.de/pub/perl/embperl/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://perl.apache.org/embperl/
-COMMENT=	Perl5 library for embedding perl in HTML documents
-
-CONFLICTS=	ap-Embperl-[0-9]*
-
-DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
-
-PERL5_PACKLIST=	auto/HTML/Embperl/.packlist
-
-MAKE_ENV+=	APACHE_SRC=${PREFIX}/include/httpd
-MAKE_ENV+=	APACHE_MODULES=${PREFIX}/lib/httpd
-MAKE_ENV+=	APACHE=${PREFIX}/sbin/httpd
-
-.include "../../lang/perl5/module.mk"
-.include "../../www/ap-perl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-Embperl/distinfo b/www/ap-Embperl/distinfo
deleted file mode 100644
index 81f14ecd21d..00000000000
--- a/www/ap-Embperl/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:08:27 wiz Exp $
-
-SHA1 (HTML-Embperl-1.2.0.tar.gz) = dd022431682777ea46870b54ed3fb1b810e3de52
-RMD160 (HTML-Embperl-1.2.0.tar.gz) = 699c3cfba9e28f5460c596271e674543d14243da
-Size (HTML-Embperl-1.2.0.tar.gz) = 254872 bytes
-SHA1 (patch-aa) = 84f571837cb69c556539195fd740b698856a73f9
-SHA1 (patch-ab) = 30ad449b639ebae16e7c45f1c7c6bc41a3554fc7
diff --git a/www/ap-Embperl/patches/patch-aa b/www/ap-Embperl/patches/patch-aa
deleted file mode 100644
index 291fecf5f35..00000000000
--- a/www/ap-Embperl/patches/patch-aa
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/02 20:46:35 rh Exp $
-
-Our perl_module is named mod_perl.so, not libperl.so
-Get rid of annoying interaction, partly by commenting out some code,
-partly by adding support for a few environment variables.
-
---- Makefile.PL.dist	Wed Nov 17 07:40:47 1999
-+++ Makefile.PL	Thu Dec  2 19:38:08 1999
-@@ -24,10 +24,10 @@
- %neededmodules =
-     ( 
-       'mod_perl.c' => { name	    => 'perl_module', 
--			path	    => ['$apache_src/modules/perl/libperl.so', '$EPBINDIR/modules/libperl.so'],
-+			path	    => ['$apache_src/modules/perl/mod_perl.so', '$EPBINDIR/modules/mod_perl.so'],
- 			win32path   => ['$EPBINDIR/modules/apachemoduleperl.dll'],
- 			win32path   => ['$mpdll'],
--			file	    => 'libperl.so',
-+			file	    => 'mod_perl.so',
- 			win32file   => 'apachemoduleperl.dll',
- 		      },
-       'mod_dir.c'  => { name	    => 'dir_module', 
-@@ -328,7 +328,8 @@
- 
-     if (-e "$apache_src/httpd.h" || -e "$apache_src/main/httpd.h" || -e "$apache_src/include/httpd.h")
- 	    {
--	    $b = GetYesNo ("Use $apache_src as Apache source", 'y') if (!$b) ;
-+	    # $b = GetYesNo ("Use $apache_src as Apache source", 'y') if (!$b) ;
-+	    $b = 1;
- 	    }
-     }
- 
-@@ -519,7 +520,8 @@
-             $EPGROUP = GetString ("Group to run httpd", $EPGROUP) ;
-             }
-         
--        $EPHTTPD = "$apache_src/httpd" ;
-+	$EPHTTPD = $ENV{APACHE};
-+        $EPHTTPD = "$apache_src/httpd" if (! -e $EPHTTPD);
-         $EPHTTPD = "$apache_src/httpsd" if (!-e $EPHTTPD && -e "$apache_src/httpsd") ;
-         
-         if (!-e $EPHTTPD)
-@@ -565,7 +567,9 @@
-     $EPBINDIR	  = dirname ($EPHTTPD) ;    
-     $EPMODPERL	  = '' ;
-     
--    $addmodpath = '' ;
-+    # $addmodpath = '' ;
-+    $addmodpath = $ENV{APACHE_MODULES};
-+    $addmodpath = '' if (! -d $addmodpath);
-     while (($mod, $opt) = each %neededmodules)
- 	{
- 	if (!grep (/$mod/, @modules))
diff --git a/www/ap-Embperl/patches/patch-ab b/www/ap-Embperl/patches/patch-ab
deleted file mode 100644
index 0e79839cd6f..00000000000
--- a/www/ap-Embperl/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/12/02 20:46:35 rh Exp $
-
-Perl's pod2man complains of missing "DESCRIPTION", so add one.
-
---- EmbperlD.pod.dist	Wed Nov 17 07:40:48 1999
-+++ EmbperlD.pod	Thu Dec  2 19:45:01 1999
-@@ -8,6 +8,8 @@
- 
- I<Embperl> ist ein Perlmodul welches es erlaubt beliebigen Perlcode in HTML Dokumente einzuf�gen.
- 
-+=head1 DESCRIPTION
-+
- =head1 Aufrufen/Konfigurieren von Embperl
- 
- =head2 mod_perl Konfiguration
diff --git a/www/ap-auth-external/DESCR b/www/ap-auth-external/DESCR
deleted file mode 100644
index 0a4e81c24c1..00000000000
--- a/www/ap-auth-external/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-The Apache HTTP Daemon can be configured to require users to supply logins
-and passwords before accessing pages in some directories. Authentication is
-the process of checking if the password given is correct for a user. Apache
-has standard modules for authenticating out of several different kinds of
-databases. The external authentication module provides a flexible tool for
-creating authentication systems based on other databases.
-
-The module can be used in either of two somewhat divergent ways:
-1) External Authentication:
-
-When a user supplies a login and password, mod_auth*_external runs a program
-you write, passing it the login and password. Your program does whatever
-checking and logging it needs to, and then returns a Accept/Reject flag to
-Apache.
-
-2) Hardcoded Authentication:
-
-Some hooks have been inserted into mod_auth*_external to make it easy to
-replace the call to the external authentication program with a call to a
-hardcoded internal authentication routine that you write.
diff --git a/www/ap-auth-external/MESSAGE b/www/ap-auth-external/MESSAGE
deleted file mode 100644
index 687b1d78364..00000000000
--- a/www/ap-auth-external/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2007/02/03 04:13:25 obache Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule ${MODULE_NAME} lib/httpd/mod_auth_external.so
-
-===========================================================================
diff --git a/www/ap-auth-external/Makefile b/www/ap-auth-external/Makefile
deleted file mode 100644
index 60e5f8b5dd6..00000000000
--- a/www/ap-auth-external/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2012/10/28 06:30:02 asau Exp $
-#
-
-DISTNAME=	mod_auth_external-${DISTVERS}
-PKGREVISION=	2
-PKGNAME=	${APACHE_PKG_PREFIX}-auth-external-${DISTVERS}
-CATEGORIES=	www
-MASTER_SITES=	http://mod-auth-external.googlecode.com/files/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/mod-auth-external/
-COMMENT=	Apache module for external program authentication
-
-PKG_APACHE_ACCEPTED=	apache13
-
-.include "../../mk/apache.mk"
-
-APACHE_MODULE_NAME=	mod_auth_external.${MODULE_EXT}
-
-DISTVERS=	2.1.19
-MODULE_EXT=	so
-MESSAGE_SUBST+=	MODULE_NAME=external_auth_module
-
-.include "../../www/apache/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-external/PLIST b/www/ap-auth-external/PLIST
deleted file mode 100644
index 6fdc24e064f..00000000000
--- a/www/ap-auth-external/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/19 09:00:24 sborrill Exp $
-lib/httpd/mod_auth_external.so
diff --git a/www/ap-auth-external/distinfo b/www/ap-auth-external/distinfo
deleted file mode 100644
index a5056cd3ef8..00000000000
--- a/www/ap-auth-external/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2007/11/02 15:06:26 sborrill Exp $
-
-SHA1 (mod_auth_external-2.1.19.tar.gz) = da2266f93acf82e488e14380157f1acd69198ad9
-RMD160 (mod_auth_external-2.1.19.tar.gz) = f4012119f3e3eca73b07c1f90292338e6256e31a
-Size (mod_auth_external-2.1.19.tar.gz) = 51390 bytes
-SHA1 (mod_auth_external-2.2.11.tar.gz) = da89adcdac611ec8c0f69a79f2edff669210f2a1
-RMD160 (mod_auth_external-2.2.11.tar.gz) = be27183d8049989f64548a5c8dd3cdecc3b3a5e2
-Size (mod_auth_external-2.2.11.tar.gz) = 52542 bytes
-SHA1 (patch-aa) = 259f28f6db5937d9c015c60339c5fd14b8ab7dc9
diff --git a/www/ap-auth-external/patches/patch-aa b/www/ap-auth-external/patches/patch-aa
deleted file mode 100644
index 2c617471338..00000000000
--- a/www/ap-auth-external/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/11/02 15:06:26 sborrill Exp $
-
---- mod_auth_external.c.orig	2003-10-23 15:20:45.000000000 +0100
-+++ mod_auth_external.c	2007-07-16 15:28:19.000000000 +0100
-@@ -227,6 +227,7 @@
- #define ENV_PASS	"PASS"
- #define ENV_GROUP	"GROUP"
- #define ENV_URI		"URI"
-+#define ENV_METHOD	"METHOD"
- #define ENV_IP		"IP"
- #define ENV_HOST	"HOST"		/* Remote Host */
- #define ENV_HTTP_HOST	"HTTP_HOST"	/* Local Host */
-@@ -485,6 +486,9 @@
- 	if (r->uri)
- 	    child_env[i++]= ap_pstrcat(r->pool, ENV_URI"=", r->uri, NULL);
- 
-+	if (r->method)
-+	    child_env[i++]= ap_pstrcat(r->pool, ENV_METHOD"=", r->method, NULL);
-+
- 	if ((host= lookup_header(r,"Host")) != NULL)
- 	    child_env[i++]= ap_pstrcat(r->pool, ENV_HTTP_HOST"=", host, NULL);
- 
diff --git a/www/ap-auth-kerb/Makefile b/www/ap-auth-kerb/Makefile
index ad05647c4f1..824938b6347 100644
--- a/www/ap-auth-kerb/Makefile
+++ b/www/ap-auth-kerb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/28 06:30:02 asau Exp $
+# $NetBSD: Makefile,v 1.10 2014/06/10 15:22:14 joerg Exp $
 
 DISTNAME=	mod_auth_kerb-5.4
 PKGNAME=	${DISTNAME:S/mod/${APACHE_PKG_PREFIX}/:S/_/-/g}
@@ -10,7 +10,7 @@ HOMEPAGE=	http://modauthkerb.sourceforge.net/
 COMMENT=	Module to allow Apache authentication using Kerberos
 LICENSE=	modified-bsd
 
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 CONFLICTS=	ap-auth-kerb-[0-9]*
 
diff --git a/www/ap-auth-ldap/DESCR b/www/ap-auth-ldap/DESCR
deleted file mode 100644
index 6565c30c8db..00000000000
--- a/www/ap-auth-ldap/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is an authentication module for Apache that allows you to
-authenticate HTTP clients using user entries in an LDAP directory.
diff --git a/www/ap-auth-ldap/MESSAGE b/www/ap-auth-ldap/MESSAGE
deleted file mode 100644
index 1567a266a90..00000000000
--- a/www/ap-auth-ldap/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:42 wiz Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule auth_ldap_module lib/httpd/auth_ldap.so
-
-===========================================================================
diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
deleted file mode 100644
index 587dd838f6e..00000000000
--- a/www/ap-auth-ldap/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.37 2014/02/12 23:18:43 tron Exp $
-
-DISTNAME=	auth_ldap-1.6.1
-PKGNAME=	ap13-auth-ldap-1.6.1
-PKGREVISION=	5
-SVR4_PKGNAME=	apldap
-CATEGORIES=	www databases
-MASTER_SITES=	http://www.rudedog.org/auth_ldap/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.rudedog.org/auth_ldap/
-COMMENT=	Module to allow apache authentication against an LDAP directory
-
-CONFLICTS=	ap-auth-ldap-[0-9]*
-
-APACHE_MODULE_NAME=	auth_ldap.so
-CPPFLAGS+=		-DWITH_OPENLDAP
-LDFLAGS+=		-lldap -llber
-
-post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/mod_auth_ldap
-	${INSTALL_DATA} ${WRKSRC}/FAQ.html				\
-		${DESTDIR}${PREFIX}/share/doc/mod_auth_ldap
-	${INSTALL_DATA} ${WRKSRC}/auth_ldap.html			\
-		${DESTDIR}${PREFIX}/share/doc/mod_auth_ldap
-	${INSTALL_DATA} ${WRKSRC}/future-directions.html		\
-		${DESTDIR}${PREFIX}/share/doc/mod_auth_ldap
-
-.include "../../www/apache/module.mk"
-
-.include "../../databases/openldap-client/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-ldap/PLIST b/www/ap-auth-ldap/PLIST
deleted file mode 100644
index b661862bb63..00000000000
--- a/www/ap-auth-ldap/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:15 joerg Exp $
-lib/httpd/auth_ldap.so
-share/doc/mod_auth_ldap/FAQ.html
-share/doc/mod_auth_ldap/auth_ldap.html
-share/doc/mod_auth_ldap/future-directions.html
diff --git a/www/ap-auth-ldap/distinfo b/www/ap-auth-ldap/distinfo
deleted file mode 100644
index b0f212b1bc3..00000000000
--- a/www/ap-auth-ldap/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2006/01/15 16:25:41 kleink Exp $
-
-SHA1 (auth_ldap-1.6.1.tar.gz) = 37e163ee78c5f25ef1ef951cecd4d603dbf55cf4
-RMD160 (auth_ldap-1.6.1.tar.gz) = 165c00e37552705843381e98db73e458f6d8026c
-Size (auth_ldap-1.6.1.tar.gz) = 82718 bytes
-SHA1 (patch-aa) = 1780795616eb3942f395ebb5ff948fe5ebd6f390
diff --git a/www/ap-auth-ldap/patches/patch-aa b/www/ap-auth-ldap/patches/patch-aa
deleted file mode 100644
index 5b91122e20a..00000000000
--- a/www/ap-auth-ldap/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/01/15 16:25:41 kleink Exp $
-
---- auth_ldap.c.orig	2006-01-09 19:08:56.000000000 +0100
-+++ auth_ldap.c	2006-01-15 17:19:30.000000000 +0100
-@@ -173,7 +173,6 @@
- #else
-     if ((sec->ldc->ldap = ldap_init(sec->host, sec->port)) == NULL) {
- #endif
--      extern int errno;
-       auth_ldap_log_reason(r, "Could not connect to LDAP server: %s", strerror(errno));
-       return 0;
-     }
diff --git a/www/ap-auth-mysql/Makefile b/www/ap-auth-mysql/Makefile
index b395578877a..d71f110c9cb 100644
--- a/www/ap-auth-mysql/Makefile
+++ b/www/ap-auth-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2013/03/28 21:40:50 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2014/06/10 15:22:14 joerg Exp $
 #
 
 DISTNAME=		mod-auth-mysql_4.3.9.orig
@@ -12,7 +12,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://packages.debian.org/sid/libapache2-mod-auth-mysql
 COMMENT=		Module to allow apache authentication against a MySQL database
 
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 CONFLICTS=	ap-auth-mysql-[0-9]*
 
@@ -27,11 +27,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME:S/.orig//:S/_/-/}
 
 .include "../../mk/apache.mk"
 
-.if ${PKG_APACHE} == "apache13"
-CONFIGURE_ARGS+=	--enable-apache13 --disable-apache2
-.else
 CONFIGURE_ARGS+=	--disable-apache13 --enable-apache2
-.endif
 
 APACHE_MODULE=		YES
 APACHE_MODULE_NAME=	mod_auth_mysql.so
diff --git a/www/ap-auth-ntlm/DESCR b/www/ap-auth-ntlm/DESCR
deleted file mode 100644
index caf744bde0a..00000000000
--- a/www/ap-auth-ntlm/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-NTLM is an authentication protocol used by Microsoft Internet Informations
-Server(tm) and Microsoft Internet Explorer(tm). While it is not really
-secure, it offers background authentication (the workstation logon
-credentials of users are passed through to the web server). This feature is
-widely used in intranets based on these Microsoft products.
-
-This module is implementing NTLM authentication for Apache on Unix
-platforms. It is available free of charges under the BSD License.
diff --git a/www/ap-auth-ntlm/MESSAGE b/www/ap-auth-ntlm/MESSAGE
deleted file mode 100644
index 2a82ca63c46..00000000000
--- a/www/ap-auth-ntlm/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2008/10/17 19:23:25 sborrill Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule ${MODULE_NAME} lib/httpd/mod_ntlm.so
-
-An example httpd.conf fragment can be found in:
-
-  ${EGDIR}/ntlm.conf
-
-===========================================================================
diff --git a/www/ap-auth-ntlm/Makefile b/www/ap-auth-ntlm/Makefile
deleted file mode 100644
index 17812168d40..00000000000
--- a/www/ap-auth-ntlm/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2012/10/28 06:30:03 asau Exp $
-#
-
-DISTNAME=	ntlm1
-PKGNAME=	${APACHE_PKG_PREFIX}-auth-ntlm-${DISTVERS}
-CATEGORIES=	www
-MASTER_SITES=	http://www.jamiekerwick.co.uk/modntlm/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://modntlm.sourceforge.com/
-COMMENT=	Apache module for NTLM authentication
-
-PKG_APACHE_ACCEPTED=	apache13
-
-.include "../../mk/apache.mk"
-
-APACHE_MODULE_NAME=	mod_ntlm.${MODULE_EXT}
-
-WRKSRC=		${WRKDIR}
-
-DISTVERS=	0.5
-MODULE_EXT=	so
-MESSAGE_SUBST+=	MODULE_NAME=ntlm_module
-MESSAGE_SUBST+=	EGDIR=${EGDIR}
-
-EGDIR=		${PREFIX}/share/examples/mod_ntlm
-
-INSTALLATION_DIRS+=	${EGDIR}
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/ntlm.conf ${DESTDIR}${EGDIR}
-
-.include "../../www/apache/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-ntlm/PLIST b/www/ap-auth-ntlm/PLIST
deleted file mode 100644
index 993297f050e..00000000000
--- a/www/ap-auth-ntlm/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:15 joerg Exp $
-lib/httpd/mod_ntlm.so
-share/examples/mod_ntlm/ntlm.conf
diff --git a/www/ap-auth-ntlm/distinfo b/www/ap-auth-ntlm/distinfo
deleted file mode 100644
index 961a285a9c6..00000000000
--- a/www/ap-auth-ntlm/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2009/06/05 08:13:48 hasso Exp $
-
-SHA1 (ntlm1.tar.gz) = f1fb13c664125c8d543069d3357a740cbb76a154
-RMD160 (ntlm1.tar.gz) = 768ff7e0fb381c1b6642d6d1a739c209f17f26fd
-Size (ntlm1.tar.gz) = 79318 bytes
-SHA1 (patch-ntlmssp.inc.c) = 43e5ba88ccb30ace9e17ee442b62900b742ea6f0
-SHA1 (patch-smbencrypt.inc.c) = f8990066f6467655b10d314eeb1a564abe49cf87
-SHA1 (patch-smblib.inc.c) = 90c4c795a7d4619650e565d3055cf2a0447b7d70
diff --git a/www/ap-auth-ntlm/patches/patch-ntlmssp.inc.c b/www/ap-auth-ntlm/patches/patch-ntlmssp.inc.c
deleted file mode 100644
index ed1b9922524..00000000000
--- a/www/ap-auth-ntlm/patches/patch-ntlmssp.inc.c
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-ntlmssp.inc.c,v 1.2 2008/12/19 12:49:54 joerg Exp $
---- ntlmssp.inc.c.orig	2004-02-19 15:24:08.000000000 +0000
-+++ ntlmssp.inc.c	2008-10-17 17:53:34.000000000 +0100
-@@ -1,1 +1,2 @@
-+#include "httpd/httpd.h"
- /*
diff --git a/www/ap-auth-ntlm/patches/patch-smbencrypt.inc.c b/www/ap-auth-ntlm/patches/patch-smbencrypt.inc.c
deleted file mode 100644
index 3cb5fbb0244..00000000000
--- a/www/ap-auth-ntlm/patches/patch-smbencrypt.inc.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-smbencrypt.inc.c,v 1.2 2009/06/05 08:13:48 hasso Exp $
---- smbval/smbencrypt.inc.c.orig	2003-06-05 20:21:26.000000000 +0100
-+++ smbval/smbencrypt.inc.c	2008-10-17 17:47:37.000000000 +0100
-@@ -19,7 +19,9 @@
- #include <arpa/inet.h>
- #include <dirent.h>
- #include <string.h>
-+#if !defined(__NetBSD__) && !defined(__DragonFly__)
- #include <sys/vfs.h>
-+#endif
- #include <netinet/in.h>
- 
- #include "smblib-priv.h"
diff --git a/www/ap-auth-ntlm/patches/patch-smblib.inc.c b/www/ap-auth-ntlm/patches/patch-smblib.inc.c
deleted file mode 100644
index bb488366aa1..00000000000
--- a/www/ap-auth-ntlm/patches/patch-smblib.inc.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-smblib.inc.c,v 1.1.1.1 2008/10/17 19:23:25 sborrill Exp $
---- smbval/smblib.inc.c.orig	2004-02-19 15:24:46.000000000 +0000
-+++ smbval/smblib.inc.c	2008-10-17 17:50:39.000000000 +0100
-@@ -22,8 +22,8 @@
- #include <stdio.h>
- #include <malloc.h>
- 
--static int SMBlib_errno;
--static int SMBlib_SMB_Error;
-+int SMBlib_errno;
-+int SMBlib_SMB_Error;
- #define SMBLIB_ERRNO
- #define uchar unsigned char
- #include "smblib-priv.h"
-@@ -33,7 +33,7 @@
- 
- #include <signal.h>
- 
--static SMB_State_Types SMBlib_State;
-+SMB_State_Types SMBlib_State;
- 
- /* Initialize the SMBlib package     */
- static int 
diff --git a/www/ap-auth-pam/DESCR b/www/ap-auth-pam/DESCR
deleted file mode 100644
index b66bc2ea4a1..00000000000
--- a/www/ap-auth-pam/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is an authentication module for Apache that allows you to authenticate
-HTTP clients using Pluggable Authentication Modules (PAM).
diff --git a/www/ap-auth-pam/MESSAGE b/www/ap-auth-pam/MESSAGE
deleted file mode 100644
index 28ffa78287c..00000000000
--- a/www/ap-auth-pam/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:50 wiz Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule pam_auth_module lib/httpd/mod_auth_pam.so
-
-For more information, see
-
-	${PREFIX}/share/doc/html/mod_auth_pam/configure.html
-
-===========================================================================
diff --git a/www/ap-auth-pam/Makefile b/www/ap-auth-pam/Makefile
deleted file mode 100644
index d00103eafc9..00000000000
--- a/www/ap-auth-pam/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2012/10/28 06:30:03 asau Exp $
-
-DISTNAME=	mod_auth_pam-1.0a
-PKGNAME=	ap13-auth-pam-1.0a
-CATEGORIES=	www
-MASTER_SITES=	http://pam.sourceforge.net/mod_auth_pam/dist/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://pam.sourceforge.net/mod_auth_pam/
-COMMENT=	Module to allow Apache authentication using PAM
-
-CONFLICTS=	ap-auth-pam-[0-9]*
-
-APACHE_MODULE_NAME=	mod_auth_pam.so
-LDFLAGS+=		-lpam
-
-EGDIR=		${PREFIX}/share/examples/mod_auth_pam
-HTMLDIR=	${PREFIX}/share/doc/html/mod_auth_pam
-
-INSTALLATION_DIRS+=	${EGDIR} ${HTMLDIR}
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/samples/httpd ${DESTDIR}${EGDIR}/httpd.pam
-	${INSTALL_DATA} ${WRKSRC}/doc/configure.html ${DESTDIR}${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/faq.html ${DESTDIR}${HTMLDIR}
-
-.include "../../www/apache/module.mk"
-.include "../../mk/pam.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-pam/PLIST b/www/ap-auth-pam/PLIST
deleted file mode 100644
index c05e3e10fed..00000000000
--- a/www/ap-auth-pam/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:15 joerg Exp $
-lib/httpd/mod_auth_pam.so
-share/doc/html/mod_auth_pam/configure.html
-share/doc/html/mod_auth_pam/faq.html
-share/examples/mod_auth_pam/httpd.pam
diff --git a/www/ap-auth-pam/distinfo b/www/ap-auth-pam/distinfo
deleted file mode 100644
index e7bd2798f96..00000000000
--- a/www/ap-auth-pam/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:08:27 wiz Exp $
-
-SHA1 (mod_auth_pam-1.0a.tar.gz) = a3c29d10690101cf1bd9ce1c262fdbe8c12cc0b3
-RMD160 (mod_auth_pam-1.0a.tar.gz) = 8e6aa2cf7d41da00b92c27a2ec9f9e4dedff8285
-Size (mod_auth_pam-1.0a.tar.gz) = 8765 bytes
-SHA1 (patch-aa) = 7470a6a196bd8fd1d44d723fd647ad6f3b9a5784
diff --git a/www/ap-auth-pam/patches/patch-aa b/www/ap-auth-pam/patches/patch-aa
deleted file mode 100644
index 08360c99548..00000000000
--- a/www/ap-auth-pam/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/05/24 16:18:58 kristerw Exp $
-
---- mod_auth_pam.c.orig	2004-05-24 18:13:45.000000000 +0200
-+++ mod_auth_pam.c	2004-05-24 18:15:20.000000000 +0200
-@@ -197,12 +197,12 @@
- 
- static command_rec auth_pam_cmds[] = {
-   { "AuthFailDelay", (const char*(*)())auth_fail_delay, 0, OR_AUTHCFG, TAKE1,
--    "number of micro seconds to wait after failed authentication attempt. defau
-+    "number of micro seconds to wait after failed authentication attempt. defau\
- lt is 0" },
-   { "AuthPAM_Authorative", (const char*(*)())auth_fall_through, NULL, OR_AUTHCFG, FLAG,
-     "no longer in use -- see AuthPAM_FallThrough instead" },
-   { "AuthPAM_FallThrough", (const char*(*)())auth_fall_through, NULL, OR_AUTHCFG, FLAG,
--    "on|off - determines if other authentication methods are attempted if this
-+    "on|off - determines if other authentication methods are attempted if this \
- one fails; default is off" },
-   { "AuthPAM_Enabled", (const char*(*)())auth_enable, NULL, OR_AUTHCFG, FLAG,
-     "on|off - determines if PAM authentication is enabled; default is on" },
diff --git a/www/ap-auth-postgresql/DESCR b/www/ap-auth-postgresql/DESCR
deleted file mode 100644
index de69d8665c5..00000000000
--- a/www/ap-auth-postgresql/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-The PostgreSQL Authentication Module (mod_auth_pg) enables Apache to
-authenticate users with the information stored in a PostgreSQL database.
-This module gets a username and password pair in the standard way or
-from a cookie, and you can choose your preferred method.
diff --git a/www/ap-auth-postgresql/MESSAGE b/www/ap-auth-postgresql/MESSAGE
deleted file mode 100644
index 69ab384c0b7..00000000000
--- a/www/ap-auth-postgresql/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:43 wiz Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule auth_pg_module lib/httpd/mod_auth_pg.so
-
-===========================================================================
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
deleted file mode 100644
index ddc2b4610ae..00000000000
--- a/www/ap-auth-postgresql/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.37 2014/06/10 14:21:37 joerg Exp $
-
-DISTNAME=	AuthPG-1.4
-PKGNAME=	ap13-auth-postgresql-1.4
-PKGREVISION=	2
-CATEGORIES=	www databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=authpg/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://authpg.sourceforge.net/
-COMMENT=	Module to allow apache authentication against a Postgresql database
-
-CONFLICTS=	ap-auth-postgresql-[0-9]*
-CONFLICTS+=	ap-auth-pgsql-[0-9]*
-CONFLICTS+=	ap13-auth-pgsql-[0-9]*
-
-APACHE_MODULE_NAME=	mod_auth_pg.so
-
-CPPFLAGS+=	-I${PGSQL_PREFIX}/include/postgresql
-LDFLAGS+=	-lpq -lcrypt
-
-DOCDIR=	${PREFIX}/share/doc/mod_auth_pg
-EGDIR=	${PREFIX}/share/examples/mod_auth_pg
-
-INSTALLATION_DIRS+=	${DOCDIR} ${EGDIR}
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/mod_auth_pg.html ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/mod_auth_pg.ko.html ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.ko ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample.htaccess ${DESTDIR}${EGDIR}/mod_auth_pg.htaccess
-	${INSTALL_DATA} ${WRKSRC}/sample.sql ${DESTDIR}${EGDIR}/mod_auth_pg.sql
-
-.include "../../www/apache/module.mk"
-
-.include "../../mk/pgsql.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-postgresql/PLIST b/www/ap-auth-postgresql/PLIST
deleted file mode 100644
index 6aa562f6edd..00000000000
--- a/www/ap-auth-postgresql/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:15 joerg Exp $
-lib/httpd/mod_auth_pg.so
-share/doc/mod_auth_pg/README
-share/doc/mod_auth_pg/README.ko
-share/doc/mod_auth_pg/mod_auth_pg.html
-share/doc/mod_auth_pg/mod_auth_pg.ko.html
-share/examples/mod_auth_pg/mod_auth_pg.htaccess
-share/examples/mod_auth_pg/mod_auth_pg.sql
diff --git a/www/ap-auth-postgresql/distinfo b/www/ap-auth-postgresql/distinfo
deleted file mode 100644
index 34d974e658a..00000000000
--- a/www/ap-auth-postgresql/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/03/20 19:59:21 joerg Exp $
-
-SHA1 (AuthPG-1.4.tar.gz) = 06c73b8ea8b5e6145e351d5575d26eef4527532e
-RMD160 (AuthPG-1.4.tar.gz) = 7fcfeb2ff1321f7bf128321f54da8210e04bc1be
-Size (AuthPG-1.4.tar.gz) = 12681 bytes
-SHA1 (patch-aa) = 4654bae71c324c9614c3c8334717d8638c57ac42
diff --git a/www/ap-auth-postgresql/patches/patch-aa b/www/ap-auth-postgresql/patches/patch-aa
deleted file mode 100644
index c7fe538f658..00000000000
--- a/www/ap-auth-postgresql/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/03/20 19:59:22 joerg Exp $
-
---- mod_auth_pg.c.orig	2006-03-20 19:56:45.000000000 +0000
-+++ mod_auth_pg.c
-@@ -2,7 +2,7 @@
- /*  mod_auth_pg.c       Copyright 1998-2003 Min Sik Kim <minskim@bawi.org> */
- /*                                                                         */
- 
--#include <postgresql/libpq-fe.h>
-+#include <libpq-fe.h>
- 
- #include "httpd.h"
- #include "http_config.h"
diff --git a/www/ap-dav/DESCR b/www/ap-dav/DESCR
deleted file mode 100644
index bf32071a0f7..00000000000
--- a/www/ap-dav/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-WebDAV stands for "Web-based Distributed Authoring and Versioning".  It is
-a set of extensions to the HTTP protocol which allows users to
-collaboratively edit and manage files on remote web servers.
-
-mod_dav is an Apache module to provide DAV capabilities (RFC 2518) for the
-Apache web server.  mod_dav currently implements a Class 1 and Class 2 DAV
-server.  This means that it provides all the basic DAV facilities for
-manipulating resources (files) on the target web server, along with
-manipulating properties on those resources.  In addition, it handles the
-(un)locking of resources so that clients can have exclusive access to
-modify resources.
diff --git a/www/ap-dav/MESSAGE b/www/ap-dav/MESSAGE
deleted file mode 100644
index 3e70a59ea03..00000000000
--- a/www/ap-dav/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:43 wiz Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule dav_module lib/httpd/mod_dav.so
-
-For more information, see
-
-	${PREFIX}/share/doc/mod_dav/INSTALL
-
-===========================================================================
diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile
deleted file mode 100644
index 7f27c4952a6..00000000000
--- a/www/ap-dav/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2012/10/28 06:30:03 asau Exp $
-
-DISTNAME=		mod_dav-1.0.3-1.3.6
-PKGNAME=		ap13-dav-1.0.3
-CATEGORIES=		www
-MASTER_SITES=		http://www.webdav.org/mod_dav/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.webdav.org/mod_dav/
-COMMENT=		Apache WebDAV module
-
-CONFLICTS=		ap-dav-[0-9]*
-
-APACHE_MODULE=		YES
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
-
-AP_MODULE_DIR=		${PREFIX}/lib/httpd
-DOCDIR=			${PREFIX}/share/doc/mod_dav
-HTMLDIR=		${PREFIX}/share/doc/html/mod_dav
-
-INSTALLATION_DIRS=	${AP_MODULE_DIR} ${DOCDIR} ${HTMLDIR}
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/libdav.so ${DESTDIR}${AP_MODULE_DIR}/mod_dav.so
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${DESTDIR}${HTMLDIR}
-
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../www/apache/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-dav/PLIST b/www/ap-dav/PLIST
deleted file mode 100644
index e3122bd9c71..00000000000
--- a/www/ap-dav/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:15 joerg Exp $
-lib/httpd/mod_dav.so
-share/doc/html/mod_dav/LICENSE.html
-share/doc/mod_dav/README
-share/doc/mod_dav/INSTALL
diff --git a/www/ap-dav/distinfo b/www/ap-dav/distinfo
deleted file mode 100644
index 08aea179812..00000000000
--- a/www/ap-dav/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 14:08:27 wiz Exp $
-
-SHA1 (mod_dav-1.0.3-1.3.6.tar.gz) = cf1baa75c14131f96299be3fdf26d1fa91e6c7e3
-RMD160 (mod_dav-1.0.3-1.3.6.tar.gz) = e674c56b66b5ef9fa3edb29f581eb3e2c705d20d
-Size (mod_dav-1.0.3-1.3.6.tar.gz) = 185284 bytes
-SHA1 (patch-ad) = 5c08ec68748b6fabb5cb5361ef04fb760cd76008
diff --git a/www/ap-dav/patches/patch-ad b/www/ap-dav/patches/patch-ad
deleted file mode 100644
index 06d291404f9..00000000000
--- a/www/ap-dav/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/03/06 15:35:07 jlam Exp $
-
---- Makefile.in.orig	Sat Nov  3 10:00:21 2001
-+++ Makefile.in
-@@ -20,6 +20,8 @@
- # the correct directory by placing generated includes first.
- ALL_CFLAGS = $(CPPFLAGS) @INCLUDE@ @CFLAGS@ $(INCLUDE) $(CFLAGS)
- 
-+LDFLAGS = @LDFLAGS@
-+
- SRCS = \
- 	dav_props.c \
- 	dav_util.c \
-@@ -50,7 +52,7 @@
- 
- # For DSO installs with APXS
- libdav.so: $(OBJS)
--	$(APXS) -c -o $@ $(APXS_CFLAGS) $(OBJS) $(APXS_EXP) $(LIBS)
-+	$(APXS) -c -o $@ $(APXS_CFLAGS) $(LDFLAGS) $(OBJS) $(APXS_EXP) $(LIBS)
- 
- # For static installs
- libdav.a: $(OBJS)
diff --git a/www/ap-dtcl/DESCR b/www/ap-dtcl/DESCR
deleted file mode 100644
index 1f7b3f27f2b..00000000000
--- a/www/ap-dtcl/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The mod_dtcl Apache module enables the use of Tcl as an HTML-embedded
-scripting language, similar to PHP. It is fast, light, and lets you
-use the extensive codebase of existing Tcl code, on the web.
diff --git a/www/ap-dtcl/MESSAGE b/www/ap-dtcl/MESSAGE
deleted file mode 100644
index 4cdfeb0a408..00000000000
--- a/www/ap-dtcl/MESSAGE
+++ /dev/null
@@ -1,22 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:43 wiz Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule dtcl_module lib/httpd/mod_dtcl.so
-
-In order to turn on parsing of .ttml pages, you will also need to add
-
-  AddType application/x-httpd-tcl .ttml
-
-Optionally, you can also turn on support for raw in-process tcl execution
-by adding
-
-  AddType application/x-dtcl-tcl .tcl
-
-For more information, see
-
-	${PREFIX}/share/doc/html/mod_dtcl/documentation.html
-
-===========================================================================
diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
deleted file mode 100644
index 6def738ff99..00000000000
--- a/www/ap-dtcl/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile,v 1.33 2014/01/11 14:42:06 adam Exp $
-
-DISTNAME=	mod_dtcl-0.11.6
-PKGNAME=	ap13-dtcl-0.11.2
-PKGREVISION=	3
-CATEGORIES=	www
-MASTER_SITES=	http://tcl.apache.org/mod_dtcl/download/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://tcl.apache.org/
-COMMENT=	Simple, fast Tcl server side scripting for apache
-
-CONFLICTS=	ap-dtcl-[0-9]*
-
-WRKSRC=		${WRKDIR}/mod_dtcl
-
-TCLSH=		${BUILDLINK_PREFIX.tcl}/bin/tclsh
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.apache}/include/httpd -DEAPI
-
-MAKE_ENV+=	TCLSH=${TCLSH:Q}
-MAKE_ENV+=	INCLUDES=${CPPFLAGS:M*:Q}
-
-APACHE_MODULE=	yes
-APACHEMODDIR=	${PREFIX}/lib/httpd
-HTMLDIR=	${PREFIX}/share/doc/html/mod_dtcl
-EGDIR=		${PREFIX}/share/examples/mod_dtcl
-
-INSTALLATION_DIRS=	${APACHEMODDIR} ${HTMLDIR} ${EGDIR}/tests
-
-.include "../../lang/tcl/buildlink3.mk"
-.include "../../www/apache/buildlink3.mk"
-
-do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} builddtcl.sh
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/mod_dtcl.so ${DESTDIR}${APACHEMODDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.gif ${DESTDIR}${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DESTDIR}${HTMLDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} tests/README ${DESTDIR}${EGDIR}/tests
-	cd ${WRKSRC}; ${INSTALL_DATA} tests/dtcl-test.tcl ${DESTDIR}${EGDIR}/tests
-	cd ${WRKSRC}; ${INSTALL_DATA} tests/dtcl-test2.ttml ${DESTDIR}${EGDIR}/tests
-	cd ${WRKSRC}; ${INSTALL_DATA} tests/dtcl.test ${DESTDIR}${EGDIR}/tests
-	cd ${WRKSRC}; ${INSTALL_DATA} tests/makeconf.tcl ${DESTDIR}${EGDIR}/tests
-	cd ${WRKSRC}; ${INSTALL_DATA} tests/runtests.tcl ${DESTDIR}${EGDIR}/tests
-	cd ${WRKSRC}; ${INSTALL_DATA} tests/template.conf.tcl ${DESTDIR}${EGDIR}/tests
-	cd ${WRKSRC}; ${INSTALL_DATA} contrib/*.ttml ${DESTDIR}${EGDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} contrib/*.tcl ${DESTDIR}${EGDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} docs/examples.ttml ${DESTDIR}${EGDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-dtcl/PLIST b/www/ap-dtcl/PLIST
deleted file mode 100644
index 434d77f295d..00000000000
--- a/www/ap-dtcl/PLIST
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:15 joerg Exp $
-lib/httpd/mod_dtcl.so
-share/doc/html/mod_dtcl/asf_logo.gif
-share/doc/html/mod_dtcl/commands.html
-share/doc/html/mod_dtcl/directives.html
-share/doc/html/mod_dtcl/documentation.html
-share/doc/html/mod_dtcl/dtcl.gif
-share/doc/html/mod_dtcl/help.html
-share/doc/html/mod_dtcl/index.html
-share/doc/html/mod_dtcl/install.html
-share/doc/html/mod_dtcl/logoLarge.gif
-share/doc/html/mod_dtcl/nav.html
-share/doc/html/mod_dtcl/other.html
-share/doc/html/mod_dtcl/top.html
-share/examples/mod_dtcl/clocks.ttml
-share/examples/mod_dtcl/dtclparser.tcl
-share/examples/mod_dtcl/examples.ttml
-share/examples/mod_dtcl/tabletransform.tcl
-share/examples/mod_dtcl/tcl_include.tcl
-share/examples/mod_dtcl/tests/README
-share/examples/mod_dtcl/tests/dtcl-test.tcl
-share/examples/mod_dtcl/tests/dtcl-test2.ttml
-share/examples/mod_dtcl/tests/dtcl.test
-share/examples/mod_dtcl/tests/makeconf.tcl
-share/examples/mod_dtcl/tests/runtests.tcl
-share/examples/mod_dtcl/tests/template.conf.tcl
diff --git a/www/ap-dtcl/distinfo b/www/ap-dtcl/distinfo
deleted file mode 100644
index a429a35c10f..00000000000
--- a/www/ap-dtcl/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.11 2012/08/19 06:58:07 marino Exp $
-
-SHA1 (mod_dtcl-0.11.6.tar.gz) = 8a48b2292bb1048b17fd268011d1a4307ef5770e
-RMD160 (mod_dtcl-0.11.6.tar.gz) = 9fe42c888d476029852dad2742accb7b7d654e67
-Size (mod_dtcl-0.11.6.tar.gz) = 90374 bytes
-SHA1 (patch-Makefile) = 6de218f5380c0235e873ebdfc687c82c9c8e0e11
-SHA1 (patch-aa) = 512e310549e475fbd6106eef52d2f789f4a0390b
-SHA1 (patch-ab) = 6eed9b2e971501ddcd1500cab5e16fa6a7037658
diff --git a/www/ap-dtcl/patches/patch-Makefile b/www/ap-dtcl/patches/patch-Makefile
deleted file mode 100644
index 10effc71418..00000000000
--- a/www/ap-dtcl/patches/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2012/08/19 06:58:08 marino Exp $
-
-Fixes error: ERROR: lib/httpd/mod_dtcl.so: missing library: libtcl85.so
-
---- Makefile.orig	2001-09-05 12:01:22.000000000 +0000
-+++ Makefile
-@@ -26,7 +26,7 @@ static: $(OBJECTS) docs/documentation.ht
- 	$(TCL_STLIB_LD) $(STATICLIB) $(OBJECTS) 
- 
- shared: $(OBJECTS) docs/documentation.html
--	$(TCL_SHLIB_LD) -o $(SHLIB) $(OBJECTS) $(TCL_LIB_SPEC) $(TCL_LIBS)
-+	$(TCL_SHLIB_LD) -o $(SHLIB) $(OBJECTS) $(COMPILER_RPATH_FLAG)$(PREFIX)/lib $(TCL_LIB_SPEC) $(TCL_LIBS)
- 
- # I don't have too many C files, so it's just clearer to do things by
- # hand
diff --git a/www/ap-dtcl/patches/patch-aa b/www/ap-dtcl/patches/patch-aa
deleted file mode 100644
index 5d40418ef64..00000000000
--- a/www/ap-dtcl/patches/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2002/05/21 12:04:42 wiz Exp $
-
---- builddtcl.sh.orig	Tue Oct  9 17:29:47 2001
-+++ builddtcl.sh
-@@ -3,53 +3,2 @@
- 
--# Name of tclsh - on FreeBSD, this is probably tclsh8.2
--TCLSH=tclsh  ######### CHANGEME ##########
--# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
--TCLSH=`which $TCLSH`
--
--if [ "$TCLSH" = "" ]
--    then
--    echo "No tclsh executable, please edit builddtcl.sh"
--    exit 1
--fi
--
--TCLSHEXIST=`echo "puts helloworld" | $TCLSH`
--if [ "$TCLSHEXIST" != "helloworld" ]
--    then
--    echo "Tclsh is not $TCLSH, please edit builddtcl.sh"
--    exit 1
--    else
--    echo "Using $TCLSH as tclsh program"
--fi
--
--# Location of Apache source install (for static installs - you can
--# comment this out for shared lib installs
--# APACHE=$HOME/download/apache-1.3/  ######### CHANGEME ##########
--# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
--# APACHE=/usr/local/src/apache-1.3/
--# APACHE=/
--
--export APACHE
--
--if [ -d $APACHE ]
--    then
--    echo "Apache in $APACHE"
--    else
--    echo "Apache NOT in $APACHE, please edit builddtcl.sh"
--    exit 1
--fi
--
--# Location of Apache include files.
--INC=/usr/include/apache-1.3/  ######### CHANGEME ##########
--# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
--# INC=$APACHE/src/include
--
--if [ -f $INC/httpd.h ] 
--    then
--    echo "Apache includes in $INC"
--    INCLUDES="-I$INC" ; export INCLUDES
--    else
--    echo "Apache include files *not* in $INC, please edit builddtcl.sh"
--    exit 1
--fi
--
- # find location of tclConfig.sh, source it, and export variables to
diff --git a/www/ap-dtcl/patches/patch-ab b/www/ap-dtcl/patches/patch-ab
deleted file mode 100644
index aac0ce509e1..00000000000
--- a/www/ap-dtcl/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/11/30 20:43:09 rillig Exp $
-
---- tcl_commands.c.orig	2002-03-13 15:56:06.000000000 +0000
-+++ tcl_commands.c	2007-11-30 20:41:17.000000000 +0000
-@@ -388,7 +388,7 @@ int HGetVars(ClientData clientData, Tcl_
-     env     = (table_entry *) env_arr->elts;
- 
-     /* Get the user/pass info for Basic authentication */
--    (const char*)authorization = ap_table_get(globals->r->headers_in, "Authorization");
-+    authorization = (const char *)ap_table_get(globals->r->headers_in, "Authorization");
-     if (authorization && !strcasecmp(ap_getword_nc(POOL, &authorization, ' '), "Basic"))
-     {
- 	char *tmp;
diff --git a/www/ap-fastcgi/DESCR b/www/ap-fastcgi/DESCR
index 9d5d4ad4c94..fd3d6e4652e 100644
--- a/www/ap-fastcgi/DESCR
+++ b/www/ap-fastcgi/DESCR
@@ -5,5 +5,5 @@ processes running between requests.  So, unlike CGI, you do not have the
 overhead of starting up a new process and doing application initialization
 (e.g. connecting to a database) each time somebody requests a document.
 
-This package works with Apache version 1.3 series.  In order to use FastCGI
-with the version 2 series, use www/ap2-fastcgi instead.
+This package works with Apache version 2 series.  In order to use FastCGI
+with the version 1.3 series, use www/ap-fastcgi instead.
diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile
index 24d38ab238f..f4630411ea9 100644
--- a/www/ap-fastcgi/Makefile
+++ b/www/ap-fastcgi/Makefile
@@ -1,15 +1,37 @@
-# $NetBSD: Makefile,v 1.32 2012/10/28 06:30:04 asau Exp $
-#
+# $NetBSD: Makefile,v 1.33 2014/06/10 15:22:15 joerg Exp $
 
-.include "Makefile.common"
+DISTNAME=	mod_fastcgi-2.4.6
+PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
+CATEGORIES=	www
+MASTER_SITES=	http://www.fastcgi.com/dist/
 
-PKGNAME=	${DISTNAME:S/mod_/ap13-/}
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.fastcgi.com/
+COMMENT=	New, improved CGI-like interface module for Apache
 
-CONFLICTS=	ap-fastcgi-[0-9]*
+PLIST_SUBST+=	APACHE_MANUAL=${APACHE_MANUAL:Q}
+MESSAGE_SUBST+=	APACHE_MANUAL=${APACHE_MANUAL:Q}
 
-APACHE_MODULE=	yes
-APACHE_MODULE_NAME=	mod_fastcgi.so
-APACHE_MANUAL=	htdocs/manual
+INSTALLATION_DIRS+=	share/httpd/${APACHE_MANUAL}/mod
 
-.include "../../www/apache/module.mk"
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/docs/mod_fastcgi.html	\
+		${DESTDIR}${PREFIX}/share/httpd/${APACHE_MANUAL}/mod/
+
+PKG_APACHE_ACCEPTED=	apache22
+APACHE_MANUAL=		manual
+APACHE_MODULE=		YES
+USE_LIBTOOL=		YES
+
+MAKE_FLAGS+=		LIBTOOL=${LIBTOOL:Q}
+
+SUBST_CLASSES+=		ap2
+SUBST_STAGE.ap2=	pre-build
+SUBST_FILES.ap2=	Makefile
+SUBST_SED.ap2=		-e s,/usr/local/apache2,${PREFIX}/share/httpd,
+
+post-patch:
+	${CP} ${WRKSRC}/Makefile.AP2 ${WRKSRC}/Makefile
+
+.include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-fastcgi/Makefile.common b/www/ap-fastcgi/Makefile.common
deleted file mode 100644
index 0b02d0c796b..00000000000
--- a/www/ap-fastcgi/Makefile.common
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile.common,v 1.7 2010/02/20 14:58:45 joerg Exp $
-#
-# used by www/ap-fastcgi/Makefile
-# used by www/ap2-fastcgi/Makefile
-#
-DISTNAME=	mod_fastcgi-2.4.6
-CATEGORIES=	www
-MASTER_SITES=	http://www.fastcgi.com/dist/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.fastcgi.com/
-COMMENT=	New, improved CGI-like interface module for Apache
-
-DISTINFO_FILE=	${.CURDIR}/../../www/ap-fastcgi/distinfo
-PATCHDIR=	${.CURDIR}/../../www/ap-fastcgi/patches
-PLIST_SRC=	${.CURDIR}/../../www/ap-fastcgi/PLIST
-MESSAGE_SRC=	${.CURDIR}/../../www/ap-fastcgi/MESSAGE
-
-PLIST_SUBST+=	APACHE_MANUAL=${APACHE_MANUAL:Q}
-MESSAGE_SUBST+=	APACHE_MANUAL=${APACHE_MANUAL:Q}
-
-INSTALLATION_DIRS+=	share/httpd/${APACHE_MANUAL}/mod
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/docs/mod_fastcgi.html	\
-		${DESTDIR}${PREFIX}/share/httpd/${APACHE_MANUAL}/mod/
diff --git a/www/ap-geoip2/Makefile b/www/ap-geoip2/Makefile
index e4ce7e7c5df..bb72dd04865 100644
--- a/www/ap-geoip2/Makefile
+++ b/www/ap-geoip2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/28 06:30:04 asau Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/10 15:22:15 joerg Exp $
 #
 
 DISTNAME=	mod_geoip2_1.2.5
@@ -14,7 +14,7 @@ LICENSE=	apache-1.1
 .include "../../mk/apache.mk"
 APACHE_MODULE=	yes
 APACHE_MODULE_NAME=	mod_geoip.so
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 NO_CONFIGURE=	yes
 CPPFLAGS+=	-I${DESTDIR}/include
 LDFLAGS+=	-L${DESTDIR}/lib -lGeoIP
diff --git a/www/ap-jk/DESCR b/www/ap-jk/DESCR
deleted file mode 100644
index fc3ea83db0c..00000000000
--- a/www/ap-jk/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Tomcat is the Java Servlet / Java Server Page environment produced
-by the Apache Foundation's Jakarta Project.  Tomcat can be run as a
-standalone web server with Servlet and JSP support, or using Apache
-Server as its web server via the mod_jk Apache module (the
-www/ap-jk package).
-
-mod_jk is a replacement to the elderly mod_jserv. It is a completely
-new Tomcat-Apache plugin that handles the communication between
-Tomcat and Apache
diff --git a/www/ap-jk/MESSAGE b/www/ap-jk/MESSAGE
deleted file mode 100644
index d259beac753..00000000000
--- a/www/ap-jk/MESSAGE
+++ /dev/null
@@ -1,34 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2012/10/21 21:33:25 erh Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule jk_module lib/httpd/mod_jk.so
-  AddModule  mod_jk.c
-
-You will also need a running Java Servlet engine, e.g. www/apache-tomcat6
-You will need to consult the servlet engine documentation to finish
-configuring Apache before you can use mod_jk.so.
-Possible settings you can add to your httpd.conf to use Apache Tomcat are:
-(according to http://tomcat.apache.org/connectors-doc/generic_howto/quick.html)
-
-  <IfModule mod_jk.c>
-  JkWorkersFile	${PREFIX}/tomcat/conf/workers.properties
-  JkLogFile     /var/log/httpd/mod_jk.log
-  JkShmFile     /var/log/httpd/mod_jk.shm
-  JkLogLevel    info
-  JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
-  JkMount /examples/* worker1
-  </IfModule>
-
-With a minimum workers.properties file:
-
-  # Define 1 real worker using ajp13
-  worker.list=worker1
-  # Set properties for worker1 (ajp13)
-  worker.worker1.type=ajp13
-  worker.worker1.host=localhost
-  worker.worker1.port=8009
-
-===========================================================================
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
deleted file mode 100644
index f4bd09b6f52..00000000000
--- a/www/ap-jk/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.41 2012/10/28 06:30:04 asau Exp $
-
-DISTNAME=	tomcat-connectors-${JK_VERSION}-src
-PKGNAME=	ap13-jk-${JK_VERSION}
-
-MAKE_PARAMS+=		USE_APXS=1
-MAKE_PARAMS+=		WITH_APXS=${APXS}
-
-INSTALLATION_DIRS+=	lib/httpd
-
-.include "../../www/ap-jk/Makefile.common"
-.include "../../www/apache/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-jk/Makefile.common b/www/ap-jk/Makefile.common
deleted file mode 100644
index d94a180c1a3..00000000000
--- a/www/ap-jk/Makefile.common
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile.common,v 1.7 2012/10/21 21:33:25 erh Exp $
-# used by www/ap-jk/Makefile
-# used by www/ap2-jk/Makefile
-
-JK_VERSION=	1.2.37
-CATEGORIES=	www java
-MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-connectors/jk/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://tomcat.apache.org/connectors-doc/
-COMMENT=	Apache connector for accessing Jakarta Tomcat
-LICENSE=    apache-2.0
-
-CONFLICTS=	ap-jk-[0-9]*
-
-PATCHDIR=	${.CURDIR}/../../www/ap-jk/patches
-DISTINFO_FILE=	${.CURDIR}/../../www/ap-jk/distinfo
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/native
-APACHE_MODULE=	YES
-BUILD_DEFS+=	JK_ENABLE_JNI
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake
-
-SUBST_CLASSES+=		jk-lt
-SUBST_STAGE.jk-lt=	post-configure
-SUBST_FILES.jk-lt=	Makefile common/Makefile apache-2.0/Makefile
-SUBST_SED.jk-lt=	-e "s|^\\(LIBTOOL =\\) [^ ]*\$$|\\1 \$$(SHELL) \$$(top_builddir)/libtool|g"
-SUBST_MESSAGE.jk-lt=	Fixing libtool references.
-
-# XXX The standard --with-apxs2 when using apache2 doesn't work
-CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
-
-.if defined(JK_ENABLE_JNI)
-USE_JAVA=	yes
-CONFIGURE_ARGS+=	--enable-jni
-CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME:Q}
-SUBST_FILES.jk-lt+=	jni/Makefile
-.endif
-
-.if defined(JK_ENABLE_JNI)
-.include "../../mk/java-vm.mk"
-.endif
diff --git a/www/ap-jk/PLIST b/www/ap-jk/PLIST
deleted file mode 100644
index 856929adac5..00000000000
--- a/www/ap-jk/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:15:45 zuntum Exp $
-lib/httpd/mod_jk.so
diff --git a/www/ap-jk/distinfo b/www/ap-jk/distinfo
deleted file mode 100644
index 463b3a3f154..00000000000
--- a/www/ap-jk/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.11 2012/10/21 21:33:25 erh Exp $
-
-SHA1 (tomcat-connectors-1.2.37-src.tar.gz) = 99e9ba0b2e72b28da7de6b14f103302e7b392a5d
-RMD160 (tomcat-connectors-1.2.37-src.tar.gz) = fbc47d9f767c75b039554dfc0776876290c580d9
-Size (tomcat-connectors-1.2.37-src.tar.gz) = 1528647 bytes
-SHA1 (patch-ab) = ce0e84952f94a97d55fe143a27d3208afe027cf0
-SHA1 (patch-ad) = a7a77730b694ccb6d3d3fdc820cf74de522120bc
diff --git a/www/ap-jk/patches/patch-ab b/www/ap-jk/patches/patch-ab
deleted file mode 100644
index 4b4053049ae..00000000000
--- a/www/ap-jk/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2012/10/21 21:33:25 erh Exp $
-
-Fixup the Makefile so it uses the right libtool.
-
---- apache-2.0/Makefile.in.orig	2012-05-09 08:08:26.000000000 -0500
-+++ apache-2.0/Makefile.in	2012-10-21 15:25:01.000000000 -0500
-@@ -34,6 +34,8 @@
- # Apache2 settings, values guessed by Apache config and used to build it
- # Will define libexecdir, LIBTOOL, etc
- include @APACHE_CONFIG_VARS@
-+top_builddir = ..
-+LIBTOOL = 
- 
- # Local settings ( overriding/appending to Apache's )
- COMMON=../common
diff --git a/www/ap-jk/patches/patch-ad b/www/ap-jk/patches/patch-ad
deleted file mode 100644
index 1398984b4e9..00000000000
--- a/www/ap-jk/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2012/10/21 21:33:25 erh Exp $
-
-Fixup the Makefile so it doesn't use libtool to install.
-
---- apache-1.3/Makefile.in.orig	2006-03-02 16:45:37.000000000 +0000
-+++ apache-1.3/Makefile.in	2006-03-02 16:45:52.000000000 +0000
-@@ -67,7 +67,7 @@
- install_dynamic: mod_jk.la
- 	@echo ""
- 	@echo "Copying files to Apache libexec Directory..."
--	${LIBTOOL} --mode=install ${CP} $< ${libexecdir}/mod_jk.so
-+	${BSD_INSTALL_LIB} mod_jk.so ${DESTDIR}${PREFIX}/lib/httpd
- 
- #
- # Clean part.
diff --git a/www/ap-mono/Makefile b/www/ap-mono/Makefile
index 3e24dbd306f..79e89d20c52 100644
--- a/www/ap-mono/Makefile
+++ b/www/ap-mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2014/04/09 07:27:17 obache Exp $
+# $NetBSD: Makefile,v 1.28 2014/06/10 15:22:15 joerg Exp $
 
 DISTNAME=	mod_mono-2.10
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.mono-project.com/Mod_mono
 COMMENT=	Apache module that provides ASP.NET support
 
 APACHE_MODULE=		yes
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 CONF_FILES=		${PREFIX}/share/examples/httpd/mod_mono.conf\
 			${PKG_SYSCONFDIR}/httpd/mod_mono.conf
diff --git a/www/ap-perl/DESCR b/www/ap-perl/DESCR
deleted file mode 100644
index 00e074d618f..00000000000
--- a/www/ap-perl/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-The Apache/Perl integration project brings together the full power of the
-Perl programming language and the Apache HTTP server.  This is achieved by
-linking the Perl runtime library into the server and providing an object
-oriented Perl interface to the server's C language API.
-
-These pieces are seamlessly glued together by the `mod_perl' server
-plugin, making it is possible to write Apache modules entirely in Perl.
-In addition, the persistent interpreter embedded in the server avoids the
-overhead of starting an external interpreter program and the additional
-Perl start-up (compile) time.
diff --git a/www/ap-perl/MESSAGE b/www/ap-perl/MESSAGE
deleted file mode 100644
index 1899e560c5f..00000000000
--- a/www/ap-perl/MESSAGE
+++ /dev/null
@@ -1,19 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:44 wiz Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule perl_module lib/httpd/mod_perl.so
-  <Files ~ "\.pl$">
-     PerlHandler         Apache::Registry
-     PerlSendHeader      On
-     SetHandler          perl-script
-     Options             +ExecCGI
-  </Files>
-
-If switching to/from a server with and without mod_perl enabled, you
-should NOT use "apachectl restart" - instead, fully stop and then start
-the server.  This prevents problems with libperl spinning on the CPU.
-
-===========================================================================
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
deleted file mode 100644
index c25a0153edd..00000000000
--- a/www/ap-perl/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.53 2014/05/29 23:37:55 wiz Exp $
-#
-
-DISTNAME=		mod_perl-1.31
-PKGNAME=		ap13-perl-1.31
-PKGREVISION=		3
-CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Apache/} \
-			http://perl.apache.org/dist/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://perl.apache.org/
-COMMENT=		Module that embeds a Perl interpreter into Apache
-LICENSE=		apache-1.1
-
-CONFLICTS=		ap-perl-[0-9]*
-CONFLICTS+=		ap2-perl-[0-9]*
-
-DEPENDS+=		${BUILDLINK_API_DEPENDS.apache}:../../www/apache
-DEPENDS+=		p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource
-
-APACHE_MODULE=		YES
-PERL5_PACKLIST=		auto/mod_perl/.packlist
-
-MAKE_PARAMS+=		USE_APXS=1
-MAKE_PARAMS+=		WITH_APXS=${APXS}
-MAKE_PARAMS+=		EVERYTHING=1
-
-INSTALLATION_DIRS+=	lib/httpd share/httpd/htdocs/manual/mod
-
-.include "../../lang/perl5/module.mk"
-.include "../../www/apache/buildlink3.mk"
-
-post-install:
-	${INSTALL_LIB} ${WRKSRC}/apaci/libperl.so \
-	    ${DESTDIR}${PREFIX}/lib/httpd/mod_perl.so
-	${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/mod_perl.html \
-	    ${DESTDIR}${PREFIX}/share/httpd/htdocs/manual/mod
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-perl/PLIST b/www/ap-perl/PLIST
deleted file mode 100644
index 5ca9d3a11f5..00000000000
--- a/www/ap-perl/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:15:49 zuntum Exp $
-lib/httpd/mod_perl.so
-share/httpd/htdocs/manual/mod/mod_perl.html
diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk
deleted file mode 100644
index 50ced084206..00000000000
--- a/www/ap-perl/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.15 2012/05/07 01:54:04 dholland Exp $
-
-BUILDLINK_TREE+=	ap13-perl
-
-.if !defined(AP_PERL_BUILDLINK3_MK)
-AP_PERL_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ap13-perl+=	ap13-perl>=1.29
-BUILDLINK_ABI_DEPENDS.ap13-perl+=	ap13-perl>=1.29
-BUILDLINK_PKGSRCDIR.ap13-perl?=	../../www/ap-perl
-
-BUILDLINK_FILES.ap13-perl+=	lib/httpd/mod_perl.*
-BUILDLINK_FILES.ap13-perl+=	\
-	${PERL5_SUB_INSTALLVENDORARCH}/auto/Apache/include/*
-BUILDLINK_FILES.ap13-perl+=	\
-	${PERL5_SUB_INSTALLVENDORARCH}/auto/Apache/include/modules/perl/*
-
-.include "../../www/apache/buildlink3.mk"
-.endif # AP_PERL_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-ap13-perl
diff --git a/www/ap-perl/distinfo b/www/ap-perl/distinfo
deleted file mode 100644
index 68c5d03a68e..00000000000
--- a/www/ap-perl/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.16 2012/10/15 13:14:26 wiz Exp $
-
-SHA1 (mod_perl-1.31.tar.gz) = 5f6eadf2b0fc24ed4376d7708226391baa14c73f
-RMD160 (mod_perl-1.31.tar.gz) = 296bd5e95018c313bab84ae7b21ae9f64bd4a394
-Size (mod_perl-1.31.tar.gz) = 389960 bytes
-SHA1 (patch-Symbol_Symbol.xs) = 7a8b29c987d439f8309656936cd0377263a719fd
-SHA1 (patch-aa) = 85f4a3171f8a91eb9e77d4b2ed424ada970c377c
-SHA1 (patch-ab) = 18b02747ae4b9ab17ce252cf003bf9fd7e4b2560
-SHA1 (patch-src_modules_perl_Log.xs) = 60c7473fac429a4aeeb60c8670dcdcb0f9cb80be
-SHA1 (patch-src_modules_perl_mod__perl.c) = 3c2e82fb91d4a470e7f018a92b330eac4c7b0630
-SHA1 (patch-src_modules_perl_perl__config.c) = daa30ae219bce44c0763ec84f64cef79989651a4
-SHA1 (patch-src_modules_perl_perl__util.c) = 84d02d62c2dfc0b7765acd36fd3f69da92e92413
diff --git a/www/ap-perl/patches/patch-Symbol_Symbol.xs b/www/ap-perl/patches/patch-Symbol_Symbol.xs
deleted file mode 100644
index cc3ad5fa9da..00000000000
--- a/www/ap-perl/patches/patch-Symbol_Symbol.xs
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Symbol_Symbol.xs,v 1.1 2011/09/21 14:59:32 obache Exp $
-
-* fixes build with perl-5.14.
-
---- Symbol/Symbol.xs.orig	2000-12-22 06:02:32.000000000 +0000
-+++ Symbol/Symbol.xs
-@@ -30,7 +30,7 @@ static void undef(SV *ref)
- 	    has_proto = TRUE;
- 
- 	cv_undef(cv);
--	CvGV(cv) = gv;   /* let user-undef'd sub keep its identity */
-+	CvGV_set(cv, gv);   /* let user-undef'd sub keep its identity */
-         if(has_proto) 
-             SvPOK_on(cv); /* otherwise we get `Prototype mismatch:' */
- 
diff --git a/www/ap-perl/patches/patch-aa b/www/ap-perl/patches/patch-aa
deleted file mode 100644
index 695b2e672b9..00000000000
--- a/www/ap-perl/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2011/09/21 14:59:32 obache Exp $
-
---- apaci/Makefile.tmpl.orig	2008-02-26 08:43:35.000000000 +0000
-+++ apaci/Makefile.tmpl
-@@ -94,7 +94,8 @@ distclean: clean
- 
- #   FOR STAND-ALONE BUILDING ONLY
- install:
--	$(APXS) -i -a -n perl libperl.$(LIBEXT)
-+	#@cp libperl.so mod_perl.so
-+	#$(APXS) -i -n perl libperl.$(LIBEXT)
- 
- depend:
- 	cp Makefile.tmpl Makefile.tmpl.bak \
diff --git a/www/ap-perl/patches/patch-ab b/www/ap-perl/patches/patch-ab
deleted file mode 100644
index 2499de02126..00000000000
--- a/www/ap-perl/patches/patch-ab
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/11/23 10:52:24 martti Exp $
-
---- src/modules/perl/Connection.xs.orig	Fri Sep 29 16:41:30 2000
-+++ src/modules/perl/Connection.xs	Fri Nov 23 11:38:03 2001
-@@ -78,7 +78,11 @@
-     RETVAL = newSVpv((char *)&conn->remote_addr,
-                       sizeof conn->remote_addr);
-     if(sv_addr) {
-+#ifdef APACHE6
-+        struct sockaddr_storage addr;
-+#else
-         struct sockaddr_in addr; 
-+#endif
-         STRLEN sockaddrlen; 
-         char * new_addr = SvPV(sv_addr,sockaddrlen); 
-         if (sockaddrlen != sizeof(addr)) { 
-@@ -106,7 +110,26 @@
- #else
-         conn->remote_ip = pstrdup(conn->pool, (char *)SvPV(ST(1),na));
- #endif
-+#ifdef APACHE6
-+	{
-+	  struct addrinfo hints, *res0;
-+	  int error;
-+
-+	  memset(&hints, 0, sizeof(hints));
-+	  hints.ai_family = PF_UNSPEC;
-+	  hints.ai_flags = AI_NUMERICHOST;
-+	  error = getaddrinfo(conn->remote_ip, NULL, &hints, &res0);
-+	  if (!error) {
-+	    memcpy(&conn->remote_addr, res0->ai_addr, res0->ai_addrlen);
-+	    freeaddrinfo(res0);
-+	  } else {
-+            croak("Bad ip address in remote_ip getaddrinfo failed %s",
-+		  gai_strerror(error)); 
-+	  }
-+	}
-+#else
-         conn->remote_addr.sin_addr.s_addr = inet_addr(conn->remote_ip);
-+#endif
-     }
- 
-     OUTPUT:
diff --git a/www/ap-perl/patches/patch-src_modules_perl_Log.xs b/www/ap-perl/patches/patch-src_modules_perl_Log.xs
deleted file mode 100644
index 4fd8d2fa5fe..00000000000
--- a/www/ap-perl/patches/patch-src_modules_perl_Log.xs
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_modules_perl_Log.xs,v 1.1 2011/09/21 14:59:32 obache Exp $
-
-* fixes build with perl-5.14.
-
---- src/modules/perl/Log.xs.orig	2001-01-25 07:43:05.000000000 +0000
-+++ src/modules/perl/Log.xs
-@@ -10,7 +10,7 @@
- static void perl_cv_alias(char *to, char *from)
- {
-     GV *gp = gv_fetchpv(to, TRUE, SVt_PVCV);
--    GvCV(gp) = perl_get_cv(from, TRUE);
-+    GvCV_set(gp, perl_get_cv(from, TRUE));
- }
- 
- static void ApacheLog(int level, SV *sv, SV *msg)
diff --git a/www/ap-perl/patches/patch-src_modules_perl_mod__perl.c b/www/ap-perl/patches/patch-src_modules_perl_mod__perl.c
deleted file mode 100644
index 4352b68868d..00000000000
--- a/www/ap-perl/patches/patch-src_modules_perl_mod__perl.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_modules_perl_mod__perl.c,v 1.1 2011/09/21 14:59:32 obache Exp $
-
-* fixes build with perl-5.14.
-
---- src/modules/perl/mod_perl.c.orig	2008-11-20 18:12:31.000000000 +0000
-+++ src/modules/perl/mod_perl.c
-@@ -785,7 +785,7 @@ void perl_startup (server_rec *s, pool *
-     /* *CORE::GLOBAL::exit = \&Apache::exit */
-     if(gv_stashpv("CORE::GLOBAL", FALSE)) {
- 	GV *exitgp = gv_fetchpv("CORE::GLOBAL::exit", TRUE, SVt_PVCV);
--	GvCV(exitgp) = perl_get_cv("Apache::exit", TRUE);
-+	GvCV_set(exitgp, perl_get_cv("Apache::exit", TRUE));
- 	GvIMPORTED_CV_on(exitgp);
-     }
- 
diff --git a/www/ap-perl/patches/patch-src_modules_perl_perl__config.c b/www/ap-perl/patches/patch-src_modules_perl_perl__config.c
deleted file mode 100644
index d51070384fa..00000000000
--- a/www/ap-perl/patches/patch-src_modules_perl_perl__config.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_modules_perl_perl__config.c,v 1.1 2011/09/21 14:59:32 obache Exp $
-
-* fixes build with perl-5.14.
-
---- src/modules/perl/perl_config.c.orig	2003-03-14 04:55:59.000000000 +0000
-+++ src/modules/perl/perl_config.c
-@@ -1720,7 +1720,7 @@ void perl_clear_symtab(HV *symtab) 
- 	if((cv = GvCV((GV*)val)) && (GvSTASH((GV*)val) == GvSTASH(CvGV(cv)))) {
-             GV *gv = CvGV(cv);
-             cv_undef(cv);
--            CvGV(cv) = gv;
-+            CvGV_set(cv, gv);
-             GvCVGEN(gv) = 1; /* invalidate method cache */
-         }
-     }
diff --git a/www/ap-perl/patches/patch-src_modules_perl_perl__util.c b/www/ap-perl/patches/patch-src_modules_perl_perl__util.c
deleted file mode 100644
index 4f267561d4d..00000000000
--- a/www/ap-perl/patches/patch-src_modules_perl_perl__util.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_modules_perl_perl__util.c,v 1.3 2012/10/15 13:14:26 wiz Exp $
-
-Remove uid code; similar to changes done to mod_perl-2.x, see
-https://rt.cpan.org/Public/Bug/Display.html?id=77129
-
---- src/modules/perl/perl_util.c.orig	2007-12-03 07:19:59.000000000 +0000
-+++ src/modules/perl/perl_util.c
-@@ -669,15 +669,6 @@ void mod_perl_init_ids(void)  /* $$, $>,
- {
-     if(set_ids++) return;
-     sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), (I32)getpid());
--#ifndef WIN32
--    uid  = (int)getuid(); 
--    euid = (int)geteuid(); 
--    gid  = (int)getgid(); 
--    egid = (int)getegid(); 
--    MP_TRACE_g(fprintf(stderr, 
--		     "perl_init_ids: uid=%d, euid=%d, gid=%d, egid=%d\n",
--		     uid, euid, gid, egid));
--#endif
- }
- 
- int perl_eval_ok(server_rec *s)
diff --git a/www/ap-python/DESCR b/www/ap-python/DESCR
deleted file mode 100644
index 8b240e90a1b..00000000000
--- a/www/ap-python/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Mod_python is an Apache module that embeds the Python interpreter
-within the server. With mod_python you can write web-based applications
-in Python that will run many times faster than traditional CGI and
-will have access to advanced features such as ability to retain
-database connections and other data between hits and access to
-Apache internals.
diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile
deleted file mode 100644
index 07a400d1e8c..00000000000
--- a/www/ap-python/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2014/05/09 07:37:23 wiz Exp $
-
-DISTNAME=		mod_python-2.7.11
-PKGNAME=		ap13-${PYPKGPREFIX}-python-2.7.11
-CATEGORIES=		www
-MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/modpython/}
-EXTRACT_SUFX=		.tgz
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.modpython.org/
-COMMENT=		Python interpreter embedded into Apache
-
-USE_TOOLS+=	pax
-
-CONFLICTS=	ap-python-[0-9]* ap13-python-[0-9]* ap13-py[0-9]*-python-[0-9]*
-SUPERSEDES=	ap13-python-[0-9]*
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		PYTHON_BIN=${PYTHONBIN:Q} ac_cv_path_MKDEP=
-
-INSTALLATION_DIRS=	lib/httpd share/doc/ap-mod_python
-
-PY_PATCHPLIST=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 2.7.11; 3.5.0 is supposed to work
-
-post-install:
-	cd ${WRKSRC}/doc-html && pax -rwpe . ${DESTDIR}${PREFIX}/share/doc/ap-mod_python
-
-.include "../../lang/python/extension.mk"
-.include "../../www/apache/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-python/PLIST b/www/ap-python/PLIST
deleted file mode 100644
index adab49db316..00000000000
--- a/www/ap-python/PLIST
+++ /dev/null
@@ -1,123 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2009/08/30 03:08:40 obache Exp $
-lib/httpd/mod_python.so
-${PYSITELIB}/mod_python/__init__.py
-${PYSITELIB}/mod_python/__init__.pyc
-${PYSITELIB}/mod_python/__init__.pyo
-${PYSITELIB}/mod_python/apache.py
-${PYSITELIB}/mod_python/apache.pyc
-${PYSITELIB}/mod_python/apache.pyo
-${PYSITELIB}/mod_python/cgihandler.py
-${PYSITELIB}/mod_python/cgihandler.pyc
-${PYSITELIB}/mod_python/cgihandler.pyo
-${PYSITELIB}/mod_python/httpdapi.py
-${PYSITELIB}/mod_python/httpdapi.pyc
-${PYSITELIB}/mod_python/httpdapi.pyo
-${PYSITELIB}/mod_python/publisher.py
-${PYSITELIB}/mod_python/publisher.pyc
-${PYSITELIB}/mod_python/publisher.pyo
-${PYSITELIB}/mod_python/util.py
-${PYSITELIB}/mod_python/util.pyc
-${PYSITELIB}/mod_python/util.pyo
-${PYSITELIB}/mod_python/zhandler.py
-${PYSITELIB}/mod_python/zhandler.pyc
-${PYSITELIB}/mod_python/zhandler.pyo
-share/doc/ap-mod_python/about.html
-share/doc/ap-mod_python/app-vnsinst.html
-share/doc/ap-mod_python/app-wininst.html
-share/doc/ap-mod_python/contents.html
-share/doc/ap-mod_python/dir-handlers-ach.html
-share/doc/ap-mod_python/dir-handlers-auh.html
-share/doc/ap-mod_python/dir-handlers-fuh.html
-share/doc/ap-mod_python/dir-handlers-hph.html
-share/doc/ap-mod_python/dir-handlers-pch.html
-share/doc/ap-mod_python/dir-handlers-ph.html
-share/doc/ap-mod_python/dir-handlers-pih.html
-share/doc/ap-mod_python/dir-handlers-plh.html
-share/doc/ap-mod_python/dir-handlers-prrh.html
-share/doc/ap-mod_python/dir-handlers-syn.html
-share/doc/ap-mod_python/dir-handlers-th.html
-share/doc/ap-mod_python/dir-handlers-tph.html
-share/doc/ap-mod_python/dir-handlers.html
-share/doc/ap-mod_python/dir-other-epd.html
-share/doc/ap-mod_python/dir-other-ipd.html
-share/doc/ap-mod_python/dir-other-ipdv.html
-share/doc/ap-mod_python/dir-other-par.html
-share/doc/ap-mod_python/dir-other-pd.html
-share/doc/ap-mod_python/dir-other-phm.html
-share/doc/ap-mod_python/dir-other-pi.html
-share/doc/ap-mod_python/dir-other-po.html
-share/doc/ap-mod_python/dir-other-pomz.html
-share/doc/ap-mod_python/dir-other-pp.html
-share/doc/ap-mod_python/dir-other.html
-share/doc/ap-mod_python/directives.html
-share/doc/ap-mod_python/front.html
-share/doc/ap-mod_python/genindex.html
-share/doc/ap-mod_python/hand-cgi.html
-share/doc/ap-mod_python/hand-httpdapy.html
-share/doc/ap-mod_python/hand-pub-alg-args.html
-share/doc/ap-mod_python/hand-pub-alg-auth.html
-share/doc/ap-mod_python/hand-pub-alg-trav.html
-share/doc/ap-mod_python/hand-pub-alg.html
-share/doc/ap-mod_python/hand-pub-intro.html
-share/doc/ap-mod_python/hand-pub.html
-share/doc/ap-mod_python/hand-z.html
-share/doc/ap-mod_python/handlers.html
-share/doc/ap-mod_python/icons/blank.gif
-share/doc/ap-mod_python/icons/blank.png
-share/doc/ap-mod_python/icons/contents.gif
-share/doc/ap-mod_python/icons/contents.png
-share/doc/ap-mod_python/icons/icons2
-share/doc/ap-mod_python/icons/index.gif
-share/doc/ap-mod_python/icons/index.png
-share/doc/ap-mod_python/icons/modules.gif
-share/doc/ap-mod_python/icons/modules.png
-share/doc/ap-mod_python/icons/next.gif
-share/doc/ap-mod_python/icons/next.png
-share/doc/ap-mod_python/icons/previous.gif
-share/doc/ap-mod_python/icons/previous.png
-share/doc/ap-mod_python/icons/up.gif
-share/doc/ap-mod_python/icons/up.png
-share/doc/ap-mod_python/index.html
-share/doc/ap-mod_python/inst-apacheconfig.html
-share/doc/ap-mod_python/inst-compiling.html
-share/doc/ap-mod_python/inst-configure.html
-share/doc/ap-mod_python/inst-installing.html
-share/doc/ap-mod_python/inst-make.html
-share/doc/ap-mod_python/inst-makeinstall.html
-share/doc/ap-mod_python/inst-prerequisites.html
-share/doc/ap-mod_python/inst-testing.html
-share/doc/ap-mod_python/inst-trouble.html
-share/doc/ap-mod_python/installation.html
-share/doc/ap-mod_python/intr-flexibility.html
-share/doc/ap-mod_python/intr-history.html
-share/doc/ap-mod_python/intr-performance.html
-share/doc/ap-mod_python/introduction.html
-share/doc/ap-mod_python/modpython.css
-share/doc/ap-mod_python/modpython.html
-share/doc/ap-mod_python/modpython2
-share/doc/ap-mod_python/module-apache.html
-share/doc/ap-mod_python/node58.html
-share/doc/ap-mod_python/node74.html
-share/doc/ap-mod_python/pyapi-callback.html
-share/doc/ap-mod_python/pyapi-debug.html
-share/doc/ap-mod_python/pyapi-handler.html
-share/doc/ap-mod_python/pyapi-interps.html
-share/doc/ap-mod_python/pyapi-mpconn-mem.html
-share/doc/ap-mod_python/pyapi-mpconn.html
-share/doc/ap-mod_python/pyapi-mprequest-mem.html
-share/doc/ap-mod_python/pyapi-mprequest-meth.html
-share/doc/ap-mod_python/pyapi-mprequest.html
-share/doc/ap-mod_python/pyapi-mpserver.html
-share/doc/ap-mod_python/pyapi-mpsrv-mem.html
-share/doc/ap-mod_python/pyapi-mpsrv-meth.html
-share/doc/ap-mod_python/pyapi-mptable.html
-share/doc/ap-mod_python/pyapi-util-fstor-fld.html
-share/doc/ap-mod_python/pyapi-util-fstor.html
-share/doc/ap-mod_python/pyapi-util-funcs.html
-share/doc/ap-mod_python/pyapi-util.html
-share/doc/ap-mod_python/pythonapi.html
-share/doc/ap-mod_python/tut-more-complicated.html
-share/doc/ap-mod_python/tut-overview.html
-share/doc/ap-mod_python/tut-pub.html
-share/doc/ap-mod_python/tut-what-it-do.html
-share/doc/ap-mod_python/tutorial.html
diff --git a/www/ap-python/distinfo b/www/ap-python/distinfo
deleted file mode 100644
index b57d69999a9..00000000000
--- a/www/ap-python/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.6 2009/08/30 03:08:40 obache Exp $
-
-SHA1 (mod_python-2.7.11.tgz) = 8c123359f98a7acf077e078226fccdb0ff51c4ce
-RMD160 (mod_python-2.7.11.tgz) = 1b34de01b3fa4bb27bb5a39396a2497db66fabd5
-Size (mod_python-2.7.11.tgz) = 175763 bytes
-SHA1 (patch-aa) = 43c2f7df1e2ad58cf8d334dde631990bc56ff3e9
-SHA1 (patch-ab) = b79f50bed5ad6bda8f5e6aef111fbc9b9aedf943
-SHA1 (patch-ac) = 1c2a5c1d961e9710561c406b60518fbfef4cb2cb
-SHA1 (patch-ad) = a59ed67d803dfa93bd9db58b796b4821fc3b072e
-SHA1 (patch-ae) = 2010c3b1522d61332bee60d052770e5addb115d1
-SHA1 (patch-af) = cd658639b5443ae63185611768b91f167bb06c7d
-SHA1 (patch-ag) = 0377336cdb8f40429d36277c23070a174a924c5b
diff --git a/www/ap-python/patches/patch-aa b/www/ap-python/patches/patch-aa
deleted file mode 100644
index a542aa60f95..00000000000
--- a/www/ap-python/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/07/10 14:59:57 joerg Exp $
-
---- src/Makefile.in.orig	2001-04-07 07:43:21.000000000 +0200
-+++ src/Makefile.in	2004-07-20 23:12:57.000000000 +0200
-@@ -52,7 +52,7 @@
- INCLUDES=@INCLUDES@
- LIBS=@LIBS@
- LDFLAGS=@LDFLAGS@
--OPT=
-+OPT=-DEAPI -fPIC
- CFLAGS=$(OPT) $(INCLUDES) 
- srcdir=.
- 
diff --git a/www/ap-python/patches/patch-ab b/www/ap-python/patches/patch-ab
deleted file mode 100644
index ad8ffee972c..00000000000
--- a/www/ap-python/patches/patch-ab
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/02/05 21:05:58 drochner Exp $
---- src/tableobject.c.orig	Mon May 28 23:00:41 2001
-+++ src/tableobject.c	Sun Nov  4 18:28:55 2001
-@@ -185,6 +185,105 @@
- };
- 
- /**
-+ ** table_get
-+ **
-+ *
-+ *  Implements dictionary like get(k,[x]) method.
-+ */
-+
-+static PyObject * table_get(tableobject *self, PyObject *args)
-+{
-+
-+    PyObject *key,*v;
-+    PyObject *failob = Py_None;
-+    array_header *ah;
-+    table_entry *elts;
-+    int i, j;
-+
-+    if(!PyArg_ParseTuple(args, "O|O:get", &key, &failob))
-+      return NULL;
-+    v=tablegetitem(self,key);
-+    if(v = NULL) {
-+      v=failob;
-+      Py_INCREF(failob);
-+    }
-+    return v;
-+}
-+
-+/**
-+ ** table_keys
-+ **
-+ *
-+ *  Implements dictionary like items() method.
-+ */
-+
-+static PyObject * table_items(tableobject *self)
-+{
-+
-+    PyObject *v;
-+    array_header *ah;
-+    table_entry *elts;
-+    int i, j;
-+
-+    ah = ap_table_elts(self->table);
-+    elts = (table_entry *) ah->elts;
-+
-+    v = PyList_New(ah->nelts);
-+
-+    for (i = 0, j = 0; i < ah->nelts; i++)
-+    {
-+	if (elts[i].key)
-+	{
-+	  PyObject *vp = PyTuple_New(2);
-+	  if(vp == NULL) {
-+	    Py_DECREF(v);
-+	    return NULL;
-+	  }
-+	  PyTuple_SET_ITEM(vp,0,PyString_FromString(elts[i].key));
-+	  PyTuple_SET_ITEM(vp,1,PyString_FromString(ap_table_get(self->table,
-+								 elts[i].key)));
-+	  PyList_SetItem(v, j, vp);
-+	  j++;
-+	}
-+    }
-+    return v;
-+}
-+/**
-+ ** table_keys
-+ **
-+ *
-+ *  Implements dictionary like values() method.
-+ *   This mostly for completeness sake, I can't see use for it
-+ */
-+
-+static PyObject * table_values(tableobject *self)
-+{
-+
-+    PyObject *v;
-+    array_header *ah;
-+    table_entry *elts;
-+    int i, j;
-+
-+    ah = ap_table_elts(self->table);
-+    elts = (table_entry *) ah->elts;
-+
-+    v = PyList_New(ah->nelts);
-+
-+    for (i = 0, j = 0; i < ah->nelts; i++)
-+    {
-+	if (elts[i].key)
-+	{
-+	    PyObject *val = PyString_FromString(ap_table_get(self->table,
-+							     elts[i].key));
-+	    PyList_SetItem(v, j, val);
-+	    j++;
-+	}
-+    }
-+    return v;
-+}
-+
-+
-+/**
-  ** table_keys
-  **
-  *
-@@ -261,9 +360,13 @@
- /* table method definitions */
- 
- static PyMethodDef tablemethods[] = {
--    {"keys",                 (PyCFunction)table_keys,    METH_VARARGS},
-     {"has_key",              (PyCFunction)table_has_key, METH_VARARGS},
-     {"add",                  (PyCFunction)mp_table_add,  METH_VARARGS},
-+    {"items",                (PyCFunction)table_items,   METH_VARARGS},
-+    {"keys",                 (PyCFunction)table_keys,    METH_VARARGS},
-+    {"get",                  (PyCFunction)table_get,     METH_VARARGS},
-+    {"values",               (PyCFunction)table_values,  METH_VARARGS},
-+    /* Still needs: copy, update, clear, setdefault, popitem */    
-     {NULL, NULL} /* sentinel */
- };
- 
diff --git a/www/ap-python/patches/patch-ac b/www/ap-python/patches/patch-ac
deleted file mode 100644
index a0c037111db..00000000000
--- a/www/ap-python/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/02/05 21:05:58 drochner Exp $
---- src/mod_python.c.orig	Sat Nov 10 13:06:57 2001
-+++ src/mod_python.c	Sat Nov 10 13:07:53 2001
-@@ -474,11 +474,13 @@
- 
-     if (! ((m = PyImport_ImportModule(MODULENAME)))) {
- 	fprintf(stderr, "make_obcallback(): could not import %s.\n", MODULENAME);
-+	PyErr_Print();
-     }
-     
--    if (! ((obCallBack = PyObject_CallMethod(m, INITFUNC, NULL)))) {
-+    if (m && ! ((obCallBack = PyObject_CallMethod(m, INITFUNC, NULL)))) {
- 	fprintf(stderr, "make_obcallback(): could not call %s.\n",
- 		INITFUNC);
-+	PyErr_Print();
-     }
-     
-     return obCallBack;
diff --git a/www/ap-python/patches/patch-ad b/www/ap-python/patches/patch-ad
deleted file mode 100644
index 1c9b7be4752..00000000000
--- a/www/ap-python/patches/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/08/30 03:08:40 obache Exp $
-
---- Makefile.in.orig	2000-12-06 03:05:37.000000000 +0000
-+++ Makefile.in
-@@ -82,7 +82,7 @@ install_dso:	dso
- 	@echo
- 	@echo "Performing DSO installation."
- 	@echo
--	$(INSTALL) src/mod_python.so $(LIBEXECDIR)
-+	$(INSTALL) src/mod_python.so $(DESTDIR)$(LIBEXECDIR)
- 	@$(MAKE) install_py_lib
- 	@echo
- 	@echo "Now don't forget to edit your main config and add"
-@@ -114,12 +114,13 @@ install_static:	static
- 	@echo
- 
- install_py_lib:
--	$(INSTALL) -d $(PY_STD_LIB)/site-packages/mod_python
-+	$(INSTALL) -d $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
- 	@for f in `ls lib/python/mod_python/*.py`; \
- 	do \
--		$(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \
-+		$(BSD_INSTALL_DATA) $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \
- 	done
--	python $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
-+	@PYTHON_BIN@ $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
-+	@PYTHON_BIN@ -O $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
- 
- clean:
- 	cd src && $(MAKE) clean
diff --git a/www/ap-python/patches/patch-ae b/www/ap-python/patches/patch-ae
deleted file mode 100644
index 9632d3a85c9..00000000000
--- a/www/ap-python/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/12/03 09:44:10 darcy Exp $
-
---- lib/python/mod_python/apache.py.orig	2002-04-19 14:20:40.000000000 -0400
-+++ lib/python/mod_python/apache.py
-@@ -552,6 +552,9 @@
-                     elif string.lower(h) == "content-type":
-                         self.req.content_type = v
-                         self.req.headers_out[h] = v
-+                    elif h.lower() == "location":
-+                        self.req.status = HTTP_MOVED_TEMPORARILY
-+                        self.req.headers_out["location"] = v
-                     else:
-                         self.req.headers_out.add(h, v)
-                 self.req.send_http_header()
diff --git a/www/ap-python/patches/patch-af b/www/ap-python/patches/patch-af
deleted file mode 100644
index c17e934b37a..00000000000
--- a/www/ap-python/patches/patch-af
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/12/03 09:44:10 darcy Exp $
-
---- lib/python/mod_python/cgihandler.py.orig	2000-12-05 22:05:37.000000000 -0500
-+++ lib/python/mod_python/cgihandler.py
-@@ -108,6 +108,7 @@
-             # thread safe, this is why we must obtain the lock.
-             cwd = os.getcwd()
-             os.chdir(dir)
-+            sys.path.append (dir)
- 
-             # simulate cgi environment
-             env, si, so = apache.setup_cgi(req)
-@@ -119,7 +120,9 @@
-                 raise apache.SERVER_RETURN, apache.HTTP_NOT_FOUND
- 
-             # this executes the module
--            imp.load_module(module_name, fd, path, desc)
-+            try: imp.load_module(module_name, fd, path, desc)
-+            except SystemExit, e:
-+                if not e or not e.args or e.args[0]: raise
- 
-             return apache.OK
- 
diff --git a/www/ap-python/patches/patch-ag b/www/ap-python/patches/patch-ag
deleted file mode 100644
index 6caf75e63f9..00000000000
--- a/www/ap-python/patches/patch-ag
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/12/03 09:44:10 darcy Exp $
-
---- lib/python/mod_python/apache.py.orig	2002-04-19 14:20:40.000000000 -0400
-+++ lib/python/mod_python/apache.py
-@@ -529,17 +529,9 @@
-             # are headers over yet?
-             headers_over = 0
- 
--            # first try RFC-compliant CRLF
--            ss = string.split(self.headers, '\r\n\r\n', 1)
--            if len(ss) < 2:
--                # second try with \n\n
--                ss = string.split(self.headers, '\n\n', 1)
--                if len(ss) >= 2:
--                    headers_over = 1
--            else:
--                headers_over = 1
--                    
--            if headers_over:
-+            # split the headers from the body.
-+            ss = string.split(self.headers.replace('\r\n', '\n'), '\n\n', 1)
-+            if len(ss) == 2:
-                 # headers done, process them
-                 string.replace(ss[0], '\r\n', '\n')
-                 lines = string.split(ss[0], '\n')
diff --git a/www/ap-rivet/DESCR b/www/ap-rivet/DESCR
deleted file mode 100644
index 074a38c9b2f..00000000000
--- a/www/ap-rivet/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Rivet is a system for creating dynamic web content via a
-programming language integrated with Apache Web Server.  It is
-designed to be fast, powerful and extensible, consume few system
-resources, be easy to learn, and to provide the user with a platform
-that can also be used for other programming tasks outside the web
-(GUI's, system administration tasks, text processing, database
-manipulation, XML, and so on).  In order to meet these goals, the Tcl
-programming language has been chosen to combine with the Apache Web
-Server.
diff --git a/www/ap-rivet/Makefile b/www/ap-rivet/Makefile
deleted file mode 100644
index 6f3a377b119..00000000000
--- a/www/ap-rivet/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2014/01/11 14:42:06 adam Exp $
-
-DISTNAME=	rivet-0.5.0
-PKGNAME=	ap13-${DISTNAME}
-PKGREVISION=	2
-CATEGORIES=	www
-MASTER_SITES=	http://apache.mirror99.com/tcl/rivet/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://tcl.apache.org/rivet/
-COMMENT=	System for creating dynamic web content via Tcl
-
-CONFLICTS=	ap-rivet-[0-9]*
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-
-#CONFIGURE_ARGS+=	-prefix ${PREFIX:Q}/lib
-#CONFIGURE_ARGS+=	-with-apxs ${APXS:Q}
-#CONFIGURE_ARGS+=	-with-tclconfig ${BUILDLINK_PREFIX.tcl:Q}/lib/tclConfig.sh
-
-.include "../../lang/tcl/buildlink3.mk"
-.include "../../www/apache/buildlink3.mk"
-
-pre-install:
-	set -e;								\
-	cd ${WRKSRC:Q};							\
-	for i in "*" "*/*" "*/*/*"; do					\
-		eval ${RM:Q}" -rf $$i/CVS";				\
-	done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-rivet/PLIST b/www/ap-rivet/PLIST
deleted file mode 100644
index ec671395e69..00000000000
--- a/www/ap-rivet/PLIST
+++ /dev/null
@@ -1,55 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 22:00:16 joerg Exp $
-lib/httpd/mod_rivet.la
-lib/rivet/librivet.la
-lib/rivet/librivetparser.la
-lib/rivet${PKGVERSION}/README
-lib/rivet${PKGVERSION}/init.tcl
-lib/rivet${PKGVERSION}/packages/README
-lib/rivet${PKGVERSION}/packages/commserver/commserver.tcl
-lib/rivet${PKGVERSION}/packages/commserver/server.tcl
-lib/rivet${PKGVERSION}/packages/dio/dio.tcl
-lib/rivet${PKGVERSION}/packages/dio/dio_Mysql.tcl
-lib/rivet${PKGVERSION}/packages/dio/dio_Postgresql.tcl
-lib/rivet${PKGVERSION}/packages/dio/dio_Sqlite.tcl
-lib/rivet${PKGVERSION}/packages/dio/diodisplay.tcl
-lib/rivet${PKGVERSION}/packages/dio/pkgIndex.tcl
-lib/rivet${PKGVERSION}/packages/dtcl/dtcl.tcl
-lib/rivet${PKGVERSION}/packages/dtcl/pkgIndex.tcl
-lib/rivet${PKGVERSION}/packages/form/form.tcl
-lib/rivet${PKGVERSION}/packages/form/pkgIndex.tcl
-lib/rivet${PKGVERSION}/packages/rivet_ncgi/rivet_ncgi.tcl
-lib/rivet${PKGVERSION}/packages/session/README.txt
-lib/rivet${PKGVERSION}/packages/session/pkgIndex.tcl
-lib/rivet${PKGVERSION}/packages/session/session-class.tcl
-lib/rivet${PKGVERSION}/packages/session/session-create.sql
-lib/rivet${PKGVERSION}/packages/session/session-demo.rvt
-lib/rivet${PKGVERSION}/packages/session/session-drop.sql
-lib/rivet${PKGVERSION}/packages/session/session-httpd.conf
-lib/rivet${PKGVERSION}/packages/simpledb/pkgIndex.tcl
-lib/rivet${PKGVERSION}/packages/simpledb/simpledb.tcl
-lib/rivet${PKGVERSION}/packages/simpledb/simpledb.test
-lib/rivet${PKGVERSION}/packages/tclrivet/README
-lib/rivet${PKGVERSION}/packages/tclrivet/parse.tcl
-lib/rivet${PKGVERSION}/packages/tclrivet/pkgIndex.tcl
-lib/rivet${PKGVERSION}/packages/tclrivet/tclrivet.tcl
-lib/rivet${PKGVERSION}/packages/tclrivet/tclrivetparser.tcl
-lib/rivet${PKGVERSION}/pkgIndex.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/README
-lib/rivet${PKGVERSION}/rivet-tcl/cookie.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/debug.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/html.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/import_keyvalue_pairs.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/import_switch_args.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/incr0.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/lassign.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/lempty.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/lmatch.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/load_cookies.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/load_response.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/parray.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/random.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/read_file.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/rivet_command_document.tcl
-lib/rivet${PKGVERSION}/rivet-tcl/tclIndex
-lib/rivet${PKGVERSION}/rivet-tcl/wrap.tcl
-@pkgdir lib/rivet${PKGVERSION}/packages/rivet
diff --git a/www/ap-rivet/distinfo b/www/ap-rivet/distinfo
deleted file mode 100644
index 551857c3997..00000000000
--- a/www/ap-rivet/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.5 2008/07/27 16:35:07 joerg Exp $
-
-SHA1 (rivet-0.5.0.tar.gz) = a273d1fe72780491294aa8f164fd92f50f2fe8ac
-RMD160 (rivet-0.5.0.tar.gz) = 1cf02739f16156761ce8d10df855c5812e492312
-Size (rivet-0.5.0.tar.gz) = 792027 bytes
-SHA1 (patch-aa) = 63fd2544995a5cf4a0245a8c42d9af9ab4dfa8be
-SHA1 (patch-ab) = 66d7832e71a0d7c19be0a01d5e16ae38fc653f09
-SHA1 (patch-ac) = af11e2e286fc00c611e255b07942cb9fd543eb70
-SHA1 (patch-ad) = 0eed225b5b453a832e4fbb4400481dcb1cb1fe24
diff --git a/www/ap-rivet/patches/patch-aa b/www/ap-rivet/patches/patch-aa
deleted file mode 100644
index 07352fb8b72..00000000000
--- a/www/ap-rivet/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/06/10 20:06:56 minskim Exp $
-
---- src/rivetCore.c.orig	2004-02-24 02:24:34.000000000 -0800
-+++ src/rivetCore.c
-@@ -635,7 +635,7 @@ TCL_CMD_HEADER( Rivet_Upload )
- 	if (TclWeb_UploadChannel(varname, &chan, globals->req) != TCL_OK) {
- 	    return TCL_ERROR;
- 	}
--	(CONST84 char *)channelname = Tcl_GetChannelName(chan);
-+	channelname = (CONST84 char *)Tcl_GetChannelName(chan);
- 	Tcl_SetStringObj(result, channelname, -1);
- 	break;
-     }
diff --git a/www/ap-rivet/patches/patch-ab b/www/ap-rivet/patches/patch-ab
deleted file mode 100644
index b28ec80f4db..00000000000
--- a/www/ap-rivet/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/08/23 11:22:07 minskim Exp $
-
---- src/TclWebapache.c.orig	2004-12-03 02:17:10.000000000 +0000
-+++ src/TclWebapache.c
-@@ -660,10 +660,10 @@ TclWeb_GetEnvVar( TclWebRequest *req, ch
-     TclWeb_InitEnvVars( req );
- 
-     /* Check to see if it's a header variable first. */
--    (const char *)val = ap_table_get( req->req->headers_in, key );
-+    val = (char *)ap_table_get( req->req->headers_in, key );
- 
-     if( !val ) {
--	(const char *)val = ap_table_get( req->req->subprocess_env, key );
-+	val = (char *)ap_table_get( req->req->subprocess_env, key );
-     }
- 
-     return val;
diff --git a/www/ap-rivet/patches/patch-ac b/www/ap-rivet/patches/patch-ac
deleted file mode 100644
index d1e0503bae8..00000000000
--- a/www/ap-rivet/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/08/23 11:22:07 minskim Exp $
-
---- src/Makefile.in.orig	2005-03-24 10:32:04.000000000 +0000
-+++ src/Makefile.in
-@@ -281,7 +281,7 @@ apxs_libexec_LTLIBRARIES = mod_rivet.la
- 
- # ... and these two.  We want to put the libs in the package path,
- # rather than the standard library location for the system.
--lib_libexecdir = @TCL_PACKAGE_PATH@/rivet
-+lib_libexecdir = @prefix@/lib/rivet
- lib_libexec_LTLIBRARIES = librivet.la librivetparser.la
- 
- #
diff --git a/www/ap-rivet/patches/patch-ad b/www/ap-rivet/patches/patch-ad
deleted file mode 100644
index 2e20a5a6d9b..00000000000
--- a/www/ap-rivet/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/07/27 16:35:07 joerg Exp $
-
---- configure.orig	2008-07-27 16:07:00.000000000 +0000
-+++ configure
-@@ -23365,15 +23365,15 @@ echo $ECHO_N "checking system version (f
-     else
- 	system=`uname -s`-`uname -r`
- 	if test "$?" -ne 0 ; then
--	    echo "$as_me:$LINENO: result: unknown (can't find uname command)" >&5
--echo "${ECHO_T}unknown (can't find uname command)" >&6
-+	    echo "$as_me:$LINENO: result: unknown (can\'t find uname command)" >&5
-+echo "${ECHO_T}unknown (can\'t find uname command)" >&6
- 	    system=unknown
- 	else
- 	    # Special check for weird MP-RAS system (uname returns weird
- 	    # results, and the version is kept in special file).
- 
- 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--		system=MP-RAS-`awk '{print }' /etc/.relid'`
-+		system=MP-RAS-`awk '{print }' /etc/.relid`
- 	    fi
- 	    if test "`uname -s`" = "AIX" ; then
- 		system=AIX-`uname -v`.`uname -r`
diff --git a/www/ap-rpaf/Makefile b/www/ap-rpaf/Makefile
index 767bfd55711..fd7095d6c27 100644
--- a/www/ap-rpaf/Makefile
+++ b/www/ap-rpaf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/28 06:30:05 asau Exp $
+# $NetBSD: Makefile,v 1.10 2014/06/10 15:22:16 joerg Exp $
 #
 
 DISTNAME=		mod_rpaf-0.5
@@ -16,7 +16,7 @@ APACHE_MODULE=		yes
 INSTALLATION_DIRS=	share/doc
 
 # does not compile with apache24
-PKG_APACHE_ACCEPTED=	apache13 apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 .include "../../mk/apache.mk"
 
@@ -28,14 +28,10 @@ INSTALLATION_DIRS+=	share/doc/mod_rpaf
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mod_rpaf.txt
 
-.if ${PKG_APACHE} == "apache13"
-MODULE_EXT=	so
-.else
 MODULE_EXT=	la
 do-configure:
 	${RM} -f ${WRKSRC}/mod_rpaf.c
 	${CP} -f ${WRKSRC}/mod_rpaf-2.0.c ${WRKSRC}/mod_rpaf.c
-.endif
 
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile
index 95bc1509339..55824c62fc8 100644
--- a/www/ap-ruby/Makefile
+++ b/www/ap-ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2012/10/28 06:30:05 asau Exp $
+# $NetBSD: Makefile,v 1.38 2014/06/10 15:22:16 joerg Exp $
 #
 
 DISTNAME=	mod_ruby-${VERSION}
@@ -14,7 +14,7 @@ COMMENT=	Apache module that embeds Ruby interpreter within
 RUBY_VERSION_SUPPORTED= 18
 
 APACHE_MODULE=		yes
-PKG_APACHE_ACCEPTED=	apache13 apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 USE_APR=		yes
 VERSION=		1.3.0
 HAS_CONFIGURE=  	yes
diff --git a/www/ap-scgi/Makefile b/www/ap-scgi/Makefile
index e50e0782318..f3567d6e90d 100644
--- a/www/ap-scgi/Makefile
+++ b/www/ap-scgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/05/09 07:37:23 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2014/06/10 15:22:16 joerg Exp $
 #
 
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME}
@@ -11,20 +11,15 @@ DEPENDS+=	${PYPKGPREFIX}-scgi-[0-9]*:../../www/py-scgi
 APACHE_MODULE= yes
 
 # does not compile with apache24
-PKG_APACHE_ACCEPTED=	apache13 apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-quixote via py-scgi
 
 .include "../../mk/apache.mk"
 .include "../../www/apache/module.mk"
 
-.if ${APACHE_PKG_PREFIX} == "ap13"
-MODULE_EXT=	so
-APACHE_MODULE_SRCDIR=	${WRKDIR}/${DISTNAME}/apache1
-.else
 MODULE_EXT=	la
 APACHE_MODULE_SRCDIR=	${WRKDIR}/${DISTNAME}/apache2
-.endif
 
 APACHE_MODULE_NAME=	mod_scgi.${MODULE_EXT}
 APACHE_MODULE_SRC=	mod_scgi.c
diff --git a/www/ap-ssl/DESCR b/www/ap-ssl/DESCR
deleted file mode 100644
index 50eec623b90..00000000000
--- a/www/ap-ssl/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-This Apache module provides strong cryptography for the Apache 1.3
-webserver via the Secure Sockets Layer (SSL v2/v3) and Transport
-Layer Security (TLS v1) protocols by the help of the Open Source
-SSL/TLS toolkit OpenSSL which is based on SSLeay from Eric A. Young
-and Tim J. Hudson.
-
-The mod_ssl package was created in April 1998 by Ralf S. Engelschall
-and was originally derived from software developed by Ben Laurie
-for use in the Apache-SSL HTTP server project.  Additionally it
-uses a tool developed by Larry Wall and David MacKenzie for use in
-the GNU project of the FSF.
diff --git a/www/ap-ssl/MESSAGE b/www/ap-ssl/MESSAGE
deleted file mode 100644
index 1d5a1cabb69..00000000000
--- a/www/ap-ssl/MESSAGE
+++ /dev/null
@@ -1,26 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2002/11/19 23:03:53 jlam Exp $
-
-You will need to generate certificates and keys for your server before
-Apache will start with mod_ssl support.  Please read
-
-	${PREFIX}/share/doc/mod_ssl/README.mkcert
-
-for more information on how to do this.
-
-The SSL-specific configuration parts of the default httpd.conf are
-bracketed by:
-
-  <IfDefine SSL>
-  </IfDefine>
-
-In order to start Apache with mod_ssl support, you need to run Apache
-with "apachectl startssl" instead of "apachectl start".  This may be done
-by adding:
-
-	apache=YES
-	apache_start="startssl"
-
-to /etc/rc.conf.
-
-===========================================================================
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
deleted file mode 100644
index 96a4798e2fd..00000000000
--- a/www/ap-ssl/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-# $NetBSD: Makefile,v 1.117 2014/05/29 23:37:55 wiz Exp $
-
-DISTNAME=		mod_ssl-2.8.31-1.3.41
-PKGNAME=		ap13-ssl-2.8.31
-PKGREVISION=		7
-CATEGORIES=		www security
-MASTER_SITES=		http://www.modssl.org/source/ \
-			ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.modssl.org/
-COMMENT=		SSL/TLS protocols module for Apache
-
-CONFLICTS=		apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]*
-CONFLICTS+=		ap-ssl-[0-9]*
-
-
-APACHE_MODULE=		yes
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../www/apache/buildlink3.mk"
-BUILDLINK_API_DEPENDS.apache+=	apache>=1.3.42
-
-SSL_RPATH_LDFLAGS=	${LINKER_RPATH_FLAG} ${SSLBASE}/lib
-FIX_RPATH+=		SSL_RPATH_LDFLAGS
-MAKE_ENV+=		SSL_RPATH_LDFLAGS=${SSL_RPATH_LDFLAGS:Q}
-
-PKG_SYSCONFVAR=		apache
-PKG_SYSCONFSUBDIR?=	httpd
-
-EGDIR=			${PREFIX}/share/examples/mod_ssl
-OWN_DIRS=		${PKG_SYSCONFDIR}/ssl.crl
-OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.crt
-OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.csr
-OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.prm
-OWN_DIRS_PERMS=		${PKG_SYSCONFDIR}/ssl.key			\
-			${ROOT_USER} ${ROOT_GROUP} 0700
-
-CONF_FILES=		# empty
-CONFS=			ssl.crl/Makefile.crl ssl.crl/README.CRL		\
-			ssl.crt/Makefile.crt ssl.crt/README.CRT		\
-			ssl.csr/README.CSR ssl.csr/README.CSR		\
-			ssl.key/README.KEY ssl.prm/README.PRM
-.for file in ${CONFS}
-CONF_FILES+=		${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file}
-.endfor
-
-.include "../../security/openssl/buildlink3.mk"
-
-SUBST_CLASSES+=		paths perl
-SUBST_FILES.paths=	README.mkcert pkg.sslsup/mkcert.sh
-SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
-SUBST_STAGE.paths=	post-patch
-SUBST_FILES.perl=	pkg.contrib/loadcacert.cgi
-SUBST_SED.perl=		-e 's,^\#!/.*,\#!${PERL5},g'
-SUBST_STAGE.perl=	post-patch
-
-post-extract:
-	${CP} ${FILESDIR}/README.mkcert ${WRKSRC}
-
-INSTALLATION_DIRS+=	lib/httpd sbin \
-			${EGDIR}/ssl.crl ${EGDIR}/ssl.crt ${EGDIR}/ssl.csr \
-			${EGDIR}/ssl.key ${EGDIR}/ssl.prm \
-			share/doc/mod_ssl \
-			share/httpd/htdocs/manual/mod/mod_ssl share/mod_ssl
-
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/pkg.sslmod/libssl.so \
-	    ${DESTDIR}${PREFIX}/lib/httpd/mod_ssl.so
-	${INSTALL_SCRIPT} ${WRKSRC}/pkg.sslsup/mkcert.sh		\
-	    ${DESTDIR}${PREFIX}/sbin/mkcert
-
-	cd ${WRKSRC}/pkg.ssldoc && ${INSTALL_DATA} *.html *.gif *.jpg	\
-	    ${DESTDIR}${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl
-	cd ${WRKSRC}/pkg.contrib && ${INSTALL_SCRIPT} *.sh *.cgi	\
-	    ${DESTDIR}${PREFIX}/share/mod_ssl
-	${INSTALL_DATA} ${WRKSRC}/README.mkcert \
-	    ${DESTDIR}${PREFIX}/share/doc/mod_ssl
-
-	cd ${WRKSRC}/pkg.sslcfg; ${RM} -f server.*
-	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.CRL *.crl	\
-	    ${DESTDIR}${EGDIR}/ssl.crl
-	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.CRT *.crt	\
-	    ${DESTDIR}${EGDIR}/ssl.crt
-	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.CSR		\
-	    ${DESTDIR}${EGDIR}/ssl.csr
-	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.KEY *.key	\
-	    ${DESTDIR}${EGDIR}/ssl.key
-	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.PRM *.prm	\
-	    ${DESTDIR}${EGDIR}/ssl.prm
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-ssl/PLIST b/www/ap-ssl/PLIST
deleted file mode 100644
index 6b9f7b6daec..00000000000
--- a/www/ap-ssl/PLIST
+++ /dev/null
@@ -1,75 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:16 joerg Exp $
-lib/httpd/mod_ssl.so
-sbin/mkcert
-share/doc/mod_ssl/README.mkcert
-share/examples/mod_ssl/ssl.crl/Makefile.crl
-share/examples/mod_ssl/ssl.crl/README.CRL
-share/examples/mod_ssl/ssl.crt/Makefile.crt
-share/examples/mod_ssl/ssl.crt/README.CRT
-share/examples/mod_ssl/ssl.crt/ca-bundle.crt
-share/examples/mod_ssl/ssl.crt/snakeoil-ca-dsa.crt
-share/examples/mod_ssl/ssl.crt/snakeoil-ca-rsa.crt
-share/examples/mod_ssl/ssl.crt/snakeoil-dsa.crt
-share/examples/mod_ssl/ssl.crt/snakeoil-rsa.crt
-share/examples/mod_ssl/ssl.csr/README.CSR
-share/examples/mod_ssl/ssl.key/README.KEY
-share/examples/mod_ssl/ssl.key/snakeoil-ca-dsa.key
-share/examples/mod_ssl/ssl.key/snakeoil-ca-rsa.key
-share/examples/mod_ssl/ssl.key/snakeoil-dsa.key
-share/examples/mod_ssl/ssl.key/snakeoil-rsa.key
-share/examples/mod_ssl/ssl.prm/README.PRM
-share/examples/mod_ssl/ssl.prm/snakeoil-ca-dsa.prm
-share/examples/mod_ssl/ssl.prm/snakeoil-dsa.prm
-share/httpd/htdocs/manual/mod/mod_ssl/apache_pb.gif
-share/httpd/htdocs/manual/mod/mod_ssl/feather.jpg
-share/httpd/htdocs/manual/mod/mod_ssl/index.html
-share/httpd/htdocs/manual/mod/mod_ssl/mod_ssl_sb.gif
-share/httpd/htdocs/manual/mod/mod_ssl/openssl_ics.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_compat.gfont000.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_compat.html
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_cover_logo.jpg
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_cover_title.jpg
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.gfont000.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.html
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_glossary.html
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_howto.gfont000.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_howto.html
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro.gfont000.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro.html
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro_fig1.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro_fig2.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_intro_fig3.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_overview.gfont000.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_overview.html
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_overview_fig1.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_reference.gfont000.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_reference.html
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-chapter.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-1.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-2.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-3.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-4.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-5.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-6.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.head-num-7.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.navbut-next-n.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.navbut-next-s.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.navbut-prev-n.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.navbut-prev-s.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-abstract.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-compat.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-faq.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-gloss.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-howto.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-intro.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-over.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-preface.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-ref.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-toc.gif
-share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-tutor.gif
-share/mod_ssl/cca.sh
-share/mod_ssl/gid-mkcert.sh
-share/mod_ssl/loadcacert.cgi
-share/mod_ssl/sign.sh
diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo
deleted file mode 100644
index 95cbad09b5f..00000000000
--- a/www/ap-ssl/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.36 2014/05/12 10:37:25 jperkin Exp $
-
-SHA1 (mod_ssl-2.8.31-1.3.41.tar.gz) = f2d2210041332fc1d4b7243a856d4d81f961d306
-RMD160 (mod_ssl-2.8.31-1.3.41.tar.gz) = c3083c29710c4537ca8c79ddd8c1992eb95cbfee
-Size (mod_ssl-2.8.31-1.3.41.tar.gz) = 820067 bytes
-SHA1 (patch-aa) = f2db042ff2e15ebfc9387b254467be78747cf947
-SHA1 (patch-ab) = d6e4f5ef249506b9b4f003f84d78e2eb075dcd34
-SHA1 (patch-ac) = 5c5fa8cbcb278f9e4035aafde783537463847d7c
-SHA1 (patch-pkg.sslmod_ssl__util__ssl.c) = 87ddded4ea02d4f279fecc1aaa88cd9578c26064
diff --git a/www/ap-ssl/files/README.mkcert b/www/ap-ssl/files/README.mkcert
deleted file mode 100644
index b972f9cddbf..00000000000
--- a/www/ap-ssl/files/README.mkcert
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: README.mkcert,v 1.3 2001/11/26 07:34:06 jlam Exp $
-
-If you don't already have them, you will need to generate SSL certificates
-and keys for your server before Apache will start with mod_ssl support.
-You can do this with:
-
-        @PREFIX@/sbin/mkcert -t custom -a RSA
-
-If you already have an existing server certificate and key, you will need
-to run:
-
-        @PREFIX@/sbin/mkcert -t existing -c /path/to/cert -k /path/to/key
-
-to generate new certificates from your existing ones.  For a more detailed,
-step-by-step description of how to generate SSL certificates, point your
-browser at:
-
-	@PREFIX@/share/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.html
-
-After generating your SSL certificates, you should update the certificate
-hashes with:
-
-	cd @PKG_SYSCONFDIR@/ssl.crt; make -f Makefile.crt update
diff --git a/www/ap-ssl/patches/patch-aa b/www/ap-ssl/patches/patch-aa
deleted file mode 100644
index f8d5ea2816e..00000000000
--- a/www/ap-ssl/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2005/07/14 04:04:58 wiz Exp $
-
---- pkg.sslmod/libssl.module.orig	2005-07-06 10:32:14.000000000 +0200
-+++ pkg.sslmod/libssl.module
-@@ -434,7 +434,7 @@ ConfigStart
-             exit 1
-         fi
-     fi
--    SSL_LDFLAGS="$SSL_LDFLAGS -L\$(SSL_LIBDIR)"
-+    SSL_LDFLAGS="$SSL_LDFLAGS -L\$(SSL_LIBDIR) \$(SSL_RPATH_LDFLAGS)"
-     SSL_LIBS="$SSL_LIBS -lssl -lcrypto"
- 
-     #
diff --git a/www/ap-ssl/patches/patch-ab b/www/ap-ssl/patches/patch-ab
deleted file mode 100644
index 397e941baef..00000000000
--- a/www/ap-ssl/patches/patch-ab
+++ /dev/null
@@ -1,455 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/01/05 21:21:55 joerg Exp $
-
---- pkg.sslsup/mkcert.sh.orig	Sun Apr 16 19:21:24 2000
-+++ pkg.sslsup/mkcert.sh
-@@ -1,39 +1,57 @@
--#!/bin/sh
-+#!@SH@
- ##
- ##  mkcert.sh -- SSL Certificate Generation Utility
- ##  Copyright (c) 1998-2000 Ralf S. Engelschall, All Rights Reserved. 
- ##
- 
- #   parameters
--make="$1"
--mflags="$2"
--openssl="$3"
--support="$4"
--type="$5"
--algo="$6"
--crt="$7"
--key="$8"
--view="$9"
--
--#   we can operate only inside the Apache 1.3 source
--#   tree and only when mod_ssl+OpenSSL is actually configured.
--if [ ! -f "../README.configure" ]; then
--    echo "mkcert.sh:Error: Cannot operate outside the Apache 1.3 source tree." 1>&2
--    echo "mkcert.sh:Hint:  You have to stay inside apache_1.3.x/src." 1>&2
--    exit 1
--fi
--if [ ".$openssl" = . ]; then
--    echo "mkcert.sh:Error: mod_ssl/OpenSSL has to be configured before using this utility." 1>&2
--    echo "mkcert.sh:Hint:  Configure mod_ssl with --enable-module=ssl in APACI, first." 1>&2
--    exit 1
-+parameters=`getopt a:c:t:k:v $*`
-+if [ $# = 0 ]; then
-+    cat << EOF
-+Usage:
-+        mkcert.sh [-t type] [-a algo] [-c crtfile ] [-k keyfile] [-v]
-+
-+Options:
-+        -t type		Type of certificates to generate.  Valid types are:
-+                            dummy      self-signed Snake Oil cert
-+                            test       test cert signed by Snake Oil CA
-+                            custom     custom cert signed by own CA
-+                            existing   existing cert
-+
-+        -a algo         Signature algorithm for generated certificate.  Valid
-+                        algorithms are RSA or DSA.
-+
-+        -c crtfile      Path to an existing certificate
-+
-+        -k keyfile      Path to an existing key file
-+
-+        -v              Display the certificate and key, then exit.
-+
-+EOF
-+    exit 2
- fi
- 
-+set -- $parameters
-+for param; do
-+    case $param in
-+        -a) algo=$2 ;;
-+        -c) crt=$2 ;;
-+        -t) type=$2 ;;
-+        -k) key=$2 ;;
-+        -v) view=1 ;;
-+        --) break ;;
-+    esac
-+    shift
-+done
-+
-+openssl="openssl"
-+confdir=@PKG_SYSCONFDIR@
-+
- #   configuration
--#   WE ARE CALLED FROM THE PARENT DIR!
--sslcrtdir="../conf/ssl.crt"
--sslcsrdir="../conf/ssl.csr"
--sslkeydir="../conf/ssl.key"
--sslprmdir="../conf/ssl.prm"
-+sslcrtdir="$confdir/ssl.crt"
-+sslcsrdir="$confdir/ssl.csr"
-+sslkeydir="$confdir/ssl.key"
-+sslprmdir="$confdir/ssl.prm"
- 
- #   some optional terminal sequences
- case $TERM in
-@@ -93,11 +111,11 @@ if [ ".$view" != . ]; then
- fi
- 
- #   find some random files
--#   (do not use /dev/random here, because this device 
--#   doesn't work as expected on all platforms)
--randfiles=''
-+#   We will always generate a /tmp/randfile using /dev/urandom
-+#   before passing $randfile to openssl.
-+randfiles='/tmp/randfile'
- for file in /var/log/messages /var/adm/messages /var/log/system.log /var/wtmp \
--            /kernel /kernel/genunix /vmunix /vmlinuz /mach \
-+            /kernel /kernel/genunix /vmunix /vmlinuz /mach /netbsd \
-             /etc/hosts /etc/group /etc/resolv.conf /bin/ls; do
-     if [ -r $file ]; then
-         if [ ".$randfiles" = . ]; then
-@@ -112,7 +130,7 @@ done
- if [ -f $HOME/.rnd ]; then
-     RANDFILE="$HOME/.rnd"
- else
--    RANDFILE=".mkcert.rnd"
-+    RANDFILE="/tmp/.mkcert.rnd"
-     (ps; date) >$RANDFILE
- fi
- export RANDFILE
-@@ -156,12 +174,12 @@ case $type in
-         fi
-         echo "${T_MD}RESULT: Server Certification Files${T_ME}"
-         echo ""
--        echo "o  ${T_MD}conf/ssl.key/server.key${T_ME}"
-+        echo "o  ${T_MD}$confdir/ssl.key/server.key${T_ME}"
-         echo "   The PEM-encoded $algo private key file which you configure"
-         echo "   with the 'SSLCertificateKeyFile' directive (automatically done"
-         echo "   when you install via APACI). ${T_MD}KEEP THIS FILE PRIVATE!${T_ME}"
-         echo ""
--        echo "o  ${T_MD}conf/ssl.crt/server.crt${T_ME}"
-+        echo "o  ${T_MD}$confdir/ssl.crt/server.crt${T_ME}"
-         echo "   The PEM-encoded X.509 certificate file which you configure"
-         echo "   with the 'SSLCertificateFile' directive (automatically done"
-         echo "   when you install via APACI)."
-@@ -211,6 +229,7 @@ case $type in
-         echo "______________________________________________________________________"
-         echo ""
-         echo "${T_MD}STEP 1: Generating $algo private key (1024 bit) [server.key]${T_ME}"
-+        (umask 077; head -500 /dev/urandom > randfile)
-         if [ ".$algo" = .RSA ]; then
-             if [ ".$randfiles" != . ]; then
-                 $openssl genrsa -rand $randfiles -out $sslkeydir/server.key 1024
-@@ -238,10 +257,11 @@ case $type in
-                 exit 1
-             fi
-         fi
-+        rm -f randfile
-         echo "______________________________________________________________________"
-         echo ""
-         echo "${T_MD}STEP 2: Generating X.509 certificate signing request [server.csr]${T_ME}"
--        cat >.mkcert.cfg <<EOT
-+        cat >/tmp/.mkcert.cfg <<EOT
- [ req ]
- default_bits                    = 1024
- distinguished_name              = req_DN
-@@ -265,7 +285,7 @@ emailAddress                    = "7. Em
- emailAddress_max                = 40
- emailAddress_default            = www@snakeoil.dom
- EOT
--        $openssl req -config .mkcert.cfg \
-+        $openssl req -config /tmp/.mkcert.cfg \
-                      -new \
-                      -key $sslkeydir/server.key \
-                      -out $sslcsrdir/server.csr
-@@ -273,7 +293,7 @@ EOT
-             echo "mkcert.sh:Error: Failed to generate certificate signing request" 1>&2
-             exit 1
-         fi
--        rm -f .mkcert.cfg
-+        rm -f /tmp/.mkcert.cfg
-         prompt="8. Certificate Validity     (days)          [365]:"
-         echo dummy | awk '{ printf("%s", prompt); }' "prompt=$prompt"
-         read days
-@@ -287,8 +307,8 @@ EOT
-         read certversion
-         extfile=""
-         if [ ".$certversion" = .3 -o ".$certversion" = . ]; then
--            extfile="-extfile .mkcert.cfg"
--            cat >.mkcert.cfg <<EOT
-+            extfile="-extfile /tmp/.mkcert.cfg"
-+            cat >/tmp/.mkcert.cfg <<EOT
- extensions = x509v3
- [ x509v3 ]
- subjectAltName   = email:copy
-@@ -296,13 +316,13 @@ nsComment        = "mod_ssl generated te
- nsCertType       = server
- EOT
-         fi
--        if [ ! -f .mkcert.serial ]; then
--            echo '01' >.mkcert.serial
-+        if [ ! -f /tmp/.mkcert.serial ]; then
-+            echo '01' >/tmp/.mkcert.serial
-         fi
-         if [ ".$algo" = .RSA ]; then
-             $openssl x509 $extfile \
-                           -days $days \
--                          -CAserial .mkcert.serial \
-+                          -CAserial /tmp/.mkcert.serial \
-                           -CA $sslcrtdir/snakeoil-ca-rsa.crt \
-                           -CAkey $sslkeydir/snakeoil-ca-rsa.key \
-                           -in $sslcsrdir/server.csr -req \
-@@ -310,7 +330,7 @@ EOT
-         else
-             $openssl x509 $extfile \
-                           -days $days \
--                          -CAserial .mkcert.serial \
-+                          -CAserial /tmp/.mkcert.serial \
-                           -CA $sslcrtdir/snakeoil-ca-dsa.crt \
-                           -CAkey $sslkeydir/snakeoil-ca-dsa.key \
-                           -in $sslcsrdir/server.csr -req \
-@@ -320,7 +340,7 @@ EOT
-             echo "mkcert.sh:Error: Failed to generate X.509 certificate" 1>&2
-             exit 1
-         fi
--        rm -f .mkcert.cfg
-+        rm -f /tmp/.mkcert.cfg
-         echo "Verify: matching certificate & key modulus"
-         modcrt=`$openssl x509 -noout -modulus -in $sslcrtdir/server.crt | sed -e 's;.*Modulus=;;'`
-         if [ ".$algo" = .RSA ]; then
-@@ -387,22 +407,22 @@ EOT
-         echo ""
-         echo "${T_MD}RESULT: Server Certification Files${T_ME}"
-         echo ""
--        echo "o  ${T_MD}conf/ssl.key/server.key${T_ME}"
-+        echo "o  ${T_MD}$confdir/ssl.key/server.key${T_ME}"
-         echo "   The PEM-encoded $algo private key file which you configure"
-         echo "   with the 'SSLCertificateKeyFile' directive (automatically done"
-         echo "   when you install via APACI). ${T_MD}KEEP THIS FILE PRIVATE!${T_ME}"
-         echo ""
--        echo "o  ${T_MD}conf/ssl.crt/server.crt${T_ME}"
-+        echo "o  ${T_MD}$confdir/ssl.crt/server.crt${T_ME}"
-         echo "   The PEM-encoded X.509 certificate file which you configure"
-         echo "   with the 'SSLCertificateFile' directive (automatically done"
-         echo "   when you install via APACI)."
-         echo ""
--        echo "o  ${T_MD}conf/ssl.csr/server.csr${T_ME}"
-+        echo "o  ${T_MD}$confdir/ssl.csr/server.csr${T_ME}"
-         echo "   The PEM-encoded X.509 certificate signing request file which" 
-         echo "   you can send to an official Certificate Authority (CA) in order"
-         echo "   to request a real server certificate (signed by this CA instead"
-         echo "   of our demonstration-only Snake Oil CA) which later can replace"
--        echo "   the conf/ssl.crt/server.crt file."
-+        echo "   the $confdir/ssl.crt/server.crt file."
-         echo ""
-         echo "WARNING: Do not use this for real-life/production systems"
-         echo ""
-@@ -448,6 +468,7 @@ EOT
-         echo "______________________________________________________________________"
-         echo ""
-         echo "${T_MD}STEP 1: Generating $algo private key for CA (1024 bit) [ca.key]${T_ME}"
-+        (umask 077; head -500 /dev/urandom > randfile)
-         if [ ".$algo" = .RSA ]; then
-             if [ ".$randfiles" != . ]; then
-                 $openssl genrsa -rand $randfiles -out $sslkeydir/ca.key 1024
-@@ -475,10 +496,11 @@ EOT
-                 exit 1
-             fi
-         fi
-+        rm -f randfile
-         echo "______________________________________________________________________"
-         echo ""
-         echo "${T_MD}STEP 2: Generating X.509 certificate signing request for CA [ca.csr]${T_ME}"
--        cat >.mkcert.cfg <<EOT
-+        cat >/tmp/.mkcert.cfg <<EOT
- [ req ]
- default_bits                    = 1024
- distinguished_name              = req_DN
-@@ -502,7 +524,7 @@ emailAddress                    = "7. Em
- emailAddress_max                = 40
- emailAddress_default            = ca@snakeoil.dom
- EOT
--        $openssl req -config .mkcert.cfg \
-+        $openssl req -config /tmp/.mkcert.cfg \
-                      -new \
-                      -key $sslkeydir/ca.key \
-                      -out $sslcsrdir/ca.csr
-@@ -510,7 +532,7 @@ EOT
-             echo "mkcert.sh:Error: Failed to generate certificate signing request" 1>&2
-             exit 1
-         fi
--        rm -f .mkcert.cfg
-+        rm -f /tmp/.mkcert.cfg
-         prompt="8. Certificate Validity     (days)          [365]:"
-         echo dummy | awk '{ printf("%s", prompt); }' "prompt=$prompt"
-         read days
-@@ -524,8 +546,8 @@ EOT
-         read certversion
-         extfile=""
-         if [ ".$certversion" = .3 -o ".$certversion" = . ]; then
--            extfile="-extfile .mkcert.cfg"
--            cat >.mkcert.cfg <<EOT
-+            extfile="-extfile /tmp/.mkcert.cfg"
-+            cat >/tmp/.mkcert.cfg <<EOT
- extensions = x509v3
- [ x509v3 ]
- subjectAltName   = email:copy
-@@ -543,7 +565,7 @@ EOT
-             echo "mkcert.sh:Error: Failed to generate self-signed CA certificate" 1>&2
-             exit 1
-         fi
--        rm -f .mkcert.cfg
-+        rm -f /tmp/.mkcert.cfg
-         echo "Verify: matching certificate & key modulus"
-         modcrt=`$openssl x509 -noout -modulus -in $sslcrtdir/ca.crt | sed -e 's;.*Modulus=;;'`
-         if [ ".$algo" = .RSA ]; then
-@@ -564,6 +586,7 @@ EOT
-         echo "______________________________________________________________________"
-         echo ""
-         echo "${T_MD}STEP 4: Generating $algo private key for SERVER (1024 bit) [server.key]${T_ME}"
-+        (umask 077; head -500 /dev/urandom > randfile)
-         if [ ".$algo" = .RSA ]; then
-             if [ ".$randfiles" != . ]; then
-                 $openssl genrsa -rand $randfiles -out $sslkeydir/server.key 1024
-@@ -588,10 +611,11 @@ EOT
-                 exit 1
-             fi
-         fi
-+        rm -f randfile
-         echo "______________________________________________________________________"
-         echo ""
-         echo "${T_MD}STEP 5: Generating X.509 certificate signing request for SERVER [server.csr]${T_ME}"
--        cat >.mkcert.cfg <<EOT
-+        cat >/tmp/.mkcert.cfg <<EOT
- [ req ]
- default_bits                    = 1024
- distinguished_name              = req_DN
-@@ -615,7 +639,7 @@ emailAddress                    = "7. Em
- emailAddress_max                = 40
- emailAddress_default            = www@snakeoil.dom
- EOT
--        $openssl req -config .mkcert.cfg \
-+        $openssl req -config /tmp/.mkcert.cfg \
-                      -new \
-                      -key $sslkeydir/server.key \
-                      -out $sslcsrdir/server.csr
-@@ -623,7 +647,7 @@ EOT
-             echo "mkcert.sh:Error: Failed to generate certificate signing request" 1>&2
-             exit 1
-         fi
--        rm -f .mkcert.cfg
-+        rm -f /tmp/.mkcert.cfg
-         prompt="8. Certificate Validity     (days)          [365]:"
-         echo dummy | awk '{ printf("%s", prompt); }' "prompt=$prompt"
-         read days
-@@ -637,8 +661,8 @@ EOT
-         read certversion
-         extfile=""
-         if [ ".$certversion" = .3 -o ".$certversion" = . ]; then
--            extfile="-extfile .mkcert.cfg"
--            cat >.mkcert.cfg <<EOT
-+            extfile="-extfile /tmp/.mkcert.cfg"
-+            cat >/tmp/.mkcert.cfg <<EOT
- extensions = x509v3
- [ x509v3 ]
- subjectAltName   = email:copy
-@@ -646,12 +670,12 @@ nsComment        = "mod_ssl generated cu
- nsCertType       = server
- EOT
-         fi
--        if [ ! -f .mkcert.serial ]; then
--            echo '01' >.mkcert.serial
-+        if [ ! -f /tmp/.mkcert.serial ]; then
-+            echo '01' >/tmp/.mkcert.serial
-         fi
-         $openssl x509 $extfile \
-                       -days $days \
--                      -CAserial .mkcert.serial \
-+                      -CAserial /tmp/.mkcert.serial \
-                       -CA    $sslcrtdir/ca.crt \
-                       -CAkey $sslkeydir/ca.key \
-                       -in    $sslcsrdir/server.csr -req \
-@@ -660,7 +684,7 @@ EOT
-             echo "mkcert.sh:Error: Failed to generate X.509 certificate" 1>&2
-             exit 1
-         fi
--        rm -f .mkcert.cfg
-+        rm -f /tmp/.mkcert.cfg
-         echo "Verify: matching certificate & key modulus"
-         modcrt=`$openssl x509 -noout -modulus -in $sslcrtdir/server.crt | sed -e 's;.*Modulus=;;'`
-         if [ ".$algo" = .RSA ]; then
-@@ -764,31 +788,31 @@ EOT
-         echo ""
-         echo "${T_MD}RESULT: CA and Server Certification Files${T_ME}"
-         echo ""
--        echo "o  ${T_MD}conf/ssl.key/ca.key${T_ME}"
-+        echo "o  ${T_MD}$confdir/ssl.key/ca.key${T_ME}"
-         echo "   The PEM-encoded $algo private key file of the CA which you can"
-         echo "   use to sign other servers or clients. ${T_MD}KEEP THIS FILE PRIVATE!${T_ME}"
-         echo ""
--        echo "o  ${T_MD}conf/ssl.crt/ca.crt${T_ME}"
-+        echo "o  ${T_MD}$confdir/ssl.crt/ca.crt${T_ME}"
-         echo "   The PEM-encoded X.509 certificate file of the CA which you use to"
-         echo "   sign other servers or clients. When you sign clients with it (for"
-         echo "   SSL client authentication) you can configure this file with the"
-         echo "   'SSLCACertificateFile' directive."
-         echo ""
--        echo "o  ${T_MD}conf/ssl.key/server.key${T_ME}"
-+        echo "o  ${T_MD}$confdir/ssl.key/server.key${T_ME}"
-         echo "   The PEM-encoded $algo private key file of the server which you configure"
-         echo "   with the 'SSLCertificateKeyFile' directive (automatically done"
-         echo "   when you install via APACI). ${T_MD}KEEP THIS FILE PRIVATE!${T_ME}"
-         echo ""
--        echo "o  ${T_MD}conf/ssl.crt/server.crt${T_ME}"
-+        echo "o  ${T_MD}$confdir/ssl.crt/server.crt${T_ME}"
-         echo "   The PEM-encoded X.509 certificate file of the server which you configure"
-         echo "   with the 'SSLCertificateFile' directive (automatically done"
-         echo "   when you install via APACI)."
-         echo ""
--        echo "o  ${T_MD}conf/ssl.csr/server.csr${T_ME}"
-+        echo "o  ${T_MD}$confdir/ssl.csr/server.csr${T_ME}"
-         echo "   The PEM-encoded X.509 certificate signing request of the server file which" 
-         echo "   you can send to an official Certificate Authority (CA) in order"
-         echo "   to request a real server certificate (signed by this CA instead"
--        echo "   of our own CA) which later can replace the conf/ssl.crt/server.crt"
-+        echo "   of our own CA) which later can replace the $confdir/ssl.crt/server.crt"
-         echo "   file."
-         echo ""
-         echo "Congratulations that you establish your server with real certificates."
-@@ -808,14 +832,26 @@ EOT
-             echo "mkcert.sh: Cannot find certificate file: $crt" 1>&2
-             exit 1
-         fi
-+        if [ $crt -ef $sslcrtdir/server.crt ]; then
-+            mv -f $crt $crt.backup
-+            crt="$crt.backup"
-+        fi
-         if [ ".$key" != . ]; then
-             if [ ! -f "$key" ]; then
-                 echo "mkcert.sh: Cannot find private key file: $key" 1>&2
-                 exit 1
-             fi
-+            if [ $key -ef $sslkeydir/server.key ]; then
-+                mv -f $key $key.backup
-+                key="$key.backup"
-+            fi
-             cp $crt $sslcrtdir/server.crt
-             (umask 077; cp $key $sslkeydir/server.key)
-         else
-+            if [ $crt -ef $sslcrtdir/server.crt ]; then
-+                mv -f $crt $crt.backup
-+                crt="$crt.backup"
-+            fi
-             key=$crt
-             umask 077
-             touch $sslkeydir/server.key
-@@ -836,12 +872,12 @@ EOT
-         fi
-         echo "${T_MD}RESULT: Server Certification Files${T_ME}"
-         echo ""
--        echo "o  ${T_MD}conf/ssl.key/server.key${T_ME}"
-+        echo "o  ${T_MD}$confdir/ssl.key/server.key${T_ME}"
-         echo "   The PEM-encoded $algo private key file which you configure"
-         echo "   with the 'SSLCertificateKeyFile' directive (automatically done"
-         echo "   when you install via APACI). ${T_MD}KEEP THIS FILE PRIVATE!${T_ME}"
-         echo ""
--        echo "o  ${T_MD}conf/ssl.crt/server.crt${T_ME}"
-+        echo "o  ${T_MD}$confdir/ssl.crt/server.crt${T_ME}"
-         echo "   The PEM-encoded X.509 certificate file which you configure"
-         echo "   with the 'SSLCertificateFile' directive (automatically done"
-         echo "   when you install via APACI)."
diff --git a/www/ap-ssl/patches/patch-ac b/www/ap-ssl/patches/patch-ac
deleted file mode 100644
index 2aa2dcbfe5c..00000000000
--- a/www/ap-ssl/patches/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/02/10 03:55:18 dholland Exp $
-
-Hack this brutally to accept the security-fixed apache 1.3 from 2/2010.
-The differences from 1.3.41 to 1.3.42 are minimal.
-
---- pkg.sslmod/libssl.version~  2008-02-08 06:18:01.000000000 -0500
-+++ pkg.sslmod/libssl.version   2010-02-09 05:29:19.000000000 -0500
-@@ -1 +1 @@
--mod_ssl/2.8.31-1.3.41
-+mod_ssl/2.8.31-1.3.42
diff --git a/www/ap-ssl/patches/patch-pkg.sslmod_ssl__util__ssl.c b/www/ap-ssl/patches/patch-pkg.sslmod_ssl__util__ssl.c
deleted file mode 100644
index 801de6c2526..00000000000
--- a/www/ap-ssl/patches/patch-pkg.sslmod_ssl__util__ssl.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-pkg.sslmod_ssl__util__ssl.c,v 1.1 2014/05/12 10:37:25 jperkin Exp $
-
-Catch up with newer OpenSSL API.
-
---- pkg.sslmod/ssl_util_ssl.c.orig	2006-05-08 07:15:38.000000000 +0000
-+++ pkg.sslmod/ssl_util_ssl.c
-@@ -324,7 +324,7 @@ BOOL SSL_X509_isSGC(X509 *cert)
- {
-     X509_EXTENSION *ext;
-     int ext_nid;
--    STACK *sk;
-+    _STACK *sk;
-     BOOL is_sgc;
-     int idx;
-     int i;
-@@ -333,7 +333,7 @@ BOOL SSL_X509_isSGC(X509 *cert)
-     idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
-     if (idx >= 0) {
-         ext = X509_get_ext(cert, idx);
--        if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) {
-+        if ((sk = (_STACK *)X509V3_EXT_d2i(ext)) != NULL) {
-             for (i = 0; i < sk_num(sk); i++) {
-                 ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i));
-                 if (ext_nid == NID_ms_sgc || ext_nid == NID_ns_sgc) {
diff --git a/www/ap-throttle/DESCR b/www/ap-throttle/DESCR
deleted file mode 100644
index c159d90541a..00000000000
--- a/www/ap-throttle/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-mod_throttle allows throttling of connections to the Apache web
-server. It uses System V shared memory and semaphores to implement the
-state information.
diff --git a/www/ap-throttle/MESSAGE b/www/ap-throttle/MESSAGE
deleted file mode 100644
index 39707f99a48..00000000000
--- a/www/ap-throttle/MESSAGE
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/02/16 11:19:03 grant Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule throttle_module lib/httpd/mod_throttle.so
-
-  # throttle htdocs to 100k/sec
-  <Directory ${PREFIX}/share/httpd/htdocs>
-    <IfModule mod_throttle.c>
-      ThrottlePolicy Speed 100k 1
-    </IfModule>
-  </Directory>
-
-===========================================================================
diff --git a/www/ap-throttle/Makefile b/www/ap-throttle/Makefile
deleted file mode 100644
index 224ef23ac13..00000000000
--- a/www/ap-throttle/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2012/10/28 06:30:05 asau Exp $
-
-DISTNAME=	mod_throttle312
-PKGNAME=	ap13-throttle-3.1.2
-CATEGORIES=	www
-MASTER_SITES=	http://www.snert.com/Software/mod_throttle/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	eric@cirr.com
-HOMEPAGE=	${MASTER_SITES}
-COMMENT=	Apache module for limiting bandwidth usage
-
-CONFLICTS=	ap-throttle-[0-9]*
-
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:S/ap13-/mod_/}
-
-APACHE_MODULE_NAME=	mod_throttle.so
-APACHE_MODULE_SRC=	mod_throttle.c
-
-INSTALLATION_DIRS+=	share/doc/mod_throttle
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/index.shtml \
-	    ${DESTDIR}${PREFIX}/share/doc/mod_throttle/index.html
-
-.include "../../www/apache/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-throttle/PLIST b/www/ap-throttle/PLIST
deleted file mode 100644
index a55e2fbd069..00000000000
--- a/www/ap-throttle/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/06/02 13:26:20 abs Exp $
-lib/httpd/mod_throttle.so
-share/doc/mod_throttle/index.html
diff --git a/www/ap-throttle/distinfo b/www/ap-throttle/distinfo
deleted file mode 100644
index 3c0c804291d..00000000000
--- a/www/ap-throttle/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/01/02 21:29:36 joerg Exp $
-
-SHA1 (mod_throttle312.tgz) = a813beb97d4a23f467e07bcc24d9464d2ee91ef5
-RMD160 (mod_throttle312.tgz) = 81a45042d96f01f423b934cf70930c7561e8eb51
-Size (mod_throttle312.tgz) = 41397 bytes
-SHA1 (patch-aa) = 183974becac517d2f95c1bdc073b07d0a9927baf
diff --git a/www/ap-throttle/patches/patch-aa b/www/ap-throttle/patches/patch-aa
deleted file mode 100644
index c8c22b1fe59..00000000000
--- a/www/ap-throttle/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/01/02 21:29:37 joerg Exp $
-
---- mod_throttle.c.orig	Sun Dec  3 04:15:10 2000
-+++ mod_throttle.c
-@@ -719,7 +719,7 @@ critical_release(t_critical *mp)
- #include <sys/ipc.h>
- #include <sys/sem.h>
- 
--#if (defined(__GNU_LIBRARY__) && (!defined(_SEM_SEMUN_UNDEFINED))) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#if (defined(__GNU_LIBRARY__) && (!defined(_SEM_SEMUN_UNDEFINED))) || defined(__FreeBSD__) || defined(__DragonFly__)
- /* union semun is defined by including <sys/sem.h> */
- #else
- /* X/OPEN says we have to define it ourselves (twits). */
diff --git a/www/ap-xslt/DESCR b/www/ap-xslt/DESCR
deleted file mode 100644
index 5cde6178055..00000000000
--- a/www/ap-xslt/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-mod_xslt is a simple Apache module to serve XML based content. Data
-is stored in XML files on the server. The user requests the XML
-file and the translation method via a url such as
-this:http://localhost/sourcefile.html The module will parse this
-URL into a XML source file and an XSL source file. In the example
-above, the XML file will be sourcefile.xml. The module will open
-sourcefile.xml and determine its DOCTYPE. Based on the DOCTYPE,
-the XSL file will be opened. Should the DOCTYPE be "tutorial", the
-XSL file opened would be tutorial_html.xsl. The content-type returned
-to the browser is text/html. The translation occurs transparently
-to the user.
diff --git a/www/ap-xslt/MESSAGE b/www/ap-xslt/MESSAGE
deleted file mode 100644
index 7a828fbd016..00000000000
--- a/www/ap-xslt/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2003/05/27 05:03:21 grant Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadFile lib/libsablot.so
-  LoadFile lib/libxmlparse.so
-  LoadFile lib/libxmltok.so
-  LoadModule mod_xslt_module lib/httpd/mod_xslt.so
-
-===========================================================================
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
deleted file mode 100644
index 91a9debf79c..00000000000
--- a/www/ap-xslt/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.40 2014/02/12 23:18:43 tron Exp $
-
-DISTNAME=	modxslt-1.1
-PKGNAME=	ap13-xslt-1.1
-PKGREVISION=	4
-CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=modxslt/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.mod-xslt2.com/
-COMMENT=	Simple, fast XSLT transformations for apache
-
-CONFLICTS=	ap-xslt-[0-9]*
-
-WRKSRC=		${WRKDIR}/modxslt
-
-APACHE_MODULE_NAME=	mod_xslt.so
-LDFLAGS+=		-lsablot
-
-.include "../../www/apache/module.mk"
-
-.include "../../textproc/sablotron/buildlink3.mk"
-.include "../../www/libwww/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-xslt/PLIST b/www/ap-xslt/PLIST
deleted file mode 100644
index 009c3550b36..00000000000
--- a/www/ap-xslt/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:04 zuntum Exp $
-lib/httpd/mod_xslt.so
diff --git a/www/ap-xslt/distinfo b/www/ap-xslt/distinfo
deleted file mode 100644
index f5a1178fedd..00000000000
--- a/www/ap-xslt/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.8 2012/11/23 11:37:41 joerg Exp $
-
-SHA1 (modxslt-1.1.tar.gz) = 136edef75ef6caf53eb865102a2ebfa15383df47
-RMD160 (modxslt-1.1.tar.gz) = 463aeb1afd8f375bb6dd25fd85022c37dd35cba7
-Size (modxslt-1.1.tar.gz) = 11693 bytes
-SHA1 (patch-ab) = 01a10351878013ba6ecedc86afd5ee2461c863e8
diff --git a/www/ap-xslt/patches/patch-ab b/www/ap-xslt/patches/patch-ab
deleted file mode 100644
index 3e9c098249d..00000000000
--- a/www/ap-xslt/patches/patch-ab
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2012/11/23 11:37:41 joerg Exp $
-
-This patch incorporates a patch from the mod_xslt project page on sourceforge
-in order to have a valid base URI set during xslt processing, so that document
-inclusion will DTRT.
-
-It also fixes two multi-line literals which are disallowed in gcc 3.3.
-
---- mod_xslt.c.orig	2000-08-24 02:05:28.000000000 +0000
-+++ mod_xslt.c
-@@ -43,7 +43,7 @@
- #include "http_protocol.h"
- #include "ap_config.h"
- #include "util_uri.h"
--#include "alloc.h"
-+#include "ap_alloc.h"
- #include "http_core.h"
- #include "sablot.h"
- #include "http_log.h"
-@@ -195,6 +195,8 @@ MessageHandler sablotMH = {
- 
- int transform(request_rec *r, char *styleSheetStr, char *inputStr, char **resultStr) {
-   int se;
-+  char *cwd = NULL;
-+  char *baseURI = NULL;
-   char *argums[] =
-   {
-     "/_stylesheet", styleSheetStr,
-@@ -209,6 +211,14 @@ int transform(request_rec *r, char *styl
-     se = SablotCreateProcessor (&theproc);
-     if (cfg->debug)
-       se |= SablotRegHandler(theproc, HLR_MESSAGE, &sablotMH, (void*)r);
-+
-+    /* get current working directory */
-+    cwd = ap_palloc(r->pool, MAXCHAR +1);
-+    getcwd(cwd, MAXCHAR);
-+
-+    /* set base URI to cwd */
-+    baseURI = ap_pstrcat(r->pool, "file://", cwd, "/", NULL);
-+    se |= SablotSetBase(theproc, baseURI);
-     se |= SablotRunProcessor(theproc,"arg:/_stylesheet","arg:/_xmlinput","arg:/_output",NULL,argums);
-     se |= SablotGetResultArg(theproc,"arg:/_output", resultStr);
-     se |= SablotDestroyProcessor(theproc);
-@@ -288,12 +298,12 @@ static int mod_xslt_handler(request_rec 
- 
-   if (!strcmp("xml",mimetype))
-     if (cfg->debug){
--      return mod_xslt_debug_out(r, "XSLT DEBUG: \"AddHandler mod_xslt .xml\" will cause infinite
--      recursion. Remove it!\n"); 
--      return ;
-+      return mod_xslt_debug_out(r, "XSLT DEBUG: \"AddHandler mod_xslt .xml\" will cause infinite\n"
-+      "recursion. Remove it!\n"); 
-+      return SERVER_ERROR;
-     } else {
--      ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server, "\"AddHandler mod_xslt .xml\" will cause infinite
--      recursion. Remove it!\n");
-+      ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server, "\"AddHandler mod_xslt .xml\" will cause infinite\n"
-+      "recursion. Remove it!\n");
-       return SERVER_ERROR;
-     }
- 
diff --git a/www/ap2-auth-external/Makefile b/www/ap2-auth-external/Makefile
index f66116513d7..875f06137fa 100644
--- a/www/ap2-auth-external/Makefile
+++ b/www/ap2-auth-external/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/28 06:30:06 asau Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/10 15:22:16 joerg Exp $
 #
 
 DISTNAME=	mod_auth_external-${DISTVERS}
@@ -11,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/mod-auth-external/
 COMMENT=	Apache module for external program authentication
 
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 .include "../../mk/apache.mk"
 
diff --git a/www/ap2-auth-ldap/DESCR b/www/ap2-auth-ldap/DESCR
deleted file mode 100644
index 6565c30c8db..00000000000
--- a/www/ap2-auth-ldap/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is an authentication module for Apache that allows you to
-authenticate HTTP clients using user entries in an LDAP directory.
diff --git a/www/ap2-auth-ldap/MESSAGE b/www/ap2-auth-ldap/MESSAGE
deleted file mode 100644
index 5d89a318d6d..00000000000
--- a/www/ap2-auth-ldap/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/02/26 01:06:08 adrianp Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  LoadModule mm_auth_ldap_module lib/httpd/mod_auth_ldap.so
-
-===========================================================================
diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile
deleted file mode 100644
index bda377da699..00000000000
--- a/www/ap2-auth-ldap/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2014/02/12 23:18:43 tron Exp $
-
-DISTNAME=	mod_auth_ldap3.05
-PKGNAME=	ap2-auth-ldap-3.05
-PKGREVISION=	9
-CATEGORIES=	www databases
-MASTER_SITES=	http://www.muquit.com/muquit/software/mod_auth_ldap/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	${MASTER_SITES}/mod_auth_ldap.html
-COMMENT=	Module to allow apache2 authentication against an LDAP directory
-
-GNU_CONFIGURE=		YES
-APACHE_MODULE=		YES
-APACHE_MODULE_NAME=	mm_auth_ldap_module
-USE_LIBTOOL=		YES
-CPPFLAGS+=		-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lldap -llber
-
-PKG_APACHE_ACCEPTED=	apache2
-
-.include "../../mk/apache.mk"
-BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.47
-
-CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
-CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
-CONFIGURE_ARGS+=	--with-apache-dir=${PREFIX:Q}
-CONFIGURE_ARGS+=	--with-apache-ver=2
-
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
-SUBST_FILES.paths=	configure
-SUBST_SED.paths=	-e "s|@@HASHLIB@@|${PREFIX}/include|g"
-SUBST_SED.paths+=	-e "s|@@HASHINC@@|${PREFIX}/lib|g"
-SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-
-INSTALLATION_DIRS+=	lib/httpd
-
-do-install:
-	${PREFIX}/share/httpd/build/instdso.sh \
-	    SH_LIBTOOL=${PREFIX}/share/httpd/build/libtool \
-	    ${WRKSRC}/mod_auth_ldap.la ${DESTDIR}${PREFIX}/lib/httpd
-
-.include "../../databases/openldap-client/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-auth-ldap/PLIST b/www/ap2-auth-ldap/PLIST
deleted file mode 100644
index bd9ad30e511..00000000000
--- a/www/ap2-auth-ldap/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/26 01:06:08 adrianp Exp $
-lib/httpd/mod_auth_ldap.so
diff --git a/www/ap2-auth-ldap/distinfo b/www/ap2-auth-ldap/distinfo
deleted file mode 100644
index f7db4c81235..00000000000
--- a/www/ap2-auth-ldap/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/10/14 10:47:43 adrianp Exp $
-
-SHA1 (mod_auth_ldap3.05.tar.gz) = bbdd0e3615408d629a02c170e9853da7262fad29
-RMD160 (mod_auth_ldap3.05.tar.gz) = 211e2911f711a6f39bc4c2a9497a97c80f4295b9
-Size (mod_auth_ldap3.05.tar.gz) = 532894 bytes
-SHA1 (patch-aa) = cbb9cd3424dfec05a8c10af6ba6c62b4eaafc414
-SHA1 (patch-ab) = f7b2c59c26aaf8345e89fa61000da979c0e9b523
diff --git a/www/ap2-auth-ldap/patches/patch-aa b/www/ap2-auth-ldap/patches/patch-aa
deleted file mode 100644
index c722ce3af15..00000000000
--- a/www/ap2-auth-ldap/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/02/26 01:06:08 adrianp Exp $
-
---- Makefile.in.orig	2005-02-26 00:15:01.000000000 +0000
-+++ Makefile.in	2005-02-26 00:16:15.000000000 +0000
-@@ -41,13 +41,13 @@
- .c.o:
- 	$(APXS) -c $(CPPFLAGS) $*.c
- 
--all: $(HASH_LIB_NAME) $(LDBM_LIB_NAME) $(MODULE)
-+all: $(MODULE)
- 
- $(MODULE): $(OBJS)
- 	@echo ""
- 	@echo ""
- 	@echo "***Creating module** mod_auth_ldap v$(MOD_VER) for Apache $(AV) *******"
--	$(APXS) -c $(OBJS) $(LDFLAGS) $(LIBS)
-+	#$(APXS) -c $(OBJS) $(LDFLAGS) $(LIBS)
- 
- install:
- 	@echo ""
diff --git a/www/ap2-auth-ldap/patches/patch-ab b/www/ap2-auth-ldap/patches/patch-ab
deleted file mode 100644
index d2a33e0a63f..00000000000
--- a/www/ap2-auth-ldap/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/02/26 01:06:08 adrianp Exp $
-
---- configure.orig	2005-02-26 00:17:39.000000000 +0000
-+++ configure	2005-02-26 00:18:15.000000000 +0000
-@@ -3830,8 +3830,8 @@
-     if test ."$withval" = ."yes"; then
-         HASHLIB_NAME="hash routines from ght hash library"
-         HASHLIB_TYPE="-DUSE_MEM_CACHE -DMM_ADD"
--        HASHINC="-I./libs/libghthash/src"
--        HASHLIB="./libs/libghthash/src/.libs/libghthash.a"
-+        HASHINC="-I@@HASHINC@@"
-+        HASHLIB="@@HASHLIB@@/libghthash.a"
-         HASH_LIB_NAME="libghthash.a"
-         use_mem_cache=1
-     fi
diff --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile
index 6b36a2f37f6..f840cc84c3d 100644
--- a/www/ap2-auth-mysql/Makefile
+++ b/www/ap2-auth-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2013/03/28 21:40:50 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2014/06/10 15:22:17 joerg Exp $
 #
 
 DISTNAME=		mod_auth_mysql.c
@@ -23,7 +23,7 @@ NO_CONFIGURE=		yes
 APACHE_MODULE_NAME=	mod_auth_mysql
 DOC_DIR=		${PREFIX}/share/doc/${APACHE_MODULE_NAME}
 
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 INSTALLATION_DIRS+=	${DOC_DIR} lib/httpd
 
diff --git a/www/ap2-auth-ntlm/Makefile b/www/ap2-auth-ntlm/Makefile
index 1c3297ac271..a2eedde58ae 100644
--- a/www/ap2-auth-ntlm/Makefile
+++ b/www/ap2-auth-ntlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/28 06:30:06 asau Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/10 15:22:17 joerg Exp $
 #
 
 DISTNAME=	ntlm2
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://modntlm.sourceforge.net/
 COMMENT=	Apache module for NTLM authentication
 
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 .include "../../mk/apache.mk"
 
diff --git a/www/ap2-auth-pgsql/Makefile b/www/ap2-auth-pgsql/Makefile
index bc6712f1471..840ad037722 100644
--- a/www/ap2-auth-pgsql/Makefile
+++ b/www/ap2-auth-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2014/06/10 14:21:37 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2014/06/10 15:22:17 joerg Exp $
 
 DISTNAME=		mod_auth_pgsql-2.0.3
 PKGNAME=		${APACHE_PKG_PREFIX}-auth-pgsql-2.0.3
@@ -15,7 +15,7 @@ CONFLICTS=		ap-auth-postgresql-*
 APACHE_MODULE=		yes
 APACHE_MODULE_NAME=	mod_auth_pgsql.la
 
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 .include "../../mk/apache.mk"
 .include "../../www/apache/module.mk"
diff --git a/www/ap2-auth-radius/Makefile b/www/ap2-auth-radius/Makefile
index 2d0a9a19882..a2091799cf5 100644
--- a/www/ap2-auth-radius/Makefile
+++ b/www/ap2-auth-radius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/02/12 23:18:43 tron Exp $
+# $NetBSD: Makefile,v 1.14 2014/06/10 15:22:17 joerg Exp $
 
 DISTNAME=	mod_auth_radius
 PKGNAME=	${APACHE_PKG_PREFIX}-auth-radius-1.5.7
@@ -18,10 +18,9 @@ APACHE_MODULE_NAME=	mod_auth_radius.la
 APACHE_MODULE_SRC=	mod_auth_radius.c
 USE_LIBTOOL=		YES
 
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 .include "../../mk/apache.mk"
 .include "../../www/apache/module.mk"
-BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.47
 
 .include "../../security/openssl/buildlink3.mk"
 
diff --git a/www/ap2-auth-xradius/Makefile b/www/ap2-auth-xradius/Makefile
index f2718ee8232..d485c4e439b 100644
--- a/www/ap2-auth-xradius/Makefile
+++ b/www/ap2-auth-xradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/28 06:30:07 asau Exp $
+# $NetBSD: Makefile,v 1.9 2014/06/10 15:22:17 joerg Exp $
 
 DISTNAME=	mod_auth_xradius-0.4.6
 PKGNAME=	${APACHE_PKG_PREFIX}-auth-xradius-0.4.6
@@ -13,9 +13,8 @@ COMMENT=	Module to allow apache2 authentication against a RADIUS server
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 .include "../../mk/apache.mk"
-BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.42
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 
diff --git a/www/ap2-bw/Makefile b/www/ap2-bw/Makefile
index b71fe759565..44086620023 100644
--- a/www/ap2-bw/Makefile
+++ b/www/ap2-bw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/28 06:30:07 asau Exp $
+# $NetBSD: Makefile,v 1.11 2014/06/10 15:22:17 joerg Exp $
 #
 
 DISTNAME=		bw_mod-0.6
@@ -15,7 +15,7 @@ COMMENT=		Class-based bandwidth limiting module for Apache 2
 APACHE_MODULE=		# defined
 INSTALLATION_DIRS=	share/doc
 
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 APACHE_MODULE_NAME=	mod_bw.la
 
diff --git a/www/ap2-cband/Makefile b/www/ap2-cband/Makefile
index 102b2316ce4..d4d510f1cf0 100644
--- a/www/ap2-cband/Makefile
+++ b/www/ap2-cband/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/28 06:30:07 asau Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/10 15:22:17 joerg Exp $
 #
 
 DISTNAME=		mod-cband-0.9.7.5
@@ -16,7 +16,7 @@ APACHE_MODULE_NAME=	mod_cband
 DOC_DIR=		${PREFIX}/share/doc/${APACHE_MODULE_NAME}
 
 APACHE_MODULE=		yes
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 USE_LIBTOOL=		yes
 HAS_CONFIGURE=		yes
diff --git a/www/ap2-fastcgi/DESCR b/www/ap2-fastcgi/DESCR
deleted file mode 100644
index fd3d6e4652e..00000000000
--- a/www/ap2-fastcgi/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-FastCGI provides a high-performance alternative to CGI for writing Web
-server applications in a variety of languages, including Perl, C, C++,
-Java, and Python.  FastCGI gets its speed by having keeping application
-processes running between requests.  So, unlike CGI, you do not have the
-overhead of starting up a new process and doing application initialization
-(e.g. connecting to a database) each time somebody requests a document.
-
-This package works with Apache version 2 series.  In order to use FastCGI
-with the version 1.3 series, use www/ap-fastcgi instead.
diff --git a/www/ap2-fastcgi/Makefile b/www/ap2-fastcgi/Makefile
deleted file mode 100644
index a4df8a43811..00000000000
--- a/www/ap2-fastcgi/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2012/10/28 06:30:07 asau Exp $
-
-.include "../../www/ap-fastcgi/Makefile.common"
-
-PKGNAME=		${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
-PKG_APACHE_ACCEPTED=	apache2 apache22
-APACHE_MANUAL=		manual
-APACHE_MODULE=		YES
-USE_LIBTOOL=		YES
-
-MAKE_FLAGS+=		LIBTOOL=${LIBTOOL:Q}
-
-SUBST_CLASSES+=		ap2
-SUBST_STAGE.ap2=	pre-build
-SUBST_FILES.ap2=	Makefile
-SUBST_SED.ap2=		-e s,/usr/local/apache2,${PREFIX}/share/httpd,
-
-post-patch:
-	${CP} ${WRKSRC}/Makefile.AP2 ${WRKSRC}/Makefile
-
-.include "../../mk/apache.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-fcgid/Makefile b/www/ap2-fcgid/Makefile
index 8eb979d8ebd..2531656cb53 100644
--- a/www/ap2-fcgid/Makefile
+++ b/www/ap2-fcgid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/03/06 15:04:53 prlw1 Exp $
+# $NetBSD: Makefile,v 1.11 2014/06/10 15:22:17 joerg Exp $
 
 DISTNAME=	mod_fcgid-2.3.9
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
@@ -10,7 +10,7 @@ HOMEPAGE=	http://httpd.apache.org/mod_fcgid/
 COMMENT=	High performance alternative to mod_cgi or mod_cgid
 LICENSE=	apache-2.0
 
-PKG_APACHE_ACCEPTED=	apache2 apache22 apache24
+PKG_APACHE_ACCEPTED=	apache22 apache24
 APACHE_MODULE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/www/ap2-jk/Makefile b/www/ap2-jk/Makefile
index e8135e51e86..d5a25fbac21 100644
--- a/www/ap2-jk/Makefile
+++ b/www/ap2-jk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/02/18 15:34:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2014/06/10 15:22:17 joerg Exp $
 
 DISTNAME=	tomcat-connectors-${JK_VERSION}-src
 PKGNAME=	${APACHE_PKG_PREFIX}-jk-${JK_VERSION}
@@ -6,7 +6,7 @@ PKGNAME=	${APACHE_PKG_PREFIX}-jk-${JK_VERSION}
 MAKE_PARAMS+=		USE_APXS=1
 MAKE_PARAMS+=		WITH_APXS=${APXS}
 
-PKG_APACHE_ACCEPTED=	apache2 apache22 apache24
+PKG_APACHE_ACCEPTED=	apache22 apache24
 
 INSTALLATION_DIRS+=	lib/httpd
 
diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile
index bceacbafd17..225b99171aa 100644
--- a/www/ap2-perl/Makefile
+++ b/www/ap2-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2014/05/29 23:37:56 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2014/06/10 15:22:17 joerg Exp $
 
 DISTNAME=	mod_perl-2.0.8
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
@@ -13,7 +13,7 @@ LICENSE=	apache-2.0
 
 CONFLICTS=	ap-perl-[0-9]* p5-Apache-Reload-[0-9]* p5-Apache-Test-[0-9]*
 
-PKG_APACHE_ACCEPTED=	apache2 apache22 apache24
+PKG_APACHE_ACCEPTED=	apache22 apache24
 
 APACHE_MODULE=		yes
 PERL5_PACKLIST=		auto/mod_perl2/.packlist
diff --git a/www/ap2-python/Makefile b/www/ap2-python/Makefile
index 450c1a55ceb..a5540dab43d 100644
--- a/www/ap2-python/Makefile
+++ b/www/ap2-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/02/23 11:40:00 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2014/06/10 15:22:17 joerg Exp $
 
 DISTNAME=	mod_python-3.5.0
 PKGNAME=	${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-${DISTNAME:S/mod_//}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.modpython.org/
 COMMENT=	Apache module that embeds the Python interpreter
 LICENSE=	apache-2.0
 
-PKG_APACHE_ACCEPTED=	apache2 apache22 apache24
+PKG_APACHE_ACCEPTED=	apache22 apache24
 
 MAKE_JOBS_SAFE=		no
 
diff --git a/www/ap2-suphp/Makefile b/www/ap2-suphp/Makefile
index f3f13d18969..5558ef16b00 100644
--- a/www/ap2-suphp/Makefile
+++ b/www/ap2-suphp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/03/07 15:58:27 adam Exp $
+# $NetBSD: Makefile,v 1.19 2014/06/10 15:22:17 joerg Exp $
 
 DISTNAME=	suphp-0.7.2
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME}
@@ -27,7 +27,7 @@ EGDIR=			${PREFIX}/share/examples/suphp
 CONF_FILES=		${EGDIR}/suphp.conf ${PKG_SYSCONFDIR}/suphp.conf
 
 USE_APR=		yes
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 SUBST_CLASSES+=		suphp
 SUBST_STAGE.suphp=	post-configure
diff --git a/www/ap2-transform/Makefile b/www/ap2-transform/Makefile
index 65876614c6e..7d0e6c38196 100644
--- a/www/ap2-transform/Makefile
+++ b/www/ap2-transform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/01/01 11:52:37 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2014/06/10 15:22:17 joerg Exp $
 #
 
 DISTNAME=	mod_transform-0.4.0
@@ -16,7 +16,7 @@ USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-PKG_APACHE_ACCEPTED=	apache2 apache22
+PKG_APACHE_ACCEPTED=	apache22
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
 
diff --git a/www/ap2-wsgi/Makefile b/www/ap2-wsgi/Makefile
index 10f264a206c..4c56efb79eb 100644
--- a/www/ap2-wsgi/Makefile
+++ b/www/ap2-wsgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/06/07 07:44:09 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2014/06/10 15:22:17 joerg Exp $
 
 DISTNAME=	${VERSION}
 PKGNAME=	${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-wsgi-${VERSION}
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
 CONFIGURE_ARGS+=	--with-python=${PYTHONBIN:Q}
 
-PKG_APACHE_ACCEPTED=	apache2 apache22 apache24
+PKG_APACHE_ACCEPTED=	apache22 apache24
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/apache.mk"
diff --git a/www/ap2-xsendfile/Makefile b/www/ap2-xsendfile/Makefile
index 47b6e39fd56..1d9efcb76a9 100644
--- a/www/ap2-xsendfile/Makefile
+++ b/www/ap2-xsendfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/09/13 11:45:26 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/10 15:22:18 joerg Exp $
 #
 
 DISTNAME=		mod_xsendfile-0.12
@@ -16,7 +16,7 @@ APACHE_MODULE_NAME=	${DISTNAME:C|-.*||}.so
 APACHE_MODULE_SRC=	${DISTNAME:C|-.*||}.c
 APACHE_MODULE_LA=	${DISTNAME:C|-.*||}.la
 
-PKG_APACHE_ACCEPTED=	apache2 apache22 apache24
+PKG_APACHE_ACCEPTED=	apache22 apache24
 
 do-build:
 	cd ${WRKSRC} && ${APXS} ${CPPFLAGS} ${LDFLAGS} -c -o ${APACHE_MODULE_NAME} ${APACHE_MODULE_SRC}
diff --git a/www/ap2-xslt2/DESCR b/www/ap2-xslt2/DESCR
deleted file mode 100644
index 2b07456b07b..00000000000
--- a/www/ap2-xslt2/DESCR
+++ /dev/null
@@ -1,23 +0,0 @@
-mod-xslt2 is a server side module able to transform ``xml''
-documents in ``html'' (or to any other format) before they
-even get back to the browser.
-
-mod-xslt2 main features include:
-
-* Ability to parse generated xml (ability to parse the output of
-  php or perl scripts).
-
-* Ability to use the ``xslt'' indicated by the <?xml-stylesheet
-  processing instruction.
-
-* Ability to send back the xml file unparsed to the browser.
-
-* Ability to fetch xslt or DTDs from scripts rather than from
-  static files.
-
-* Ability to fetch a different xslt depending on the content of
-  the request headers, of the get parameters or the web server
-  environment.
-
-* Ability to allow xslt stylesheets to make use of these
-  variables to generate output.
diff --git a/www/ap2-xslt2/MESSAGE b/www/ap2-xslt2/MESSAGE
deleted file mode 100644
index dd66435021f..00000000000
--- a/www/ap2-xslt2/MESSAGE
+++ /dev/null
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/12/07 13:37:21 xtraeme Exp $
-
-In order to enable mod_xslt in your Apache installation, you need to add
-the following to your httpd.conf file:
-
-LoadModule mxslt_module lib/httpd/mod_xslt.so
-
-Please also refer to the documentation in:
-
-http://www.mod-xslt2.com/doc/manual.xml
-
-And don't forget to restart the Apache server in order to use mod_xslt.
-
-===========================================================================
diff --git a/www/ap2-xslt2/Makefile b/www/ap2-xslt2/Makefile
deleted file mode 100644
index 74249d08c70..00000000000
--- a/www/ap2-xslt2/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2014/01/01 11:52:37 wiz Exp $
-#
-
-DISTNAME=	modxslt-${DIST_VER}
-PKGNAME=	${APACHE_PKG_PREFIX}-xslt2-${DIST_VER}
-PKGREVISION=	5
-CATEGORIES=	www
-MASTER_SITES=	http://www.mod-xslt2.com/software/archive/${DIST_VER}/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.mod-xslt2.com/
-COMMENT=	Apache module able to apply stylesheets to XML data on the fly
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake bash:run
-MAKE_JOBS_SAFE=	no
-
-APACHE_MODULE=	yes
-DIST_VER=	2004112100
-
-PKG_APACHE_ACCEPTED=	apache2
-
-CONFIGURE_ARGS+=	--enable-fallback-wraparound
-CONFIGURE_ARGS+=	--enable-libxslt-hack
-CONFIGURE_ARGS+=	--with-apxs=${PREFIX}/sbin/apxs \
-			--with-xml2-config=${BUILDLINK_PREFIX.libxml2}/bin/xml2-config \
-			--with-apr-config=${BUILDLINK_PREFIX.apr}/bin/apr-config \
-			--with-apu-config=${BUILDLINK_PREFIX.apr}/bin/apu-config
-
-REPLACE_BASH=	utils/modxslt-config.pre.in
-
-INSTALLATION_DIRS+=	bin lib/httpd
-
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../mk/apache.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-xslt2/PLIST b/www/ap2-xslt2/PLIST
deleted file mode 100644
index 2058769f8cf..00000000000
--- a/www/ap2-xslt2/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:17 joerg Exp $
-bin/modxslt-config
-bin/modxslt-parse
-bin/modxslt-perror
-include/modxslt2/modxslt-system.h
-include/modxslt2/modxslt-table.h
-include/modxslt2/modxslt-version.h
-include/modxslt2/modxslt.h
-lib/httpd/mod_xslt.la
-lib/libmodxslt0.la
-man/man1/modxslt-config.1
-man/man1/modxslt-parse.1
-man/man1/modxslt-perror.1
diff --git a/www/ap2-xslt2/distinfo b/www/ap2-xslt2/distinfo
deleted file mode 100644
index c31534a663c..00000000000
--- a/www/ap2-xslt2/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.3 2012/11/23 11:38:15 joerg Exp $
-
-SHA1 (modxslt-2004112100.tar.gz) = a9b4d43695f2f0ac7baa42063a2abb2d0aa6f774
-RMD160 (modxslt-2004112100.tar.gz) = 0fcbc99d22632f3a7535bd19eae0466a729828a8
-Size (modxslt-2004112100.tar.gz) = 1740676 bytes
-SHA1 (patch-aa) = c292443b9d72ad1e37054cf4c6a2b615b8dd735d
-SHA1 (patch-ab) = 326350cd9db151315e0ba8143ffb90d5dd9a78fc
-SHA1 (patch-ac) = 4f9d75ef323d585bf8b72142bee0b7be17ca706c
-SHA1 (patch-ad) = f7e5ce7c710822eaae27e1295ecfcf2b813e3f25
-SHA1 (patch-ae) = 986bf5dfd9116991d27c56b67838d094a641f38f
-SHA1 (patch-af) = df00ce0a96c8aca2b188aa56e5817e2376dd3f29
-SHA1 (patch-lib_modxslt-libxml.c) = d3994ecac9de6bd3500ec1fae43b70683087c693
diff --git a/www/ap2-xslt2/patches/patch-aa b/www/ap2-xslt2/patches/patch-aa
deleted file mode 100644
index 9a63fffe6c9..00000000000
--- a/www/ap2-xslt2/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/12/07 02:34:01 xtraeme Exp $
-
---- sapi/apache2/modxslt.c.orig	2006-12-07 02:21:14.000000000 +0100
-+++ sapi/apache2/modxslt.c	2006-12-07 02:22:21.000000000 +0100
-@@ -470,7 +470,8 @@
- 
- 
- #ifdef HAVE_NETWORK_IOCTLS
--# include <net/if.h>
-+#include <sys/sockio.h>
-+#include <net/if.h>
- 
- static int mxslt_ap2_setanyiplist(mxslt_table_t * ips_table) {
-   struct ifconf ifc;
diff --git a/www/ap2-xslt2/patches/patch-ab b/www/ap2-xslt2/patches/patch-ab
deleted file mode 100644
index a9815b506f3..00000000000
--- a/www/ap2-xslt2/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/12/07 02:34:01 xtraeme Exp $
-
---- lib/Makefile.in.orig	2004-10-02 10:24:02.000000000 +0200
-+++ lib/Makefile.in	2006-12-07 02:53:57.000000000 +0100
-@@ -156,13 +156,13 @@
- install: install-library install-headers
- 
- install-library: libmodxslt$(LIB_VERSION).la 
--	$(LIBTOOL) --mode=install install $(IFLAGS) -D -m 0644 -o root -g root \
--		libmodxslt$(LIB_VERSION).la $(DESTDIR)$(libdir)/libmodxslt$(LIB_VERSION).la
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) \
-+		   libmodxslt$(LIB_VERSION).la $(DESTDIR)$(libdir)
- 
- install-headers:
--	$(INSTALL) -d -m 0755 -o root -g root $(DESTDIR)$(includedir)/modxslt$(LIB_VERSION)
--	$(INSTALL) -m 0644 -o root -g root $(srcdir)/modxslt$(LIB_VERSION)/*.h $(DESTDIR)$(includedir)/modxslt$(LIB_VERSION)
--	$(INSTALL) -m 0644 -o root -g root ./modxslt$(LIB_VERSION)/*.h $(DESTDIR)$(includedir)/modxslt$(LIB_VERSION)
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(includedir)/modxslt2
-+	$(BSD_INSTALL_DATA) $(srcdir)/modxslt$(LIB_VERSION)/*.h $(DESTDIR)$(includedir)/modxslt2
-+	$(BSD_INSTALL_DATA) ./modxslt$(LIB_VERSION)/*.h $(DESTDIR)$(includedir)/modxslt2
- 
- uninstall: uninstall-library uninstall-headers
- 
diff --git a/www/ap2-xslt2/patches/patch-ac b/www/ap2-xslt2/patches/patch-ac
deleted file mode 100644
index f601d87f179..00000000000
--- a/www/ap2-xslt2/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/12/07 02:34:01 xtraeme Exp $
-
---- sapi/apache2/Makefile.in.orig	2004-10-02 10:24:09.000000000 +0200
-+++ sapi/apache2/Makefile.in	2006-12-07 03:05:49.000000000 +0100
-@@ -92,12 +92,7 @@
- install: mod_xslt.la install-stamp Makefile
- 
- install-stamp: mod_xslt.la Makefile
--	test "x$$UID" = "x" || test "x$$UID" = "x0" || { echo 'You must be root!'; exit 1; }
--	$(LIBTOOL) --mode=install $(INSTALL) $(STRIP) -D -o root -g root -m 0644 mod_xslt.la '$(DESTDIR)$(APXS_INSTALLDIR)'
--	@echo Removing extra files...
--	FILE=`grep dlname mod_xslt.la | sed -e "s/[^']*'\([^']*\).*/\1/"` && \
--	  find '$(DESTDIR)$(APXS_INSTALLDIR)' -name 'mod_xslt.*'|grep -v "$$FILE"|xargs rm -f && \
--	  echo '$(DESTDIR)$(APXS_INSTALLDIR)'/$(FILE) > install-stamp
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) mod_xslt.la '$(DESTDIR)$(APXS_INSTALLDIR)'
- 
- uninstall: 
- 	test -f install-stamp && rm -f `cat install-stamp`
diff --git a/www/ap2-xslt2/patches/patch-ad b/www/ap2-xslt2/patches/patch-ad
deleted file mode 100644
index cf626f43807..00000000000
--- a/www/ap2-xslt2/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/12/07 02:34:01 xtraeme Exp $
-
---- utils/Makefile.in.orig	2006-12-07 03:03:58.000000000 +0100
-+++ utils/Makefile.in	2006-12-07 03:05:11.000000000 +0100
-@@ -126,15 +126,15 @@
- install: install-modxslt-parse install-modxslt-config install-modxslt-perror
- 
- install-modxslt-perror:
--	$(LIBTOOL) --mode=install install $(IFLAGS) -D -m 0755 -o root -g root modxslt-perror \
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) modxslt-perror \
- 		$(DESTDIR)$(bindir)/modxslt-perror
- 
- install-modxslt-parse:
--	$(LIBTOOL) --mode=install install $(IFLAGS) -D -m 0755 -o root -g root modxslt-parse \
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) modxslt-parse \
- 		$(DESTDIR)$(bindir)/modxslt-parse
- 
- install-modxslt-config:
--	install -D -m 0755 -o root -g root modxslt-config \
-+	$(BSD_INSTALL_SCRIPT) modxslt-config \
- 		$(DESTDIR)$(bindir)/modxslt-config
- 
- uninstall: uninstall-modxslt-parse uninstall-modxslt-config uninstall-modxslt-perror
diff --git a/www/ap2-xslt2/patches/patch-ae b/www/ap2-xslt2/patches/patch-ae
deleted file mode 100644
index f36ac27ff24..00000000000
--- a/www/ap2-xslt2/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/12/07 02:34:01 xtraeme Exp $
-
---- doc/man/Makefile.in.orig	2004-10-02 10:24:10.000000000 +0200
-+++ doc/man/Makefile.in	2006-12-07 03:17:46.000000000 +0100
-@@ -77,8 +77,10 @@
- 	$(XSLT) $(XSLTPARAM) modxslt-parse.xml 
- 
- install: modxslt-config.1 modxslt-perror.1 modxslt-parse.1
--	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
--	$(INSTALL) --mode=0644 --owner=root --group=root $^ $(DESTDIR)$(mandir)/man1
-+	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
-+	$(BSD_INSTALL_MAN) modxslt-config.1 $(DESTDIR)$(mandir)/man1
-+	$(BSD_INSTALL_MAN) modxslt-perror.1 $(DESTDIR)$(mandir)/man1
-+	$(BSD_INSTALL_MAN) modxslt-parse.1 $(DESTDIR)$(mandir)/man1
- 
- uninstall:	
- 	rm $(DESTDIR)$(mandir)/man1/{modxslt-config.1,modxslt-parse.1,modxslt-perror.1}
diff --git a/www/ap2-xslt2/patches/patch-af b/www/ap2-xslt2/patches/patch-af
deleted file mode 100644
index ad5d0c071f5..00000000000
--- a/www/ap2-xslt2/patches/patch-af
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/06/29 22:55:50 joerg Exp $
-
---- configure.orig	2004-11-21 01:12:28.000000000 +0000
-+++ configure
-@@ -22911,7 +22911,7 @@ if test "${ac_cv_lib_aprutil_0_apr_briga
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-laprutil-0 `$APUC --link-ld` `$APUC --libs` `$APRC --link-ld` $LIBS"
-+LIBS="-laprutil-0 `$APUC --link-ld` `$APUC --libs` `$APRC --link-ld` ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23215,13 +23215,13 @@ echo "$as_me: error: could not find pthr
- fi
- 
- 
--  echo "$as_me:$LINENO: checking for pthread_setspecific in -lpthread" >&5
--echo $ECHO_N "checking for pthread_setspecific in -lpthread... $ECHO_C" >&6
-+  echo "$as_me:$LINENO: checking for pthread_setspecific in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_setspecific in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_setspecific+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23280,7 +23280,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_setspecific" >&6
- if test $ac_cv_lib_pthread_pthread_setspecific = yes; then
- 
--    LIBS="$LIBS -lpthread"
-+    LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-     CFLAGS="$CFLAGS -D_REENTRANT"
- 
- cat >>confdefs.h <<\_ACEOF
diff --git a/www/ap2-xslt2/patches/patch-lib_modxslt-libxml.c b/www/ap2-xslt2/patches/patch-lib_modxslt-libxml.c
deleted file mode 100644
index 614b1e62af4..00000000000
--- a/www/ap2-xslt2/patches/patch-lib_modxslt-libxml.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-lib_modxslt-libxml.c,v 1.1 2012/11/23 11:38:15 joerg Exp $
-
---- lib/modxslt-libxml.c.orig	2012-11-22 21:06:39.000000000 +0000
-+++ lib/modxslt-libxml.c
-@@ -537,9 +537,9 @@ xmlDocPtr mxslt_doc_xml_parse(mxslt_doc_
-   }
- 
-   input->buf=buf;
--  input->base=input->buf->buffer->content;
--  input->cur=input->buf->buffer->content;
--  input->end=&input->buf->buffer->content[input->buf->buffer->use];
-+  input->base=xmlBufferContent(input->buf->buffer);
-+  input->cur=xmlBufferContent(input->buf->buffer);
-+  input->end=xmlBufferContent(input->buf->buffer) + xmlBufferLength(input->buf->buffer);
- 
-   inputPush(ctx, input);
- 
diff --git a/www/apache/DESCR b/www/apache/DESCR
deleted file mode 100644
index cd2fdaa4cf7..00000000000
--- a/www/apache/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The Apache HTTP Server Project is a collaborative software development
-effort aimed at creating a robust, commercial-grade, featureful, and
-freely-available source code implementation of an HTTP (Web) server.
diff --git a/www/apache/Makefile b/www/apache/Makefile
deleted file mode 100644
index b4d2cd871b0..00000000000
--- a/www/apache/Makefile
+++ /dev/null
@@ -1,240 +0,0 @@
-# $NetBSD: Makefile,v 1.207 2014/05/29 23:37:56 wiz Exp $
-#
-# 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.42
-PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		7
-CATEGORIES=		www
-MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
-			${MASTER_SITE_APACHE:=httpd/old/}
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${NETBSD_LOGO} ${MODSSL_DIST}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://httpd.apache.org/
-COMMENT=		Apache HTTP (Web) server
-
-NETBSD_LOGO=		sitedrivenby.gif
-SITES.${NETBSD_LOGO}=	http://www.NetBSD.org/images/logos/
-
-MODSSL_VERSION=		2.8.31
-MODSSL_DISTNAME=	mod_ssl-${MODSSL_VERSION}-1.3.41
-MODSSL_DIST=		${MODSSL_DISTNAME}.tar.gz
-MODSSL_SRC=		${WRKDIR}/${MODSSL_DISTNAME}
-SITES.${MODSSL_DIST}=	http://www.modssl.org/source/ \
-			ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \
-			ftp://ftp.funet.fi/pub/crypt/cryptography/libs/modssl/source/
-
-CONFLICTS=		apache-*ssl-[0-9]* apache6-[0-9]*
-
-EXTRACT_ONLY=		${DISTFILES:N*.gif}
-# Actually, apache is only written in C, but we need this so that
-# a dlopen()ed apache module that's written in C++ will have static
-# objects constructed properly.
-USE_LANGUAGES=		c c++
-HAS_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-layout="${WRKSRC}/config.layout:pkgsrc"
-CONFIGURE_ARGS+=	--enable-module=most				\
-			--enable-module=auth_db				\
-			--disable-module=auth_dbm
-CONFIGURE_ARGS+=	--enable-rule=EAPI				\
-			--disable-module=ssl
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+=	--without-confadjust
-CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
-CONFIGURE_ARGS+=	--with-port=80
-CONFIGURE_ENV+=		OPTIM=${APACHE_CUSTOM_CFLAGS:Q}
-CONFIGURE_ENV+=		EAPI_MM="${BUILDLINK_PREFIX.libmm}"
-CONFIGURE_ENV+=		BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
-INSTALL_MAKE_FLAGS+=	root=${DESTDIR:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if empty(STRIPFLAG)
-CONFIGURE_ARGS+=	--without-execstrip
-.endif
-
-PKG_SYSCONFSUBDIR?=	httpd
-USE_TOOLS+=		perl
-
-APACHE_USER?=		www
-APACHE_GROUP?=		www
-PKG_USERS_VARS+=	APACHE_USER
-PKG_GROUPS_VARS+=	APACHE_GROUP
-
-CONFIGURE_ARGS+=	--server-uid=${APACHE_USER:Q}
-CONFIGURE_ARGS+=	--server-gid=${APACHE_GROUP:Q}
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.apache
-PKG_SUPPORTED_OPTIONS=	perf-tuning suexec
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Msuexec)
-APACHE_SUEXEC_DOCROOT?=	${PREFIX}/share/httpd/htdocs
-APACHE_SUEXEC_PATH=	/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
-APACHE_SUEXEC_CONFIGURE_ARGS+=						\
-			--suexec-caller=${APACHE_USER}			\
-			--suexec-safepath=${APACHE_SUEXEC_PATH:Q}	\
-			--suexec-docroot=${APACHE_SUEXEC_DOCROOT}
-CONFIGURE_ARGS+=	--enable-suexec 				\
-			${APACHE_SUEXEC_CONFIGURE_ARGS:M--suexec-*}
-PLIST_SRC=		${PKGDIR}/PLIST.suexec
-BUILD_DEFS+=	 	APACHE_SUEXEC_DOCROOT
-.endif
-
-# 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).
-#
-.if !defined(NOPIC)
-CONFIGURE_ARGS+=	--enable-module=so	# requires dlopen()
-_ENABLE_MOD=		--enable-shared
-PLIST_SRC+=		${PKGDIR}/PLIST.shared
-.else
-_ENABLE_MOD=		--enable-module
-.endif
-PLIST_SRC+=		${PKGDIR}/PLIST
-
-CONFIGURE_ARGS+=	${_ENABLE_MOD}=proxy
-CONFIGURE_ARGS+=	${_ENABLE_MOD}=define	# from mod_ssl pkg.addon
-
-APACHE_CUSTOM_CFLAGS?=	# empty
-
-.if !empty(PKG_OPTIONS:Mperf-tuning)
-APACHE_CUSTOM_CFLAGS+=	-DBUFFERED_LOGS
-APACHE_CUSTOM_CFLAGS+=	${COMPILER_PERFTUNE_FLAGS}
-LDFLAGS+=		${COMPILER_PERFTUNE_FLAGS}
-.endif
-
-# Explicitly turn on large file support
-APACHE_CUSTOM_CFLAGS+=	-D_LARGEFILE_SOURCE
-APACHE_CUSTOM_CFLAGS+=	-D_FILE_OFFSET_BITS=64
-
-.include "../../mk/compiler.mk"
-
-# On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that
-# certain symbols from the C++ implementation (__get_eh_context, etc.)
-# referenced by DSOs written in C++ will resolve correctly.
-#
-.if ${OPSYS} == "NetBSD"
-.  if ${OBJECT_FMT} == "ELF"
-LINK_LIBGCC_LDFLAGS=	${LINK_ALL_LIBGCC_HACK}
-MAKE_ENV+=		LINK_LIBGCC_LDFLAGS=${LINK_LIBGCC_LDFLAGS:Q}
-#
-# If we are using gcc3, we need to link against libgcc_s, too.  This
-# ensures modules can resolve symbols they require from gcc.
-#
-.    if !empty(CC_VERSION:Mgcc-3*)
-LINK_LIBGCC_LDFLAGS+=	-lgcc_s
-.    endif
-.  endif
-.endif
-
-BUILD_DEFS+=		APACHE_CUSTOM_CFLAGS APACHE_USER APACHE_GROUP
-
-EGDIR=		${PREFIX}/share/examples/httpd
-
-CONF_FILES=	${EGDIR}/httpd.conf.default ${PKG_SYSCONFDIR}/httpd.conf
-CONF_FILES+=	${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic
-CONF_FILES+=	${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types
-RCD_SCRIPTS=	apache
-
-REQD_DIRS=		${PREFIX}/share/httpd
-REQD_DIRS+=		${PREFIX}/share/httpd/htdocs
-REQD_DIRS+=		${PREFIX}/lib/httpd
-OWN_DIRS+=		${VARBASE}/httpd
-OWN_DIRS+=		${VARBASE}/log/httpd
-OWN_DIRS_PERMS+=	${VARBASE}/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
-
-#
-# Fix paths in the apache manpages.
-#
-SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-patch
-SUBST_FILES.man=	src/support/*.1 src/support/*.8
-SUBST_SED.man=		-e 's,/usr/local/apache/conf,${PKG_SYSCONFDIR},'
-SUBST_SED.man+=		-e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},'
-SUBST_SED.man+=		-e 's,/path/to/apache/etc,${PKG_SYSCONFDIR},'
-SUBST_SED.man+=		-e 's,/usr/local/apache/logs,${VARBASE}/log/httpd,'
-SUBST_SED.man+=		-e 's,/usr/local/apache,${PREFIX}/share/httpd/htdocs,'
-SUBST_SED.man+=		-e 's,/usr/web,${PREFIX}/share/httpd/htdocs,'
-
-SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	config.layout
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@VARBASE@,${VARBASE},g'
-SUBST_STAGE.paths=	post-patch
-
-.include "../../mk/bdb.buildlink3.mk"
-SUBST_CLASSES+=         db
-SUBST_STAGE.db=         post-patch
-SUBST_FILES.db=         src/modules/standard/mod_auth_db.module
-SUBST_SED.db+=          -e 's,@DB_LIB@,${BDB_LIBS},g'
-SUBST_SED.db+=          -e 's,@DB_VERSION@,${BDB_TYPE},g'
-.if defined(BDB_BASE) && !empty(BDB_BASE)
-SUBST_SED.db+=          -e 's,@DB_CFLAGS@,-I${BDB_BASE}/include,g'
-.else
-SUBST_SED.db+=          -e 's,@DB_CFLAGS@,,g'
-.endif
-
-REPLACE_PERL+=			cgi-bin/printenv
-CHECK_INTERPRETER_SKIP+=	lib/httpd/httpd.exp
-
-PKG_GROUPS=		${APACHE_GROUP}
-PKG_USERS=		${APACHE_USER}:${APACHE_GROUP}
-
-MAKE_ENV+=		CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q} XARGS=${XARGS:Q}
-MAKE_ENV+=		FIND=${FIND:Q} CHGRP=${CHGRP:Q}
-
-.include "../../devel/libmm/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-
-post-extract:
-	${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include
-	${CP} ${MODSSL_SRC}/pkg.addon/*.c ${WRKSRC}/src/modules/extra
-	${CP} ${MODSSL_SRC}/pkg.addon/*.html ${WRKSRC}/htdocs/manual/mod
-	${CP} ${MODSSL_SRC}/pkg.eapi/*.c ${WRKSRC}/src/ap
-	${CP} ${MODSSL_SRC}/pkg.eapi/*.h ${WRKSRC}/src/include
-	${CP} ${FILESDIR}/config.layout ${WRKSRC}
-
-pre-patch:
-	cd ${WRKSRC} && ${CAT}						\
-		${MODSSL_SRC}/pkg.addon/addon.patch			\
-		${MODSSL_SRC}/pkg.eapi/eapi.patch			\
-		${MODSSL_SRC}/pkg.sslcfg/sslcfg.patch			\
-		${MODSSL_SRC}/pkg.sslmod/sslmod.patch			\
-		${MODSSL_SRC}/pkg.sslsup/sslsup.patch			\
-		| ${PATCH} ${PATCH_ARGS}
-	cd ${WRKSRC} && ${TAIL} -n +160					\
-		${MODSSL_SRC}/pkg.ssldoc/ssldoc.patch			\
-		| ${PATCH} ${PATCH_ARGS}
-	${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
-
-post-patch:
-	cd ${WRKSRC}/src/support;					\
-	${SED}	-e "s|@INSTALL@|"`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`" -c -o ${LIBOWN} -g ${LIBGRP}|" \
-		apxs.pl > apxs.pl.sed;					\
-	${MV} apxs.pl.sed apxs.pl
-
-pre-install:
-	${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f
-
-post-install:
-.if !defined(NOPIC)
-	cd ${DESTDIR}${PREFIX}/lib/httpd; ${MV} libproxy.so mod_proxy.so
-.endif
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/httpd
-	for file in httpd.conf magic mime.types; do			\
-		${INSTALL_DATA} ${DESTDIR}${PKG_SYSCONFDIR}/$${file}.default	\
-			${DESTDIR}${PREFIX}/share/examples/httpd;	\
-		${RM} -f ${DESTDIR}${PKG_SYSCONFDIR}/$${file}.default;	\
-	done
-	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${DESTDIR}${PREFIX}/share/httpd/htdocs
-	${CHMOD} ${NONBINMODE} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv \
-	  ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/apache/PLIST b/www/apache/PLIST
deleted file mode 100644
index 4e5e228c29e..00000000000
--- a/www/apache/PLIST
+++ /dev/null
@@ -1,616 +0,0 @@
-@comment $NetBSD: PLIST,v 1.17 2014/03/11 14:05:17 jperkin Exp $
-bin/checkgid
-bin/dbmmanage
-bin/htdigest
-bin/htpasswd
-include/httpd/ap.h
-include/httpd/ap_alloc.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_ebcdic.h
-include/httpd/ap_hook.h
-include/httpd/ap_include_extern.h
-include/httpd/ap_md5.h
-include/httpd/ap_mm.h
-include/httpd/ap_mmn.h
-include/httpd/ap_sha1.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-inline.c
-include/httpd/os.h
-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
-include/httpd/xml/asciitab.h
-include/httpd/xml/hashtable.h
-include/httpd/xml/iasciitab.h
-include/httpd/xml/latin1tab.h
-include/httpd/xml/nametab.h
-include/httpd/xml/utf8tab.h
-include/httpd/xml/xmldef.h
-include/httpd/xml/xmlparse.h
-include/httpd/xml/xmlrole.h
-include/httpd/xml/xmltok.h
-include/httpd/xml/xmltok_impl.h
-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/examples/httpd/httpd.conf.default
-share/examples/httpd/magic.default
-share/examples/httpd/mime.types.default
-share/httpd/htdocs/apache_pb.gif
-share/httpd/htdocs/index.html.ca
-share/httpd/htdocs/index.html.cz
-share/httpd/htdocs/index.html.de
-share/httpd/htdocs/index.html.dk
-share/httpd/htdocs/index.html.ee
-share/httpd/htdocs/index.html.el
-share/httpd/htdocs/index.html.en
-share/httpd/htdocs/index.html.es
-share/httpd/htdocs/index.html.fr
-share/httpd/htdocs/index.html.he.iso8859-8
-share/httpd/htdocs/index.html.hu
-share/httpd/htdocs/index.html.it
-share/httpd/htdocs/index.html.ja.jis
-share/httpd/htdocs/index.html.kr.iso-kr
-share/httpd/htdocs/index.html.lb.utf8
-share/httpd/htdocs/index.html.nl
-share/httpd/htdocs/index.html.nn
-share/httpd/htdocs/index.html.no
-share/httpd/htdocs/index.html.po.iso-pl
-share/httpd/htdocs/index.html.pt
-share/httpd/htdocs/index.html.pt-br
-share/httpd/htdocs/index.html.ru.cp-1251
-share/httpd/htdocs/index.html.ru.cp866
-share/httpd/htdocs/index.html.ru.iso-ru
-share/httpd/htdocs/index.html.ru.koi8-r
-share/httpd/htdocs/index.html.ru.ucs2
-share/httpd/htdocs/index.html.ru.ucs4
-share/httpd/htdocs/index.html.ru.utf8
-share/httpd/htdocs/index.html.se
-share/httpd/htdocs/index.html.zh-tw.big5
-share/httpd/htdocs/manual/LICENSE
-share/httpd/htdocs/manual/bind.html.en
-share/httpd/htdocs/manual/bind.html.fr
-share/httpd/htdocs/manual/bind.html.html
-share/httpd/htdocs/manual/bind.html.ja.jis
-share/httpd/htdocs/manual/configuring.html.en
-share/httpd/htdocs/manual/configuring.html.fr
-share/httpd/htdocs/manual/configuring.html.html
-share/httpd/htdocs/manual/configuring.html.ja.jis
-share/httpd/htdocs/manual/content-negotiation.html.en
-share/httpd/htdocs/manual/content-negotiation.html.html
-share/httpd/htdocs/manual/content-negotiation.html.ja.jis
-share/httpd/htdocs/manual/custom-error.html.en
-share/httpd/htdocs/manual/custom-error.html.fr
-share/httpd/htdocs/manual/custom-error.html.html
-share/httpd/htdocs/manual/custom-error.html.ja.jis
-share/httpd/htdocs/manual/cygwin.html
-share/httpd/htdocs/manual/dns-caveats.html.en
-share/httpd/htdocs/manual/dns-caveats.html.fr
-share/httpd/htdocs/manual/dns-caveats.html.ja.jis
-share/httpd/htdocs/manual/dns-caveats.html.html
-share/httpd/htdocs/manual/dso.html
-share/httpd/htdocs/manual/ebcdic.html
-share/httpd/htdocs/manual/env.html.en
-share/httpd/htdocs/manual/env.html.html
-share/httpd/htdocs/manual/env.html.ja.jis
-share/httpd/htdocs/manual/footer.html
-share/httpd/htdocs/manual/handler.html.en
-share/httpd/htdocs/manual/handler.html.html
-share/httpd/htdocs/manual/handler.html.ja.jis
-share/httpd/htdocs/manual/header.html
-share/httpd/htdocs/manual/howto/auth.html
-share/httpd/htdocs/manual/howto/cgi.html.en
-share/httpd/htdocs/manual/howto/cgi.html.html
-share/httpd/htdocs/manual/howto/cgi.html.ja.jis
-share/httpd/htdocs/manual/howto/footer.html
-share/httpd/htdocs/manual/howto/header.html
-share/httpd/htdocs/manual/howto/htaccess.html
-share/httpd/htdocs/manual/howto/ssi.html.en
-share/httpd/htdocs/manual/howto/ssi.html.html
-share/httpd/htdocs/manual/howto/ssi.html.ja.jis
-share/httpd/htdocs/manual/images/apache_header.gif
-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/pixel.gif
-share/httpd/htdocs/manual/images/sub.gif
-share/httpd/htdocs/manual/index.html.en
-share/httpd/htdocs/manual/index.html.fr
-share/httpd/htdocs/manual/index.html.html
-share/httpd/htdocs/manual/index.html.ja.jis
-share/httpd/htdocs/manual/install-tpf.html
-share/httpd/htdocs/manual/install-ztpf.html
-share/httpd/htdocs/manual/install.html.en
-share/httpd/htdocs/manual/install.html.es
-share/httpd/htdocs/manual/install.html.fr
-share/httpd/htdocs/manual/install.html.html
-share/httpd/htdocs/manual/install.html.ja.jis
-share/httpd/htdocs/manual/invoking.html.en
-share/httpd/htdocs/manual/invoking.html.fr
-share/httpd/htdocs/manual/invoking.html.ja.jis
-share/httpd/htdocs/manual/invoking.html.html
-share/httpd/htdocs/manual/keepalive.html.en
-share/httpd/htdocs/manual/keepalive.html.html
-share/httpd/htdocs/manual/keepalive.html.ja.jis
-share/httpd/htdocs/manual/location.html.en
-share/httpd/htdocs/manual/location.html.html
-share/httpd/htdocs/manual/location.html.ja.jis
-share/httpd/htdocs/manual/logs.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/rewriteguide.html
-share/httpd/htdocs/manual/misc/security_tips.html
-share/httpd/htdocs/manual/misc/tutorials.html
-share/httpd/htdocs/manual/misc/vif-info.html
-share/httpd/htdocs/manual/misc/windoz_keepalive.html
-share/httpd/htdocs/manual/mod/core.html.en
-share/httpd/htdocs/manual/mod/core.html.fr
-share/httpd/htdocs/manual/mod/core.html.html
-share/httpd/htdocs/manual/mod/core.html.ja.jis
-share/httpd/htdocs/manual/mod/directive-dict.html.en
-share/httpd/htdocs/manual/mod/directive-dict.html.fr
-share/httpd/htdocs/manual/mod/directive-dict.html.html
-share/httpd/htdocs/manual/mod/directive-dict.html.ja.jis
-share/httpd/htdocs/manual/mod/directives.html.de
-share/httpd/htdocs/manual/mod/directives.html.en
-share/httpd/htdocs/manual/mod/directives.html.fr
-share/httpd/htdocs/manual/mod/directives.html.html
-share/httpd/htdocs/manual/mod/directives.html.ja.jis
-share/httpd/htdocs/manual/mod/footer.html
-share/httpd/htdocs/manual/mod/header.html
-share/httpd/htdocs/manual/mod/index-bytype.html.en
-share/httpd/htdocs/manual/mod/index-bytype.html.fr
-share/httpd/htdocs/manual/mod/index-bytype.html.html
-share/httpd/htdocs/manual/mod/index-bytype.html.ja.jis
-share/httpd/htdocs/manual/mod/index.html.en
-share/httpd/htdocs/manual/mod/index.html.fr
-share/httpd/htdocs/manual/mod/index.html.html
-share/httpd/htdocs/manual/mod/index.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_access.html.en
-share/httpd/htdocs/manual/mod/mod_access.html.html
-share/httpd/htdocs/manual/mod/mod_access.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_actions.html.en
-share/httpd/htdocs/manual/mod/mod_actions.html.html
-share/httpd/htdocs/manual/mod/mod_actions.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_alias.html.en
-share/httpd/htdocs/manual/mod/mod_alias.html.html
-share/httpd/htdocs/manual/mod/mod_alias.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_asis.html.en
-share/httpd/htdocs/manual/mod/mod_asis.html.html
-share/httpd/htdocs/manual/mod/mod_asis.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_auth.html.en
-share/httpd/htdocs/manual/mod/mod_auth.html.html
-share/httpd/htdocs/manual/mod/mod_auth.html.ja.jis
-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_auth_digest.html
-share/httpd/htdocs/manual/mod/mod_autoindex.html.en
-share/httpd/htdocs/manual/mod/mod_autoindex.html.html
-share/httpd/htdocs/manual/mod/mod_autoindex.html.ja.jis
-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.en
-share/httpd/htdocs/manual/mod/mod_cgi.html.html
-share/httpd/htdocs/manual/mod/mod_cgi.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_cookies.html
-share/httpd/htdocs/manual/mod/mod_define.html
-share/httpd/htdocs/manual/mod/mod_digest.html
-share/httpd/htdocs/manual/mod/mod_dir.html.en
-share/httpd/htdocs/manual/mod/mod_dir.html.html
-share/httpd/htdocs/manual/mod/mod_dir.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_dld.html
-share/httpd/htdocs/manual/mod/mod_env.html.en
-share/httpd/htdocs/manual/mod/mod_env.html.html
-share/httpd/htdocs/manual/mod/mod_env.html.ja.jis
-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.en
-share/httpd/htdocs/manual/mod/mod_info.html.html
-share/httpd/htdocs/manual/mod/mod_info.html.ja.jis
-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.en
-share/httpd/htdocs/manual/mod/mod_log_config.html.html
-share/httpd/htdocs/manual/mod/mod_log_config.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_log_forensic.html.en
-share/httpd/htdocs/manual/mod/mod_log_forensic.html.html
-share/httpd/htdocs/manual/mod/mod_log_referer.html
-share/httpd/htdocs/manual/mod/mod_mime.html.en
-share/httpd/htdocs/manual/mod/mod_mime.html.html
-share/httpd/htdocs/manual/mod/mod_mime.html.ja.jis
-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.en
-share/httpd/htdocs/manual/mod/mod_negotiation.html.html
-share/httpd/htdocs/manual/mod/mod_negotiation.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_proxy.html
-share/httpd/htdocs/manual/mod/mod_rewrite.html.en
-share/httpd/htdocs/manual/mod/mod_rewrite.html.html
-share/httpd/htdocs/manual/mod/mod_rewrite.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_setenvif.html.en
-share/httpd/htdocs/manual/mod/mod_setenvif.html.html
-share/httpd/htdocs/manual/mod/mod_setenvif.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_so.html.en
-share/httpd/htdocs/manual/mod/mod_so.html.html
-share/httpd/htdocs/manual/mod/mod_so.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_speling.html.en
-share/httpd/htdocs/manual/mod/mod_speling.html.html
-share/httpd/htdocs/manual/mod/mod_speling.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_status.html
-share/httpd/htdocs/manual/mod/mod_unique_id.html.en
-share/httpd/htdocs/manual/mod/mod_unique_id.html.html
-share/httpd/htdocs/manual/mod/mod_unique_id.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_userdir.html.en
-share/httpd/htdocs/manual/mod/mod_userdir.html.html
-share/httpd/htdocs/manual/mod/mod_userdir.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_usertrack.html
-share/httpd/htdocs/manual/mod/mod_vhost_alias.html
-share/httpd/htdocs/manual/mod/module-dict.html.en
-share/httpd/htdocs/manual/mod/module-dict.html.html
-share/httpd/htdocs/manual/mod/module-dict.html.ja.jis
-share/httpd/htdocs/manual/mpeix.html
-share/httpd/htdocs/manual/multilogs.html
-share/httpd/htdocs/manual/netware.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.en
-share/httpd/htdocs/manual/new_features_1_3.html.html
-share/httpd/htdocs/manual/new_features_1_3.html.ja.jis
-share/httpd/htdocs/manual/process-model.html.en
-share/httpd/htdocs/manual/process-model.html.html
-share/httpd/htdocs/manual/process-model.html.ja.jis
-share/httpd/htdocs/manual/programs/ab.html
-share/httpd/htdocs/manual/programs/apachectl.html.en
-share/httpd/htdocs/manual/programs/apachectl.html.html
-share/httpd/htdocs/manual/programs/apachectl.html.ja.jis
-share/httpd/htdocs/manual/programs/apxs.html
-share/httpd/htdocs/manual/programs/dbmmanage.html
-share/httpd/htdocs/manual/programs/footer.html
-share/httpd/htdocs/manual/programs/header.html
-share/httpd/htdocs/manual/programs/htdigest.html
-share/httpd/htdocs/manual/programs/htpasswd.html.en
-share/httpd/htdocs/manual/programs/htpasswd.html.html
-share/httpd/htdocs/manual/programs/htpasswd.html.ja.jis
-share/httpd/htdocs/manual/programs/httpd.html.en
-share/httpd/htdocs/manual/programs/httpd.html.html
-share/httpd/htdocs/manual/programs/httpd.html.ja.jis
-share/httpd/htdocs/manual/programs/index.html.en
-share/httpd/htdocs/manual/programs/index.html.html
-share/httpd/htdocs/manual/programs/index.html.ja.jis
-share/httpd/htdocs/manual/programs/logresolve.html
-share/httpd/htdocs/manual/programs/other.html
-share/httpd/htdocs/manual/programs/rotatelogs.html
-share/httpd/htdocs/manual/programs/suexec.html.en
-share/httpd/htdocs/manual/programs/suexec.html.html
-share/httpd/htdocs/manual/programs/suexec.html.ja.jis
-share/httpd/htdocs/manual/readme-tpf.html
-share/httpd/htdocs/manual/sections.html.en
-share/httpd/htdocs/manual/sections.html.html
-share/httpd/htdocs/manual/sections.html.ja.jis
-share/httpd/htdocs/manual/server-wide.html.en
-share/httpd/htdocs/manual/server-wide.html.fr
-share/httpd/htdocs/manual/server-wide.html.html
-share/httpd/htdocs/manual/server-wide.html.ja.jis
-share/httpd/htdocs/manual/sitemap.html
-share/httpd/htdocs/manual/sourcereorg.html
-share/httpd/htdocs/manual/stopping.html.en
-share/httpd/htdocs/manual/stopping.html.fr
-share/httpd/htdocs/manual/stopping.html.html
-share/httpd/htdocs/manual/suexec.html.en
-share/httpd/htdocs/manual/suexec.html.html
-share/httpd/htdocs/manual/suexec.html.ja.jis
-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/urlmapping.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.en
-share/httpd/htdocs/manual/vhosts/fd-limits.html.html
-share/httpd/htdocs/manual/vhosts/fd-limits.html.ja.jis
-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.en
-share/httpd/htdocs/manual/vhosts/index.html.html
-share/httpd/htdocs/manual/vhosts/index.html.ja.jis
-share/httpd/htdocs/manual/vhosts/ip-based.html
-share/httpd/htdocs/manual/vhosts/mass.html
-share/httpd/htdocs/manual/vhosts/name-based.html.en
-share/httpd/htdocs/manual/vhosts/name-based.html.html
-share/httpd/htdocs/manual/vhosts/name-based.html.ja.jis
-share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html
-share/httpd/htdocs/manual/vhosts/virtual-host.html
-share/httpd/htdocs/manual/win_compiling.html.en
-share/httpd/htdocs/manual/win_compiling.html.html
-share/httpd/htdocs/manual/win_compiling.html.ja.jis
-share/httpd/htdocs/manual/win_service.html.en
-share/httpd/htdocs/manual/win_service.html.html
-share/httpd/htdocs/manual/win_service.html.ja.jis
-share/httpd/htdocs/manual/windows.html.en
-share/httpd/htdocs/manual/windows.html.html
-share/httpd/htdocs/manual/windows.html.ja.jis
-share/httpd/htdocs/sitedrivenby.gif
-share/httpd/icons/README
-share/httpd/icons/README.html
-share/httpd/icons/a.gif
-share/httpd/icons/a.png
-share/httpd/icons/alert.black.gif
-share/httpd/icons/alert.black.png
-share/httpd/icons/alert.red.gif
-share/httpd/icons/alert.red.png
-share/httpd/icons/apache_pb.gif
-share/httpd/icons/apache_pb.png
-share/httpd/icons/back.gif
-share/httpd/icons/back.png
-share/httpd/icons/ball.gray.gif
-share/httpd/icons/ball.gray.png
-share/httpd/icons/ball.red.gif
-share/httpd/icons/ball.red.png
-share/httpd/icons/binary.gif
-share/httpd/icons/binary.png
-share/httpd/icons/binhex.gif
-share/httpd/icons/binhex.png
-share/httpd/icons/blank.gif
-share/httpd/icons/blank.png
-share/httpd/icons/bomb.gif
-share/httpd/icons/bomb.png
-share/httpd/icons/box1.gif
-share/httpd/icons/box1.png
-share/httpd/icons/box2.gif
-share/httpd/icons/box2.png
-share/httpd/icons/broken.gif
-share/httpd/icons/broken.png
-share/httpd/icons/burst.gif
-share/httpd/icons/burst.png
-share/httpd/icons/c.gif
-share/httpd/icons/c.png
-share/httpd/icons/comp.blue.gif
-share/httpd/icons/comp.blue.png
-share/httpd/icons/comp.gray.gif
-share/httpd/icons/comp.gray.png
-share/httpd/icons/compressed.gif
-share/httpd/icons/compressed.png
-share/httpd/icons/continued.gif
-share/httpd/icons/continued.png
-share/httpd/icons/dir.gif
-share/httpd/icons/dir.png
-share/httpd/icons/diskimg.gif
-share/httpd/icons/diskimg.png
-share/httpd/icons/down.gif
-share/httpd/icons/down.png
-share/httpd/icons/dvi.gif
-share/httpd/icons/dvi.png
-share/httpd/icons/f.gif
-share/httpd/icons/f.png
-share/httpd/icons/folder.gif
-share/httpd/icons/folder.open.gif
-share/httpd/icons/folder.open.png
-share/httpd/icons/folder.png
-share/httpd/icons/folder.sec.gif
-share/httpd/icons/folder.sec.png
-share/httpd/icons/forward.gif
-share/httpd/icons/forward.png
-share/httpd/icons/generic.gif
-share/httpd/icons/generic.png
-share/httpd/icons/generic.red.gif
-share/httpd/icons/generic.red.png
-share/httpd/icons/generic.sec.gif
-share/httpd/icons/generic.sec.png
-share/httpd/icons/hand.right.gif
-share/httpd/icons/hand.right.png
-share/httpd/icons/hand.up.gif
-share/httpd/icons/hand.up.png
-share/httpd/icons/icon.sheet.gif
-share/httpd/icons/icon.sheet.png
-share/httpd/icons/image1.gif
-share/httpd/icons/image1.png
-share/httpd/icons/image2.gif
-share/httpd/icons/image2.png
-share/httpd/icons/image3.gif
-share/httpd/icons/image3.png
-share/httpd/icons/index.gif
-share/httpd/icons/index.png
-share/httpd/icons/layout.gif
-share/httpd/icons/layout.png
-share/httpd/icons/left.gif
-share/httpd/icons/left.png
-share/httpd/icons/link.gif
-share/httpd/icons/link.png
-share/httpd/icons/movie.gif
-share/httpd/icons/movie.png
-share/httpd/icons/p.gif
-share/httpd/icons/p.png
-share/httpd/icons/patch.gif
-share/httpd/icons/patch.png
-share/httpd/icons/pdf.gif
-share/httpd/icons/pdf.png
-share/httpd/icons/pie0.gif
-share/httpd/icons/pie0.png
-share/httpd/icons/pie1.gif
-share/httpd/icons/pie1.png
-share/httpd/icons/pie2.gif
-share/httpd/icons/pie2.png
-share/httpd/icons/pie3.gif
-share/httpd/icons/pie3.png
-share/httpd/icons/pie4.gif
-share/httpd/icons/pie4.png
-share/httpd/icons/pie5.gif
-share/httpd/icons/pie5.png
-share/httpd/icons/pie6.gif
-share/httpd/icons/pie6.png
-share/httpd/icons/pie7.gif
-share/httpd/icons/pie7.png
-share/httpd/icons/pie8.gif
-share/httpd/icons/pie8.png
-share/httpd/icons/portal.gif
-share/httpd/icons/portal.png
-share/httpd/icons/ps.gif
-share/httpd/icons/ps.png
-share/httpd/icons/quill.gif
-share/httpd/icons/quill.png
-share/httpd/icons/right.gif
-share/httpd/icons/right.png
-share/httpd/icons/screw1.gif
-share/httpd/icons/screw1.png
-share/httpd/icons/screw2.gif
-share/httpd/icons/screw2.png
-share/httpd/icons/script.gif
-share/httpd/icons/script.png
-share/httpd/icons/small/back.gif
-share/httpd/icons/small/back.png
-share/httpd/icons/small/binary.gif
-share/httpd/icons/small/binary.png
-share/httpd/icons/small/binhex.gif
-share/httpd/icons/small/binhex.png
-share/httpd/icons/small/blank.gif
-share/httpd/icons/small/blank.png
-share/httpd/icons/small/broken.gif
-share/httpd/icons/small/broken.png
-share/httpd/icons/small/burst.gif
-share/httpd/icons/small/burst.png
-share/httpd/icons/small/comp1.gif
-share/httpd/icons/small/comp1.png
-share/httpd/icons/small/comp2.gif
-share/httpd/icons/small/comp2.png
-share/httpd/icons/small/compressed.gif
-share/httpd/icons/small/compressed.png
-share/httpd/icons/small/continued.gif
-share/httpd/icons/small/continued.png
-share/httpd/icons/small/dir.gif
-share/httpd/icons/small/dir.png
-share/httpd/icons/small/dir2.gif
-share/httpd/icons/small/dir2.png
-share/httpd/icons/small/doc.gif
-share/httpd/icons/small/doc.png
-share/httpd/icons/small/forward.gif
-share/httpd/icons/small/forward.png
-share/httpd/icons/small/generic.gif
-share/httpd/icons/small/generic.png
-share/httpd/icons/small/generic2.gif
-share/httpd/icons/small/generic2.png
-share/httpd/icons/small/generic3.gif
-share/httpd/icons/small/generic3.png
-share/httpd/icons/small/image.gif
-share/httpd/icons/small/image.png
-share/httpd/icons/small/image2.gif
-share/httpd/icons/small/image2.png
-share/httpd/icons/small/index.gif
-share/httpd/icons/small/index.png
-share/httpd/icons/small/key.gif
-share/httpd/icons/small/key.png
-share/httpd/icons/small/movie.gif
-share/httpd/icons/small/movie.png
-share/httpd/icons/small/patch.gif
-share/httpd/icons/small/patch.png
-share/httpd/icons/small/ps.gif
-share/httpd/icons/small/ps.png
-share/httpd/icons/small/rainbow.gif
-share/httpd/icons/small/rainbow.png
-share/httpd/icons/small/sound.gif
-share/httpd/icons/small/sound.png
-share/httpd/icons/small/sound2.gif
-share/httpd/icons/small/sound2.png
-share/httpd/icons/small/tar.gif
-share/httpd/icons/small/tar.png
-share/httpd/icons/small/text.gif
-share/httpd/icons/small/text.png
-share/httpd/icons/small/transfer.gif
-share/httpd/icons/small/transfer.png
-share/httpd/icons/small/unknown.gif
-share/httpd/icons/small/unknown.png
-share/httpd/icons/small/uu.gif
-share/httpd/icons/small/uu.png
-share/httpd/icons/sound1.gif
-share/httpd/icons/sound1.png
-share/httpd/icons/sound2.gif
-share/httpd/icons/sound2.png
-share/httpd/icons/sphere1.gif
-share/httpd/icons/sphere1.png
-share/httpd/icons/sphere2.gif
-share/httpd/icons/sphere2.png
-share/httpd/icons/tar.gif
-share/httpd/icons/tar.png
-share/httpd/icons/tex.gif
-share/httpd/icons/tex.png
-share/httpd/icons/text.gif
-share/httpd/icons/text.png
-share/httpd/icons/transfer.gif
-share/httpd/icons/transfer.png
-share/httpd/icons/unknown.gif
-share/httpd/icons/unknown.png
-share/httpd/icons/up.gif
-share/httpd/icons/up.png
-share/httpd/icons/uu.gif
-share/httpd/icons/uu.png
-share/httpd/icons/uuencoded.gif
-share/httpd/icons/uuencoded.png
-share/httpd/icons/world1.gif
-share/httpd/icons/world1.png
-share/httpd/icons/world2.gif
-share/httpd/icons/world2.png
diff --git a/www/apache/PLIST.shared b/www/apache/PLIST.shared
deleted file mode 100644
index 06d49e5916d..00000000000
--- a/www/apache/PLIST.shared
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.shared,v 1.5 2009/06/14 22:00:17 joerg Exp $
-lib/httpd/httpd.exp
-lib/httpd/mod_define.so
-lib/httpd/mod_proxy.so
diff --git a/www/apache/PLIST.suexec b/www/apache/PLIST.suexec
deleted file mode 100644
index 9a3212dab1f..00000000000
--- a/www/apache/PLIST.suexec
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.suexec,v 1.1 2001/11/01 02:22:55 zuntum Exp $
-sbin/suexec
-man/man8/suexec.8
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
deleted file mode 100644
index 5ca24e2ed67..00000000000
--- a/www/apache/buildlink3.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.20 2012/05/07 01:54:04 dholland Exp $
-
-BUILDLINK_TREE+=	apache
-
-.if !defined(APACHE_BUILDLINK3_MK)
-APACHE_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.apache+=	apache-1.3.*
-BUILDLINK_ABI_DEPENDS.apache+=	apache>=1.3.34nb5
-BUILDLINK_PKGSRCDIR.apache?=	../../www/apache
-
-.  if defined(APACHE_MODULE)
-BUILDLINK_DEPMETHOD.apache+=	full
-.  else
-BUILDLINK_DEPMETHOD.apache?=	build
-.  endif
-
-USE_TOOLS+=	perl	# for "apxs"
-APXS?=		${BUILDLINK_PREFIX.apache}/sbin/apxs
-
-.  if defined(GNU_CONFIGURE)
-CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
-.  endif
-
-# required because httpd/os.h includes <dlfcn.h> when it is found by
-# Apache's configure script.
-.include "../../mk/dlopen.buildlink3.mk"
-.endif # APACHE_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-apache
diff --git a/www/apache/distinfo b/www/apache/distinfo
deleted file mode 100644
index 26b7dd04abb..00000000000
--- a/www/apache/distinfo
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: distinfo,v 1.63 2013/03/02 17:52:33 joerg Exp $
-
-SHA1 (apache_1.3.42.tar.gz) = b3f8575d855132bc243d79af59ae2a318e7e2c53
-RMD160 (apache_1.3.42.tar.gz) = a1573bd04e17cad5d67388cfe08b7f26e06a9ee1
-Size (apache_1.3.42.tar.gz) = 2661241 bytes
-SHA1 (mod_ssl-2.8.31-1.3.41.tar.gz) = f2d2210041332fc1d4b7243a856d4d81f961d306
-RMD160 (mod_ssl-2.8.31-1.3.41.tar.gz) = c3083c29710c4537ca8c79ddd8c1992eb95cbfee
-Size (mod_ssl-2.8.31-1.3.41.tar.gz) = 820067 bytes
-SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
-RMD160 (sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
-Size (sitedrivenby.gif) = 8519 bytes
-SHA1 (patch-aa) = 54c32338f0dd6f37f28e3ef37b26d2867f90280d
-SHA1 (patch-ab) = 084d52bb2afbacf18b9d0793293d8ae333c67802
-SHA1 (patch-ac) = b961c90a58a94f48daff417af146df98d5ec428c
-SHA1 (patch-ad) = c02cd1af3c4b5e0d49aaa7f0eff20a8d76a633aa
-SHA1 (patch-ae) = 1654cdaa58622b7572ab9190928854e80e8c88c7
-SHA1 (patch-af) = 4eb5041f2ae8f1d434abbcab416d25739a0979e8
-SHA1 (patch-ag) = e29d1d4934a7490e9c51e338375d4d1cc9e93304
-SHA1 (patch-ah) = 7c7ad1c09a1c849129313bb272106a1dcd2abf7b
-SHA1 (patch-ai) = 249dd6367c8a0d31568dd09acf2be6dc49ce9673
-SHA1 (patch-aj) = ac7337b51d7d4ca25cef4020961736404ec79f01
-SHA1 (patch-ak) = 1be52fb5fca6c05c7cf489de541e0d52383ee43a
-SHA1 (patch-al) = 07eb4aab03e646184379d13cdf7176e95f1c1ac8
-SHA1 (patch-am) = 76bbb4ae3a8cce666bf91fb605f72572350f23a1
-SHA1 (patch-an) = 45a5bf946628b1e1b2e60c217214965390f7b3d7
-SHA1 (patch-ao) = 96b97e1faf6828a6880c39eb246d07c4a56bfe12
-SHA1 (patch-aq) = 1fda54aae47edb675549095adac2eb0378d1f60c
-SHA1 (patch-ar) = 29276bc264b9d2ce7dea4a196ac3bd55e6853f53
-SHA1 (patch-as) = ef4143e0c809af5792f282ebbd405e7bda339484
-SHA1 (patch-at) = 85b7ff5b51014881e6187656660cf23f6d3283c0
-SHA1 (patch-au) = f70d13e093a277bcb0945330f3684d8a5158a5e6
diff --git a/www/apache/files/ap_include_extern.h b/www/apache/files/ap_include_extern.h
deleted file mode 100644
index 2e4c3d84918..00000000000
--- a/www/apache/files/ap_include_extern.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* $NetBSD: ap_include_extern.h,v 1.3 1998/12/04 17:23:19 tv 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/apache/files/apache.sh b/www/apache/files/apache.sh
deleted file mode 100644
index ba45defaf07..00000000000
--- a/www/apache/files/apache.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: apache.sh,v 1.27 2005/04/18 14:40:17 wiz Exp $
-#
-# PROVIDE: apache
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# You will need to set some variables in /etc/rc.conf to start Apache:
-#
-# apache=YES 
-# apache_start="start"  # set to "startssl" to allow HTTPS connections
-#			# if ap-ssl is installed; this variable is optional
-
-if [ -f /etc/rc.subr ]
-then
-	. /etc/rc.subr
-fi
-
-name="apache"
-rcvar=$name
-command="@PREFIX@/sbin/httpd"
-ctl_command="@PREFIX@/sbin/apachectl"
-required_files="@PKG_SYSCONFDIR@/httpd.conf"
-extra_commands="reload"
-start_cmd="apache_doit start"
-stop_cmd="apache_doit stop"
-reload_cmd="apache_doit reload"
-
-apache_doit ()
-{
-	: ${apache_start:=start}
-
-	case $1 in
-	start)	action=${apache_start} ;;
-	reload)	action=graceful ;;
-	*)	action=$1 ;;
-	esac
-	${ctl_command} ${action}
-}
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]
-then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	apache_doit "$1"
-fi
diff --git a/www/apache/files/config.layout b/www/apache/files/config.layout
deleted file mode 100644
index 47eeaab8966..00000000000
--- a/www/apache/files/config.layout
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: config.layout,v 1.7 2004/11/15 15:05:34 sketch Exp $
-
-<Layout pkgsrc>
-prefix: @PREFIX@
-exec_prefix: @PREFIX@
-bindir: ${exec_prefix}/bin
-sbindir: ${exec_prefix}/sbin
-libexecdir: ${exec_prefix}/lib/httpd
-mandir: ${prefix}/man
-sysconfdir: @PKG_SYSCONFDIR@
-datadir: ${prefix}/share/httpd
-iconsdir: ${prefix}/share/httpd/icons
-htdocsdir: ${prefix}/share/httpd/htdocs
-manualdir: ${prefix}/share/httpd/htdocs/manual
-cgidir: ${exec_prefix}/libexec/cgi-bin
-includedir: ${prefix}/include/httpd
-localstatedir: @VARBASE@/httpd
-runtimedir: @VARBASE@/run
-logfiledir: @VARBASE@/log/httpd
-proxycachedir: @VARBASE@/httpd/proxy
-</Layout>
diff --git a/www/apache/module.mk b/www/apache/module.mk
index c8e38281b8b..9d23f077faf 100644
--- a/www/apache/module.mk
+++ b/www/apache/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.13 2010/02/20 14:58:46 joerg Exp $
+# $NetBSD: module.mk,v 1.14 2014/06/10 15:22:18 joerg Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install apache modules.
@@ -41,13 +41,6 @@ apache-module-build:
 
 do-build: apache-module-build
 
-.if !defined(PKG_APACHE) || ${PKG_APACHE} == "apache13"
-.PHONY: apache-module-install
-apache-module-install:
-	${INSTALL_LIB_DIR} ${APACHE_MODULE_DESTDIR}
-	${INSTALL_LIB} ${APACHE_MODULE_SRCDIR}/${APACHE_MODULE_NAME} \
-	    ${APACHE_MODULE_DESTDIR}
-.else
 .PHONY: apache-module-install
 apache-module-install:
 	${INSTALL_LIB_DIR} ${APACHE_MODULE_DESTDIR}
@@ -55,7 +48,6 @@ apache-module-install:
 	    SH_LIBTOOL=${PREFIX}/share/httpd/build/libtool \
 	    ${APACHE_MODULE_SRCDIR}/${APACHE_MODULE_NAME} \
 	    ${APACHE_MODULE_DESTDIR}
-.endif
 
 do-install: apache-module-install
 
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
deleted file mode 100644
index d380fe0ff29..00000000000
--- a/www/apache/patches/patch-aa
+++ /dev/null
@@ -1,181 +0,0 @@
-$NetBSD: patch-aa,v 1.26 2008/02/23 05:16:34 obache Exp $
-
---- Makefile.tmpl.orig	2008-02-23 04:22:56.000000000 +0000
-+++ Makefile.tmpl
-@@ -57,6 +57,8 @@ INSTALL_DATA    = $(INSTALL) $(IFLAGS_DA
- PERL            = @PERL@
- TAR		= @TAR@
- TAROPT		= @TAROPT@
-+BINOWN		= @BINOWN@
-+BINGRP		= @BINGRP@
- 
- #   installation name of Apache webserver
- TARGET          = @TARGET@
-@@ -281,11 +283,6 @@ install-mktree:
- 	$(MKDIR) $(root)$(mandir)/man1
- 	$(MKDIR) $(root)$(mandir)/man8
- 	$(MKDIR) $(root)$(sysconfdir)
--	$(MKDIR) $(root)$(sysconfdir)/ssl.crt
--	$(MKDIR) $(root)$(sysconfdir)/ssl.crl
--	$(MKDIR) $(root)$(sysconfdir)/ssl.csr
--	$(MKDIR) $(root)$(sysconfdir)/ssl.key
--	$(MKDIR) $(root)$(sysconfdir)/ssl.prm
- 	$(MKDIR) $(root)$(htdocsdir)
- 	$(MKDIR) $(root)$(manualdir)
- 	$(MKDIR) $(root)$(iconsdir)
-@@ -297,9 +294,9 @@ install-mktree:
- 	$(MKDIR) $(root)$(proxycachedir)
- 	-@if [ "x`$(AUX)/getuid.sh`" = "x0" ]; then \
- 		echo "chown $(conf_user) $(root)$(proxycachedir)"; \
--		chown $(conf_user) $(root)$(proxycachedir); \
-+		${CHOWN} $(conf_user) $(root)$(proxycachedir); \
- 		echo "chgrp $(conf_group) $(root)$(proxycachedir)"; \
--		chgrp "$(conf_group)" $(root)$(proxycachedir); \
-+		${CHGRP} "$(conf_group)" $(root)$(proxycachedir); \
- 	fi
- 	@echo "<=== [mktree]"
- 
-@@ -344,34 +341,6 @@ install-programs:
- 			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]"
-@@ -421,9 +390,9 @@ install-support:
- 	    echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec"; \
- 	    $(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \
- 	    echo "chown root $(root)$(sbindir)/suexec"; \
--	    chown root $(root)$(sbindir)/suexec; \
-+	    ${CHOWN} root $(root)$(sbindir)/suexec; \
- 	    echo "chmod 4711 $(root)$(sbindir)/suexec"; \
--	    chmod 4711 $(root)$(sbindir)/suexec; \
-+	    ${CHMOD} 4711 $(root)$(sbindir)/suexec; \
- 	    echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8"; \
- 	    $(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \
- 	fi
-@@ -465,9 +434,9 @@ install-binsupport:
- 	    echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec"; \
- 	    $(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \
- 	    echo "chown root $(root)$(sbindir)/suexec"; \
--	    chown root $(root)$(sbindir)/suexec; \
-+	    ${CHOWN} root $(root)$(sbindir)/suexec; \
- 	    echo "chmod 4711 $(root)$(sbindir)/suexec"; \
--	    chmod 4711 $(root)$(sbindir)/suexec; \
-+	    ${CHMOD} 4711 $(root)$(sbindir)/suexec; \
- 	    echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8"; \
- 	    $(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \
- 	fi
-@@ -490,21 +459,25 @@ install-include:
- #   icons and distributed CGI scripts.
- install-data:
- 	@echo "===> [data: Installing initial data files]"
--	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
-+	-@if false; then \
- 		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
- 	else \
- 		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
- 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
- 		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
--		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
--		find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
-+		${FIND} $(root)$(htdocsdir)/ -type d -exec ${CHMOD} a+rx {} \; ; \
-+		${FIND} $(root)$(htdocsdir)/ -type f -print | ${XARGS} ${CHMOD} a+r ; \
-+		${FIND} $(root)$(htdocsdir)/ -print | \
-+			${XARGS} ${CHOWN} ${BINOWN}:${BINGRP} ; \
- 	fi
- 	-@if [ -d $(TOP)/htdocs/manual ]; then \
- 		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
- 		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
- 		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
--		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
--		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
-+		${FIND} $(root)$(manualdir)/ -type d -exec ${CHMOD} a+rx {} \; ; \
-+		${FIND} $(root)$(manualdir)/ -type f -print | ${XARGS} ${CHMOD} a+r ; \
-+		${FIND} $(root)$(manualdir)/ -print | \
-+			${XARGS} ${CHOWN} ${BINOWN}:${BINGRP} ; \
- 	fi
- 	-@if [ -f $(root)$(cgidir)/printenv ]; then \
- 		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
-@@ -512,23 +485,25 @@ install-data:
- 		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}; \
-+			echo "$(INSTALL_SCRIPT) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
-+			$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
- 		done; \
- 	fi
- 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
- 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
- 	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
--	find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
--	find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \;
-+	${FIND} $(root)$(iconsdir)/ -type d -exec ${CHMOD} a+rx {} \; ;\
-+	${FIND} $(root)$(iconsdir)/ -type f -exec ${CHMOD} a+r {} \; ;\
-+	${CHOWN} -R ${BINOWN}:${BINGRP} $(root)$(iconsdir)/.
- 	@echo "<=== [data]"
- 
- #   create the initial configuration by providing default files
- #   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 \
-@@ -584,22 +559,10 @@ install-config:
-         	> $(TOP)/$(SRC)/.apaci.install.tmp && \
- 		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
- 		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
--		if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
--			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
--			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
--		else \
--			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${target_conf}]"; \
--		fi; \
- 	done
- 	-@for conf in mime.types magic; do \
- 		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
- 		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
--		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
--			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
--			$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
--		else \
--			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
--		fi; \
- 	done
- 	-@if [ ".$(ssl)" = .1 ]; then \
- 		echo "chmod 755 $(root)$(sysconfdir)/ssl.crt"; \
diff --git a/www/apache/patches/patch-ab b/www/apache/patches/patch-ab
deleted file mode 100644
index 60a35c3588f..00000000000
--- a/www/apache/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2004/10/29 13:48:31 abs Exp $
-
---- conf/httpd.conf-dist.orig	2004-10-29 14:44:35.000000000 +0100
-+++ conf/httpd.conf-dist
-@@ -197,7 +197,12 @@ MaxRequestsPerChild 0
- # the order below without expert advice.
- #
- # Example:
--# LoadModule foo_module libexec/mod_foo.so
-+# LoadModule foo_module lib/httpd/mod_foo.so
-+
-+<IfDefine SSL>
-+LoadModule ssl_module lib/httpd/mod_ssl.so
-+AddModule mod_ssl.c
-+</IfDefine>
- 
- #
- # ExtendedStatus controls whether Apache will generate "full" status
diff --git a/www/apache/patches/patch-ac b/www/apache/patches/patch-ac
deleted file mode 100644
index 2e154621153..00000000000
--- a/www/apache/patches/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2004/10/29 13:48:31 abs Exp $
-
---- htdocs/index.html.en.orig	2001-05-04 01:00:38.000000000 +0100
-+++ htdocs/index.html.en
-@@ -27,12 +27,26 @@ issues.</p>
- 
- <hr width="50%" size="8" />
- <p>The Apache <a href="manual/">documentation</a> has been included
--with this distribution.</p>
-+with this distribution.  If the <strong>mod_ssl</strong> SSL extension has
-+been installed, then please carefully read the
-+<a href="manual/mod/mod_ssl/index.html">SSL documentation</a>.</p>
- 
--<p>You are free to use the image below on an Apache-powered web
--server. Thanks for using Apache!</p>
-+<p>Information on the NetBSD multi-platform operating system can be found at
-+<a href="http://www.netbsd.org/">The NetBSD Project homepage</a></p>
- 
--<div align="center"><img src="apache_pb.gif" alt="" /></div>
-+<p>Please feel 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">
-+ <a href="http://www.apache.org/">
-+  <img src="apache_pb.gif" border=0 alt="Powered by Apache">
-+ </a>
-+ <a href="http://www.netbsd.org/">
-+  <img src="sitedrivenby.gif" border=0 alt="Site driven by NetBSD">
-+ </a>
-+</div>
- </body>
- </html>
- 
diff --git a/www/apache/patches/patch-ad b/www/apache/patches/patch-ad
deleted file mode 100644
index 4c05b4328fd..00000000000
--- a/www/apache/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2004/10/29 13:48:31 abs Exp $
-
---- src/ap/ap_hook.c.orig	2004-10-29 14:44:35.000000000 +0100
-+++ src/ap/ap_hook.c
-@@ -740,6 +740,15 @@ static int ap_hook_call_func(va_list ap,
-         *((int *)v_rc) = ((int(*)(void *, void *, void *, int, void *))(hf->hf_ptr))(v1, v2, v3, v4, v5);
-         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/apache/patches/patch-ae b/www/apache/patches/patch-ae
deleted file mode 100644
index af44c88489a..00000000000
--- a/www/apache/patches/patch-ae
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2008/02/23 05:16:34 obache Exp $
-
---- src/modules/standard/mod_include.c.orig	2006-07-12 08:16:05.000000000 +0000
-+++ src/modules/standard/mod_include.c
-@@ -51,7 +51,10 @@
- #include "http_log.h"
- #include "http_main.h"
- #include "util_script.h"
-+#include "ap_include_extern.h"
-+#include "ap_hook.h"
- #endif
-+#define parse_string ap_include_parse_string
- 
- #define STARTING_SEQUENCE "<!--#"
- #define ENDING_SEQUENCE "-->"
-@@ -448,7 +451,8 @@ static int get_directive(FILE *in, char 
- /*
-  * 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;
-@@ -646,7 +650,8 @@ static int handle_include(FILE *in, requ
-             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";
-                 }
-@@ -1058,7 +1063,8 @@ static int find_file(request_rec *r, con
-                         "in parsed file %s";
-         }
-         else {
--            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);
- 
-             if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
-@@ -2141,6 +2147,16 @@ static int handle_printenv(FILE *in, req
-     }
- }
- 
-+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 --------------------------- */
-@@ -2276,6 +2292,13 @@ static void send_parsed_content(FILE *f,
-             }
- #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,
- 			      "unknown directive \"%s\" "
- 			      "in parsed doc %s",
diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af
deleted file mode 100644
index a055a12b7f2..00000000000
--- a/www/apache/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.11 2008/02/23 05:16:34 obache Exp $
-
---- src/modules/standard/mod_so.c.orig	2008-02-23 04:22:56.000000000 +0000
-+++ src/modules/standard/mod_so.c
-@@ -322,7 +322,15 @@ static const char *load_file(cmd_parms *
-         return err;
-     }
-     
--    file = ap_server_root_relative(cmd->pool, filename);
-+    /*
-+     * If the filename starts with '!', then just dlopen() it without
-+     * translating it to a pathname relative to ServerRoot.
-+     */
-+    if (filename[0] == '!') {
-+	file = filename + 1;
-+    } else {
-+	file = ap_server_root_relative(cmd->pool, filename);
-+    }
-     
-     if (!(handle = ap_os_dso_load(file))) {
- 	const char *my_error = ap_os_dso_error();
diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag
deleted file mode 100644
index d4cb64cba89..00000000000
--- a/www/apache/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.9 2008/02/23 05:16:34 obache Exp $
-
---- src/os/unix/os.c.orig	2006-07-12 08:16:05.000000000 +0000
-+++ src/os/unix/os.c
-@@ -154,7 +154,12 @@ void ap_os_dso_unload(void *handle)
- #elif defined(HAVE_DYLD)
-     NSUnLinkModule(handle,FALSE);
- 
--#else
-+/*
-+ * Work around Apache dlclose() bug, where shared objects may be
-+ * dlclose()d before their cleanup procedures are called.
-+ * This is needed so shared modules can be used. 
-+ */
-+#elif 0
-     dlclose(handle);
- #endif
- 
diff --git a/www/apache/patches/patch-ah b/www/apache/patches/patch-ah
deleted file mode 100644
index 55da695b516..00000000000
--- a/www/apache/patches/patch-ah
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ah,v 1.6 2008/02/23 05:16:34 obache Exp $
-
---- src/support/apachectl.orig	2008-02-23 04:22:56.000000000 +0000
-+++ src/support/apachectl
-@@ -43,6 +43,9 @@ PIDFILE=/usr/local/apache/logs/httpd.pid
- # 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.  
-@@ -139,6 +142,30 @@ do
- 	    fi
- 	fi
- 	;;
-+    restartssl|sslrestart|restart-SSL)
-+	if [ $RUNNING -eq 0 ]; then
-+	    echo "$0 $ARG: httpd not running, trying to start"
-+	    if $HTTPD -DSSL ; then
-+		echo "$0 $ARG: httpd started"
-+	    else
-+		echo "$0 $ARG: httpd could not be started"
-+		ERROR=5
-+	    fi
-+	else
-+	    if $HTTPD -t >/dev/null 2>&1; then
-+		if kill -HUP $PID ; then
-+		    echo "$0 $ARG: httpd restarted"
-+		else
-+		    echo "$0 $ARG: httpd could not be restarted"
-+		    ERROR=6
-+		fi
-+	    else
-+		echo "$0 $ARG: configuration broken, ignoring restart"
-+		echo "$0 $ARG: (run 'apachectl configtest' for details)"
-+		ERROR=6
-+	    fi
-+	fi
-+	;;
-     graceful)
- 	if [ $RUNNING -eq 0 ]; then
- 	    echo "$0 $ARG: httpd not running, trying to start"
diff --git a/www/apache/patches/patch-ai b/www/apache/patches/patch-ai
deleted file mode 100644
index 788add41349..00000000000
--- a/www/apache/patches/patch-ai
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ai,v 1.12 2013/03/02 17:52:33 joerg Exp $
-
---- src/support/apxs.pl.orig	2008-02-23 04:22:56.000000000 +0000
-+++ src/support/apxs.pl
-@@ -371,11 +371,7 @@ if ($opt_c) {
-     $opt = '';
-     my ($opt_Wl, $opt_L, $opt_l);
-     foreach $opt_Wl (@opt_W) {
--        if ($CFG_LD_SHLIB !~ m/gcc$/) {
--            $opt .= " $1" if ($opt_Wl =~ m|^\s*l,(.*)$|);
--        } else {
--            $opt .= " -W$opt_Wl";
--        }
-+        $opt .= " -W$opt_Wl";
-     }
-     foreach $opt_L (@opt_L) {
-         if ($^O ne "MSWin32") {
-@@ -424,8 +420,7 @@ if ($opt_i or $opt_e) {
-         if ($^O ne "MSWin32") {
-             $t =~ s|^.+/([^/]+)$|$1|;
-             if ($opt_i) {
--                push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
--                push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-+                push(@cmds, "@INSTALL@ $f $CFG_LIBEXECDIR/$t");
-             }
-         }
- 	else {
diff --git a/www/apache/patches/patch-aj b/www/apache/patches/patch-aj
deleted file mode 100644
index a219ca40b14..00000000000
--- a/www/apache/patches/patch-aj
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aj,v 1.8 2004/10/29 13:48:31 abs Exp $
-
---- htdocs/index.html.fr.orig	2001-06-27 09:38:39.000000000 +0100
-+++ htdocs/index.html.fr
-@@ -36,12 +36,28 @@ site et ne peut intervenir sur sa config
- <hr width="50%" size="8">
- 
- <p>La <a href="manual/">documentation</a> Apache est incluse dans cette
--distribution.</p>
-+distribution. Si l'extension SSL <STRONG>mod_ssl</STRONG> a \xe9t\xe9
-+install\xe9e, lisez alors attentivement la 
-+<a href="manual/mod/mod_ssl/index.html">documentation SSL</a>.</p>
-+  
-+<p>Des informations sur le syst\xe8me d'exploitation multi-plateforme NetBSD
-+peuvent &ecirc;tre trouv\xe9es sur
-+<a href="http://www.netbsd.org/">la homepage du projet NetBSD</a>.</p> 
-+  
-+<p>Le webmaster de ce site peut librement utiliser les images ci-dessous sur u
- 
--<p>Le webmaster de ce site peut librement utiliser l'image ci-dessous sur un
--site web utilisant le logiciel Apache. Merci d'avoir choisi Apache&nbsp;!</p>
-+site web utilisant les logiciels Apache et NetBSD. Merci d'avoir choisi
-+<a href="http://www.apache.org/">Apache</a> sur
-+<a href="http://www.netbsd.org/">NetBSD</a>&nbsp;!</p>
- 
--<div align="CENTER"><img src="apache_pb.gif" alt=""></div>
-+<div align="CENTER">
-+ <a href="http://www.apache.org/">
-+  <img src="apache_pb.gif" BORDER="0" alt="Powered by Apache">
-+ </a>
-+ <a href="http://www.netbsd.org/">
-+  <img src="sitedrivenby.gif" BORDER="0" alt="Site driven by NetBSD">
-+ </a>
-+</div>
- 
- </body>
- </html>
diff --git a/www/apache/patches/patch-ak b/www/apache/patches/patch-ak
deleted file mode 100644
index 73dfc6b77d1..00000000000
--- a/www/apache/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.7 2004/11/26 18:52:47 jlam Exp $
-
---- src/Makefile.tmpl.orig	2004-11-26 04:47:20.000000000 -0500
-+++ src/Makefile.tmpl
-@@ -1,8 +1,8 @@
- 
--CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
--LIBS=$(EXTRA_LIBS) $(LIBS1)
-+CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) $(DL_CFLAGS)
-+LIBS=$(EXTRA_LIBS) $(LIBS1) $(DL_LIBS)
- INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
--LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-+LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) $(LINK_LIBGCC_LDFLAGS) $(DL_LDFLAGS)
- 
- OBJS= \
-   modules.o \
diff --git a/www/apache/patches/patch-al b/www/apache/patches/patch-al
deleted file mode 100644
index 5871e8005fc..00000000000
--- a/www/apache/patches/patch-al
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-al,v 1.10 2012/05/29 20:23:12 joerg Exp $
-
---- src/Configure.orig	2008-02-23 04:22:55.000000000 +0000
-+++ src/Configure
-@@ -466,6 +466,14 @@ case "$PLAT" in
- 	DBM_LIB=""
- 	DB_LIB=""
- 	;;
-+    *-dragonfly*)
-+	OS="DragonFly"
-+	DEF_WANTHSREGEX=no
-+	CFLAGS="$CFLAGS -funsigned-char"
-+	LIBS="$LIBS -lcrypt"
-+	DBM_LIB=""
-+	DB_LIB=""
-+	;;
-     *-openbsd*)
- 	OS='OpenBSD'
- 	DBM_LIB=""
-@@ -1111,15 +1119,19 @@ if [ "x$using_shlib" = "x1" ] ; then
- 	    esac
- 	    LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
- 	    ;;
-+	*-dragonfly*)
-+	    LD_SHLIB="gcc"
-+	    CFLAGS_SHLIB="-fPIC -DPIC"
-+	    LDFLAGS_SHLIB="-shared"
-+	    LDFLAGS_SHLIB_EXPORT="-Wl,-E"
-+	    LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
-+	    SHLIB_SUFFIX_DEPTH=2
-+	    ;;
- 	*-netbsd*)
-+	    LD_SHLIB="cc"
- 	    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
-+	    LDFLAGS_SHLIB="-shared"
-+	    LDFLAGS_SHLIB_EXPORT="-Wl,-E"
- 	    LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
- 	    SHLIB_SUFFIX_DEPTH=2
- 	    ;;
diff --git a/www/apache/patches/patch-am b/www/apache/patches/patch-am
deleted file mode 100644
index c3db87a26ea..00000000000
--- a/www/apache/patches/patch-am
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-am,v 1.9 2008/02/23 05:16:34 obache Exp $
-
---- src/include/ap_config.h.orig	2006-07-12 08:16:05.000000000 +0000
-+++ src/include/ap_config.h
-@@ -700,8 +700,8 @@ extern char *crypt();
- #undef NO_SETSID
- #define HAVE_SYSLOG 1
- 
--#elif defined(__FreeBSD__) || defined(__bsdi__)
--#if defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <osreldate.h>
- #endif
- #define HAVE_GMTOFF 1
-@@ -1305,7 +1305,7 @@ extern int ap_execve(const char *filenam
-  * so we don't have to.  Sigh...
-  */
- 
--#if defined(CRAY) || (defined(__arm) && !defined(LINUX))
-+#if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(NETBSD)))
- #ifdef __STDC__
- #define XtOffset(p_type,field) _Offsetof(p_type,field)
- #else
diff --git a/www/apache/patches/patch-an b/www/apache/patches/patch-an
deleted file mode 100644
index d0742970868..00000000000
--- a/www/apache/patches/patch-an
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-an,v 1.6 2007/10/07 20:49:57 dmcmahill Exp $
-
---- src/modules/standard/mod_auth_db.module.orig	2004-11-24 14:10:19.000000000 -0500
-+++ src/modules/standard/mod_auth_db.module
-@@ -1,37 +1,11 @@
- Name: db_auth_module
- ConfigStart
--    DB_VERSION=''
--    DB_LIB=''
--    if ./helpers/TestCompile func db_create; then
--        DB_VERSION='Berkeley-DB/3.x'
--    elif ./helpers/TestCompile lib db db_create; then
--        DB_VERSION='Berkeley-DB/3.x'
--        DB_LIB='-ldb'
--    elif ./helpers/TestCompile func db_open; then
--        DB_VERSION='Berkeley-DB/2.x'
--    elif ./helpers/TestCompile lib db db_open; then
--        DB_VERSION='Berkeley-DB/2.x'
--        DB_LIB='-ldb'
--    elif ./helpers/TestCompile lib db2 db_open; then
--        DB_VERSION='Berkeley-DB/2.x'
--        DB_LIB='-ldb2'
--    elif ./helpers/TestCompile func dbopen; then
--        DB_VERSION='Berkeley-DB/1.x'
--    elif ./helpers/TestCompile lib db dbopen; then
--        DB_VERSION='Berkeley-DB/1.x'
--        DB_LIB='-ldb'
--    elif ./helpers/TestCompile lib db1 dbopen; then
--        DB_VERSION='Berkeley-DB/1.x'
--        DB_LIB='-ldb1'
--    elif TCADDINCL='#include <db.h>' INCLUDES1="$INCLUDES1 -I/usr/include/db1" TLIB="-ldb1" \
--         helpers/TestCompile func dbm_open; then
--        # For Red Hat 7
--        DB_VERSION='Berkeley-DB/1.x'
--        DB_LIB='-ldb1'
--        CFLAGS="$CFLAGS -I/usr/include/db1"
--    fi
--    if [ ".$DB_VERSION" != . ]; then
--        if [ ".$DB_LIB" != . ]; then
-+    DB_VERSION=@DB_VERSION@
-+    DB_LIB=@DB_LIB@
-+    CFLAGS="$CFLAGS @DB_CFLAGS@"
-+
-+    if [ ".$DB_VERSION" != "" ]; then
-+        if [ ".$DB_LIB" != "" ]; then
-             LIBS="$LIBS $DB_LIB"
-             echo "      using $DB_VERSION for mod_auth_db ($DB_LIB)"
-         else
diff --git a/www/apache/patches/patch-ao b/www/apache/patches/patch-ao
deleted file mode 100644
index dd31483e932..00000000000
--- a/www/apache/patches/patch-ao
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.4 2008/02/23 05:16:34 obache Exp $
-
---- configure.orig	2008-02-23 04:22:56.000000000 +0000
-+++ configure
-@@ -186,6 +186,8 @@ if [ ! -f "$SHELL" ]; then
-     fi
- fi
- 
-+BINOWN=${BINOWN:-root}
-+BINGRP=${BINGRP:-wheel}
- ##
- ##  determine default parameters
- ##
-@@ -1259,6 +1261,8 @@ sed <Makefile.tmpl >$mkf \
- -e "s%@PLATFORM@%$PLATFORM%g" \
- -e "s%@PERL@%$PERL%g" \
- -e "s%@TAR@%$TAR%g" \
-+-e "s%@BINOWN@%$BINOWN%g" \
-+-e "s%@BINGRP@%$BINGRP%g" \
- -e "s%@TAROPT@%$TAROPT%g" \
- -e "s%@SRC@%$src%g" \
- -e "s%@MKF@%$mkf%g" \
diff --git a/www/apache/patches/patch-aq b/www/apache/patches/patch-aq
deleted file mode 100644
index e651d7744bc..00000000000
--- a/www/apache/patches/patch-aq
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aq,v 1.6 2008/02/23 05:16:34 obache Exp $
-
---- src/helpers/GuessOS.orig	2006-07-12 08:16:05.000000000 +0000
-+++ src/helpers/GuessOS
-@@ -173,6 +173,9 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
- 	FREEBSDVERS=`echo ${RELEASE}|sed -e 's/[-(].*//'`
- 	echo "${MACHINE}-whatever-freebsd${FREEBSDVERS}"; exit 0
- 	;;
-+    DragonFly:*)
-+	echo "${MACHINE}-whatever-dragonfly"; exit 0
-+	;;
- 
-     NetBSD:*:*:*486*)
- 	echo "i486-whatever-netbsd"; exit 0
diff --git a/www/apache/patches/patch-ar b/www/apache/patches/patch-ar
deleted file mode 100644
index 44677b648a3..00000000000
--- a/www/apache/patches/patch-ar
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ar,v 1.9 2009/07/25 19:55:11 roy Exp $
-
-Avoid collision with system getline(3).
-
---- src/support/htdigest.c.orig	2009-07-25 20:49:46.000000000 +0100
-+++ src/support/htdigest.c	2009-07-25 20:50:01.000000000 +0100
-@@ -71,7 +71,7 @@
-     while ((line[y++] = line[x++]));
- }
- 
--static int getline(char *s, int n, FILE *f)
-+static int get_line(char *s, int n, FILE *f)
- {
-     register int i = 0;
- 
-@@ -158,7 +158,7 @@
- {
-     static char line[MAX_STRING_LEN];
- 
--    while (!(getline(line, MAX_STRING_LEN, source))) {  
-+    while (!(get_line(line, MAX_STRING_LEN, source))) {  
- 	putline(target, line);
-     }
- }
-@@ -216,7 +216,7 @@
-     ap_cpystrn(realm, argv[2], sizeof(realm));
- 
-     found = 0;
--    while (!(getline(line, MAX_STRING_LEN, f))) {
-+    while (!(get_line(line, MAX_STRING_LEN, f))) {
- 	if (found || (line[0] == '#') || (!line[0])) {
- 	    putline(tfp, line);
- 	    continue;
diff --git a/www/apache/patches/patch-as b/www/apache/patches/patch-as
deleted file mode 100644
index 4666c48cc5c..00000000000
--- a/www/apache/patches/patch-as
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-as,v 1.9 2009/07/25 19:55:11 roy Exp $
-
-Avoid collision with system getline(3).
-
---- src/support/htpasswd.c.orig	2009-07-25 20:50:15.000000000 +0100
-+++ src/support/htpasswd.c	2009-07-25 20:50:27.000000000 +0100
-@@ -98,7 +98,7 @@
-  * Get a line of input from the user, not including any terminating
-  * newline.
-  */
--static int getline(char *s, int n, FILE *f)
-+static int get_line(char *s, int n, FILE *f)
- {
-     register int i = 0;
- 
-@@ -547,7 +547,7 @@
- 	char scratch[MAX_STRING_LEN];
- 
- 	fpw = fopen(pwfilename, "r");
--	while (! (getline(line, sizeof(line), fpw))) {
-+	while (! (get_line(line, sizeof(line), fpw))) {
- 	    char *colon;
- 
- 	    if ((line[0] == '#') || (line[0] == '\0')) {
diff --git a/www/apache/patches/patch-at b/www/apache/patches/patch-at
deleted file mode 100644
index 5f386c6c688..00000000000
--- a/www/apache/patches/patch-at
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-at,v 1.1 2009/07/25 19:55:11 roy Exp $
-
-Avoid collision with system getline(3).
-
---- src/support/logresolve.c.orig	2009-07-25 20:50:40.000000000 +0100
-+++ src/support/logresolve.c	2009-07-25 20:50:51.000000000 +0100
-@@ -71,7 +71,7 @@
- #endif /* !MPE && !WIN32*/
- 
- static void cgethost(struct in_addr ipnum, char *string, int check);
--static int getline(char *s, int n);
-+static int get_line(char *s, int n);
- static void stats(FILE *output);
- 
- 
-@@ -278,7 +278,7 @@
-  * gets a line from stdin
-  */
- 
--static int getline (char *s, int n)
-+static int get_line (char *s, int n)
- {
-     char *cp;
- 
-@@ -326,7 +326,7 @@
-     for (i = 0; i < MAX_ERR + 2; i++)
- 	errors[i] = 0;
- 
--    while (getline(line, MAXLINE)) {
-+    while (get_line(line, MAXLINE)) {
- 	if (line[0] == '\0')
- 	    continue;
- 	entries++;
diff --git a/www/apache/patches/patch-au b/www/apache/patches/patch-au
deleted file mode 100644
index 661c78c4986..00000000000
--- a/www/apache/patches/patch-au
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-au,v 1.1 2011/08/04 11:45:20 joerg Exp $
-
---- src/os/unix/os.h.orig	2011-08-03 12:02:43.000000000 +0000
-+++ src/os/unix/os.h
-@@ -33,7 +33,11 @@
- /* Compiler supports inline, so include the inlineable functions as
-  * part of the header
-  */
-+#if defined(__GNUC_STDC_INLINE__) && __GNUC_STDC_INLINE__
-+#define INLINE ap_inline
-+#else
- #define INLINE extern ap_inline
-+#endif
- 
- INLINE int ap_os_is_path_absolute(const char *file);
- 
diff --git a/www/apache2/DESCR b/www/apache2/DESCR
deleted file mode 100644
index 529e64429cd..00000000000
--- a/www/apache2/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-The Apache HTTP Server Project is an effort to develop and maintain an
-open-source HTTP server for various modern desktop and server operating
-systems, such as UNIX and Windows NT.  The goal of this project is to
-provide a secure, efficient and extensible server which provides HTTP
-services in sync with the current HTTP standards.
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
deleted file mode 100644
index bc829146bcd..00000000000
--- a/www/apache2/Makefile
+++ /dev/null
@@ -1,253 +0,0 @@
-# $NetBSD: Makefile,v 1.148 2014/05/29 23:37:56 wiz Exp $
-
-.include "Makefile.common"
-
-PKGNAME=	apache-${APACHE_VERSION}
-PKGREVISION=	3
-CATEGORIES=	www
-
-HOMEPAGE=	http://httpd.apache.org/
-COMMENT=	Apache HTTP (Web) server, version 2
-LICENSE=	apache-2.0
-
-CONFLICTS=	apache-*ssl-[0-9]* apache6-[0-9]*
-
-BUILD_DEFS+=	IPV6_READY
-BUILD_DEFS+=	VARBASE
-
-USE_TOOLS+=		pax perl perl:run pkg-config
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-layout=NetBSD
-CONFIGURE_ARGS+=	--with-port=80
-CONFIGURE_ARGS+=	--enable-so
-CONFIGURE_ENV+=		perlbin=${PERL5:Q}
-
-# Apache Portable Runtime library configure options
-CONFIGURE_ARGS+=	--with-apr=${BUILDLINK_PREFIX.apr}
-CONFIGURE_ARGS+=	--with-apr-util=${BUILDLINK_PREFIX.apr}
-
-.include "../../devel/apr0/buildlink3.mk"
-BUILDLINK_API_DEPENDS.apr+=	apr>=0.9.12.2.0.58
-
-# the following must be set before bsd.prefs.mk in order to make += work
-# in mk.conf; however, it isn't expanded until referenced, so we can
-# define DFLT_APACHE_MODULES later
-#
-APACHE_MODULES?=	${DFLT_APACHE_MODULES}
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-
-# Set the "Multi-Processing Model" used by Apache to handle requests.
-# Valid values are:
-#	prefork		non-threaded, pre-forking web server
-#	worker		hybrid multi-threaded multi-process web server
-#
-APACHE_MPM?=		prefork
-CONFIGURE_ARGS+=	--with-mpm=${APACHE_MPM:Q}
-BUILD_DEFS+=		APACHE_MPM
-PLIST_VARS+=		mpm-prefork mpm-worker
-PLIST.${APACHE_MPM}=	yes
-
-CONFIGURE_ARGS+=	--disable-access
-CONFIGURE_ARGS+=	--disable-auth
-CONFIGURE_ARGS+=	--disable-include
-CONFIGURE_ARGS+=	--disable-log-config
-CONFIGURE_ARGS+=	--disable-env
-CONFIGURE_ARGS+=	--disable-mime
-CONFIGURE_ARGS+=	--disable-setenvif
-CONFIGURE_ARGS+=	--disable-status
-CONFIGURE_ARGS+=	--disable-autoindex
-CONFIGURE_ARGS+=	--disable-asis
-CONFIGURE_ARGS+=	--disable-cgi
-CONFIGURE_ARGS+=	--disable-negotiation
-CONFIGURE_ARGS+=	--disable-dir
-CONFIGURE_ARGS+=	--disable-imap
-CONFIGURE_ARGS+=	--disable-actions
-CONFIGURE_ARGS+=	--disable-userdir
-CONFIGURE_ARGS+=	--disable-alias
-
-DFLT_APACHE_MODULES=	all
-DFLT_APACHE_MODULES+=	proxy proxy_connect proxy_ftp proxy_http
-DFLT_APACHE_MODULES+=	ssl deflate
-DFLT_APACHE_MODULES+=	access auth include log_config env mime setenvif
-DFLT_APACHE_MODULES+=	status autoindex asis cgi negotiation dir imap
-DFLT_APACHE_MODULES+=	actions userdir alias
-
-# LDAP support
-.if !empty(PKG_BUILD_OPTIONS.apr:Mldap)
-DFLT_APACHE_MODULES+=	ldap auth_ldap
-.endif
-
-# APACHE_MODULES are the modules that are linked statically into the
-# apache httpd executable.
-#
-CONFIGURE_ARGS+=	--enable-modules=${APACHE_MODULES:Q}
-BUILD_DEFS+=		APACHE_MODULES
-
-APACHE_USER?=		www
-APACHE_GROUP?=		www
-PKG_GROUPS=		${APACHE_GROUP}
-PKG_USERS=		${APACHE_USER}:${APACHE_GROUP}
-PKG_GROUPS_VARS+=	APACHE_GROUP
-PKG_USERS_VARS+=	APACHE_USER
-
-PKG_SYSCONFVAR=		apache
-PKG_SYSCONFSUBDIR?=	httpd
-EGDIR=			${PREFIX}/share/examples/httpd
-SBINDIR=		${PREFIX}/sbin
-CONF_FILES=		${EGDIR}/httpd-std.conf ${PKG_SYSCONFDIR}/httpd.conf
-CONF_FILES+=		${EGDIR}/ssl-std.conf ${PKG_SYSCONFDIR}/ssl.conf
-CONF_FILES+=		${SBINDIR}/envvars-std ${SBINDIR}/envvars
-CONF_FILES+=		${EGDIR}/magic ${PKG_SYSCONFDIR}/magic
-CONF_FILES+=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-RCD_SCRIPTS=		apache
-
-REQD_DIRS=		${PREFIX}/share/httpd
-REQD_DIRS+=		${PREFIX}/share/httpd/htdocs
-OWN_DIRS=	${VARBASE}/log/httpd
-OWN_DIRS+=		${VARBASE}/db/httpd
-OWN_DIRS_PERMS+=	${VARBASE}/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
-FIX_PERMS=		apachectl apxs dbmmanage envvars-std mkcert
-FIX_MAN_PERMS=		man1/htdbm.1 man1/htpasswd.1 man1/htdigest.1
-FIX_MAN_PERMS+=		man1/dbmmanage.1 man8/httpd.8 man8/suexec.8
-FIX_MAN_PERMS+=		man8/rotatelogs.8 man8/logresolve.8 man8/apxs.8
-FIX_MAN_PERMS+=		man8/apachectl.8 man8/ab.8
-
-# Fix paths in the apache manpages.
-SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-patch
-SUBST_FILES.man=	docs/man/*.1 docs/man/*.8
-SUBST_SED.man=		-e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},'
-SUBST_SED.man+=		-e 's,/path/to/apache/etc,${PKG_SYSCONFDIR},'
-SUBST_SED.man+=		-e 's,/usr/local/apache2,${PREFIX}/share/httpd/htdocs,'
-SUBST_SED.man+=		-e 's,/usr/web,${PREFIX}/share/httpd/htdocs,'
-
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	config.layout
-SUBST_SED.paths=	-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_SED.paths+=	-e "s|@VARBASE@|${VARBASE}|g"
-SUBST_SED.paths+=	-e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
-SUBST_MESSAGE.paths=	Fixing paths.
-
-SUBST_CLASSES+=		apr-lt
-SUBST_STAGE.apr-lt=	post-configure
-SUBST_FILES.apr-lt=	build/config_vars.mk
-SUBST_SED.apr-lt=	-e 's|^\(LIBTOOL =\) [^ ]*|\1 $$(SHELL) $$(top_builddir)/build/libtool|g'
-SUBST_MESSAGE.apr-lt=	Fixing libtool references.
-
-SUBST_CLASSES+=		confs
-SUBST_STAGE.confs=	post-configure
-SUBST_MESSAGE.confs=	Fixing configuration files.
-SUBST_FILES.confs=	docs/conf/highperformance-std.conf
-SUBST_FILES.confs+=	docs/conf/httpd-std.conf
-SUBST_FILES.confs+=	docs/conf/ssl-std.conf
-SUBST_SED.confs=	-e "s|${EGDIR}|${PKG_SYSCONFDIR}|g"
-SUBST_SED.confs+=	-e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g"
-SUBST_SED.confs+=	-e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g"
-SUBST_SED.confs+=	-e "s|logs/|${VARBASE}/log/httpd/|g"
-SUBST_SED.confs+=	-e 's|/var/log/httpd/foo\.log|logs/foo.log/|g'
-SUBST_SED.confs+=	-e 's|^\(User[	 ]\).*|\1${APACHE_USER}|g'
-SUBST_SED.confs+=	-e 's|^\(Group[	 ]\).*|\1${APACHE_GROUP}|g'
-
-# abs_srcdir in config_vars.mk is used during install so needs to reference
-# the work dir path, and by other packages such as ap2-fastcgi after install,
-# so we fix after install to reference the installed path
-SUBST_CLASSES+=		abs_srcdir
-SUBST_STAGE.abs_srcdir=	post-install
-SUBST_FILES.abs_srcdir=	${DESTDIR}${PREFIX}/share/httpd/build/config_vars.mk
-SUBST_SED.abs_srcdir=	-e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|'
-SUBST_MESSAGE.abs_srcdir=	Fixing abs_srcdir
-
-REPLACE_PERL=		docs/cgi-examples/printenv
-
-.include "options.mk"
-
-# Add dependencies for the modules that will be built.  For each module
-# ap_mod listed in ${APACHE_MODULES}, _AP_DEPENDS.ap_mod is a whitespace
-# separated list of dependencies or buildlink3.mk files needed to build
-# ap_mod, and _AP_CFG_ARGS.ap_mod is a whitespace separated list of
-# configure script options for ap_mod.
-#
-AP_DEPENDS.ssl=	../../security/openssl/buildlink3.mk
-AP_DEPENDS.deflate=	../../devel/zlib/buildlink3.mk
-
-AP_CFG_ARGS.ssl=	--with-ssl=${BUILDLINK_PREFIX.openssl}
-AP_CFG_ARGS.deflate=	--with-z=${BUILDLINK_PREFIX.zlib}
-
-.for ap_mod in ${APACHE_MODULES}
-.  if defined(AP_DEPENDS.${ap_mod}) && !empty(AP_DEPENDS.${ap_mod})
-.    for ap_depend in ${AP_DEPENDS.${ap_mod}}
-.      if exists(${ap_depend})
-.        include "${ap_depend}"
-.      else
-DEPENDS+=		${ap_depend}
-.      endif
-.    endfor
-.  endif
-.  if defined(AP_CFG_ARGS.${ap_mod}) && !empty(AP_CFG_ARGS.${ap_mod})
-CONFIGURE_ARGS+=	${AP_CFG_ARGS.${ap_mod}}
-.  endif
-.endfor
-
-post-extract:
-	${TOUCH} ${WRKSRC}/build/libtool
-
-post-build:
-	${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g"			\
-		< ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert
-
-INSTALLATION_DIRS+=	share/httpd/manual
-
-pre-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}				\
-		${MAKE_PROGRAM} install-conf sysconfdir="${EGDIR}" \
-		    DESTDIR=${DESTDIR}
-
-post-install:
-	${LN} -sf ../../../libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
-	cd ${DESTDIR}${EGDIR} &&					\
-	for file in							\
-		highperformance-std.conf				\
-		httpd-std.conf						\
-		ssl-std.conf;						\
-	do								\
-		${AWK} '						\
-			/^Listen[ 	]*80/	{			\
-				printf "%s", "Listen 0.0.0.0:80\n";	\
-				next;					\
-			}						\
-			/^Listen[ 	]*443/	{			\
-				printf "%s", "Listen 0.0.0.0:443\n";	\
-				next;					\
-			}						\
-			{ print; }					\
-			' < "$${file}" >> $${file}.new;			\
-		${MV} -f $${file}.new $${file};				\
-	done
-
-	cd ${WRKSRC}/docs/manual && pax -rw . ${DESTDIR}${PREFIX}/share/httpd/manual
-
-	${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin
-
-	for file in ${FIX_PERMS}; do \
-		${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/$$file && \
-		${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/$$file; \
-	done
-
-	${CHOWN} -RP ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd
-	${CHOWN} -RP ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd
-	${CHOWN} -RP ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd
-	${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi
-	${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv
-
-	for file in ${FIX_MAN_PERMS}; do \
-		${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/$$file; \
-	done
-
-	${INSTALL_SCRIPT} ${WRKSRC}/build/mkdir.sh ${DESTDIR}${PREFIX}/share/httpd/build
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common
deleted file mode 100644
index e05bb7b96cd..00000000000
--- a/www/apache2/Makefile.common
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile.common,v 1.29 2013/08/04 02:45:42 obache Exp $
-
-# used by devel/apr0/Makefile
-
-DISTNAME=		httpd-${APACHE_VERSION}
-EXTRACT_SUFX=		.tar.bz2
-# When updating this version be sure to update the checksum and remove
-# any PKGREVISION for devel/apr also.
-APACHE_VERSION=		2.0.65
-APR_VERSION=		0.9.20
-MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
-			${MASTER_SITE_APACHE:=httpd/old/}
-MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
deleted file mode 100644
index 05d48ec061e..00000000000
--- a/www/apache2/PLIST
+++ /dev/null
@@ -1,1080 +0,0 @@
-@comment $NetBSD: PLIST,v 1.40 2014/03/11 14:05:17 jperkin Exp $
-include/httpd/ap_compat.h
-include/httpd/ap_config.h
-include/httpd/ap_config_auto.h
-include/httpd/ap_config_layout.h
-include/httpd/ap_listen.h
-include/httpd/ap_mmn.h
-include/httpd/ap_mpm.h
-include/httpd/ap_provider.h
-include/httpd/ap_regkey.h
-include/httpd/ap_release.h
-${PLIST.mpm-worker}include/httpd/fdqueue.h
-include/httpd/http_config.h
-include/httpd/http_connection.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/mod_cgi.h
-include/httpd/mod_core.h
-include/httpd/mod_dav.h
-include/httpd/mod_include.h
-include/httpd/mod_log_config.h
-include/httpd/mod_proxy.h
-include/httpd/mod_ssl.h
-include/httpd/mod_status.h
-include/httpd/mpm.h
-include/httpd/mpm_common.h
-include/httpd/mpm_default.h
-include/httpd/os.h
-include/httpd/pcre.h
-include/httpd/pcreposix.h
-${PLIST.mpm-worker}include/httpd/pod.h
-include/httpd/rfc1413.h
-include/httpd/scoreboard.h
-include/httpd/ssl_expr.h
-include/httpd/ssl_expr_parse.h
-include/httpd/ssl_toolkit_compat.h
-include/httpd/ssl_util_ssl.h
-include/httpd/ssl_util_table.h
-include/httpd/unixd.h
-include/httpd/util_cfgtree.h
-include/httpd/util_charset.h
-include/httpd/util_ebcdic.h
-include/httpd/util_filter.h
-include/httpd/util_ldap.h
-include/httpd/util_md5.h
-include/httpd/util_script.h
-include/httpd/util_time.h
-include/httpd/util_xml.h
-lib/httpd/httpd.exp
-libexec/cgi-bin/printenv
-libexec/cgi-bin/test-cgi
-man/man1/dbmmanage.1
-man/man1/htdbm.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
-man/man8/suexec.8
-sbin/ab
-sbin/apachectl
-sbin/apxs
-sbin/checkgid
-sbin/dbmmanage
-sbin/envvars-std
-sbin/htdbm
-sbin/htdigest
-sbin/htpasswd
-sbin/httpd
-sbin/httxt2dbm
-sbin/logresolve
-sbin/mkcert
-sbin/rotatelogs
-${PLIST.suexec}sbin/suexec
-share/examples/httpd/highperformance-std.conf
-share/examples/httpd/httpd-std.conf
-share/examples/httpd/magic
-share/examples/httpd/mime.types
-share/examples/httpd/ssl-std.conf
-share/httpd/build/config.nice
-share/httpd/build/config_vars.mk
-share/httpd/build/instdso.sh
-share/httpd/build/library.mk
-share/httpd/build/libtool
-share/httpd/build/ltlib.mk
-share/httpd/build/mkdir.sh
-share/httpd/build/program.mk
-share/httpd/build/rules.mk
-share/httpd/build/special.mk
-share/httpd/error/HTTP_BAD_GATEWAY.html.var
-share/httpd/error/HTTP_BAD_REQUEST.html.var
-share/httpd/error/HTTP_FORBIDDEN.html.var
-share/httpd/error/HTTP_GONE.html.var
-share/httpd/error/HTTP_INTERNAL_SERVER_ERROR.html.var
-share/httpd/error/HTTP_LENGTH_REQUIRED.html.var
-share/httpd/error/HTTP_METHOD_NOT_ALLOWED.html.var
-share/httpd/error/HTTP_NOT_FOUND.html.var
-share/httpd/error/HTTP_NOT_IMPLEMENTED.html.var
-share/httpd/error/HTTP_PRECONDITION_FAILED.html.var
-share/httpd/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-share/httpd/error/HTTP_REQUEST_TIME_OUT.html.var
-share/httpd/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-share/httpd/error/HTTP_SERVICE_UNAVAILABLE.html.var
-share/httpd/error/HTTP_UNAUTHORIZED.html.var
-share/httpd/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-share/httpd/error/HTTP_VARIANT_ALSO_VARIES.html.var
-share/httpd/error/README
-share/httpd/error/contact.html.var
-share/httpd/error/include/bottom.html
-share/httpd/error/include/spacer.html
-share/httpd/error/include/top.html
-share/httpd/htdocs/apache_pb.gif
-share/httpd/htdocs/apache_pb.png
-share/httpd/htdocs/apache_pb2.gif
-share/httpd/htdocs/apache_pb2.png
-share/httpd/htdocs/apache_pb2_ani.gif
-share/httpd/htdocs/index.html.ca
-share/httpd/htdocs/index.html.cz.iso8859-2
-share/httpd/htdocs/index.html.de
-share/httpd/htdocs/index.html.dk
-share/httpd/htdocs/index.html.ee
-share/httpd/htdocs/index.html.el
-share/httpd/htdocs/index.html.en
-share/httpd/htdocs/index.html.es
-share/httpd/htdocs/index.html.et
-share/httpd/htdocs/index.html.fr
-share/httpd/htdocs/index.html.he.iso8859-8
-share/httpd/htdocs/index.html.hr.iso8859-2
-share/httpd/htdocs/index.html.it
-share/httpd/htdocs/index.html.ja.iso2022-jp
-share/httpd/htdocs/index.html.ko.euc-kr
-share/httpd/htdocs/index.html.lb.utf8
-share/httpd/htdocs/index.html.nl
-share/httpd/htdocs/index.html.nn
-share/httpd/htdocs/index.html.no
-share/httpd/htdocs/index.html.po.iso8859-2
-share/httpd/htdocs/index.html.pt
-share/httpd/htdocs/index.html.pt-br
-share/httpd/htdocs/index.html.ru.cp-1251
-share/httpd/htdocs/index.html.ru.cp866
-share/httpd/htdocs/index.html.ru.iso-ru
-share/httpd/htdocs/index.html.ru.koi8-r
-share/httpd/htdocs/index.html.ru.utf8
-share/httpd/htdocs/index.html.sv
-share/httpd/htdocs/index.html.var
-share/httpd/htdocs/index.html.zh-cn.gb2312
-share/httpd/htdocs/index.html.zh-tw.big5
-share/httpd/icons/README
-share/httpd/icons/README.html
-share/httpd/icons/a.gif
-share/httpd/icons/a.png
-share/httpd/icons/alert.black.gif
-share/httpd/icons/alert.black.png
-share/httpd/icons/alert.red.gif
-share/httpd/icons/alert.red.png
-share/httpd/icons/apache_pb.gif
-share/httpd/icons/apache_pb.png
-share/httpd/icons/apache_pb2.gif
-share/httpd/icons/apache_pb2.png
-share/httpd/icons/apache_pb2_ani.gif
-share/httpd/icons/back.gif
-share/httpd/icons/back.png
-share/httpd/icons/ball.gray.gif
-share/httpd/icons/ball.gray.png
-share/httpd/icons/ball.red.gif
-share/httpd/icons/ball.red.png
-share/httpd/icons/binary.gif
-share/httpd/icons/binary.png
-share/httpd/icons/binhex.gif
-share/httpd/icons/binhex.png
-share/httpd/icons/blank.gif
-share/httpd/icons/blank.png
-share/httpd/icons/bomb.gif
-share/httpd/icons/bomb.png
-share/httpd/icons/box1.gif
-share/httpd/icons/box1.png
-share/httpd/icons/box2.gif
-share/httpd/icons/box2.png
-share/httpd/icons/broken.gif
-share/httpd/icons/broken.png
-share/httpd/icons/burst.gif
-share/httpd/icons/burst.png
-share/httpd/icons/c.gif
-share/httpd/icons/c.png
-share/httpd/icons/comp.blue.gif
-share/httpd/icons/comp.blue.png
-share/httpd/icons/comp.gray.gif
-share/httpd/icons/comp.gray.png
-share/httpd/icons/compressed.gif
-share/httpd/icons/compressed.png
-share/httpd/icons/continued.gif
-share/httpd/icons/continued.png
-share/httpd/icons/dir.gif
-share/httpd/icons/dir.png
-share/httpd/icons/diskimg.gif
-share/httpd/icons/diskimg.png
-share/httpd/icons/down.gif
-share/httpd/icons/down.png
-share/httpd/icons/dvi.gif
-share/httpd/icons/dvi.png
-share/httpd/icons/f.gif
-share/httpd/icons/f.png
-share/httpd/icons/folder.gif
-share/httpd/icons/folder.open.gif
-share/httpd/icons/folder.open.png
-share/httpd/icons/folder.png
-share/httpd/icons/folder.sec.gif
-share/httpd/icons/folder.sec.png
-share/httpd/icons/forward.gif
-share/httpd/icons/forward.png
-share/httpd/icons/generic.gif
-share/httpd/icons/generic.png
-share/httpd/icons/generic.red.gif
-share/httpd/icons/generic.red.png
-share/httpd/icons/generic.sec.gif
-share/httpd/icons/generic.sec.png
-share/httpd/icons/hand.right.gif
-share/httpd/icons/hand.right.png
-share/httpd/icons/hand.up.gif
-share/httpd/icons/hand.up.png
-share/httpd/icons/icon.sheet.gif
-share/httpd/icons/icon.sheet.png
-share/httpd/icons/image1.gif
-share/httpd/icons/image1.png
-share/httpd/icons/image2.gif
-share/httpd/icons/image2.png
-share/httpd/icons/image3.gif
-share/httpd/icons/image3.png
-share/httpd/icons/index.gif
-share/httpd/icons/index.png
-share/httpd/icons/layout.gif
-share/httpd/icons/layout.png
-share/httpd/icons/left.gif
-share/httpd/icons/left.png
-share/httpd/icons/link.gif
-share/httpd/icons/link.png
-share/httpd/icons/movie.gif
-share/httpd/icons/movie.png
-share/httpd/icons/p.gif
-share/httpd/icons/p.png
-share/httpd/icons/patch.gif
-share/httpd/icons/patch.png
-share/httpd/icons/pdf.gif
-share/httpd/icons/pdf.png
-share/httpd/icons/pie0.gif
-share/httpd/icons/pie0.png
-share/httpd/icons/pie1.gif
-share/httpd/icons/pie1.png
-share/httpd/icons/pie2.gif
-share/httpd/icons/pie2.png
-share/httpd/icons/pie3.gif
-share/httpd/icons/pie3.png
-share/httpd/icons/pie4.gif
-share/httpd/icons/pie4.png
-share/httpd/icons/pie5.gif
-share/httpd/icons/pie5.png
-share/httpd/icons/pie6.gif
-share/httpd/icons/pie6.png
-share/httpd/icons/pie7.gif
-share/httpd/icons/pie7.png
-share/httpd/icons/pie8.gif
-share/httpd/icons/pie8.png
-share/httpd/icons/portal.gif
-share/httpd/icons/portal.png
-share/httpd/icons/ps.gif
-share/httpd/icons/ps.png
-share/httpd/icons/quill.gif
-share/httpd/icons/quill.png
-share/httpd/icons/right.gif
-share/httpd/icons/right.png
-share/httpd/icons/screw1.gif
-share/httpd/icons/screw1.png
-share/httpd/icons/screw2.gif
-share/httpd/icons/screw2.png
-share/httpd/icons/script.gif
-share/httpd/icons/script.png
-share/httpd/icons/small/back.gif
-share/httpd/icons/small/back.png
-share/httpd/icons/small/binary.gif
-share/httpd/icons/small/binary.png
-share/httpd/icons/small/binhex.gif
-share/httpd/icons/small/binhex.png
-share/httpd/icons/small/blank.gif
-share/httpd/icons/small/blank.png
-share/httpd/icons/small/broken.gif
-share/httpd/icons/small/broken.png
-share/httpd/icons/small/burst.gif
-share/httpd/icons/small/burst.png
-share/httpd/icons/small/comp1.gif
-share/httpd/icons/small/comp1.png
-share/httpd/icons/small/comp2.gif
-share/httpd/icons/small/comp2.png
-share/httpd/icons/small/compressed.gif
-share/httpd/icons/small/compressed.png
-share/httpd/icons/small/continued.gif
-share/httpd/icons/small/continued.png
-share/httpd/icons/small/dir.gif
-share/httpd/icons/small/dir.png
-share/httpd/icons/small/dir2.gif
-share/httpd/icons/small/dir2.png
-share/httpd/icons/small/doc.gif
-share/httpd/icons/small/doc.png
-share/httpd/icons/small/forward.gif
-share/httpd/icons/small/forward.png
-share/httpd/icons/small/generic.gif
-share/httpd/icons/small/generic.png
-share/httpd/icons/small/generic2.gif
-share/httpd/icons/small/generic2.png
-share/httpd/icons/small/generic3.gif
-share/httpd/icons/small/generic3.png
-share/httpd/icons/small/image.gif
-share/httpd/icons/small/image.png
-share/httpd/icons/small/image2.gif
-share/httpd/icons/small/image2.png
-share/httpd/icons/small/index.gif
-share/httpd/icons/small/index.png
-share/httpd/icons/small/key.gif
-share/httpd/icons/small/key.png
-share/httpd/icons/small/movie.gif
-share/httpd/icons/small/movie.png
-share/httpd/icons/small/patch.gif
-share/httpd/icons/small/patch.png
-share/httpd/icons/small/ps.gif
-share/httpd/icons/small/ps.png
-share/httpd/icons/small/rainbow.gif
-share/httpd/icons/small/rainbow.png
-share/httpd/icons/small/sound.gif
-share/httpd/icons/small/sound.png
-share/httpd/icons/small/sound2.gif
-share/httpd/icons/small/sound2.png
-share/httpd/icons/small/tar.gif
-share/httpd/icons/small/tar.png
-share/httpd/icons/small/text.gif
-share/httpd/icons/small/text.png
-share/httpd/icons/small/transfer.gif
-share/httpd/icons/small/transfer.png
-share/httpd/icons/small/unknown.gif
-share/httpd/icons/small/unknown.png
-share/httpd/icons/small/uu.gif
-share/httpd/icons/small/uu.png
-share/httpd/icons/sound1.gif
-share/httpd/icons/sound1.png
-share/httpd/icons/sound2.gif
-share/httpd/icons/sound2.png
-share/httpd/icons/sphere1.gif
-share/httpd/icons/sphere1.png
-share/httpd/icons/sphere2.gif
-share/httpd/icons/sphere2.png
-share/httpd/icons/tar.gif
-share/httpd/icons/tar.png
-share/httpd/icons/tex.gif
-share/httpd/icons/tex.png
-share/httpd/icons/text.gif
-share/httpd/icons/text.png
-share/httpd/icons/transfer.gif
-share/httpd/icons/transfer.png
-share/httpd/icons/unknown.gif
-share/httpd/icons/unknown.png
-share/httpd/icons/up.gif
-share/httpd/icons/up.png
-share/httpd/icons/uu.gif
-share/httpd/icons/uu.png
-share/httpd/icons/uuencoded.gif
-share/httpd/icons/uuencoded.png
-share/httpd/icons/world1.gif
-share/httpd/icons/world1.png
-share/httpd/icons/world2.gif
-share/httpd/icons/world2.png
-share/httpd/manual/LICENSE
-share/httpd/manual/bind.html
-share/httpd/manual/bind.html.en
-share/httpd/manual/bind.html.es
-share/httpd/manual/bind.html.fr
-share/httpd/manual/bind.html.ja.utf8
-share/httpd/manual/bind.html.ko.euc-kr
-share/httpd/manual/bind.html.tr.utf8
-share/httpd/manual/configuring.html
-share/httpd/manual/configuring.html.de
-share/httpd/manual/configuring.html.en
-share/httpd/manual/configuring.html.fr
-share/httpd/manual/configuring.html.ja.utf8
-share/httpd/manual/configuring.html.ko.euc-kr
-share/httpd/manual/configuring.html.tr.utf8
-share/httpd/manual/content-negotiation.html
-share/httpd/manual/content-negotiation.html.en
-share/httpd/manual/content-negotiation.html.fr
-share/httpd/manual/content-negotiation.html.ja.utf8
-share/httpd/manual/content-negotiation.html.ko.euc-kr
-share/httpd/manual/content-negotiation.html.tr.utf8
-share/httpd/manual/custom-error.html
-share/httpd/manual/custom-error.html.en
-share/httpd/manual/custom-error.html.es
-share/httpd/manual/custom-error.html.fr
-share/httpd/manual/custom-error.html.ja.utf8
-share/httpd/manual/custom-error.html.ko.euc-kr
-share/httpd/manual/custom-error.html.tr.utf8
-share/httpd/manual/developer/API.html
-share/httpd/manual/developer/API.html.en
-share/httpd/manual/developer/debugging.html
-share/httpd/manual/developer/debugging.html.en
-share/httpd/manual/developer/documenting.html
-share/httpd/manual/developer/documenting.html.en
-share/httpd/manual/developer/filters.html
-share/httpd/manual/developer/filters.html.en
-share/httpd/manual/developer/hooks.html
-share/httpd/manual/developer/hooks.html.en
-share/httpd/manual/developer/index.html
-share/httpd/manual/developer/index.html.en
-share/httpd/manual/developer/modules.html
-share/httpd/manual/developer/modules.html.en
-share/httpd/manual/developer/modules.html.ja.utf8
-share/httpd/manual/developer/request.html
-share/httpd/manual/developer/request.html.en
-share/httpd/manual/developer/thread_safety.html
-share/httpd/manual/developer/thread_safety.html.en
-share/httpd/manual/dns-caveats.html
-share/httpd/manual/dns-caveats.html.en
-share/httpd/manual/dns-caveats.html.es
-share/httpd/manual/dns-caveats.html.fr
-share/httpd/manual/dns-caveats.html.ja.utf8
-share/httpd/manual/dns-caveats.html.ko.euc-kr
-share/httpd/manual/dns-caveats.html.tr.utf8
-share/httpd/manual/dso.html
-share/httpd/manual/dso.html.en
-share/httpd/manual/dso.html.es
-share/httpd/manual/dso.html.fr
-share/httpd/manual/dso.html.ja.utf8
-share/httpd/manual/dso.html.ko.euc-kr
-share/httpd/manual/dso.html.tr.utf8
-share/httpd/manual/env.html
-share/httpd/manual/env.html.en
-share/httpd/manual/env.html.es
-share/httpd/manual/env.html.fr
-share/httpd/manual/env.html.ja.utf8
-share/httpd/manual/env.html.ko.euc-kr
-share/httpd/manual/env.html.tr.utf8
-share/httpd/manual/faq/all_in_one.html
-share/httpd/manual/faq/all_in_one.html.en
-share/httpd/manual/faq/all_in_one.html.ko.euc-kr
-share/httpd/manual/faq/all_in_one.html.tr.utf8
-share/httpd/manual/faq/error.html
-share/httpd/manual/faq/error.html.en
-share/httpd/manual/faq/error.html.ko.euc-kr
-share/httpd/manual/faq/error.html.tr.utf8
-share/httpd/manual/faq/index.html
-share/httpd/manual/faq/index.html.en
-share/httpd/manual/faq/index.html.ko.euc-kr
-share/httpd/manual/faq/index.html.tr.utf8
-share/httpd/manual/faq/support.html
-share/httpd/manual/faq/support.html.en
-share/httpd/manual/faq/support.html.ko.euc-kr
-share/httpd/manual/faq/support.html.tr.utf8
-share/httpd/manual/filter.html
-share/httpd/manual/filter.html.en
-share/httpd/manual/filter.html.es
-share/httpd/manual/filter.html.fr
-share/httpd/manual/filter.html.ja.utf8
-share/httpd/manual/filter.html.ko.euc-kr
-share/httpd/manual/filter.html.ru.koi8-r
-share/httpd/manual/filter.html.tr.utf8
-share/httpd/manual/glossary.html
-share/httpd/manual/glossary.html.de
-share/httpd/manual/glossary.html.en
-share/httpd/manual/glossary.html.es
-share/httpd/manual/glossary.html.ko.euc-kr
-share/httpd/manual/glossary.html.tr.utf8
-share/httpd/manual/handler.html
-share/httpd/manual/handler.html.en
-share/httpd/manual/handler.html.es
-share/httpd/manual/handler.html.fr
-share/httpd/manual/handler.html.ja.utf8
-share/httpd/manual/handler.html.ko.euc-kr
-share/httpd/manual/handler.html.ru.koi8-r
-share/httpd/manual/handler.html.tr.utf8
-share/httpd/manual/howto/auth.html
-share/httpd/manual/howto/auth.html.en
-share/httpd/manual/howto/auth.html.es
-share/httpd/manual/howto/auth.html.ja.utf8
-share/httpd/manual/howto/auth.html.ko.euc-kr
-share/httpd/manual/howto/cgi.html
-share/httpd/manual/howto/cgi.html.en
-share/httpd/manual/howto/cgi.html.ja.utf8
-share/httpd/manual/howto/cgi.html.ko.euc-kr
-share/httpd/manual/howto/htaccess.html
-share/httpd/manual/howto/htaccess.html.en
-share/httpd/manual/howto/htaccess.html.ja.utf8
-share/httpd/manual/howto/htaccess.html.ko.euc-kr
-share/httpd/manual/howto/index.html
-share/httpd/manual/howto/index.html.en
-share/httpd/manual/howto/index.html.ja.utf8
-share/httpd/manual/howto/index.html.ko.euc-kr
-share/httpd/manual/howto/public_html.html
-share/httpd/manual/howto/public_html.html.en
-share/httpd/manual/howto/public_html.html.ja.utf8
-share/httpd/manual/howto/public_html.html.ko.euc-kr
-share/httpd/manual/howto/public_html.html.tr.utf8
-share/httpd/manual/howto/ssi.html
-share/httpd/manual/howto/ssi.html.en
-share/httpd/manual/howto/ssi.html.ja.utf8
-share/httpd/manual/howto/ssi.html.ko.euc-kr
-share/httpd/manual/images/apache_header.gif
-share/httpd/manual/images/custom_errordocs.gif
-share/httpd/manual/images/custom_errordocs.png
-share/httpd/manual/images/down.gif
-share/httpd/manual/images/favicon.ico
-share/httpd/manual/images/feather.gif
-share/httpd/manual/images/feather.png
-share/httpd/manual/images/home.gif
-share/httpd/manual/images/index.gif
-share/httpd/manual/images/left.gif
-share/httpd/manual/images/mod_rewrite_fig1.gif
-share/httpd/manual/images/mod_rewrite_fig1.png
-share/httpd/manual/images/mod_rewrite_fig2.gif
-share/httpd/manual/images/mod_rewrite_fig2.png
-share/httpd/manual/images/pixel.gif
-share/httpd/manual/images/right.gif
-share/httpd/manual/images/ssl_intro_fig1.gif
-share/httpd/manual/images/ssl_intro_fig1.png
-share/httpd/manual/images/ssl_intro_fig2.gif
-share/httpd/manual/images/ssl_intro_fig2.png
-share/httpd/manual/images/ssl_intro_fig3.gif
-share/httpd/manual/images/ssl_intro_fig3.png
-share/httpd/manual/images/sub.gif
-share/httpd/manual/images/up.gif
-share/httpd/manual/index.html
-share/httpd/manual/index.html.de
-share/httpd/manual/index.html.en
-share/httpd/manual/index.html.es
-share/httpd/manual/index.html.fr
-share/httpd/manual/index.html.ja.utf8
-share/httpd/manual/index.html.ko.euc-kr
-share/httpd/manual/index.html.ru.koi8-r
-share/httpd/manual/index.html.tr.utf8
-share/httpd/manual/install.html
-share/httpd/manual/install.html.de
-share/httpd/manual/install.html.en
-share/httpd/manual/install.html.es
-share/httpd/manual/install.html.ja.utf8
-share/httpd/manual/install.html.ko.euc-kr
-share/httpd/manual/install.html.ru.koi8-r
-share/httpd/manual/install.html.tr.utf8
-share/httpd/manual/invoking.html
-share/httpd/manual/invoking.html.de
-share/httpd/manual/invoking.html.en
-share/httpd/manual/invoking.html.es
-share/httpd/manual/invoking.html.ja.utf8
-share/httpd/manual/invoking.html.ko.euc-kr
-share/httpd/manual/invoking.html.ru.koi8-r
-share/httpd/manual/invoking.html.tr.utf8
-share/httpd/manual/license.html
-share/httpd/manual/license.html.en
-share/httpd/manual/logs.html
-share/httpd/manual/logs.html.en
-share/httpd/manual/logs.html.es
-share/httpd/manual/logs.html.ja.utf8
-share/httpd/manual/logs.html.ko.euc-kr
-share/httpd/manual/logs.html.tr.utf8
-share/httpd/manual/misc/custom_errordocs.html
-share/httpd/manual/misc/custom_errordocs.html.en
-share/httpd/manual/misc/descriptors.html
-share/httpd/manual/misc/descriptors.html.en
-share/httpd/manual/misc/fin_wait_2.html
-share/httpd/manual/misc/fin_wait_2.html.en
-share/httpd/manual/misc/index.html
-share/httpd/manual/misc/index.html.en
-share/httpd/manual/misc/index.html.tr.utf8
-share/httpd/manual/misc/known_client_problems.html
-share/httpd/manual/misc/known_client_problems.html.en
-share/httpd/manual/misc/perf-tuning.html
-share/httpd/manual/misc/perf-tuning.html.en
-share/httpd/manual/misc/perf-tuning.html.ko.euc-kr
-share/httpd/manual/misc/perf-tuning.html.tr.utf8
-share/httpd/manual/misc/relevant_standards.html
-share/httpd/manual/misc/relevant_standards.html.en
-share/httpd/manual/misc/relevant_standards.html.ko.euc-kr
-share/httpd/manual/misc/rewriteguide.html
-share/httpd/manual/misc/rewriteguide.html.en
-share/httpd/manual/misc/rewriteguide.html.ko.euc-kr
-share/httpd/manual/misc/security_tips.html
-share/httpd/manual/misc/security_tips.html.en
-share/httpd/manual/misc/security_tips.html.ko.euc-kr
-share/httpd/manual/misc/security_tips.html.tr.utf8
-share/httpd/manual/misc/tutorials.html
-share/httpd/manual/misc/tutorials.html.en
-share/httpd/manual/mod/beos.html
-share/httpd/manual/mod/beos.html.de
-share/httpd/manual/mod/beos.html.en
-share/httpd/manual/mod/beos.html.es
-share/httpd/manual/mod/beos.html.ko.euc-kr
-share/httpd/manual/mod/core.html
-share/httpd/manual/mod/core.html.de
-share/httpd/manual/mod/core.html.en
-share/httpd/manual/mod/core.html.es
-share/httpd/manual/mod/core.html.ja.utf8
-share/httpd/manual/mod/core.html.tr.utf8
-share/httpd/manual/mod/directive-dict.html
-share/httpd/manual/mod/directive-dict.html.en
-share/httpd/manual/mod/directive-dict.html.es
-share/httpd/manual/mod/directive-dict.html.ja.utf8
-share/httpd/manual/mod/directive-dict.html.ko.euc-kr
-share/httpd/manual/mod/directive-dict.html.tr.utf8
-share/httpd/manual/mod/directives.html
-share/httpd/manual/mod/directives.html.de
-share/httpd/manual/mod/directives.html.en
-share/httpd/manual/mod/directives.html.es
-share/httpd/manual/mod/directives.html.ja.utf8
-share/httpd/manual/mod/directives.html.ko.euc-kr
-share/httpd/manual/mod/directives.html.ru.koi8-r
-share/httpd/manual/mod/directives.html.tr.utf8
-share/httpd/manual/mod/index.html
-share/httpd/manual/mod/index.html.de
-share/httpd/manual/mod/index.html.en
-share/httpd/manual/mod/index.html.es
-share/httpd/manual/mod/index.html.ja.utf8
-share/httpd/manual/mod/index.html.ko.euc-kr
-share/httpd/manual/mod/index.html.tr.utf8
-share/httpd/manual/mod/leader.html
-share/httpd/manual/mod/leader.html.de
-share/httpd/manual/mod/leader.html.en
-share/httpd/manual/mod/leader.html.es
-share/httpd/manual/mod/leader.html.ko.euc-kr
-share/httpd/manual/mod/mod_access.html
-share/httpd/manual/mod/mod_access.html.en
-share/httpd/manual/mod/mod_access.html.ja.utf8
-share/httpd/manual/mod/mod_actions.html
-share/httpd/manual/mod/mod_actions.html.en
-share/httpd/manual/mod/mod_actions.html.ja.utf8
-share/httpd/manual/mod/mod_actions.html.ko.euc-kr
-share/httpd/manual/mod/mod_alias.html
-share/httpd/manual/mod/mod_alias.html.en
-share/httpd/manual/mod/mod_alias.html.ja.utf8
-share/httpd/manual/mod/mod_alias.html.ko.euc-kr
-share/httpd/manual/mod/mod_alias.html.tr.utf8
-share/httpd/manual/mod/mod_asis.html
-share/httpd/manual/mod/mod_asis.html.en
-share/httpd/manual/mod/mod_asis.html.ja.utf8
-share/httpd/manual/mod/mod_asis.html.ko.euc-kr
-share/httpd/manual/mod/mod_auth.html
-share/httpd/manual/mod/mod_auth.html.en
-share/httpd/manual/mod/mod_auth.html.ja.utf8
-share/httpd/manual/mod/mod_auth_anon.html
-share/httpd/manual/mod/mod_auth_anon.html.en
-share/httpd/manual/mod/mod_auth_dbm.html
-share/httpd/manual/mod/mod_auth_dbm.html.en
-share/httpd/manual/mod/mod_auth_digest.html
-share/httpd/manual/mod/mod_auth_digest.html.en
-share/httpd/manual/mod/mod_auth_digest.html.ko.euc-kr
-share/httpd/manual/mod/mod_auth_ldap.html
-share/httpd/manual/mod/mod_auth_ldap.html.en
-share/httpd/manual/mod/mod_autoindex.html
-share/httpd/manual/mod/mod_autoindex.html.en
-share/httpd/manual/mod/mod_autoindex.html.ja.utf8
-share/httpd/manual/mod/mod_autoindex.html.ko.euc-kr
-share/httpd/manual/mod/mod_autoindex.html.tr.utf8
-share/httpd/manual/mod/mod_cache.html
-share/httpd/manual/mod/mod_cache.html.en
-share/httpd/manual/mod/mod_cache.html.ko.euc-kr
-share/httpd/manual/mod/mod_cern_meta.html
-share/httpd/manual/mod/mod_cern_meta.html.en
-share/httpd/manual/mod/mod_cern_meta.html.ko.euc-kr
-share/httpd/manual/mod/mod_cgi.html
-share/httpd/manual/mod/mod_cgi.html.en
-share/httpd/manual/mod/mod_cgi.html.ja.utf8
-share/httpd/manual/mod/mod_cgi.html.ko.euc-kr
-share/httpd/manual/mod/mod_cgid.html
-share/httpd/manual/mod/mod_cgid.html.en
-share/httpd/manual/mod/mod_cgid.html.ja.utf8
-share/httpd/manual/mod/mod_cgid.html.ko.euc-kr
-share/httpd/manual/mod/mod_charset_lite.html
-share/httpd/manual/mod/mod_charset_lite.html.en
-share/httpd/manual/mod/mod_charset_lite.html.ko.euc-kr
-share/httpd/manual/mod/mod_dav.html
-share/httpd/manual/mod/mod_dav.html.en
-share/httpd/manual/mod/mod_dav.html.ja.utf8
-share/httpd/manual/mod/mod_dav.html.ko.euc-kr
-share/httpd/manual/mod/mod_dav_fs.html
-share/httpd/manual/mod/mod_dav_fs.html.en
-share/httpd/manual/mod/mod_dav_fs.html.ja.utf8
-share/httpd/manual/mod/mod_dav_fs.html.ko.euc-kr
-share/httpd/manual/mod/mod_deflate.html
-share/httpd/manual/mod/mod_deflate.html.en
-share/httpd/manual/mod/mod_deflate.html.ja.utf8
-share/httpd/manual/mod/mod_deflate.html.ko.euc-kr
-share/httpd/manual/mod/mod_dir.html
-share/httpd/manual/mod/mod_dir.html.en
-share/httpd/manual/mod/mod_dir.html.ja.utf8
-share/httpd/manual/mod/mod_dir.html.ko.euc-kr
-share/httpd/manual/mod/mod_dir.html.tr.utf8
-share/httpd/manual/mod/mod_disk_cache.html
-share/httpd/manual/mod/mod_disk_cache.html.en
-share/httpd/manual/mod/mod_disk_cache.html.ko.euc-kr
-share/httpd/manual/mod/mod_dumpio.html
-share/httpd/manual/mod/mod_dumpio.html.en
-share/httpd/manual/mod/mod_echo.html
-share/httpd/manual/mod/mod_echo.html.en
-share/httpd/manual/mod/mod_echo.html.ja.utf8
-share/httpd/manual/mod/mod_echo.html.ko.euc-kr
-share/httpd/manual/mod/mod_env.html
-share/httpd/manual/mod/mod_env.html.en
-share/httpd/manual/mod/mod_env.html.ja.utf8
-share/httpd/manual/mod/mod_env.html.ko.euc-kr
-share/httpd/manual/mod/mod_env.html.tr.utf8
-share/httpd/manual/mod/mod_example.html
-share/httpd/manual/mod/mod_example.html.en
-share/httpd/manual/mod/mod_example.html.ko.euc-kr
-share/httpd/manual/mod/mod_expires.html
-share/httpd/manual/mod/mod_expires.html.en
-share/httpd/manual/mod/mod_expires.html.ja.utf8
-share/httpd/manual/mod/mod_expires.html.ko.euc-kr
-share/httpd/manual/mod/mod_ext_filter.html
-share/httpd/manual/mod/mod_ext_filter.html.en
-share/httpd/manual/mod/mod_ext_filter.html.ko.euc-kr
-share/httpd/manual/mod/mod_file_cache.html
-share/httpd/manual/mod/mod_file_cache.html.en
-share/httpd/manual/mod/mod_file_cache.html.ko.euc-kr
-share/httpd/manual/mod/mod_headers.html
-share/httpd/manual/mod/mod_headers.html.en
-share/httpd/manual/mod/mod_headers.html.ko.euc-kr
-share/httpd/manual/mod/mod_imap.html
-share/httpd/manual/mod/mod_imap.html.en
-share/httpd/manual/mod/mod_imap.html.ko.euc-kr
-share/httpd/manual/mod/mod_include.html
-share/httpd/manual/mod/mod_include.html.en
-share/httpd/manual/mod/mod_include.html.ja.utf8
-share/httpd/manual/mod/mod_info.html
-share/httpd/manual/mod/mod_info.html.en
-share/httpd/manual/mod/mod_info.html.ja.utf8
-share/httpd/manual/mod/mod_info.html.ko.euc-kr
-share/httpd/manual/mod/mod_isapi.html
-share/httpd/manual/mod/mod_isapi.html.en
-share/httpd/manual/mod/mod_isapi.html.ko.euc-kr
-share/httpd/manual/mod/mod_ldap.html
-share/httpd/manual/mod/mod_ldap.html.en
-share/httpd/manual/mod/mod_log_config.html
-share/httpd/manual/mod/mod_log_config.html.en
-share/httpd/manual/mod/mod_log_config.html.ja.utf8
-share/httpd/manual/mod/mod_log_config.html.ko.euc-kr
-share/httpd/manual/mod/mod_log_config.html.tr.utf8
-share/httpd/manual/mod/mod_log_forensic.html
-share/httpd/manual/mod/mod_log_forensic.html.en
-share/httpd/manual/mod/mod_log_forensic.html.tr.utf8
-share/httpd/manual/mod/mod_logio.html
-share/httpd/manual/mod/mod_logio.html.en
-share/httpd/manual/mod/mod_logio.html.ja.utf8
-share/httpd/manual/mod/mod_logio.html.ko.euc-kr
-share/httpd/manual/mod/mod_logio.html.tr.utf8
-share/httpd/manual/mod/mod_mem_cache.html
-share/httpd/manual/mod/mod_mem_cache.html.en
-share/httpd/manual/mod/mod_mem_cache.html.ja.utf8
-share/httpd/manual/mod/mod_mem_cache.html.ko.euc-kr
-share/httpd/manual/mod/mod_mime.html
-share/httpd/manual/mod/mod_mime.html.en
-share/httpd/manual/mod/mod_mime.html.ja.utf8
-share/httpd/manual/mod/mod_mime_magic.html
-share/httpd/manual/mod/mod_mime_magic.html.en
-share/httpd/manual/mod/mod_negotiation.html
-share/httpd/manual/mod/mod_negotiation.html.en
-share/httpd/manual/mod/mod_negotiation.html.ja.utf8
-share/httpd/manual/mod/mod_nw_ssl.html
-share/httpd/manual/mod/mod_nw_ssl.html.en
-share/httpd/manual/mod/mod_proxy.html
-share/httpd/manual/mod/mod_proxy.html.en
-share/httpd/manual/mod/mod_proxy_connect.html
-share/httpd/manual/mod/mod_proxy_connect.html.en
-share/httpd/manual/mod/mod_proxy_ftp.html
-share/httpd/manual/mod/mod_proxy_ftp.html.en
-share/httpd/manual/mod/mod_proxy_http.html
-share/httpd/manual/mod/mod_proxy_http.html.en
-share/httpd/manual/mod/mod_rewrite.html
-share/httpd/manual/mod/mod_rewrite.html.en
-share/httpd/manual/mod/mod_setenvif.html
-share/httpd/manual/mod/mod_setenvif.html.en
-share/httpd/manual/mod/mod_setenvif.html.ja.utf8
-share/httpd/manual/mod/mod_setenvif.html.ko.euc-kr
-share/httpd/manual/mod/mod_setenvif.html.tr.utf8
-share/httpd/manual/mod/mod_so.html
-share/httpd/manual/mod/mod_so.html.en
-share/httpd/manual/mod/mod_so.html.ja.utf8
-share/httpd/manual/mod/mod_so.html.ko.euc-kr
-share/httpd/manual/mod/mod_so.html.tr.utf8
-share/httpd/manual/mod/mod_speling.html
-share/httpd/manual/mod/mod_speling.html.en
-share/httpd/manual/mod/mod_speling.html.ja.utf8
-share/httpd/manual/mod/mod_speling.html.ko.euc-kr
-share/httpd/manual/mod/mod_ssl.html
-share/httpd/manual/mod/mod_ssl.html.en
-share/httpd/manual/mod/mod_status.html
-share/httpd/manual/mod/mod_status.html.en
-share/httpd/manual/mod/mod_status.html.ja.utf8
-share/httpd/manual/mod/mod_status.html.ko.euc-kr
-share/httpd/manual/mod/mod_status.html.tr.utf8
-share/httpd/manual/mod/mod_suexec.html
-share/httpd/manual/mod/mod_suexec.html.en
-share/httpd/manual/mod/mod_suexec.html.ja.utf8
-share/httpd/manual/mod/mod_suexec.html.ko.euc-kr
-share/httpd/manual/mod/mod_suexec.html.tr.utf8
-share/httpd/manual/mod/mod_unique_id.html
-share/httpd/manual/mod/mod_unique_id.html.en
-share/httpd/manual/mod/mod_unique_id.html.ja.utf8
-share/httpd/manual/mod/mod_unique_id.html.ko.euc-kr
-share/httpd/manual/mod/mod_userdir.html
-share/httpd/manual/mod/mod_userdir.html.en
-share/httpd/manual/mod/mod_userdir.html.ja.utf8
-share/httpd/manual/mod/mod_userdir.html.ko.euc-kr
-share/httpd/manual/mod/mod_userdir.html.tr.utf8
-share/httpd/manual/mod/mod_usertrack.html
-share/httpd/manual/mod/mod_usertrack.html.en
-share/httpd/manual/mod/mod_version.html
-share/httpd/manual/mod/mod_version.html.en
-share/httpd/manual/mod/mod_version.html.ja.utf8
-share/httpd/manual/mod/mod_version.html.ko.euc-kr
-share/httpd/manual/mod/mod_vhost_alias.html
-share/httpd/manual/mod/mod_vhost_alias.html.en
-share/httpd/manual/mod/mod_vhost_alias.html.tr.utf8
-share/httpd/manual/mod/module-dict.html
-share/httpd/manual/mod/module-dict.html.en
-share/httpd/manual/mod/module-dict.html.ja.utf8
-share/httpd/manual/mod/module-dict.html.ko.euc-kr
-share/httpd/manual/mod/module-dict.html.tr.utf8
-share/httpd/manual/mod/mpm_common.html
-share/httpd/manual/mod/mpm_common.html.de
-share/httpd/manual/mod/mpm_common.html.en
-share/httpd/manual/mod/mpm_common.html.es
-share/httpd/manual/mod/mpm_common.html.ja.utf8
-share/httpd/manual/mod/mpm_common.html.tr.utf8
-share/httpd/manual/mod/mpm_netware.html
-share/httpd/manual/mod/mpm_netware.html.en
-share/httpd/manual/mod/mpm_winnt.html
-share/httpd/manual/mod/mpm_winnt.html.de
-share/httpd/manual/mod/mpm_winnt.html.en
-share/httpd/manual/mod/mpm_winnt.html.es
-share/httpd/manual/mod/mpm_winnt.html.ja.utf8
-share/httpd/manual/mod/mpmt_os2.html
-share/httpd/manual/mod/mpmt_os2.html.en
-share/httpd/manual/mod/perchild.html
-share/httpd/manual/mod/perchild.html.en
-share/httpd/manual/mod/prefork.html
-share/httpd/manual/mod/prefork.html.de
-share/httpd/manual/mod/prefork.html.en
-share/httpd/manual/mod/prefork.html.es
-share/httpd/manual/mod/prefork.html.ja.utf8
-share/httpd/manual/mod/prefork.html.tr.utf8
-share/httpd/manual/mod/quickreference.html
-share/httpd/manual/mod/quickreference.html.de
-share/httpd/manual/mod/quickreference.html.en
-share/httpd/manual/mod/quickreference.html.es
-share/httpd/manual/mod/quickreference.html.ja.utf8
-share/httpd/manual/mod/quickreference.html.ko.euc-kr
-share/httpd/manual/mod/quickreference.html.ru.koi8-r
-share/httpd/manual/mod/quickreference.html.tr.utf8
-share/httpd/manual/mod/threadpool.html
-share/httpd/manual/mod/threadpool.html.en
-share/httpd/manual/mod/worker.html
-share/httpd/manual/mod/worker.html.de
-share/httpd/manual/mod/worker.html.en
-share/httpd/manual/mod/worker.html.es
-share/httpd/manual/mod/worker.html.ja.utf8
-share/httpd/manual/mod/worker.html.tr.utf8
-share/httpd/manual/mpm.html
-share/httpd/manual/mpm.html.de
-share/httpd/manual/mpm.html.en
-share/httpd/manual/mpm.html.es
-share/httpd/manual/mpm.html.ja.utf8
-share/httpd/manual/mpm.html.ko.euc-kr
-share/httpd/manual/mpm.html.ru.koi8-r
-share/httpd/manual/mpm.html.tr.utf8
-share/httpd/manual/new_features_2_0.html
-share/httpd/manual/new_features_2_0.html.de
-share/httpd/manual/new_features_2_0.html.en
-share/httpd/manual/new_features_2_0.html.es
-share/httpd/manual/new_features_2_0.html.fr
-share/httpd/manual/new_features_2_0.html.ja.utf8
-share/httpd/manual/new_features_2_0.html.ko.euc-kr
-share/httpd/manual/new_features_2_0.html.ru.koi8-r
-share/httpd/manual/new_features_2_0.html.tr.utf8
-share/httpd/manual/platform/ebcdic.html
-share/httpd/manual/platform/ebcdic.html.en
-share/httpd/manual/platform/ebcdic.html.ko.euc-kr
-share/httpd/manual/platform/index.html
-share/httpd/manual/platform/index.html.en
-share/httpd/manual/platform/index.html.ko.euc-kr
-share/httpd/manual/platform/netware.html
-share/httpd/manual/platform/netware.html.en
-share/httpd/manual/platform/netware.html.ko.euc-kr
-share/httpd/manual/platform/perf-hp.html
-share/httpd/manual/platform/perf-hp.html.en
-share/httpd/manual/platform/perf-hp.html.ko.euc-kr
-share/httpd/manual/platform/win_compiling.html
-share/httpd/manual/platform/win_compiling.html.en
-share/httpd/manual/platform/win_compiling.html.ko.euc-kr
-share/httpd/manual/platform/windows.html
-share/httpd/manual/platform/windows.html.en
-share/httpd/manual/platform/windows.html.ko.euc-kr
-share/httpd/manual/programs/ab.html
-share/httpd/manual/programs/ab.html.en
-share/httpd/manual/programs/ab.html.ko.euc-kr
-share/httpd/manual/programs/ab.html.tr.utf8
-share/httpd/manual/programs/apachectl.html
-share/httpd/manual/programs/apachectl.html.en
-share/httpd/manual/programs/apachectl.html.ko.euc-kr
-share/httpd/manual/programs/apachectl.html.tr.utf8
-share/httpd/manual/programs/apxs.html
-share/httpd/manual/programs/apxs.html.en
-share/httpd/manual/programs/apxs.html.ko.euc-kr
-share/httpd/manual/programs/apxs.html.tr.utf8
-share/httpd/manual/programs/configure.html
-share/httpd/manual/programs/configure.html.en
-share/httpd/manual/programs/configure.html.ko.euc-kr
-share/httpd/manual/programs/configure.html.tr.utf8
-share/httpd/manual/programs/dbmmanage.html
-share/httpd/manual/programs/dbmmanage.html.en
-share/httpd/manual/programs/dbmmanage.html.ko.euc-kr
-share/httpd/manual/programs/dbmmanage.html.tr.utf8
-share/httpd/manual/programs/htdbm.html
-share/httpd/manual/programs/htdbm.html.en
-share/httpd/manual/programs/htdbm.html.tr.utf8
-share/httpd/manual/programs/htdigest.html
-share/httpd/manual/programs/htdigest.html.en
-share/httpd/manual/programs/htdigest.html.ko.euc-kr
-share/httpd/manual/programs/htdigest.html.tr.utf8
-share/httpd/manual/programs/htpasswd.html
-share/httpd/manual/programs/htpasswd.html.en
-share/httpd/manual/programs/htpasswd.html.ko.euc-kr
-share/httpd/manual/programs/htpasswd.html.tr.utf8
-share/httpd/manual/programs/httpd.html
-share/httpd/manual/programs/httpd.html.en
-share/httpd/manual/programs/httpd.html.ko.euc-kr
-share/httpd/manual/programs/httpd.html.tr.utf8
-share/httpd/manual/programs/index.html
-share/httpd/manual/programs/index.html.en
-share/httpd/manual/programs/index.html.es
-share/httpd/manual/programs/index.html.ko.euc-kr
-share/httpd/manual/programs/index.html.ru.koi8-r
-share/httpd/manual/programs/index.html.tr.utf8
-share/httpd/manual/programs/logresolve.html
-share/httpd/manual/programs/logresolve.html.en
-share/httpd/manual/programs/logresolve.html.ko.euc-kr
-share/httpd/manual/programs/logresolve.html.tr.utf8
-share/httpd/manual/programs/other.html
-share/httpd/manual/programs/other.html.en
-share/httpd/manual/programs/other.html.ko.euc-kr
-share/httpd/manual/programs/other.html.tr.utf8
-share/httpd/manual/programs/rotatelogs.html
-share/httpd/manual/programs/rotatelogs.html.en
-share/httpd/manual/programs/rotatelogs.html.ko.euc-kr
-share/httpd/manual/programs/rotatelogs.html.tr.utf8
-share/httpd/manual/programs/suexec.html
-share/httpd/manual/programs/suexec.html.en
-share/httpd/manual/programs/suexec.html.ko.euc-kr
-share/httpd/manual/programs/suexec.html.tr.utf8
-share/httpd/manual/rewrite/index.html
-share/httpd/manual/rewrite/index.html.en
-share/httpd/manual/rewrite/index.html.tr.utf8
-share/httpd/manual/rewrite/rewrite_guide.html
-share/httpd/manual/rewrite/rewrite_guide.html.en
-share/httpd/manual/rewrite/rewrite_guide_advanced.html
-share/httpd/manual/rewrite/rewrite_guide_advanced.html.en
-share/httpd/manual/rewrite/rewrite_intro.html
-share/httpd/manual/rewrite/rewrite_intro.html.en
-share/httpd/manual/rewrite/rewrite_tech.html
-share/httpd/manual/rewrite/rewrite_tech.html.en
-share/httpd/manual/sections.html
-share/httpd/manual/sections.html.en
-share/httpd/manual/sections.html.es
-share/httpd/manual/sections.html.ja.utf8
-share/httpd/manual/sections.html.ko.euc-kr
-share/httpd/manual/sections.html.tr.utf8
-share/httpd/manual/server-wide.html
-share/httpd/manual/server-wide.html.en
-share/httpd/manual/server-wide.html.es
-share/httpd/manual/server-wide.html.ja.utf8
-share/httpd/manual/server-wide.html.ko.euc-kr
-share/httpd/manual/server-wide.html.tr.utf8
-share/httpd/manual/sitemap.html
-share/httpd/manual/sitemap.html.de
-share/httpd/manual/sitemap.html.en
-share/httpd/manual/sitemap.html.es
-share/httpd/manual/sitemap.html.ja.utf8
-share/httpd/manual/sitemap.html.ko.euc-kr
-share/httpd/manual/sitemap.html.tr.utf8
-share/httpd/manual/ssl/index.html
-share/httpd/manual/ssl/index.html.en
-share/httpd/manual/ssl/index.html.ja.utf8
-share/httpd/manual/ssl/index.html.tr.utf8
-share/httpd/manual/ssl/ssl_compat.html
-share/httpd/manual/ssl/ssl_compat.html.en
-share/httpd/manual/ssl/ssl_faq.html
-share/httpd/manual/ssl/ssl_faq.html.en
-share/httpd/manual/ssl/ssl_howto.html
-share/httpd/manual/ssl/ssl_howto.html.en
-share/httpd/manual/ssl/ssl_intro.html
-share/httpd/manual/ssl/ssl_intro.html.en
-share/httpd/manual/ssl/ssl_intro.html.ja.utf8
-share/httpd/manual/stopping.html
-share/httpd/manual/stopping.html.de
-share/httpd/manual/stopping.html.en
-share/httpd/manual/stopping.html.es
-share/httpd/manual/stopping.html.ja.utf8
-share/httpd/manual/stopping.html.ko.euc-kr
-share/httpd/manual/stopping.html.ru.koi8-r
-share/httpd/manual/stopping.html.tr.utf8
-share/httpd/manual/style/build.properties
-share/httpd/manual/style/common.dtd
-share/httpd/manual/style/css/manual-chm.css
-share/httpd/manual/style/css/manual-loose-100pc.css
-share/httpd/manual/style/css/manual-print.css
-share/httpd/manual/style/css/manual-zip-100pc.css
-share/httpd/manual/style/css/manual-zip.css
-share/httpd/manual/style/css/manual.css
-share/httpd/manual/style/faq.dtd
-share/httpd/manual/style/lang.dtd
-share/httpd/manual/style/latex/atbeginend.sty
-share/httpd/manual/style/manualpage.dtd
-share/httpd/manual/style/modulesynopsis.dtd
-share/httpd/manual/style/sitemap.dtd
-share/httpd/manual/style/version.ent
-share/httpd/manual/suexec.html
-share/httpd/manual/suexec.html.en
-share/httpd/manual/suexec.html.ja.utf8
-share/httpd/manual/suexec.html.ko.euc-kr
-share/httpd/manual/suexec.html.tr.utf8
-share/httpd/manual/upgrading.html
-share/httpd/manual/upgrading.html.de
-share/httpd/manual/upgrading.html.en
-share/httpd/manual/upgrading.html.es
-share/httpd/manual/upgrading.html.fr
-share/httpd/manual/upgrading.html.ja.utf8
-share/httpd/manual/upgrading.html.ko.euc-kr
-share/httpd/manual/upgrading.html.ru.koi8-r
-share/httpd/manual/urlmapping.html
-share/httpd/manual/urlmapping.html.en
-share/httpd/manual/urlmapping.html.ja.utf8
-share/httpd/manual/urlmapping.html.ko.euc-kr
-share/httpd/manual/urlmapping.html.tr.utf8
-share/httpd/manual/vhosts/details.html
-share/httpd/manual/vhosts/details.html.en
-share/httpd/manual/vhosts/details.html.ko.euc-kr
-share/httpd/manual/vhosts/details.html.tr.utf8
-share/httpd/manual/vhosts/examples.html
-share/httpd/manual/vhosts/examples.html.en
-share/httpd/manual/vhosts/examples.html.ko.euc-kr
-share/httpd/manual/vhosts/examples.html.tr.utf8
-share/httpd/manual/vhosts/fd-limits.html
-share/httpd/manual/vhosts/fd-limits.html.en
-share/httpd/manual/vhosts/fd-limits.html.ja.utf8
-share/httpd/manual/vhosts/fd-limits.html.ko.euc-kr
-share/httpd/manual/vhosts/fd-limits.html.tr.utf8
-share/httpd/manual/vhosts/index.html
-share/httpd/manual/vhosts/index.html.de
-share/httpd/manual/vhosts/index.html.en
-share/httpd/manual/vhosts/index.html.es
-share/httpd/manual/vhosts/index.html.ja.utf8
-share/httpd/manual/vhosts/index.html.ko.euc-kr
-share/httpd/manual/vhosts/index.html.ru.koi8-r
-share/httpd/manual/vhosts/index.html.tr.utf8
-share/httpd/manual/vhosts/ip-based.html
-share/httpd/manual/vhosts/ip-based.html.en
-share/httpd/manual/vhosts/ip-based.html.ko.euc-kr
-share/httpd/manual/vhosts/ip-based.html.tr.utf8
-share/httpd/manual/vhosts/mass.html
-share/httpd/manual/vhosts/mass.html.en
-share/httpd/manual/vhosts/mass.html.ko.euc-kr
-share/httpd/manual/vhosts/mass.html.tr.utf8
-share/httpd/manual/vhosts/name-based.html
-share/httpd/manual/vhosts/name-based.html.de
-share/httpd/manual/vhosts/name-based.html.en
-share/httpd/manual/vhosts/name-based.html.es
-share/httpd/manual/vhosts/name-based.html.ja.utf8
-share/httpd/manual/vhosts/name-based.html.ko.euc-kr
-share/httpd/manual/vhosts/name-based.html.tr.utf8
-@pkgdir share/httpd/manual/style/lang
-@pkgdir share/httpd/manual/style/xsl/util
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk
deleted file mode 100644
index f302a9aeb7d..00000000000
--- a/www/apache2/buildlink3.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.35 2014/02/12 23:18:43 tron Exp $
-
-BUILDLINK_TREE+=	apache
-
-.if !defined(APACHE_BUILDLINK3_MK)
-APACHE_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.51<2.2
-BUILDLINK_ABI_DEPENDS.apache+=	apache>=2.0.65nb2
-BUILDLINK_PKGSRCDIR.apache?=	../../www/apache2
-BUILDLINK_DEPMETHOD.apache?=	build
-.if defined(APACHE_MODULE)
-BUILDLINK_DEPMETHOD.apache+=	full
-.endif
-
-BUILDLINK_FILES.apache+=	sbin/apxs
-${BUILDLINK_DIR}/bin/apxs: buildlink-directories
-	${MKDIR} ${BUILDLINK_DIR}/bin && ${LN} -fs ../sbin/apxs ${BUILDLINK_DIR}/bin/apxs
-
-buildlink-apache-cookie: ${BUILDLINK_DIR}/bin/apxs
-
-USE_TOOLS+=	perl			# for "apxs"
-CONFIGURE_ENV+=	APR_LIBTOOL=${LIBTOOL:Q}	# make apxs use the libtool we specify
-MAKE_ENV+=	APR_LIBTOOL=${LIBTOOL:Q}
-APXS?=		${BUILDLINK_PREFIX.apache}/sbin/apxs
-.if defined(GNU_CONFIGURE)
-CONFIGURE_ARGS+=	--with-apxs2=${APXS:Q}
-.endif
-
-.include "../../devel/apr0/buildlink3.mk"
-.endif # APACHE_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-apache
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
deleted file mode 100644
index 3bea3f37cff..00000000000
--- a/www/apache2/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.59 2013/08/04 02:45:42 obache Exp $
-
-SHA1 (httpd-2.0.65.tar.bz2) = 0183866df73c7877ba9275a075a2ece7a67f6c95
-RMD160 (httpd-2.0.65.tar.bz2) = 1f0142a843486a53ba184ceb9214dc78f071e17e
-Size (httpd-2.0.65.tar.bz2) = 4999802 bytes
-SHA1 (patch-aa) = bff1ef591f5361e7169ff9005dcf86437b9dac23
-SHA1 (patch-ab) = 32c47bd5087269f530b7d52d6a1a719a50ae7260
-SHA1 (patch-ac) = 7854294ae9c7fdcf7d6c9f5f2bee526952e583e3
-SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13
-SHA1 (patch-ae) = 26bea7ea9498437fa2436710849cbb00a4159442
-SHA1 (patch-af) = 8400ae084e31026e9d8143a0246aa3e65166f380
-SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
-SHA1 (patch-ah) = 241e9083a82d465d2a1a5a116b11512ef1226f1a
-SHA1 (patch-ai) = 4dc88c15b0525a5aabc80d5c2a0720cd260629de
-SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
-SHA1 (patch-al) = 9af7b6c56177d971e135f0a00b3ab9ded5d1b6dd
-SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
-SHA1 (patch-ao) = c629a7563d0e555922526e26b266251144a14ff6
diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh
deleted file mode 100644
index 0cde9e57094..00000000000
--- a/www/apache2/files/apache.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: apache.sh,v 1.9 2005/04/18 14:35:57 tron Exp $
-#
-# PROVIDE: apache
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# You will need to set some variables in /etc/rc.conf to start Apache:
-#
-# apache=YES
-# apache_start="start"	# set to "startssl" to allow HTTPS connections;
-#			# this variable is optional
-
-if [ -f /etc/rc.subr ]
-then
-	. /etc/rc.subr
-fi
-
-name="apache"
-rcvar=$name
-command="@PREFIX@/sbin/httpd"
-ctl_command="@PREFIX@/sbin/apachectl"
-required_files="@PKG_SYSCONFDIR@/httpd.conf"
-extra_commands="reload"
-start_cmd="apache_doit start"
-stop_cmd="apache_doit stop"
-reload_cmd="apache_doit reload"
-
-apache_doit ()
-{
-	: ${apache_start:=start}
-
-	case $1 in
-	start)	action=${apache_start} ;;
-	reload)	action=graceful ;;
-	*)	action=$1 ;;
-	esac
-
-	if [ ! -x ${ctl_command} ]; then
-		return
-	fi
-
-	case ${action} in
-	start|startssl)	@ECHO@ "Starting ${name}." ;;
-	stop)		@ECHO@ "Stopping ${name}." ;;
-	esac
-
-	${ctl_command} ${action}
-}
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]
-then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	apache_doit "$1"
-fi
diff --git a/www/apache2/files/mkcert.sh b/www/apache2/files/mkcert.sh
deleted file mode 100644
index 6be1c77bc7c..00000000000
--- a/www/apache2/files/mkcert.sh
+++ /dev/null
@@ -1,914 +0,0 @@
-#!/bin/sh
-##
-##  mkcert.sh -- SSL Certificate Generation Utility
-##  Copyright (c) 1998-2000 Ralf S. Engelschall, All Rights Reserved. 
-##
-
-#   parameters
-parameters=`getopt a:c:t:k:v $*`
-if [ $# = 0 ]; then
-    cat << EOF
-Usage:
-        mkcert.sh [-t type] [-a algo] [-c crtfile ] [-k keyfile] [-v]
-
-Options:
-        -t type		Type of certificates to generate.  Valid types are:
-                            dummy      self-signed Snake Oil cert
-                            test       test cert signed by Snake Oil CA
-                            custom     custom cert signed by own CA
-                            existing   existing cert
-
-        -a algo         Signature algorithm for generated certificate.  Valid
-                        algorithms are RSA or DSA.
-
-        -c crtfile      Path to an existing certificate
-
-        -k keyfile      Path to an existing key file
-
-        -v              Display the certificate and key, then exit.
-
-EOF
-    exit 2
-fi
-
-set -- $parameters
-for param
-do
-    case $param in
-        -a) algo=$2 ;;
-        -c) crt=$2 ;;
-        -t) type=$2 ;;
-        -k) key=$2 ;;
-        -v) view=1 ;;
-        --) break ;;
-    esac
-    shift
-done
-
-openssl="openssl"
-confdir=@PKG_SYSCONFDIR@
-
-#   configuration
-sslcrtdir="$confdir/ssl.crt"
-sslcsrdir="$confdir/ssl.csr"
-sslkeydir="$confdir/ssl.key"
-sslprmdir="$confdir/ssl.prm"
-sslcrldir="$confdir/ssl.crl"
-
-if [ ! -d "${sslcrtdir}" ]; then
-    echo "Creating ${sslcrtdir}"
-    mkdir "${sslcrtdir}" || exit 1
-fi
-if [ ! -d "${sslcsrdir}" ]; then
-    echo "Creating ${sslcsrdir}"
-    mkdir "${sslcsrdir}" || exit 1
-fi
-if [ ! -d "${sslkeydir}" ]; then
-    echo "Creating ${sslkeydir}"
-    mkdir "${sslkeydir}" || exit 1
-fi
-if [ ! -d "${sslprmdir}" ]; then
-    echo "Creating ${sslprmdir}"
-    mkdir "${sslprmdir}" || exit 1
-fi
-if [ ! -d "${sslcrldir}" ]; then
-    echo "Creating ${sslcrldir}"
-    mkdir "${sslcrldir}" || exit 1
-fi
-
-#   some optional terminal sequences
-case $TERM in
-    xterm|xterm*|vt220|vt220*)
-        T_MD=`echo dummy | awk '{ printf("%c%c%c%c", 27, 91, 49, 109); }'`
-        T_ME=`echo dummy | awk '{ printf("%c%c%c", 27, 91, 109); }'`
-        ;;
-    vt100|vt100*)
-        T_MD=`echo dummy | awk '{ printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }'`
-        T_ME=`echo dummy | awk '{ printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }'`
-        ;;
-    default)
-        T_MD=''
-        T_ME=''
-        ;;
-esac
-
-#   display header
-echo "${T_MD}SSL Certificate Generation Utility${T_ME} (mkcert.sh)"
-echo "Copyright (c) 1998-2000 Ralf S. Engelschall, All Rights Reserved."
-
-#   on request view certificates only
-if [ ".$view" != . ]; then
-    if [ -f "$sslcrtdir/ca.crt" -a -f "$sslkeydir/ca.key" ]; then
-        echo ""
-        echo "${T_MD}CA X.509 Certificate${T_ME} [ca.crt]"
-        echo "______________________________________________________________________"
-        $openssl x509 -noout -text -in $sslcrtdir/ca.crt
-        echo ""
-        if [ ".`$openssl x509 -noout -text -in $sslcrtdir/ca.crt | grep 'Signature Algorithm' | grep -i RSA`" != . ]; then
-            echo "${T_MD}CA RSA Private Key${T_ME} [ca.key]"
-            echo "______________________________________________________________________"
-            $openssl rsa -noout -text -in $sslkeydir/ca.key
-        else
-            echo "${T_MD}CA DSA Private Key${T_ME} [ca.key]"
-            echo "______________________________________________________________________"
-            $openssl dsa -noout -text -in $sslkeydir/ca.key
-        fi
-    fi
-    if [ -f "$sslcrtdir/server.crt" -a -f "$sslkeydir/server.key" ]; then
-        echo ""
-        echo "${T_MD}Server X.509 Certificate${T_ME} [server.crt]"
-        echo "______________________________________________________________________"
-        $openssl x509 -noout -text -in $sslcrtdir/server.crt
-        echo ""
-        if [ ".`$openssl x509 -noout -text -in $sslcrtdir/server.crt | grep 'Signature Algorithm' | grep -i RSA`" != . ]; then
-            echo "${T_MD}Server RSA Private Key${T_ME} [server.key]"
-            echo "______________________________________________________________________"
-            $openssl rsa -noout -text -in $sslkeydir/server.key
-        else
-            echo "${T_MD}Server DSA Private Key${T_ME} [server.key]"
-            echo "______________________________________________________________________"
-            $openssl dsa -noout -text -in $sslkeydir/server.key
-        fi
-    fi
-    exit 0
-fi
-
-#   find some random files
-#   We will always generate a /tmp/randfile using /dev/urandom
-#   before passing $randfile to openssl.
-randfiles='/tmp/randfile'
-for file in /var/log/messages /var/adm/messages /var/log/system.log /var/wtmp \
-            /kernel /kernel/genunix /vmunix /vmlinuz /mach /netbsd \
-            /etc/hosts /etc/group /etc/resolv.conf /bin/ls; do
-    if [ -r $file ]; then
-        if [ ".$randfiles" = . ]; then
-            randfiles="$file"
-        else
-            randfiles="${randfiles}:$file"
-        fi
-    fi
-done
-
-#   initialize random file
-if [ -f $HOME/.rnd ]; then
-    RANDFILE="$HOME/.rnd"
-else
-    RANDFILE="/tmp/.mkcert.rnd"
-    (ps; date) >$RANDFILE
-fi
-export RANDFILE
-
-#   canonicalize parameters
-case "x$type" in
-    x ) type=test ;;
-esac
-case "x$algo" in
-    xRSA|xrsa ) 
-        algo=RSA
-        ;;
-    xDSA|xdsa ) 
-        algo=DSA 
-        ;;
-    x ) 
-        algo=choose
-        ;;
-    * ) echo "Unknown algorithm \'$algo' (use RSA or DSA!)" 1>&2
-        exit 1
-        ;;
-esac
-
-#   processing
-case $type in
-
-    dummy)
-        echo ""
-        echo "${T_MD}Generating self-signed Snake Oil certificate [DUMMY]${T_ME}"
-        echo "______________________________________________________________________"
-        echo ""
-        if [ ".$algo" = .choose ]; then
-            algo=RSA
-        fi
-        if [ ".$algo" = .RSA ]; then
-            cp $sslcrtdir/snakeoil-rsa.crt $sslcrtdir/server.crt
-            (umask 077; cp $sslkeydir/snakeoil-rsa.key $sslkeydir/server.key)
-        else
-            cp $sslcrtdir/snakeoil-dsa.crt $sslcrtdir/server.crt
-            (umask 077; cp $sslkeydir/snakeoil-dsa.key $sslkeydir/server.key)
-        fi
-        echo "${T_MD}RESULT: Server Certification Files${T_ME}"
-        echo ""
-        echo "o  ${T_MD}$confdir/ssl.key/server.key${T_ME}"
-        echo "   The PEM-encoded $algo private key file which you configure"
-        echo "   with the 'SSLCertificateKeyFile' directive (automatically done"
-        echo "   when you install via APACI). ${T_MD}KEEP THIS FILE PRIVATE!${T_ME}"
-        echo ""
-        echo "o  ${T_MD}$confdir/ssl.crt/server.crt${T_ME}"
-        echo "   The PEM-encoded X.509 certificate file which you configure"
-        echo "   with the 'SSLCertificateFile' directive (automatically done"
-        echo "   when you install via APACI)."
-        echo ""
-        echo "WARNING: Do not use this for real-life/production systems"
-        echo ""
-        ;;
-
-    test)
-        echo ""
-        echo "${T_MD}Generating test certificate signed by Snake Oil CA [TEST]${T_ME}"
-        echo "WARNING: Do not use this for real-life/production systems"
-        if [ ".$algo" = .choose ]; then
-            echo "______________________________________________________________________"
-            echo ""
-            echo "${T_MD}STEP 0: Decide the signature algorithm used for certificate${T_ME}"
-            echo "The generated X.509 CA certificate can contain either"
-            echo "RSA or DSA based ingredients. Select the one you want to use."
-            def1=R def2=r def=RSA
-            prompt="Signature Algorithm ((R)SA or (D)SA) [$def1]:"
-            while [ 1 ]; do
-                echo dummy | awk '{ printf("%s", prompt); }' "prompt=$prompt"
-                read algo
-                if [ ".$algo" = ".$def1" -o ".$algo" = ".$def2" -o ".$algo" = . ]; then
-                    algo=$def
-                    break
-                elif [ ".$algo" = ".R" -o ".$algo" = ".r" ]; then
-                    algo=RSA
-                    break
-                elif [ ".$algo" = ".D" -o ".$algo" = ".d" ]; then
-                    algo=DSA
-                    break
-                else
-                    echo "mkcert.sh:Warning: Invalid selection" 1>&2
-                fi
-            done
-        fi
-        if [ ".$algo" = ".DSA" ]; then
-            echo ""
-            echo "${T_MD}WARNING!${T_ME} You're generating a DSA based certificate/key pair."
-            echo "         This implies that RSA based ciphers won't be available later,"
-            echo "         which for your web server currently still means that mostly all"
-            echo "         popular web browsers cannot connect to it. At least not until"
-            echo "         you also generate an additional RSA based certificate/key pair"
-            echo "         and configure them in parallel."
-        fi
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}STEP 1: Generating $algo private key (1024 bit) [server.key]${T_ME}"
-        (umask 077; head -500 /dev/urandom > randfile)
-        if [ ".$algo" = .RSA ]; then
-            if [ ".$randfiles" != . ]; then
-                $openssl genrsa -rand $randfiles -out $sslkeydir/server.key 1024
-            else
-                $openssl genrsa -out $sslkeydir/server.key 1024
-            fi
-            if [ $? -ne 0 ]; then
-                echo "mkcert.sh:Error: Failed to generate RSA private key" 1>&2
-                exit 1
-            fi
-        else
-            echo "Generating DSA private key via SnakeOil CA DSA parameters"
-            if [ ".$randfiles" != . ]; then
-                (umask 077
-                 $openssl gendsa -rand $randfiles \
-                                 -out $sslkeydir/server.key \
-                                 $sslprmdir/snakeoil-ca-dsa.prm)
-            else
-                (umask 077
-                 $openssl gendsa -out $sslkeydir/server.key \
-                                 $sslprmdir/snakeoil-ca-dsa.prm)
-            fi
-            if [ $? -ne 0 ]; then
-                echo "mkcert.sh:Error: Failed to generate DSA private key" 1>&2
-                exit 1
-            fi
-        fi
-        rm -f randfile
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}STEP 2: Generating X.509 certificate signing request [server.csr]${T_ME}"
-        cat >/tmp/.mkcert.cfg <<EOT
-[ req ]
-default_bits                    = 1024
-distinguished_name              = req_DN
-[ req_DN ]
-countryName                     = "1. Country Name             (2 letter code)"
-countryName_default             = XY
-countryName_min                 = 2
-countryName_max                 = 2
-stateOrProvinceName             = "2. State or Province Name   (full name)    "
-stateOrProvinceName_default     = Snake Desert
-localityName                    = "3. Locality Name            (eg, city)     "
-localityName_default            = Snake Town
-0.organizationName              = "4. Organization Name        (eg, company)  "
-0.organizationName_default      = Snake Oil, Ltd
-organizationalUnitName          = "5. Organizational Unit Name (eg, section)  "
-organizationalUnitName_default  = Webserver Team
-commonName                      = "6. Common Name              (eg, FQDN)     "
-commonName_max                  = 64
-commonName_default              = www.snakeoil.dom
-emailAddress                    = "7. Email Address            (eg, name@FQDN)"
-emailAddress_max                = 40
-emailAddress_default            = www@snakeoil.dom
-EOT
-        $openssl req -config /tmp/.mkcert.cfg \
-                     -new \
-                     -key $sslkeydir/server.key \
-                     -out $sslcsrdir/server.csr
-        if [ $? -ne 0 ]; then
-            echo "mkcert.sh:Error: Failed to generate certificate signing request" 1>&2
-            exit 1
-        fi
-        rm -f /tmp/.mkcert.cfg
-        prompt="8. Certificate Validity     (days)          [365]:"
-        echo dummy | awk '{ printf("%s", prompt); }' "prompt=$prompt"
-        read days
-        if [ ".$days" = . ]; then
-            days=365
-        fi
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}STEP 3: Generating X.509 certificate signed by Snake Oil CA [server.crt]${T_ME}"
-        echo dummy | awk '{ printf("%s", prompt); }' "prompt=Certificate Version (1 or 3) [3]:"
-        read certversion
-        extfile=""
-        if [ ".$certversion" = .3 -o ".$certversion" = . ]; then
-            extfile="-extfile /tmp/.mkcert.cfg"
-            cat >/tmp/.mkcert.cfg <<EOT
-extensions = x509v3
-[ x509v3 ]
-subjectAltName   = email:copy
-nsComment        = "mod_ssl generated test server certificate"
-nsCertType       = server
-EOT
-        fi
-        if [ ! -f /tmp/.mkcert.serial ]; then
-            echo '01' >/tmp/.mkcert.serial
-        fi
-        if [ ".$algo" = .RSA ]; then
-            $openssl x509 $extfile \
-                          -days $days \
-                          -CAserial /tmp/.mkcert.serial \
-                          -CA $sslcrtdir/snakeoil-ca-rsa.crt \
-                          -CAkey $sslkeydir/snakeoil-ca-rsa.key \
-                          -in $sslcsrdir/server.csr -req \
-                          -out $sslcrtdir/server.crt
-        else
-            $openssl x509 $extfile \
-                          -days $days \
-                          -CAserial /tmp/.mkcert.serial \
-                          -CA $sslcrtdir/snakeoil-ca-dsa.crt \
-                          -CAkey $sslkeydir/snakeoil-ca-dsa.key \
-                          -in $sslcsrdir/server.csr -req \
-                          -out $sslcrtdir/server.crt
-        fi
-        if [ $? -ne 0 ]; then
-            echo "mkcert.sh:Error: Failed to generate X.509 certificate" 1>&2
-            exit 1
-        fi
-        rm -f /tmp/.mkcert.cfg
-        echo "Verify: matching certificate & key modulus"
-        modcrt=`$openssl x509 -noout -modulus -in $sslcrtdir/server.crt | sed -e 's;.*Modulus=;;'`
-        if [ ".$algo" = .RSA ]; then
-            modkey=`$openssl rsa -noout -modulus -in $sslkeydir/server.key | sed -e 's;.*Modulus=;;'`
-        else
-            modkey=`$openssl dsa -noout -modulus -in $sslkeydir/server.key | sed -e 's;.*Key=;;'`
-        fi
-        if [ ".$modcrt" != ".$modkey" ]; then
-            echo "mkcert.sh:Error: Failed to verify modulus on resulting X.509 certificate" 1>&2
-            exit 1
-        fi
-        echo "Verify: matching certificate signature"
-        if [ ".$algo" = .RSA ]; then
-            $openssl verify -CAfile $sslcrtdir/snakeoil-ca-rsa.crt $sslcrtdir/server.crt
-        else
-            $openssl verify -CAfile $sslcrtdir/snakeoil-ca-dsa.crt $sslcrtdir/server.crt
-        fi
-        if [ $? -ne 0 ]; then
-            echo "mkcert.sh:Error: Failed to verify signature on resulting X.509 certificate" 1>&2
-            exit 1
-        fi
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}STEP 4: Enrypting $algo private key with a pass phrase for security [server.key]${T_ME}"
-        echo "The contents of the server.key file (the generated private key) has to be"
-        echo "kept secret. So we strongly recommend you to encrypt the server.key file"
-        echo "with a Triple-DES cipher and a Pass Phrase."
-        while [ 1 ]; do
-            echo dummy | awk '{ printf("Encrypt the private key now? [Y/n]: "); }'
-            read rc
-            if [ ".$rc" = .n -o  ".$rc" = .N ]; then
-                rc="n"
-                break
-            fi
-            if [ ".$rc" = .y -o  ".$rc" = .Y -o ".$rc" = . ]; then
-                rc="y"
-                break
-            fi
-        done
-        if [ ".$rc" = .y ]; then
-            if [ ".$algo" = .RSA ]; then
-                (umask 077
-                 $openssl rsa -des3 \
-                              -in  $sslkeydir/server.key \
-                              -out $sslkeydir/server.key.crypt)
-            else
-                (umask 077
-                 $openssl dsa -des3 \
-                              -in  $sslkeydir/server.key \
-                              -out $sslkeydir/server.key.crypt)
-            fi
-            if [ $? -ne 0 ]; then
-                echo "mkcert.sh:Error: Failed to encrypt $algo private key" 1>&2
-                exit 1
-            fi
-            (umask 077; cp $sslkeydir/server.key.crypt $sslkeydir/server.key)
-            rm -f $sslkeydir/server.key.crypt
-            echo "Fine, you're using an encrypted $algo private key."
-        else
-            echo "Warning, you're using an unencrypted $algo private key."
-            echo "Please notice this fact and do this on your own risk."
-        fi
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}RESULT: Server Certification Files${T_ME}"
-        echo ""
-        echo "o  ${T_MD}$confdir/ssl.key/server.key${T_ME}"
-        echo "   The PEM-encoded $algo private key file which you configure"
-        echo "   with the 'SSLCertificateKeyFile' directive (automatically done"
-        echo "   when you install via APACI). ${T_MD}KEEP THIS FILE PRIVATE!${T_ME}"
-        echo ""
-        echo "o  ${T_MD}$confdir/ssl.crt/server.crt${T_ME}"
-        echo "   The PEM-encoded X.509 certificate file which you configure"
-        echo "   with the 'SSLCertificateFile' directive (automatically done"
-        echo "   when you install via APACI)."
-        echo ""
-        echo "o  ${T_MD}$confdir/ssl.csr/server.csr${T_ME}"
-        echo "   The PEM-encoded X.509 certificate signing request file which" 
-        echo "   you can send to an official Certificate Authority (CA) in order"
-        echo "   to request a real server certificate (signed by this CA instead"
-        echo "   of our demonstration-only Snake Oil CA) which later can replace"
-        echo "   the $confdir/ssl.crt/server.crt file."
-        echo ""
-        echo "WARNING: Do not use this for real-life/production systems"
-        echo ""
-        ;;
-
-    custom)
-        echo ""
-        echo "${T_MD}Generating custom certificate signed by own CA [CUSTOM]${T_ME}"
-        if [ ".$algo" = .choose ]; then
-            echo "______________________________________________________________________"
-            echo ""
-            echo "${T_MD}STEP 0: Decide the signature algorithm used for certificates${T_ME}"
-            echo "The generated X.509 certificates can contain either"
-            echo "RSA or DSA based ingredients. Select the one you want to use."
-            def1=R def2=r def=RSA
-            prompt="Signature Algorithm ((R)SA or (D)SA) [$def1]:"
-            while [ 1 ]; do
-                echo dummy | awk '{ printf("%s", prompt); }' "prompt=$prompt"
-                read algo
-                if [ ".$algo" = ".$def1" -o ".$algo" = ".$def2" -o ".$algo" = . ]; then
-                    algo=$def
-                    break
-                elif [ ".$algo" = ".R" -o ".$algo" = ".r" ]; then
-                    algo=RSA
-                    break
-                elif [ ".$algo" = ".D" -o ".$algo" = ".d" ]; then
-                    algo=DSA
-                    break
-                else
-                    echo "mkcert.sh:Warning: Invalid selection" 1>&2
-                fi
-            done
-        fi
-        if [ ".$algo" = ".DSA" ]; then
-            echo ""
-            echo "${T_MD}WARNING!${T_ME} You're generating DSA based certificate/key pairs."
-            echo "         This implies that RSA based ciphers won't be available later,"
-            echo "         which for your web server currently still means that mostly all"
-            echo "         popular web browsers cannot connect to it. At least not until"
-            echo "         you also generate an additional RSA based certificate/key pair"
-            echo "         and configure them in parallel."
-        fi
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}STEP 1: Generating $algo private key for CA (1024 bit) [ca.key]${T_ME}"
-        (umask 077; head -500 /dev/urandom > randfile)
-        if [ ".$algo" = .RSA ]; then
-            if [ ".$randfiles" != . ]; then
-                $openssl genrsa -rand $randfiles -out $sslkeydir/ca.key 1024
-            else
-                $openssl genrsa -out $sslkeydir/ca.key 1024
-            fi
-            if [ $? -ne 0 ]; then
-                echo "mkcert.sh:Error: Failed to generate RSA private key" 1>&2
-                exit 1
-            fi
-        else
-            if [ ".$randfiles" != . ]; then
-                $openssl dsaparam -rand $randfiles -out $sslprmdir/ca.prm 1024
-                echo "Generating DSA private key:"
-                (umask 077
-                 $openssl gendsa -rand $randfiles -out $sslkeydir/ca.key $sslprmdir/ca.prm)
-            else
-                $openssl dsaparam -out $sslprmdir/ca.prm 1024
-                echo "Generating DSA private key:"
-                (umask 077
-                 $openssl gendsa -out $sslkeydir/ca.key $sslprmdir/ca.prm)
-            fi
-            if [ $? -ne 0 ]; then
-                echo "mkcert.sh:Error: Failed to generate DSA private key" 1>&2
-                exit 1
-            fi
-        fi
-        rm -f randfile
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}STEP 2: Generating X.509 certificate signing request for CA [ca.csr]${T_ME}"
-        cat >/tmp/.mkcert.cfg <<EOT
-[ req ]
-default_bits                    = 1024
-distinguished_name              = req_DN
-[ req_DN ]
-countryName                     = "1. Country Name             (2 letter code)"
-countryName_default             = XY
-countryName_min                 = 2
-countryName_max                 = 2
-stateOrProvinceName             = "2. State or Province Name   (full name)    "
-stateOrProvinceName_default     = Snake Desert
-localityName                    = "3. Locality Name            (eg, city)     "
-localityName_default            = Snake Town
-0.organizationName              = "4. Organization Name        (eg, company)  "
-0.organizationName_default      = Snake Oil, Ltd
-organizationalUnitName          = "5. Organizational Unit Name (eg, section)  "
-organizationalUnitName_default  = Certificate Authority
-commonName                      = "6. Common Name              (eg, CA name)  "
-commonName_max                  = 64
-commonName_default              = Snake Oil CA
-emailAddress                    = "7. Email Address            (eg, name@FQDN)"
-emailAddress_max                = 40
-emailAddress_default            = ca@snakeoil.dom
-EOT
-        $openssl req -config /tmp/.mkcert.cfg \
-                     -new \
-                     -key $sslkeydir/ca.key \
-                     -out $sslcsrdir/ca.csr
-        if [ $? -ne 0 ]; then
-            echo "mkcert.sh:Error: Failed to generate certificate signing request" 1>&2
-            exit 1
-        fi
-        rm -f /tmp/.mkcert.cfg
-        prompt="8. Certificate Validity     (days)          [365]:"
-        echo dummy | awk '{ printf("%s", prompt); }' "prompt=$prompt"
-        read days
-        if [ ".$days" = . ]; then
-            days=365
-        fi
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}STEP 3: Generating X.509 certificate for CA signed by itself [ca.crt]${T_ME}"
-        echo dummy | awk '{ printf("%s", prompt); }' "prompt=Certificate Version (1 or 3) [3]:"
-        read certversion
-        extfile=""
-        if [ ".$certversion" = .3 -o ".$certversion" = . ]; then
-            extfile="-extfile /tmp/.mkcert.cfg"
-            cat >/tmp/.mkcert.cfg <<EOT
-extensions = x509v3
-[ x509v3 ]
-subjectAltName   = email:copy
-basicConstraints = CA:true,pathlen:0
-nsComment        = "mod_ssl generated custom CA certificate"
-nsCertType       = sslCA
-EOT
-        fi
-        $openssl x509 $extfile \
-                      -days $days \
-                      -signkey $sslkeydir/ca.key \
-                      -in      $sslcsrdir/ca.csr -req \
-                      -out     $sslcrtdir/ca.crt
-        if [ $? -ne 0 ]; then
-            echo "mkcert.sh:Error: Failed to generate self-signed CA certificate" 1>&2
-            exit 1
-        fi
-        rm -f /tmp/.mkcert.cfg
-        echo "Verify: matching certificate & key modulus"
-        modcrt=`$openssl x509 -noout -modulus -in $sslcrtdir/ca.crt | sed -e 's;.*Modulus=;;'`
-        if [ ".$algo" = .RSA ]; then
-            modkey=`$openssl rsa -noout -modulus -in $sslkeydir/ca.key | sed -e 's;.*Modulus=;;'`
-        else
-            modkey=`$openssl dsa -noout -modulus -in $sslkeydir/ca.key | sed -e 's;.*Key=;;'`
-        fi
-        if [ ".$modcrt" != ".$modkey" ]; then
-            echo "mkcert.sh:Error: Failed to verify modulus on resulting X.509 certificate" 1>&2
-            exit 1
-        fi
-        echo "Verify: matching certificate signature"
-        $openssl verify $sslcrtdir/ca.crt
-        if [ $? -ne 0 ]; then
-            echo "mkcert.sh:Error: Failed to verify signature on resulting X.509 certificate" 1>&2
-            exit 1
-        fi
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}STEP 4: Generating $algo private key for SERVER (1024 bit) [server.key]${T_ME}"
-        (umask 077; head -500 /dev/urandom > randfile)
-        if [ ".$algo" = .RSA ]; then
-            if [ ".$randfiles" != . ]; then
-                $openssl genrsa -rand $randfiles -out $sslkeydir/server.key 1024
-            else
-                $openssl genrsa -out $sslkeydir/server.key 1024
-            fi
-            if [ $? -ne 0 ]; then
-                echo "mkcert.sh:Error: Failed to generate RSA private key" 1>&2
-                exit 1
-            fi
-        else
-            if [ ".$randfiles" != . ]; then
-                (umask 077
-                 $openssl gendsa -rand $randfiles \
-                                 -out $sslkeydir/server.key $sslprmdir/ca.prm)
-            else
-                (umask 077
-                 $openssl gendsa -out $sslkeydir/server.key $sslprmdir/ca.prm)
-            fi
-            if [ $? -ne 0 ]; then
-                echo "mkcert.sh:Error: Failed to generate DSA private key" 1>&2
-                exit 1
-            fi
-        fi
-        rm -f randfile
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}STEP 5: Generating X.509 certificate signing request for SERVER [server.csr]${T_ME}"
-        cat >/tmp/.mkcert.cfg <<EOT
-[ req ]
-default_bits                    = 1024
-distinguished_name              = req_DN
-[ req_DN ]
-countryName                     = "1. Country Name             (2 letter code)"
-countryName_default             = XY
-countryName_min                 = 2
-countryName_max                 = 2
-stateOrProvinceName             = "2. State or Province Name   (full name)    "
-stateOrProvinceName_default     = Snake Desert
-localityName                    = "3. Locality Name            (eg, city)     "
-localityName_default            = Snake Town
-0.organizationName              = "4. Organization Name        (eg, company)  "
-0.organizationName_default      = Snake Oil, Ltd
-organizationalUnitName          = "5. Organizational Unit Name (eg, section)  "
-organizationalUnitName_default  = Webserver Team
-commonName                      = "6. Common Name              (eg, FQDN)     "
-commonName_max                  = 64
-commonName_default              = www.snakeoil.dom
-emailAddress                    = "7. Email Address            (eg, name@fqdn)"
-emailAddress_max                = 40
-emailAddress_default            = www@snakeoil.dom
-EOT
-        $openssl req -config /tmp/.mkcert.cfg \
-                     -new \
-                     -key $sslkeydir/server.key \
-                     -out $sslcsrdir/server.csr
-        if [ $? -ne 0 ]; then
-            echo "mkcert.sh:Error: Failed to generate certificate signing request" 1>&2
-            exit 1
-        fi
-        rm -f /tmp/.mkcert.cfg
-        prompt="8. Certificate Validity     (days)          [365]:"
-        echo dummy | awk '{ printf("%s", prompt); }' "prompt=$prompt"
-        read days
-        if [ ".$days" = . ]; then
-            days=365
-        fi
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}STEP 6: Generating X.509 certificate signed by own CA [server.crt]${T_ME}"
-        echo dummy | awk '{ printf("%s", prompt); }' "prompt=Certificate Version (1 or 3) [3]:"
-        read certversion
-        extfile=""
-        if [ ".$certversion" = .3 -o ".$certversion" = . ]; then
-            extfile="-extfile /tmp/.mkcert.cfg"
-            cat >/tmp/.mkcert.cfg <<EOT
-extensions = x509v3
-[ x509v3 ]
-subjectAltName   = email:copy
-nsComment        = "mod_ssl generated custom server certificate"
-nsCertType       = server
-EOT
-        fi
-        if [ ! -f /tmp/.mkcert.serial ]; then
-            echo '01' >/tmp/.mkcert.serial
-        fi
-        $openssl x509 $extfile \
-                      -days $days \
-                      -CAserial /tmp/.mkcert.serial \
-                      -CA    $sslcrtdir/ca.crt \
-                      -CAkey $sslkeydir/ca.key \
-                      -in    $sslcsrdir/server.csr -req \
-                      -out   $sslcrtdir/server.crt
-        if [ $? -ne 0 ]; then
-            echo "mkcert.sh:Error: Failed to generate X.509 certificate" 1>&2
-            exit 1
-        fi
-        rm -f /tmp/.mkcert.cfg
-        echo "Verify: matching certificate & key modulus"
-        modcrt=`$openssl x509 -noout -modulus -in $sslcrtdir/server.crt | sed -e 's;.*Modulus=;;'`
-        if [ ".$algo" = .RSA ]; then
-            modkey=`$openssl rsa -noout -modulus -in $sslkeydir/server.key | sed -e 's;.*Modulus=;;'`
-        else
-            modkey=`$openssl dsa -noout -modulus -in $sslkeydir/server.key | sed -e 's;.*Key=;;'`
-        fi
-        if [ ".$modcrt" != ".$modkey" ]; then
-            echo "mkcert.sh:Error: Failed to verify modulus on resulting X.509 certificate" 1>&2
-            exit 1
-        fi
-        echo "Verify: matching certificate signature"
-        $openssl verify -CAfile $sslcrtdir/ca.crt $sslcrtdir/server.crt
-        if [ $? -ne 0 ]; then
-            echo "mkcert.sh:Error: Failed to verify signature on resulting X.509 certificate" 1>&2
-            exit 1
-        fi
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}STEP 7: Enrypting $algo private key of CA with a pass phrase for security [ca.key]${T_ME}"
-        echo "The contents of the ca.key file (the generated private key) has to be"
-        echo "kept secret. So we strongly recommend you to encrypt the server.key file"
-        echo "with a Triple-DES cipher and a Pass Phrase."
-        while [ 1 ]; do
-            echo dummy | awk '{ printf("Encrypt the private key now? [Y/n]: "); }'
-            read rc
-            if [ ".$rc" = .n -o  ".$rc" = .N ]; then
-                rc="n"
-                break
-            fi
-            if [ ".$rc" = .y -o  ".$rc" = .Y -o ".$rc" = . ]; then
-                rc="y"
-                break
-            fi
-        done
-        if [ ".$rc" = .y ]; then
-            if [ ".$algo" = .RSA ]; then
-                (umask 077
-                 $openssl rsa -des3 \
-                              -in  $sslkeydir/ca.key \
-                              -out $sslkeydir/ca.key.crypt)
-            else
-                (umask 077
-                 $openssl dsa -des3 \
-                              -in  $sslkeydir/ca.key \
-                              -out $sslkeydir/ca.key.crypt)
-            fi
-            if [ $? -ne 0 ]; then
-                echo "mkcert.sh:Error: Failed to encrypt $algo private key" 1>&2
-                exit 1
-            fi
-            (umask 077; cp $sslkeydir/ca.key.crypt $sslkeydir/ca.key)
-            rm -f $sslkeydir/ca.key.crypt
-            echo "Fine, you're using an encrypted private key."
-        else
-            echo "Warning, you're using an unencrypted private key."
-            echo "Please notice this fact and do this on your own risk."
-        fi
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}STEP 8: Enrypting $algo private key of SERVER with a pass phrase for security [server.key]${T_ME}"
-        echo "The contents of the server.key file (the generated private key) has to be"
-        echo "kept secret. So we strongly recommend you to encrypt the server.key file"
-        echo "with a Triple-DES cipher and a Pass Phrase."
-        while [ 1 ]; do
-            echo dummy | awk '{ printf("Encrypt the private key now? [Y/n]: "); }'
-            read rc
-            if [ ".$rc" = .n -o  ".$rc" = .N ]; then
-                rc="n"
-                break
-            fi
-            if [ ".$rc" = .y -o  ".$rc" = .Y -o ".$rc" = . ]; then
-                rc="y"
-                break
-            fi
-        done
-        if [ ".$rc" = .y ]; then
-            if [ ".$algo" = .RSA ]; then
-                (umask 077
-                 $openssl rsa -des3 \
-                              -in  $sslkeydir/server.key \
-                              -out $sslkeydir/server.key.crypt)
-            else
-                (umask 077
-                 $openssl dsa -des3 \
-                              -in  $sslkeydir/server.key \
-                              -out $sslkeydir/server.key.crypt)
-            fi
-            if [ $? -ne 0 ]; then
-                echo "mkcert.sh:Error: Failed to encrypt $algo private key" 1>&2
-                exit 1
-            fi
-            (umask 077; cp $sslkeydir/server.key.crypt $sslkeydir/server.key)
-            rm -f $sslkeydir/server.key.crypt
-            echo "Fine, you're using an encrypted $algo private key."
-        else
-            echo "Warning, you're using an unencrypted $algo private key."
-            echo "Please notice this fact and do this on your own risk."
-        fi
-        echo "______________________________________________________________________"
-        echo ""
-        echo "${T_MD}RESULT: CA and Server Certification Files${T_ME}"
-        echo ""
-        echo "o  ${T_MD}$confdir/ssl.key/ca.key${T_ME}"
-        echo "   The PEM-encoded $algo private key file of the CA which you can"
-        echo "   use to sign other servers or clients. ${T_MD}KEEP THIS FILE PRIVATE!${T_ME}"
-        echo ""
-        echo "o  ${T_MD}$confdir/ssl.crt/ca.crt${T_ME}"
-        echo "   The PEM-encoded X.509 certificate file of the CA which you use to"
-        echo "   sign other servers or clients. When you sign clients with it (for"
-        echo "   SSL client authentication) you can configure this file with the"
-        echo "   'SSLCACertificateFile' directive."
-        echo ""
-        echo "o  ${T_MD}$confdir/ssl.key/server.key${T_ME}"
-        echo "   The PEM-encoded $algo private key file of the server which you configure"
-        echo "   with the 'SSLCertificateKeyFile' directive (automatically done"
-        echo "   when you install via APACI). ${T_MD}KEEP THIS FILE PRIVATE!${T_ME}"
-        echo ""
-        echo "o  ${T_MD}$confdir/ssl.crt/server.crt${T_ME}"
-        echo "   The PEM-encoded X.509 certificate file of the server which you configure"
-        echo "   with the 'SSLCertificateFile' directive (automatically done"
-        echo "   when you install via APACI)."
-        echo ""
-        echo "o  ${T_MD}$confdir/ssl.csr/server.csr${T_ME}"
-        echo "   The PEM-encoded X.509 certificate signing request of the server file which" 
-        echo "   you can send to an official Certificate Authority (CA) in order"
-        echo "   to request a real server certificate (signed by this CA instead"
-        echo "   of our own CA) which later can replace the $confdir/ssl.crt/server.crt"
-        echo "   file."
-        echo ""
-        echo "Congratulations that you establish your server with real certificates."
-        echo ""
-        ;;
-
-    existing)
-        echo ""
-        echo "${T_MD}Using existing custom certificate [EXISTING]${T_ME}"
-        echo "______________________________________________________________________"
-        echo ""
-        if [ ".$crt" = . ]; then
-            echo "mkcert.sh: No certificate file given" 1>&2
-            exit 1
-        fi
-        if [ ! -f "$crt" ]; then
-            echo "mkcert.sh: Cannot find certificate file: $crt" 1>&2
-            exit 1
-        fi
-        if [ $crt -ef $sslcrtdir/server.crt ]; then
-            mv -f $crt $crt.backup
-            crt="$crt.backup"
-        fi
-        if [ ".$key" != . ]; then
-            if [ ! -f "$key" ]; then
-                echo "mkcert.sh: Cannot find private key file: $key" 1>&2
-                exit 1
-            fi
-            if [ $key -ef $sslkeydir/server.key ]; then
-                mv -f $key $key.backup
-                key="$key.backup"
-            fi
-            cp $crt $sslcrtdir/server.crt
-            (umask 077; cp $key $sslkeydir/server.key)
-        else
-            if [ $crt -ef $sslcrtdir/server.crt ]; then
-                mv -f $crt $crt.backup
-                crt="$crt.backup"
-            fi
-            key=$crt
-            umask 077
-            touch $sslkeydir/server.key
-            sed -e '/-----BEGIN CERTIFICATE/,/-----END CERTIFICATE/p' -e '/.*/d' \
-                <$crt >$sslcrtdir/server.crt
-            sed -e '/-----BEGIN ... PRIVATE KEY/,/-----END ... PRIVATE KEY/p' -e '/.*/d' \
-                <$key >$sslkeydir/server.key
-        fi
-        $openssl x509 -noout -in $sslcrtdir/server.crt
-        if [ $? -ne 0 ]; then
-            echo "mkcert.sh:Error: Failed to check certificate contents: $crt" 1>&2
-            exit 1
-        fi
-        if [ ".`grep 'PRIVATE KEY' $sslkeydir/server.key | grep RSA`" != . ]; then
-            algo=RSA
-        else
-            algo=DSA
-        fi
-        echo "${T_MD}RESULT: Server Certification Files${T_ME}"
-        echo ""
-        echo "o  ${T_MD}$confdir/ssl.key/server.key${T_ME}"
-        echo "   The PEM-encoded $algo private key file which you configure"
-        echo "   with the 'SSLCertificateKeyFile' directive (automatically done"
-        echo "   when you install via APACI). ${T_MD}KEEP THIS FILE PRIVATE!${T_ME}"
-        echo ""
-        echo "o  ${T_MD}$confdir/ssl.crt/server.crt${T_ME}"
-        echo "   The PEM-encoded X.509 certificate file which you configure"
-        echo "   with the 'SSLCertificateFile' directive (automatically done"
-        echo "   when you install via APACI)."
-        echo ""
-        echo "Congratulations that you establish your server with real certificates."
-        echo ""
-        ;;
-
-esac
-
-##EOF##
diff --git a/www/apache2/options.mk b/www/apache2/options.mk
deleted file mode 100644
index 6d4e3305d1d..00000000000
--- a/www/apache2/options.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: options.mk,v 1.9 2010/11/01 18:03:04 adam Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.apache
-PKG_SUPPORTED_OPTIONS=	suexec
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=		suexec
-.if !empty(PKG_OPTIONS:Msuexec)
-PKG_USERS_VARS+=	APACHE_USER
-BUILD_DEFS+=		VARBASE APACHE_SUEXEC_PATH
-BUILD_DEFS+=		APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE
-
-APACHE_SUEXEC_DOCROOT?=	${PREFIX}/share/httpd/htdocs
-APACHE_SUEXEC_PATH=	/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
-APACHE_SUEXEC_LOGFILE?=	${VARBASE}/log/httpd/suexec.log
-APACHE_SUEXEC_CONFIGURE_ARGS+=						\
-	--with-suexec-bin=${PREFIX}/sbin/suexec				\
-	--with-suexec-caller=${APACHE_USER}				\
-	--with-suexec-safepath='${APACHE_SUEXEC_PATH:Q}'		\
-	--with-suexec-docroot=${APACHE_SUEXEC_DOCROOT:Q}		\
-	--with-suexec-logfile=${APACHE_SUEXEC_LOGFILE}
-
-APACHE_MODULES+=	suexec
-CONFIGURE_ARGS+=	${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
-BUILD_DEFS+=		APACHE_SUEXEC_CONFIGURE_ARGS
-PLIST.suexec=		yes
-.endif
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
deleted file mode 100644
index 3d370f171b6..00000000000
--- a/www/apache2/patches/patch-aa
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-aa,v 1.14 2005/02/09 14:57:52 tron Exp $
-
---- Makefile.in.orig	2004-11-24 19:31:09.000000000 +0000
-+++ Makefile.in	2005-02-09 13:55:40.000000000 +0000
-@@ -4,7 +4,7 @@
- 
- PROGRAM_NAME         = $(progname)
- PROGRAM_SOURCES      = modules.c
--PROGRAM_LDADD        = $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
-+PROGRAM_LDADD        = $(HTTPD_LDFLAGS) $(DL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) $(DL_LIBS)
- PROGRAM_DEPENDENCIES = \
-   $(BUILTIN_LIBS) \
-   $(MPM_LIB) \
-@@ -14,7 +14,7 @@
- PROGRAMS        = $(PROGRAM_NAME)
- TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
- PHONY_TARGETS   = $(srcdir)/buildmark.c
--INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
-+INSTALL_TARGETS = install-htdocs install-error install-icons \
- 	install-other install-cgi install-include install-suexec install-man \
- 	install-build
- 
-@@ -71,6 +71,7 @@
- 	    				< $$i; \
- 	    		fi \
- 	    	) > $(DESTDIR)$(sysconfdir)/$$i; \
-+		if false; then \
- 	    	chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
- 	    	file=`echo $$i|sed s/-std//`; \
- 	    	if [ "$$file" = "httpd.conf" ]; then \
-@@ -79,13 +80,16 @@
- 	    	if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
- 	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
- 	    	fi; \
-+	    	fi; \
- 	    done ; \
- 	done ; \
- 	if test -f "$(builddir)/envvars-std"; then \
- 	    cp -p envvars-std $(DESTDIR)$(sbindir); \
-+	    if false; then \
- 	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
- 	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
- 	    fi ; \
-+	    fi ; \
- 	fi
- 
- install-build:
-@@ -93,8 +97,6 @@
- 	@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir) 
- 	@cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
- 	cp build/*.mk $(DESTDIR)$(installbuilddir); \
--	sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
--	    build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \
- 	cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
- 	cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
- 
-@@ -108,7 +110,7 @@
- 	doxygen $(top_srcdir)/docs/doxygen.conf
- 
- install-htdocs:
--	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
-+	-@if false; then \
-            echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
-         else \
- 	    echo Installing HTML documents ; \
-@@ -118,7 +120,7 @@
- 	fi
- 
- install-error:
--	-@if [ -d $(DESTDIR)$(errordir) ]; then \
-+	-@if false; then \
-            echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
-         else \
- 	    echo Installing error documents ; \
-@@ -128,7 +130,7 @@
- 	fi
- 
- install-icons:
--	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
-+	-@if false; then \
-            echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
-         else \
- 	    echo Installing icons ; \
-@@ -138,7 +140,7 @@
- 	fi
- 
- install-cgi:
--	-@if [ -d $(DESTDIR)$(cgidir) ];then \
-+	-@if false; then \
- 	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
- 	else \
- 	   echo Installing CGIs ; \
-@@ -191,8 +193,6 @@
- 	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
- 	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
- 	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
--	@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
--	@(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true
- 
- install-suexec:
- 	@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache2/patches/patch-ab b/www/apache2/patches/patch-ab
deleted file mode 100644
index 1c76fab3c98..00000000000
--- a/www/apache2/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2010/11/01 18:03:04 adam Exp $
-
---- server/mpm_common.c.orig	2007-07-14 17:03:18.000000000 +0000
-+++ server/mpm_common.c
-@@ -425,7 +425,7 @@ AP_DECLARE(gid_t) ap_gname2id(const char
- #ifndef HAVE_INITGROUPS
- int initgroups(const char *name, gid_t basegid)
- {
--#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) || defined(TPF) || defined(__TANDEM) || defined(OS2) || defined(WIN32) || defined(NETWARE)
-+#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) || defined(TPF) || defined(__TANDEM) || defined(OS2) || defined(WIN32) || defined(NETWARE) || defined(__INTERIX)
- /* QNX, MPE and BeOS do not appear to support supplementary groups. */
-     return 0;
- #else /* ndef QNX */
diff --git a/www/apache2/patches/patch-ac b/www/apache2/patches/patch-ac
deleted file mode 100644
index 65be10df3cc..00000000000
--- a/www/apache2/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2010/11/01 18:03:04 adam Exp $
-
---- configure.orig	2010-10-14 18:00:29.000000000 +0000
-+++ configure
-@@ -5384,7 +5384,7 @@ case $host in
-               LTCFLAGS="-prefer-non-pic -static"
-               ;;
-           *)
--              SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)'
-+              SH_LIBTOOL='shlibtool'
-               SHLTCFLAGS=""
-               LTCFLAGS=""
-               ;;
-@@ -18868,7 +18868,6 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
- 
--perlbin=`$ac_aux_dir/PrintPath perl`
- if test "x$perlbin" = "x"; then
-     perlbin="/replace/with/path/to/perl/interpreter"
- fi
diff --git a/www/apache2/patches/patch-ad b/www/apache2/patches/patch-ad
deleted file mode 100644
index a2137450ac6..00000000000
--- a/www/apache2/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2006/08/30 06:16:27 rillig Exp $
-
---- config.layout.orig	2004-11-24 19:31:09.000000000 +0000
-+++ config.layout
-@@ -322,3 +322,26 @@
-     installbuilddir: ${prefix}/etc/apache2/build
-     errordir:      ${datadir}/error
- </Layout>
-+
-+#   NetBSD (pkgsrc) layout
-+<Layout NetBSD>
-+    prefix:        @PREFIX@
-+    exec_prefix:   ${prefix}
-+    bindir:        ${exec_prefix}/bin
-+    sbindir:       ${exec_prefix}/sbin
-+    libexecdir:    ${exec_prefix}/lib/httpd
-+    mandir:        ${prefix}/man
-+    sysconfdir:    @SYSCONFDIR@
-+    datadir:       ${prefix}/share/httpd
-+    installbuilddir: ${datadir}/build
-+    errordir:      ${datadir}/error
-+    iconsdir:      ${datadir}/icons
-+    htdocsdir:     ${datadir}/htdocs
-+    manualdir:     ${datadir}/manual
-+    cgidir:        ${exec_prefix}/libexec/cgi-bin
-+    includedir:    ${prefix}/include/httpd
-+    localstatedir: @VARBASE@
-+    runtimedir:    ${localstatedir}/run
-+    logfiledir:    ${localstatedir}/log/httpd
-+    proxycachedir: ${localstatedir}/db/httpd/proxy
-+</Layout>
diff --git a/www/apache2/patches/patch-ae b/www/apache2/patches/patch-ae
deleted file mode 100644
index a4621af7c10..00000000000
--- a/www/apache2/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.10 2010/11/01 18:03:04 adam Exp $
-
---- modules/ssl/ssl_engine_init.c.orig	2010-09-28 15:59:13.000000000 +0000
-+++ modules/ssl/ssl_engine_init.c
-@@ -535,7 +535,7 @@ static void ssl_init_ctx_verify(server_r
-             ssl_die();
-         }
- 
--        SSL_CTX_set_client_CA_list(ctx, (STACK *)ca_list);
-+        SSL_CTX_set_client_CA_list(ctx, (STACK_OF(X509_NAME) *)ca_list);
-     }
- 
-     /*
diff --git a/www/apache2/patches/patch-af b/www/apache2/patches/patch-af
deleted file mode 100644
index a8ffe98bdf3..00000000000
--- a/www/apache2/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.8 2009/09/04 18:55:34 wiz Exp $
-
---- modules/ssl/ssl_util_ssl.c.orig	2006-07-12 07:40:55.000000000 +0000
-+++ modules/ssl/ssl_util_ssl.c
-@@ -466,7 +466,7 @@ int SSL_CTX_use_certificate_chain(
-     X509 *x509;
-     unsigned long err;
-     int n;
--    STACK *extra_certs;
-+    STACK_OF(X509) *extra_certs;
- 
-     if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
-         return -1;
diff --git a/www/apache2/patches/patch-ag b/www/apache2/patches/patch-ag
deleted file mode 100644
index f4abb2f6a89..00000000000
--- a/www/apache2/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2003/01/28 14:21:58 martti Exp $
-
---- support/Makefile.in.orig	2002-08-29 22:25:40.000000000 +0300
-+++ support/Makefile.in	2003-01-28 16:09:07.000000000 +0200
-@@ -24,9 +24,11 @@
- 	done
- 	@if test -f "$(builddir)/envvars-std"; then \
- 	    cp -p envvars-std $(DESTDIR)$(sbindir); \
-+	    if false; then \
- 	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
- 	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
- 	    fi ; \
-+	    fi ; \
- 	fi
- 
- htpasswd_OBJECTS = htpasswd.lo
diff --git a/www/apache2/patches/patch-ah b/www/apache2/patches/patch-ah
deleted file mode 100644
index e6ccb184e62..00000000000
--- a/www/apache2/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.11 2010/11/01 18:03:04 adam Exp $
-
---- modules/ssl/ssl_engine_kernel.c.orig	2010-09-28 15:59:13.000000000 +0000
-+++ modules/ssl/ssl_engine_kernel.c
-@@ -573,7 +573,7 @@ int ssl_hook_Access(request_rec *r)
-                  * sk_X509_shift-ed the peer cert out of the chain.
-                  * we put it back here for the purpose of quick_renegotiation.
-                  */
--                cert_stack = sk_new_null();
-+                cert_stack = sk_X509_new_null();
-                 sk_X509_push(cert_stack, MODSSL_PCHAR_CAST cert);
-             }
- 
diff --git a/www/apache2/patches/patch-ai b/www/apache2/patches/patch-ai
deleted file mode 100644
index 2f05b63c5f8..00000000000
--- a/www/apache2/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.7 2005/04/25 09:13:14 adam Exp $
-
---- support/apxs.in.orig	2005-02-04 20:21:18.000000000 +0000
-+++ support/apxs.in
-@@ -338,9 +338,12 @@ if (! -x "$apu_bindir/apu-config") {
-     exit(1);
- }
- 
--my $libtool = `$apr_bindir/apr-config --installbuilddir`;
--chomp($libtool);
--$libtool = "$libtool/libtool";
-+my $libtool = $ENV{'APR_LIBTOOL'};
-+unless ($libtool) {
-+	$libtool = `$apr_bindir/apr-config --installbuilddir`;
-+	chomp($libtool);
-+	$libtool = "$libtool/libtool";
-+}
- 
- my $apr_includedir = `$apr_bindir/apr-config --includes`;
- chomp($apr_includedir);
diff --git a/www/apache2/patches/patch-ak b/www/apache2/patches/patch-ak
deleted file mode 100644
index f38289721b6..00000000000
--- a/www/apache2/patches/patch-ak
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2002/08/25 21:51:57 jlam Exp $
-
---- docs/conf/httpd-std.conf.in.orig	Wed Apr 24 16:24:35 2002
-+++ docs/conf/httpd-std.conf.in
-@@ -24,9 +24,9 @@
- # Configuration and logfile names: If the filenames you specify for many
- # of the server's control files begin with "/" (or "drive:/" for Win32), the
- # server will use that explicit path.  If the filenames do *not* begin
--# with "/", the value of ServerRoot is prepended -- so "@rel_logfiledir@/foo.log"
-+# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
- # with ServerRoot set to "@@ServerRoot@@" will be interpreted by the
--# server as "@@ServerRoot@@/@rel_logfiledir@/foo.log".
-+# server as "@@ServerRoot@@/logs/foo.log".
- #
- 
- ### Section 1: Global Environment
-@@ -54,7 +54,7 @@
- #
- <IfModule !mpm_winnt.c>
- <IfModule !mpm_netware.c>
--#LockFile @rel_logfiledir@/accept.lock
-+#LockFile @rel_runtimedir@/accept.lock
- </IfModule>
- </IfModule>
- 
-@@ -68,7 +68,7 @@
- #
- <IfModule !mpm_netware.c>
- <IfModule !perchild.c>
--#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
-+#ScoreBoardFile @rel_runtimedir@/apache_runtime_status
- </IfModule>
- </IfModule>
- 
diff --git a/www/apache2/patches/patch-al b/www/apache2/patches/patch-al
deleted file mode 100644
index 8f7af571b85..00000000000
--- a/www/apache2/patches/patch-al
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-al,v 1.3 2005/04/25 09:13:14 adam Exp $
-
---- include/httpd.h.orig	2005-02-26 09:04:10.000000000 +0000
-+++ include/httpd.h
-@@ -105,9 +105,9 @@ extern "C" {
- /* The name of the log files */
- #ifndef DEFAULT_ERRORLOG
- #if defined(OS2) || defined(WIN32)
--#define DEFAULT_ERRORLOG "logs/error.log"
-+#define DEFAULT_ERRORLOG DEFAULT_REL_LOGFILEDIR "/error.log"
- #else
--#define DEFAULT_ERRORLOG "logs/error_log"
-+#define DEFAULT_ERRORLOG DEFAULT_REL_LOGFILEDIR "/error.log"
- #endif
- #endif /* DEFAULT_ERRORLOG */
- 
-@@ -123,7 +123,7 @@ extern "C" {
- 
- /* The name of the server config file */
- #ifndef SERVER_CONFIG_FILE
--#define SERVER_CONFIG_FILE "conf/httpd.conf"
-+#define SERVER_CONFIG_FILE DEFAULT_REL_SYSCONFDIR "/httpd.conf"
- #endif
- 
- /* Whether we should enable rfc1413 identity checking */
-@@ -214,7 +214,7 @@ extern "C" {
- 
- /** The name of the MIME types file */
- #ifndef AP_TYPES_CONFIG_FILE
--#define AP_TYPES_CONFIG_FILE "conf/mime.types"
-+#define AP_TYPES_CONFIG_FILE DEFAULT_REL_SYSCONFDIR "/mime.types"
- #endif
- 
- /*
diff --git a/www/apache2/patches/patch-am b/www/apache2/patches/patch-am
deleted file mode 100644
index 6e8f2734940..00000000000
--- a/www/apache2/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2005/04/25 09:13:14 adam Exp $
-
---- include/scoreboard.h.orig	2005-02-04 20:21:18.000000000 +0000
-+++ include/scoreboard.h
-@@ -36,7 +36,7 @@ extern "C" {
- 
- /* Scoreboard file, if there is one */
- #ifndef DEFAULT_SCOREBOARD
--#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
-+#define DEFAULT_SCOREBOARD DEFAULT_REL_RUNTIMEDIR "/apache_runtime_status"
- #endif
- 
- /* Scoreboard info on a process is, for now, kept very brief --- 
diff --git a/www/apache2/patches/patch-ao b/www/apache2/patches/patch-ao
deleted file mode 100644
index 7c9c5e73159..00000000000
--- a/www/apache2/patches/patch-ao
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ao,v 1.7 2005/10/11 20:10:35 joerg Exp $
-
---- modules/ssl/ssl_toolkit_compat.h.orig	2005-10-11 18:24:59.000000000 +0000
-+++ modules/ssl/ssl_toolkit_compat.h
-@@ -24,6 +24,12 @@
- 
- #ifdef OPENSSL_VERSION_NUMBER
- 
-+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
-+#ifndef PEM_F_DEF_CALLBACK
-+#define PEM_F_DEF_CALLBACK PEM_F_PEM_DEF_CALLBACK
-+#endif
-+#endif
-+
- /*
-  * rsa sslc uses incomplete types for most structures
-  * so we macroize for OpenSSL those which cannot be dereferenced
diff --git a/www/p5-Apache-AuthCookie/DESCR b/www/p5-Apache-AuthCookie/DESCR
deleted file mode 100644
index 7a14905bc60..00000000000
--- a/www/p5-Apache-AuthCookie/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache::AuthCookie allows you to intercept a user's first unauthenticated
-access to a protected document. The user will be presented with a custom
-form where they can enter authentication credentials. The credentials are
-posted to the server where AuthCookie verifies them and returns a session
-key.
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
deleted file mode 100644
index a7b2f589236..00000000000
--- a/www/p5-Apache-AuthCookie/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2014/05/29 23:37:58 wiz Exp $
-#
-
-DISTNAME=	Apache-AuthCookie-3.12
-PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	6
-CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://search.cpan.org/dist/Apache-AuthCookie/
-COMMENT=	Perl5 module for Authentication and Authorization via cookies
-
-DEPENDS+=	ap13-perl>=1.29:../../www/ap-perl
-DEPENDS+=	p5-Apache-Test-[0-9]*:../../www/p5-Apache-Test
-
-PERL5_PACKLIST=		auto/Apache/AuthCookie/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-AuthCookie/distinfo b/www/p5-Apache-AuthCookie/distinfo
deleted file mode 100644
index 07cbffbb347..00000000000
--- a/www/p5-Apache-AuthCookie/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2008/07/26 19:27:27 he Exp $
-
-SHA1 (Apache-AuthCookie-3.12.tar.gz) = 0c0c5f4b26bab813edba7cf4e7965933adbd4753
-RMD160 (Apache-AuthCookie-3.12.tar.gz) = d7e8df15b15fe7d1844ae1800534ccef7624138a
-Size (Apache-AuthCookie-3.12.tar.gz) = 36014 bytes
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 780652ba030..bc74ae8ac96 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2014/05/31 12:22:42 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2014/06/10 15:22:18 joerg Exp $
 
 DISTNAME=	Apache-Gallery-0.9.1
 PKGNAME=	p5-${DISTNAME}
@@ -27,11 +27,7 @@ PERL5_PACKLIST=		auto/Apache/Gallery/.packlist
 PKG_SYSCONFSUBDIR?=	httpd
 MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
-.if defined(PKG_APACHE_DEFAULT) && (${PKG_APACHE_DEFAULT} == "apache2")
 LIBAPREQ=		p5-libapreq2
-.else
-LIBAPREQ=		p5-libapreq
-.endif
 
 AG=			ag
 AG_DOCDIR=		${PREFIX}/share/doc/${AG}
diff --git a/www/p5-HTML-Mason/options.mk b/www/p5-HTML-Mason/options.mk
index da2f6da8a2c..45f5f428059 100644
--- a/www/p5-HTML-Mason/options.mk
+++ b/www/p5-HTML-Mason/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2014/02/23 09:47:53 wen Exp $
+# $NetBSD: options.mk,v 1.4 2014/06/10 15:22:18 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.p5-HTML-Mason
 PKG_SUPPORTED_OPTIONS=	fastcgi modperl
@@ -11,13 +11,8 @@ PKG_SUGGESTED_OPTIONS=	# empty
 ###
 .if !empty(PKG_OPTIONS:Mmodperl)
 .  include "../../mk/apache.mk"
-.  if ${PKG_APACHE} == "apache13"
-DEPENDS+=	p5-libapreq>=0.32:../../www/p5-libapreq
-.    include "../../www/ap-perl/buildlink3.mk"
-.  elif ${PKG_APACHE} == "apache2" || ${PKG_APACHE} == "apache22"
 DEPENDS+=	p5-libapreq2-[0-9]*:../../www/p5-libapreq2
-.    include "../../www/ap2-perl/buildlink3.mk"
-.  endif
+.include "../../www/ap2-perl/buildlink3.mk"
 .endif
 
 ###
diff --git a/www/p5-Kwiki-ModPerl/Makefile b/www/p5-Kwiki-ModPerl/Makefile
index df6e55bdb4d..630c9fe34a9 100644
--- a/www/p5-Kwiki-ModPerl/Makefile
+++ b/www/p5-Kwiki-ModPerl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/05/29 23:38:10 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2014/06/10 15:22:19 joerg Exp $
 
 DISTNAME=	Kwiki-ModPerl-0.09
 PKGNAME=	p5-${DISTNAME}
@@ -15,10 +15,6 @@ DEPENDS+=	p5-Kwiki>=0.38:../../www/p5-Kwiki
 PERL5_PACKLIST=		auto/Kwiki/ModPerl/.packlist
 
 .include "../../mk/apache.mk"
-.if ${PKG_APACHE} == "apache13"
-.include "../../www/ap-perl/buildlink3.mk"
-.else
 .include "../../www/ap2-perl/buildlink3.mk"
-.endif
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index 89533607560..e4203b29e4d 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2014/05/29 23:38:17 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2014/06/10 15:22:19 joerg Exp $
 
 DISTNAME=	libapreq2-2.12
 PKGNAME=	p5-${DISTNAME}
@@ -12,8 +12,6 @@ HOMEPAGE=	http://httpd.apache.org/apreq/
 COMMENT=	Lots of Apache specific httpd handling modules
 LICENSE=	apache-2.0
 
-PKG_APACHE_ACCEPTED=	apache2 apache22
-
 DEPENDS+=	p5-ExtUtils-XSBuilder>=0.23:../../devel/p5-ExtUtils-XSBuilder
 
 USE_TOOLS+=	gmake
author	joerg <joerg@pkgsrc.org>	2014-06-10 15:22:13 +0000
committer	joerg <joerg@pkgsrc.org>	2014-06-10 15:22:13 +0000
commit	9611c157d010938e53b1714e3f7f317facf558c0 (patch)
tree	2feb1f410c493c9e7cc492d5a0165cd0c95d68b8
parent	4b76c8f2e9956fd11677f6e5d815fdc0a154e0d8 (diff)
download	pkgsrc-9611c157d010938e53b1714e3f7f317facf558c0.tar.gz