5 files changed, 23 insertions, 188 deletions

diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 27a8cf8f3baf..be333002b962 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -8,7 +8,7 @@ PORTNAME=	apr
 PORTVERSION=	2.0.${SNAPDATE}
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://svn.apache.org/snapshots/apr/
+MASTER_SITES=	http://svn-master.apache.org/snapshots/apr/
 DISTNAME=	${PORTNAME}_${SNAPDATE}
 
 MAINTAINER=	apache@FreeBSD.org
@@ -18,7 +18,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 NO_LATEST_LINK=	yes
 
-SNAPDATE=	20100610211336
+SNAPDATE=	20110821151329
 
 MAKE_JOBS_SAFE=	yes
 
@@ -26,7 +26,6 @@ OPTIONS=	THREADS "Enable Threads in apr"				on  \
 		IPV6	"Enable IPV6 Support in apr"			on  \
 		BDB	"Enable Berkley BDB support in apr-util"	on  \
 		GDBM	"Enable GNU dbm support in apr-util"		on  \
-		LDAP	"Enable LDAP support in apr-util"		off \
 		MYSQL	"Enable MySQL suport in apr-util"		off \
 		NDBM	"Enable NDBM support in apr-util"		off \
 		PGSQL	"Enable Postgresql suport in apr-util"		off \
@@ -136,22 +135,6 @@ PLIST_SUB+=	NDBM="@comment "
 CONFIGURE_ARGS+=	--without-ndbm
 .endif
 
-.if defined(WITH_LDAP)
-EXTRAS=	yes
-PLIST_SUB+=	LDAP=""
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
-	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap${OPENLDAP_VER}
-.else
-PKGNAMESUFFIX=	-ldap
-.endif
-.else
-PLIST_SUB+=	LDAP="@comment "
-CONFIGURE_ARGS+=	--without-ldap
-.endif
-
 .if defined(WITH_MYSQL)
 EXTRAS=	yes
 PLIST_SUB+=	MYSQL=""
diff --git a/devel/apr2/distinfo b/devel/apr2/distinfo
index 60309bbc6834..a0c75fa01735 100644
--- a/devel/apr2/distinfo
+++ b/devel/apr2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apr_20100610211336.tar.gz) = bd94edc1699bda3f98bfaab2b37cc047df0c730e1fd79fb0081c8318854ab746
-SIZE (apr_20100610211336.tar.gz) = 990268
+SHA256 (apr_20110821151329.tar.gz) = 2a1597f102428b1f6ce81362561f450f83ecff04066e685bf70f1da70ce4932d
+SIZE (apr_20110821151329.tar.gz) = 977267
diff --git a/devel/apr2/files/patch-bdb5 b/devel/apr2/files/patch-bdb5
deleted file mode 100644
index 46b24e564345..000000000000
--- a/devel/apr2/files/patch-bdb5
+++ /dev/null
@@ -1,144 +0,0 @@
-Index: apr-util-1.3.9/build/dbm.m4
-===================================================================
---- build/dbm.m4	(revision 948003)
-+++ build/dbm.m4	(working copy)
-@@ -112,7 +112,7 @@
-         changequote([,])
-         unset $cache_id
-         AC_CHECK_HEADER([$bdb_header], [
--          if test "$1" = "3" -o "$1" = "4"; then
-+          if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then
-             # We generate a separate cache variable for each prefix and libname
-             # we search under.  That way, we avoid caching information that
-             # changes if the user runs `configure' with a different set of
-@@ -541,6 +541,25 @@
-     apu_db_version=4
-   fi
- ])
-+dnl
-+dnl APU_CHECK_DB50: is DB5.0 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB50], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.5.0 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("5", "0", "-1",
-+    "$places",
-+    "db50/db.h db5/db.h db.h",
-+    "db-5.0 db5-5.0 db50 db5 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=5
-+  fi
-+])
- 
- AC_DEFUN([APU_CHECK_DB], [
-   requested=$1
-@@ -631,6 +650,12 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db50)
-+    APU_CHECK_DB50("$check_places")
-+    if test "$apu_db_version" != "5"; then
-+      AC_MSG_ERROR(Berkeley db5 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -638,36 +663,39 @@
- ])
- 
- dnl
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.8 to 1.
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.0 to 1.
- dnl
- AC_DEFUN([APU_CHECK_DB_ALL], [
-   all_places=$1
-  
--  APU_CHECK_DB48("$all_places")
--  if test "$apu_db_version" != "4"; then
--    APU_CHECK_DB47("$all_places")
-+  APU_CHECK_DB50("$all_places")
-+  if test "$apu_db_version" != "5"; then
-+    APU_CHECK_DB48("$all_places")
-     if test "$apu_db_version" != "4"; then
--      APU_CHECK_DB46("$all_places")
-+      APU_CHECK_DB47("$all_places")
-       if test "$apu_db_version" != "4"; then
--        APU_CHECK_DB45("$all_places")
-+        APU_CHECK_DB46("$all_places")
-         if test "$apu_db_version" != "4"; then
--          APU_CHECK_DB44("$all_places")
-+          APU_CHECK_DB45("$all_places")
-           if test "$apu_db_version" != "4"; then
--            APU_CHECK_DB43("$all_places")
-+            APU_CHECK_DB44("$all_places")
-             if test "$apu_db_version" != "4"; then
--              APU_CHECK_DB42("$all_places")
-+              APU_CHECK_DB43("$all_places")
-               if test "$apu_db_version" != "4"; then
--                APU_CHECK_DB41("$all_places")
-+                APU_CHECK_DB42("$all_places")
-                 if test "$apu_db_version" != "4"; then
--                  APU_CHECK_DB4("$all_places")
-+                  APU_CHECK_DB41("$all_places")
-                   if test "$apu_db_version" != "4"; then
--                    APU_CHECK_DB3("$all_places")
--                    if test "$apu_db_version" != "3"; then
--                      APU_CHECK_DB2("$all_places")
--                      if test "$apu_db_version" != "2"; then
--                        APU_CHECK_DB1("$all_places")
--                        if test "$apu_db_version" != "1"; then
--                          APU_CHECK_DB185("$all_places")
-+                    APU_CHECK_DB4("$all_places")
-+                    if test "$apu_db_version" != "4"; then
-+                      APU_CHECK_DB3("$all_places")
-+                      if test "$apu_db_version" != "3"; then
-+                        APU_CHECK_DB2("$all_places")
-+                        if test "$apu_db_version" != "2"; then
-+                          APU_CHECK_DB1("$all_places")
-+                          if test "$apu_db_version" != "1"; then
-+                            APU_CHECK_DB185("$all_places")
-+                          fi
-                         fi
-                       fi
-                     fi
-@@ -707,11 +735,11 @@
-   apu_db_version=0
- 
-   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48}])],
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])],
-   [
-     if test "$withval" = "yes"; then
-       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
--        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
-     fi
-     requested="$withval"
-   ], [
-@@ -914,6 +942,10 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db50)
-+      apu_use_db=1
-+      apu_default_dbm=db5
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -921,7 +953,7 @@
-       ;;
-     *)
-       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
--        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
-       ;;
-   esac
- 
diff --git a/devel/apr2/files/patch-buildconf b/devel/apr2/files/patch-buildconf
index c374dc360955..985d119bb2f0 100644
--- a/devel/apr2/files/patch-buildconf
+++ b/devel/apr2/files/patch-buildconf
@@ -1,18 +1,23 @@
---- ./buildconf.orig	2009-11-13 22:13:59.000000000 -0500
-+++ ./buildconf	2010-05-26 23:19:19.245814435 -0400
-@@ -69,6 +69,7 @@
+--- ./buildconf.orig	2011-08-10 22:03:47.000000000 +0200
++++ ./buildconf	2011-08-10 22:08:22.000000000 +0200
+@@ -81,6 +81,7 @@
    fi
    # Do we need this anymore?
    echo "buildconf: Using libtool.m4 at ${ltfile}."
-+  chmod 644 build/libtool.m4 
-   cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
- fi
- if test "$1" = "2"; then
-@@ -76,6 +77,7 @@
-   # Wouldn't it just be better to define top_builddir??
-   mv build/libtool.m4 build/libtool.m4.$$
-   cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
-+  chmod 644 build/libtool.m4.$$
-   rm build/libtool.m4.$$
- fi
++  chmod 644 build/libtool.m4
+   rm -f build/libtool.m4
+   cp -p $ltfile build/libtool.m4
  
+@@ -94,9 +95,12 @@
+ # Not sure, would it interfere with httpd top_builddir when bundled?
+ mv build/libtool.m4 build/libtool.m4.$$
+ sed -e 's/\(LIBTOOL=.*\)top_build/\1apr_build/' < build/libtool.m4.$$ > build/libtool.m4
++chmod 644 build/libtool.m4.$$
+ rm -f build/libtool.m4.$$
+ 
+ # Clean up any leftovers
++chmod 644 aclocal.m4
++chmod 644 libtool.m4
+ rm -f aclocal.m4 libtool.m4
+ 
+ #
diff --git a/devel/apr2/pkg-plist b/devel/apr2/pkg-plist
index 89797373cdd7..d48ba3c5361d 100644
--- a/devel/apr2/pkg-plist
+++ b/devel/apr2/pkg-plist
@@ -27,11 +27,6 @@ include/apr-2/apr_global_mutex.h
 include/apr-2/apr_hash.h
 include/apr-2/apr_hooks.h
 include/apr-2/apr_inherit.h
-include/apr-2/apr_ldap.h
-include/apr-2/apr_ldap_init.h
-include/apr-2/apr_ldap_option.h
-include/apr-2/apr_ldap_rebind.h
-include/apr-2/apr_ldap_url.h
 include/apr-2/apr_lib.h
 include/apr-2/apr_md4.h
 include/apr-2/apr_md5.h
@@ -91,10 +86,6 @@ lib/libapr-2.so.%%SHLIB_MAJOR%%
 %%NDBM%%lib/apr-2/apr_dbm_ndbm.so
 %%NDBM%%lib/apr-2/apr_dbm_ndbm.la
 %%NDBM%%lib/apr-2/apr_dbm_ndbm.a
-%%LDAP%%lib/apr-2/apr_ldap-2.so
-%%LDAP%%lib/apr-2/apr_ldap.so
-%%LDAP%%lib/apr-2/apr_ldap.la
-%%LDAP%%lib/apr-2/apr_ldap.a
 %%MYSQL%%lib/apr-2/apr_dbd_mysql-2.so
 %%MYSQL%%lib/apr-2/apr_dbd_mysql.so
 %%MYSQL%%lib/apr-2/apr_dbd_mysql.la