- Per popular request, add "you can you use make show-modules"-like

  message option in pre-everything:: target.
- Change OpenSSL fix. (specially when WITH_BERKELEYDB=FreeBSD is defined)
  There are too many cases of failure (at leat 3), so I can't force -STABLE
  users to use SSL_EXPERIMENT_ENGINE [1]
- Add WITH_SSL_EXPERIMENTAL_ENGINE knob [2]
- Better db42 apr-util detection [3]
- Add fastest mirror to PATCH_SITES
- Add db42 to "make show-options"

Note to users:
    Unless you have a *really* good request, no more features will be added.
    Please send me with your bug reports:
            - uname -a output
            - all config.log files
            - pkg_info output
            - your make command line

Noticed by:     apache2-test-ng.sh script [1]
                Barry Pederson <bp@barryp.org> [3]
Requested by:   jb@perso-web.com [2]

8 files changed, 66 insertions, 34 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index c9e0bb9b0ef6..0126742e7be2 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -30,9 +30,10 @@ CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 
 # patch files
-PATCH_SITES+=		http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/:apache
-PATCHFILES+=		httpd-2.0.48-buildconf.patch:apache \
-			httpd-2.0.48-ldap-fix.patch:apache
+PATCH_SITES+=		http://sheepkiller.nerim.net/ports/apache2/:clement \
+			http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/:clement
+PATCHFILES+=		httpd-2.0.48-buildconf.patch:clement \
+			httpd-2.0.48-ldap-fix.patch:clement
 PATCH_DIST_STRIP+=	-p1:apache-clem
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION}
@@ -52,7 +53,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
 		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}" \
- 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
+ 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \
+		LOCALBASE="${LOCALBASE}"
 
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 RC_SUB=		-e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
@@ -74,6 +76,10 @@ USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--enable-static-support
 .endif
 
+.if defined(WITH_SSL_EXPERIMENTAL_ENGINE)
+CFLAGS+=	-DSSL_EXPERIMENTAL_ENGINE
+.endif
+
 # for slave ports
 .if !defined(MASTERDIR)
 APACHEDIR=	${.CURDIR}
@@ -132,6 +138,7 @@ show-modules:
 pre-everything::
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"  To see all available knobs, type make show-options"
+	@${ECHO_MSG}    "  You can check your modules configuration by using show-modules"
 	@${ECHO_MSG}	""
 
 post-extract:
diff --git a/www/apache2/Makefile.doc b/www/apache2/Makefile.doc
index 7488d59e1266..68443874f431 100644
--- a/www/apache2/Makefile.doc
+++ b/www/apache2/Makefile.doc
@@ -27,7 +27,7 @@
 ##      WITH_THREADS:             Enable threads support !! USE IT WITH CARE !!
 ##           WITH_CUSTOM_THREADS: Let you choose which threaded modules you want
 ##      WITH_DBM:                 Choose your DBM: bdb (Berkeley DB), gdbm or ndbm (default)
-##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3, db4, db41 or FreeBSD (1.85)(default)
+##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3, db4, db41, db42 or FreeBSD (1.85)(default)
 ##      WITH_STATIC_SUPPORT:      Build statically linked support binaries
 ##      WITH_STATIC_APACHE:       Build a static version of httpd (implies WITH_STATIC_MODULES)
 ##      WITH_ALL_STATIC_MODULES:  All modules will be statically linked.
diff --git a/www/apache2/Makefile.modules b/www/apache2/Makefile.modules
index c8270cb043f8..59eba703fe77 100644
--- a/www/apache2/Makefile.modules
+++ b/www/apache2/Makefile.modules
@@ -76,7 +76,8 @@ CONFIGURE_ARGS+=	--with-dbm=db41 \
 			--with-berkeley-db=${LOCALBASE}
 .       elif ${WITH_BERKELEYDB} == "db42"
 LIB_DEPENDS+=		db-4.2:${PORTSDIR}/databases/db42
-CONFIGURE_ARGS+=	--with-dbm=db42
+CONFIGURE_ARGS+=	--with-dbm=db42 \
+			--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db42
 .       else
 BROKEN=		"Unknown Berkeley DB version"
 .       endif
@@ -98,7 +99,7 @@ EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter charset_li
 			optional_fn_import optional_fn_export
 LDAP_MODULES=		ldap auth_ldap
 MISC_MODULES=		actions alias asis autoindex cache cern_meta \
-			cgi cgid charset_lite  deflate dir disk_cache env expires \
+			cgi cgid charset_lite deflate dir disk_cache env expires \
 			file_cache headers imap include info log_config logio mime \
 			mime_magic negotiation rewrite setenvif speling status \
 			unique_id userdir usertrack vhost_alias
@@ -182,9 +183,6 @@ _APACHE_MODULES+=	${WITH_CUSTOM_THREADS}
 _APACHE_MODULES+=	${SSL_MODULE}
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 RC_SUB+=		-e 's,@@SSL@@,ssl,g'
-.    if ${OPENSSLBASE} == /usr && ${OSVERSION} < 500000
-CFLAGS+=	-DSSL_EXPERIMENTAL_ENGINE
-.    endif
 .else
 RC_SUB+=		-e 's,@@SSL@@,,g'
 .endif
@@ -198,13 +196,13 @@ SUEXEC_GIDMIN?=			1000
 SUEXEC_CALLER?=			${WWWOWN}
 _APACHE_MODULES+=		${SUEXEC_MODULES}
 CONFIGURE_ARGS+=		--with-suexec-caller=${SUEXEC_CALLER} \
-						--with-suexec-uidmin=${SUEXEC_UIDMIN} \
-						--with-suexec-gidmin=${SUEXEC_GIDMIN} \
-						--with-suexec-userdir="${SUEXEC_USERDIR}" \
-						--with-suexec-docroot="${SUEXEC_DOCROOT}" \
-						--with-suexec-safepath="${SUEXEC_SAFEPATH}" \
-						--with-suexec-logfile="/var/log/httpd-suexec.log" \
-						--with-suexec-bin="${PREFIX_RELDEST}/sbin/suexec"
+				--with-suexec-uidmin=${SUEXEC_UIDMIN} \
+				--with-suexec-gidmin=${SUEXEC_GIDMIN} \
+				--with-suexec-userdir="${SUEXEC_USERDIR}" \
+				--with-suexec-docroot="${SUEXEC_DOCROOT}" \
+				--with-suexec-safepath="${SUEXEC_SAFEPATH}" \
+				--with-suexec-logfile="/var/log/httpd-suexec.log" \
+				--with-suexec-bin="${PREFIX_RELDEST}/sbin/suexec"
 .   if defined(WITH_SUEXEC_UMASK)
 CONFIGURE_ARGS+=			--with-suexec-umask=${WITH_SUEXEC_UMASK}
 .   endif
diff --git a/www/apache2/files/patch-modules:ssl:mod_ssl.h b/www/apache2/files/patch-modules:ssl:mod_ssl.h
new file mode 100644
index 000000000000..e916df9d0376
--- /dev/null
+++ b/www/apache2/files/patch-modules:ssl:mod_ssl.h
@@ -0,0 +1,11 @@
+--- modules/ssl/mod_ssl.h.orig	Tue Sep 16 01:00:06 2003
++++ modules/ssl/mod_ssl.h	Sat Jan 10 22:08:18 2004
+@@ -123,7 +123,7 @@
+ #else /* !HAVE_SSLC (implicit HAVE_OPENSSL) */
+ 
+ #include <ssl.h>
+-#include <err.h>
++#include <openssl/err.h>
+ #include <x509.h>
+ #include <pem.h>
+ #include <crypto.h>
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index c9e0bb9b0ef6..0126742e7be2 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -30,9 +30,10 @@ CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 
 # patch files
-PATCH_SITES+=		http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/:apache
-PATCHFILES+=		httpd-2.0.48-buildconf.patch:apache \
-			httpd-2.0.48-ldap-fix.patch:apache
+PATCH_SITES+=		http://sheepkiller.nerim.net/ports/apache2/:clement \
+			http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/:clement
+PATCHFILES+=		httpd-2.0.48-buildconf.patch:clement \
+			httpd-2.0.48-ldap-fix.patch:clement
 PATCH_DIST_STRIP+=	-p1:apache-clem
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION}
@@ -52,7 +53,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
 		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}" \
- 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
+ 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \
+		LOCALBASE="${LOCALBASE}"
 
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 RC_SUB=		-e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
@@ -74,6 +76,10 @@ USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--enable-static-support
 .endif
 
+.if defined(WITH_SSL_EXPERIMENTAL_ENGINE)
+CFLAGS+=	-DSSL_EXPERIMENTAL_ENGINE
+.endif
+
 # for slave ports
 .if !defined(MASTERDIR)
 APACHEDIR=	${.CURDIR}
@@ -132,6 +138,7 @@ show-modules:
 pre-everything::
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"  To see all available knobs, type make show-options"
+	@${ECHO_MSG}    "  You can check your modules configuration by using show-modules"
 	@${ECHO_MSG}	""
 
 post-extract:
diff --git a/www/apache20/Makefile.doc b/www/apache20/Makefile.doc
index 7488d59e1266..68443874f431 100644
--- a/www/apache20/Makefile.doc
+++ b/www/apache20/Makefile.doc
@@ -27,7 +27,7 @@
 ##      WITH_THREADS:             Enable threads support !! USE IT WITH CARE !!
 ##           WITH_CUSTOM_THREADS: Let you choose which threaded modules you want
 ##      WITH_DBM:                 Choose your DBM: bdb (Berkeley DB), gdbm or ndbm (default)
-##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3, db4, db41 or FreeBSD (1.85)(default)
+##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3, db4, db41, db42 or FreeBSD (1.85)(default)
 ##      WITH_STATIC_SUPPORT:      Build statically linked support binaries
 ##      WITH_STATIC_APACHE:       Build a static version of httpd (implies WITH_STATIC_MODULES)
 ##      WITH_ALL_STATIC_MODULES:  All modules will be statically linked.
diff --git a/www/apache20/Makefile.modules b/www/apache20/Makefile.modules
index c8270cb043f8..59eba703fe77 100644
--- a/www/apache20/Makefile.modules
+++ b/www/apache20/Makefile.modules
@@ -76,7 +76,8 @@ CONFIGURE_ARGS+=	--with-dbm=db41 \
 			--with-berkeley-db=${LOCALBASE}
 .       elif ${WITH_BERKELEYDB} == "db42"
 LIB_DEPENDS+=		db-4.2:${PORTSDIR}/databases/db42
-CONFIGURE_ARGS+=	--with-dbm=db42
+CONFIGURE_ARGS+=	--with-dbm=db42 \
+			--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db42
 .       else
 BROKEN=		"Unknown Berkeley DB version"
 .       endif
@@ -98,7 +99,7 @@ EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter charset_li
 			optional_fn_import optional_fn_export
 LDAP_MODULES=		ldap auth_ldap
 MISC_MODULES=		actions alias asis autoindex cache cern_meta \
-			cgi cgid charset_lite  deflate dir disk_cache env expires \
+			cgi cgid charset_lite deflate dir disk_cache env expires \
 			file_cache headers imap include info log_config logio mime \
 			mime_magic negotiation rewrite setenvif speling status \
 			unique_id userdir usertrack vhost_alias
@@ -182,9 +183,6 @@ _APACHE_MODULES+=	${WITH_CUSTOM_THREADS}
 _APACHE_MODULES+=	${SSL_MODULE}
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 RC_SUB+=		-e 's,@@SSL@@,ssl,g'
-.    if ${OPENSSLBASE} == /usr && ${OSVERSION} < 500000
-CFLAGS+=	-DSSL_EXPERIMENTAL_ENGINE
-.    endif
 .else
 RC_SUB+=		-e 's,@@SSL@@,,g'
 .endif
@@ -198,13 +196,13 @@ SUEXEC_GIDMIN?=			1000
 SUEXEC_CALLER?=			${WWWOWN}
 _APACHE_MODULES+=		${SUEXEC_MODULES}
 CONFIGURE_ARGS+=		--with-suexec-caller=${SUEXEC_CALLER} \
-						--with-suexec-uidmin=${SUEXEC_UIDMIN} \
-						--with-suexec-gidmin=${SUEXEC_GIDMIN} \
-						--with-suexec-userdir="${SUEXEC_USERDIR}" \
-						--with-suexec-docroot="${SUEXEC_DOCROOT}" \
-						--with-suexec-safepath="${SUEXEC_SAFEPATH}" \
-						--with-suexec-logfile="/var/log/httpd-suexec.log" \
-						--with-suexec-bin="${PREFIX_RELDEST}/sbin/suexec"
+				--with-suexec-uidmin=${SUEXEC_UIDMIN} \
+				--with-suexec-gidmin=${SUEXEC_GIDMIN} \
+				--with-suexec-userdir="${SUEXEC_USERDIR}" \
+				--with-suexec-docroot="${SUEXEC_DOCROOT}" \
+				--with-suexec-safepath="${SUEXEC_SAFEPATH}" \
+				--with-suexec-logfile="/var/log/httpd-suexec.log" \
+				--with-suexec-bin="${PREFIX_RELDEST}/sbin/suexec"
 .   if defined(WITH_SUEXEC_UMASK)
 CONFIGURE_ARGS+=			--with-suexec-umask=${WITH_SUEXEC_UMASK}
 .   endif
diff --git a/www/apache20/files/patch-modules:ssl:mod_ssl.h b/www/apache20/files/patch-modules:ssl:mod_ssl.h
new file mode 100644
index 000000000000..e916df9d0376
--- /dev/null
+++ b/www/apache20/files/patch-modules:ssl:mod_ssl.h
@@ -0,0 +1,11 @@
+--- modules/ssl/mod_ssl.h.orig	Tue Sep 16 01:00:06 2003
++++ modules/ssl/mod_ssl.h	Sat Jan 10 22:08:18 2004
+@@ -123,7 +123,7 @@
+ #else /* !HAVE_SSLC (implicit HAVE_OPENSSL) */
+ 
+ #include <ssl.h>
+-#include <err.h>
++#include <openssl/err.h>
+ #include <x509.h>
+ #include <pem.h>
+ #include <crypto.h>