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 /www/apache2
parent: 4b76c8f2e9956fd11677f6e5d815fdc0a154e0d8 (diff)
download: pkgsrc-9611c157d010938e53b1714e3f7f317facf558c0.tar.gz
22 files changed, 0 insertions, 2741 deletions
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
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 /www/apache2
parent	4b76c8f2e9956fd11677f6e5d815fdc0a154e0d8 (diff)
download	pkgsrc-9611c157d010938e53b1714e3f7f317facf558c0.tar.gz