devel/apr1 [1]

- update APR to 1.4.6
- update APR-util to 1.4.1
- remove PKGNAMESUFFIX'es

www/apache-(event|itk|peruser|worker)-mpm
- adopt new Makefile header, adjust
  PKGNAMESUFFIX in apache22 masterport
  PKGNAME match now LATEST_LINK

www/apache22 [2]-[6]
- rewrite for options NG
- PORTNAME s|apache|apache22|
- remove APR APR-util specific otions,
  will be checked now with help of apr/u-1-config

Mk/bsd.apache.mk
- rewrite for options NG
- remove no longer needet make targets
  (show-categories, make-options-list)

[1]
PR: 165143

[2]-[6]
PR: 130479
PR: 153406
PR: 158565
PR: 168769
PR: 167965

with hat apache@

2 files changed, 2 insertions, 17 deletions

diff --git a/devel/apr1/files/patch-apr_hints.m4 b/devel/apr1/files/patch-apr_hints.m4
index d335b20571eb..0664cafe4baa 100644
--- a/devel/apr1/files/patch-apr_hints.m4
+++ b/devel/apr1/files/patch-apr_hints.m4
@@ -1,5 +1,5 @@
---- apr-1.4.5/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
-+++ apr-1.4.5/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
+--- apr-1.4.6/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
++++ apr-1.4.6/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
 @@ -159,11 +159,7 @@
  	;;
      *-freebsd*)
diff --git a/devel/apr1/files/patch-apr_ldap_rebind.c b/devel/apr1/files/patch-apr_ldap_rebind.c
deleted file mode 100644
index e7c9cd2a17d7..000000000000
--- a/devel/apr1/files/patch-apr_ldap_rebind.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- apr-util-1.3.12/ldap/apr_ldap_rebind.c.orig	2011-06-18 14:42:15.000000000 +0000
-+++ apr-util-1.3.12/ldap/apr_ldap_rebind.c	2011-06-18 14:42:28.000000000 +0000
-@@ -81,11 +81,11 @@
-     get_apd
- #endif
- 
-+#if APR_HAS_THREADS
-     /* run after apr_thread_mutex_create cleanup */
-     apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null,
-                               apr_pool_cleanup_null);
- 
--#if APR_HAS_THREADS
-     if (apr_ldap_xref_lock == NULL) {
-         retcode = apr_thread_mutex_create(&apr_ldap_xref_lock, APR_THREAD_MUTEX_DEFAULT, pool);
-     }