Completely overhauled Apache+mod_ssl port:

- use mod_ssl 2.0.10 which automatically disables
  DSO for mod_log_config and mod_proxy which caused
  problems for the port

- use mod_auth_dbm instead of mod_auth_db because
  first DBM is internally mapped to our DB (so
  functionality is the same) and this way we
  get rid of the nasty conflicts with DB 2.x port.

- fixed the package list, i.e. the port
  now packages and deletes correctly

- automatically create dummy certificate, so
  the package can be tested immediately after
  installing.

- use "apachectl startssl" instead of "apachectl start"
  from within apache.sh rc script now.

- removed the outcommented patch pieces for Makefile.tmpl
  because they are confusing both inside patches/patch-ab
  and under install time.

- use a "post-patch" target to remove all .orig files
  mod_ssl's configure script created to avoid their
  installation (which confuses the package list).

3 files changed, 51 insertions, 29 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 783014bd97ba..0e1a407cd052 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for:	apache + mod_ssl
-# Version required:	1.3.1
+# New ports collection makefile for:	Apache + mod_ssl
+# Version required:	1.3.1 + 2.0.10
 # Date created:		Sat Aug 22 12:00:00 CDT 1998
 # Whom:			rse@engelschall.com
 #
-# $Id: Makefile,v 1.4 1998/09/12 17:31:25 rse Exp $
+# $Id: Makefile,v 1.5 1998/09/14 16:18:50 rse Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -25,25 +25,22 @@ BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay \
 RUN_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
 
 VERSION_APACHE=	1.3.1
-VERSION_MODSSL=	2.0.9
+VERSION_MODSSL=	2.0.10
 
 RESTRICTED=	"Contains cryptography"
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= \
-		 --sysconfdir=${PREFIX}/etc/apache \
-		 --includedir=${PREFIX}/include/apache \
-		 --logfiledir=/var/log \
-		 --runtimedir=/var/run \
-		 --datadir=${PREFIX}/www \
-		 --proxycachedir=${PREFIX}/www/proxy \
-		 --libexecdir=${PREFIX}/libexec/apache \
-		 --without-confadjust \
-		 --enable-shared=remain \
-		 --enable-module=most \
-		 --enable-module=auth_db \
-		 --disable-module=auth_dbm \
-		 --enable-module=ssl
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/apache \
+		--includedir=${PREFIX}/include/apache \
+		--logfiledir=/var/log \
+		--runtimedir=/var/run \
+		--datadir=${PREFIX}/www \
+		--proxycachedir=${PREFIX}/www/proxy \
+		--libexecdir=${PREFIX}/libexec/apache \
+		--without-confadjust \
+		--enable-shared=remain \
+		--enable-module=most \
+		--enable-module=ssl
 
 OPTIM=\
 -DHARD_SERVER_LIMIT=512 \
@@ -56,7 +53,7 @@ OPTIM+= -DBUFFERED_LOGS
 CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
 .endif
 
-CONFIGURE_ENV=	OPTIM='${OPTIM}' SSL_BASE='SYSTEM'
+CONFIGURE_ENV=	OPTIM='${OPTIM}' SSL_BASE='SYSTEM' PATH="${PREFIX}/bin:${PATH}"
 
 INSTALL_TARGET=	install-quiet
 
@@ -72,6 +69,14 @@ pre-patch:
 	&& ${ECHO_MSG} "===>  Applying mod_ssl-${VERSION_MODSSL} extension" \
 	&& ./configure --with-apache=../${DISTNAME}
 
+post-patch:
+	@cd ${WRKSRC} \
+	&& find . -type f -name "*.orig" -print | xargs ${RM} -f
+
+post-build:
+	@cd ${WRKSRC} \
+	&& ${MAKE} certificate TYPE=dummy >/dev/null 2>&1
+
 certificate:
 	@cd ${WRKSRC} \
 	&& ${ECHO_MSG} "===>  Creating Test Certificate for Server" \
@@ -81,7 +86,7 @@ post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
 		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start >/dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl startssl >/dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index 087b99d7fa85..e028e9a1ed46 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
 MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4
-MD5 (mod_ssl-2.0.9-1.3.1.tar.gz) = 8dc614582a9bc6c1037b24146c3ba721
+MD5 (mod_ssl-2.0.10-1.3.1.tar.gz) = 451e2be70440abd13118e90fd9988683
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index ad1b7232580e..0b4cc2f838c3 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -1,10 +1,15 @@
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
+etc/apache/access.conf
 etc/apache/access.conf.default
+etc/apache/httpd.conf
 etc/apache/httpd.conf.default
+etc/apache/magic
 etc/apache/magic.default
+etc/apache/mime.types
 etc/apache/mime.types.default
+etc/apache/srm.conf
 etc/apache/srm.conf.default
 etc/apache/ssl.crt/README.CRT
 etc/apache/ssl.crt/Makefile
@@ -47,9 +52,8 @@ include/apache/util_date.h
 include/apache/util_md5.h
 include/apache/util_script.h
 include/apache/util_uri.h
-libexec/apache/libproxy.so
 libexec/apache/mod_auth_anon.so
-libexec/apache/mod_auth_db.so
+libexec/apache/mod_auth_dbm.so
 libexec/apache/mod_cern_meta.so
 libexec/apache/mod_digest.so
 libexec/apache/mod_expires.so
@@ -82,6 +86,7 @@ share/doc/apache/manual/env.html
 share/doc/apache/manual/footer.html
 share/doc/apache/manual/handler.html
 share/doc/apache/manual/header.html
+share/doc/apache/manual/images/apache_pb.gif
 share/doc/apache/manual/images/custom_errordocs.gif
 share/doc/apache/manual/images/home.gif
 share/doc/apache/manual/images/index.gif
@@ -90,6 +95,7 @@ share/doc/apache/manual/images/mod_rewrite_fig1.gif
 share/doc/apache/manual/images/mod_rewrite_fig2.fig
 share/doc/apache/manual/images/mod_rewrite_fig2.gif
 share/doc/apache/manual/images/mod_ssl.jpg
+share/doc/apache/manual/images/mod_ssl_sb.gif
 share/doc/apache/manual/images/ssleay.gif
 share/doc/apache/manual/images/sub.gif
 share/doc/apache/manual/index.html
@@ -272,17 +278,28 @@ www/icons/uu.gif
 www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
+@exec cd %D/etc/apache/ssl.crt && make >/dev/null 2>&1
 @exec mkdir -p %D/www
 @exec mkdir -p %D/www/proxy
+@exec ln -fs %D/www/data.default %D/www/data
+@exec ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
+@unexec rm -f %D/www/data
+@unexec rm -f %D/www/data.default
+@unexec rm -f %D/www/cgi-bin
+@dirrm www/cgi-bin.default
 @dirrm www/proxy
+@dirrm www/icons
 @dirrm www
-@exec ln -fs %B %D/www/data.default
-@unexec rm -f %D/www/data.default
-@exec mkdir -p %D/etc/apache/ssl.crt
-@exec mkdir -p %D/etc/apache/ssl.csr
-@exec mkdir -p %D/etc/apache/ssl.key
-@exec cd %D/etc/apache/ssl.crt/ && make >/dev/null 2>&1
 @unexec rm -f %D/etc/apache/ssl.crt/*.0
 @dirrm etc/apache/ssl.crt
 @dirrm etc/apache/ssl.csr
 @dirrm etc/apache/ssl.key
+@dirrm etc/apache
+@dirrm include/apache
+@dirrm libexec/apache
+@dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/vhosts
+@dirrm share/doc/apache/manual
+@dirrm share/doc/apache