- Add support for exception hook:

  * WITH_EXCEPTION_HOOK now exists
  * Automatically add if WITH_DEBUG is set
  * Update still-outdated-documentation
- Remove automatic debuf mode if DEBUG_FLAGS is set

Exception hook is very useful for debugging (upcoming www/mod_backtrace
and www/mod_whatkilledus modules)

Makefile.modules.3rd:
- Fix CONFIGURE_ARGS for dynamic module selection.
  It's now fully usuable for apache13 ports
- Remove an useless WANT_APACHE check
- Move apxs detection at the beginning of the file, to use APXS_PREFIX
  for apache major version detection [1]
  The main advantage of this patch is to provide a nice way to
  have multiple apache versions, without altering ${LOCALBASE}.

Submitted by:    "ports/c0decafe.net" <ports at c0decafe dot net> [1]

6 files changed, 48 insertions, 26 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index e8f6087e5573..ae35d07389cb 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -100,10 +100,15 @@ CFLAGS+=	-DSSL_EXPERIMENTAL_ENGINE
 .endif
 
 # debug overrides CFLAGS
-.if defined(WITH_DEBUG) || defined (DEBUG_FLAGS)
+.if defined(WITH_DEBUG)
 DEBUG_FLAGS?=	-O0 -g -ggdb3
 CFLAGS=		${DEBUG_FLAGS}
 CONFIGURE_ARGS+=	--enable-maintainer-mode
+WITH_EXCEPTION_HOOK=	YES
+.endif
+
+.if defined(WITH_EXCEPTION_HOOK)
+CONFIGURE_ARGS+=	--enable-exception-hook
 .endif
 
 # for slave ports
diff --git a/www/apache2/Makefile.doc b/www/apache2/Makefile.doc
index fb54f7c9f6dc..d22f0d3d5709 100644
--- a/www/apache2/Makefile.doc
+++ b/www/apache2/Makefile.doc
@@ -58,8 +58,12 @@
 ##            SUEXEC_GIDMIN:      Minimal allowed GID (default 1000)
 ##            SUEXEC_CALLER:      User allowed to call SuExec (default
 ##                                ${WWWOWN} (www))
+##            SUEXEC_UMASK:       Defines umask for suexec'd process(default:
+##                                unset)
 ##	WITH_DEBUG:               Build a debug versoin of apache (set CFLAGS
-##                                to "-O0 -g -ggdb3" too)
+##                                to "-O0 -g -ggdb3" or ${DEBUG_FLAGS} and
+##                                defines WITH_EXCEPTION_HOOK too)
+##      WITH_EXCEPTION_HOOK:      Enable fatal exception hook
 ##
 ##   Port-related:
 ##      WITHOUT_WWW:              Implies NO_CGI, NO_WWWDATA, NO_ICONS and
diff --git a/www/apache2/Makefile.modules.3rd b/www/apache2/Makefile.modules.3rd
index dad8e500dbde..c5214a4f6f0c 100644
--- a/www/apache2/Makefile.modules.3rd
+++ b/www/apache2/Makefile.modules.3rd
@@ -17,14 +17,21 @@ SRC_FILE?=	${MODULENAME}.c
 OVERRIDABLE_VARS=	SRC_FILE MODULENAME SHORTMODNAME WRKSRC \
 			PKGNAMESUFFIX
 
-.if exists(${LOCALBASE}/include/apache2/http_core.h)
+
+.if exists(${APXS})
+APXS_PREFIX!=	${APXS} -q prefix
+.else
+APXS_PREFIX=	${APXS:S/\/sbin\/apxs//}
+.endif
+
+.if exists(${APXS_PREFIX}/include/apache2/http_core.h)
 WITH_APACHE2=	YES
 .   if defined (WANT_APACHE)
 .     if ${WANT_APACHE} == 13
 IGNORE=		"This module require apache13 and you have apache2 installed"
 .     endif
 .   endif
-.elif exists(${LOCALBASE}/include/apache/http_core.h)
+.elif exists(${APXS_PREFIX}/include/apache/http_core.h)
 WITH_APACHE13=	YES
 .   if defined (WANT_APACHE)
 .     if ${WANT_APACHE} == 2
@@ -82,12 +89,6 @@ AP_EXTRAS+=	-I ${AP_INC}
 AP_EXTRAS+=	-L ${AP_LIB}
 .endif
 
-.if exists(${APXS})
-APXS_PREFIX!=	${APXS} -q prefix
-.else
-APXS_PREFIX=	${APXS:S/\/sbin\/apxs//}
-.endif
-
 .if defined(AP_FAST_BUILD)
 
 ap-gen-plist:
@@ -155,18 +156,19 @@ _APACHE_MODULES+=	${${category}_MODULES}
 
 
 .if !defined(WITH_STATIC_APACHE)
+.    if ${WANT_APACHE} == common2
 # FYI
 #DYNAMIC_MODULES=	so
 CONFIGURE_ARGS+=	--enable-so
+.    endif
 .else
+.    if ${WANT_APACHE} == common2
 CONFIGURE_ARGS+=	--disable-so
+.    endif
 WITH_ALL_STATIC_MODULES=	YES
 .endif
 
 .if defined(WITH_SUEXEC)
-.if !defined(WANT_APACHE)
-WANT_APACHE=	"Too bad, guy!"
-.endif
 .if ${WANT_APACHE} == common13
 SUEXEC_CONFARGS=	suexec
 CONFIGURE_ARGS+=	--enable-suexec
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index e8f6087e5573..ae35d07389cb 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -100,10 +100,15 @@ CFLAGS+=	-DSSL_EXPERIMENTAL_ENGINE
 .endif
 
 # debug overrides CFLAGS
-.if defined(WITH_DEBUG) || defined (DEBUG_FLAGS)
+.if defined(WITH_DEBUG)
 DEBUG_FLAGS?=	-O0 -g -ggdb3
 CFLAGS=		${DEBUG_FLAGS}
 CONFIGURE_ARGS+=	--enable-maintainer-mode
+WITH_EXCEPTION_HOOK=	YES
+.endif
+
+.if defined(WITH_EXCEPTION_HOOK)
+CONFIGURE_ARGS+=	--enable-exception-hook
 .endif
 
 # for slave ports
diff --git a/www/apache20/Makefile.doc b/www/apache20/Makefile.doc
index fb54f7c9f6dc..d22f0d3d5709 100644
--- a/www/apache20/Makefile.doc
+++ b/www/apache20/Makefile.doc
@@ -58,8 +58,12 @@
 ##            SUEXEC_GIDMIN:      Minimal allowed GID (default 1000)
 ##            SUEXEC_CALLER:      User allowed to call SuExec (default
 ##                                ${WWWOWN} (www))
+##            SUEXEC_UMASK:       Defines umask for suexec'd process(default:
+##                                unset)
 ##	WITH_DEBUG:               Build a debug versoin of apache (set CFLAGS
-##                                to "-O0 -g -ggdb3" too)
+##                                to "-O0 -g -ggdb3" or ${DEBUG_FLAGS} and
+##                                defines WITH_EXCEPTION_HOOK too)
+##      WITH_EXCEPTION_HOOK:      Enable fatal exception hook
 ##
 ##   Port-related:
 ##      WITHOUT_WWW:              Implies NO_CGI, NO_WWWDATA, NO_ICONS and
diff --git a/www/apache20/Makefile.modules.3rd b/www/apache20/Makefile.modules.3rd
index dad8e500dbde..c5214a4f6f0c 100644
--- a/www/apache20/Makefile.modules.3rd
+++ b/www/apache20/Makefile.modules.3rd
@@ -17,14 +17,21 @@ SRC_FILE?=	${MODULENAME}.c
 OVERRIDABLE_VARS=	SRC_FILE MODULENAME SHORTMODNAME WRKSRC \
 			PKGNAMESUFFIX
 
-.if exists(${LOCALBASE}/include/apache2/http_core.h)
+
+.if exists(${APXS})
+APXS_PREFIX!=	${APXS} -q prefix
+.else
+APXS_PREFIX=	${APXS:S/\/sbin\/apxs//}
+.endif
+
+.if exists(${APXS_PREFIX}/include/apache2/http_core.h)
 WITH_APACHE2=	YES
 .   if defined (WANT_APACHE)
 .     if ${WANT_APACHE} == 13
 IGNORE=		"This module require apache13 and you have apache2 installed"
 .     endif
 .   endif
-.elif exists(${LOCALBASE}/include/apache/http_core.h)
+.elif exists(${APXS_PREFIX}/include/apache/http_core.h)
 WITH_APACHE13=	YES
 .   if defined (WANT_APACHE)
 .     if ${WANT_APACHE} == 2
@@ -82,12 +89,6 @@ AP_EXTRAS+=	-I ${AP_INC}
 AP_EXTRAS+=	-L ${AP_LIB}
 .endif
 
-.if exists(${APXS})
-APXS_PREFIX!=	${APXS} -q prefix
-.else
-APXS_PREFIX=	${APXS:S/\/sbin\/apxs//}
-.endif
-
 .if defined(AP_FAST_BUILD)
 
 ap-gen-plist:
@@ -155,18 +156,19 @@ _APACHE_MODULES+=	${${category}_MODULES}
 
 
 .if !defined(WITH_STATIC_APACHE)
+.    if ${WANT_APACHE} == common2
 # FYI
 #DYNAMIC_MODULES=	so
 CONFIGURE_ARGS+=	--enable-so
+.    endif
 .else
+.    if ${WANT_APACHE} == common2
 CONFIGURE_ARGS+=	--disable-so
+.    endif
 WITH_ALL_STATIC_MODULES=	YES
 .endif
 
 .if defined(WITH_SUEXEC)
-.if !defined(WANT_APACHE)
-WANT_APACHE=	"Too bad, guy!"
-.endif
 .if ${WANT_APACHE} == common13
 SUEXEC_CONFARGS=	suexec
 CONFIGURE_ARGS+=	--enable-suexec