6 files changed, 21 insertions, 57 deletions

diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 35691e187054..66a2488f88cd 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -15,7 +15,7 @@
 # APR_UTIL_WITH_LDAP:		force dependency on OpenLDAP
 
 PORTNAME=	apr
-PORTVERSION=	1.2.12
+PORTVERSION=	1.3.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
@@ -35,9 +35,12 @@ USE_LDCONFIG=		yes
 GNU_CONFIGURE=		yes
 WRKSRC=	${WRKDIR}
 
+PLIST_SUB=  SHLIB_MAJOR="${SHLIB_MAJOR}"
+SHLIB_MAJOR=	3
+
 APR_UTIL_CONF_ARGS=	--with-apr=../apr-${PORTVERSION} \
-			--with-expat=${PREFIX} \
-			--with-iconv=${PREFIX}
+			--with-expat=${LOCALBASE} \
+			--with-iconv=${LOCALBASE}
 
 .include <bsd.port.pre.mk>
 
@@ -85,8 +88,8 @@ PKGNAMESUFFIX=	-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
 
 .if defined(APR_UTIL_WITH_LDAP)
 USE_OPENLDAP=	yes
-APR_UTIL_CONF_ARGS+=	--with-ldap-include=${PREFIX}/include \
-	--with-ldap-lib=${PREFIX}/lib --with-ldap=ldap
+APR_UTIL_CONF_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
+	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap
 .else
diff --git a/devel/apr2/distinfo b/devel/apr2/distinfo
index 083619784bfe..34a5a663a98a 100644
--- a/devel/apr2/distinfo
+++ b/devel/apr2/distinfo
@@ -1,6 +1,6 @@
-MD5 (apr-1.2.12.tar.gz) = 020ea947446dca2d1210c099c7a4c837
-SHA256 (apr-1.2.12.tar.gz) = 23759142c483be869a0aec0529c5b8c94745b4dfd1c2c23f38417f4e02adcead
-SIZE (apr-1.2.12.tar.gz) = 1127522
-MD5 (apr-util-1.2.12.tar.gz) = e292942e22edd21b68609086352212e4
-SHA256 (apr-util-1.2.12.tar.gz) = 7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f
-SIZE (apr-util-1.2.12.tar.gz) = 668292
+MD5 (apr-1.3.2.tar.gz) = de95101173669bed731bede628a8cf69
+SHA256 (apr-1.3.2.tar.gz) = 1208e2caa48c5ac5d543de8642bde064731b45b490d104c59fc816aa88acafda
+SIZE (apr-1.3.2.tar.gz) = 1158861
+MD5 (apr-util-1.3.2.tar.gz) = ec615024cf2bbf30f67007ed8dcaf744
+SHA256 (apr-util-1.3.2.tar.gz) = 0c95069e5b4962d56ec4112f2aa85701b93a7374b76adcca348ca19c0db560f1
+SIZE (apr-util-1.3.2.tar.gz) = 778182
diff --git a/devel/apr2/files/patch-apr-util_build_dbm.m4 b/devel/apr2/files/patch-apr-util_build_dbm.m4
deleted file mode 100644
index f70a65798ad4..000000000000
--- a/devel/apr2/files/patch-apr-util_build_dbm.m4
+++ /dev/null
@@ -1,21 +0,0 @@
---- apr-util-1.2.12/build/dbm.m4-orig	Wed Dec  7 09:02:23 2005
-+++ apr-util-1.2.12/build/dbm.m4	Wed Dec 23 09:07:34 2005
-@@ -588,6 +588,8 @@
-     elif test "$withval" = "no"; then
-       apu_have_gdbm=0
-     else
-+      saved_cppflags="$CPPFLAGS"
-+      saved_libs="$LIBS"
-       CPPFLAGS="-I$withval/include"
-       LIBS="-L$withval/lib "
- 
-@@ -597,6 +599,9 @@
-         APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-         APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
-       fi
-+
-+      CPPFLAGS="$saved_cppflags"
-+      LIBS="$saved_libs"
-     fi
-   ], [
-     apu_have_gdbm=0
diff --git a/devel/apr2/files/patch-apr-util_configure b/devel/apr2/files/patch-apr-util_configure
deleted file mode 100644
index 74a683599819..000000000000
--- a/devel/apr2/files/patch-apr-util_configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- apr-util-1.2.12/configure.orig	Mon Sep 26 18:28:49 2005
-+++ apr-util-1.2.12/configure	Fri Dec 23 15:06:09 2005
-@@ -13806,6 +13806,8 @@
-     elif test "$withval" = "no"; then
-       apu_have_gdbm=0
-     else
-+      saved_cppflags="$CPPFLAGS"
-+      saved_libs="$LIBS"
-       CPPFLAGS="-I$withval/include"
-       LIBS="-L$withval/lib "
- 
-@@ -14064,6 +14066,9 @@
-   fi
- 
-       fi
-+
-+      CPPFLAGS="$saved_cppflags"
-+      LIBS="$saved_libs"
-     fi
- 
- else
diff --git a/devel/apr2/files/patch-apr_hints.m4 b/devel/apr2/files/patch-apr_hints.m4
index 59d70bcabe62..dba4f3e347d4 100644
--- a/devel/apr2/files/patch-apr_hints.m4
+++ b/devel/apr2/files/patch-apr_hints.m4
@@ -1,5 +1,5 @@
---- apr-1.2.12/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
-+++ apr-1.2.12/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
+--- apr-1.3.2/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
++++ apr-1.3.2/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
 @@ -137,11 +137,7 @@
  	;;
      *-freebsd*)
diff --git a/devel/apr2/pkg-plist b/devel/apr2/pkg-plist
index a52a515abe10..5023f715d620 100644
--- a/devel/apr2/pkg-plist
+++ b/devel/apr2/pkg-plist
@@ -29,10 +29,12 @@ include/apr-1/apr_inherit.h
 include/apr-1/apr_ldap.h
 include/apr-1/apr_ldap_init.h
 include/apr-1/apr_ldap_option.h
+include/apr-1/apr_ldap_rebind.h
 include/apr-1/apr_ldap_url.h
 include/apr-1/apr_lib.h
 include/apr-1/apr_md4.h
 include/apr-1/apr_md5.h
+include/apr-1/apr_memcache.h
 include/apr-1/apr_mmap.h
 include/apr-1/apr_network_io.h
 include/apr-1/apr_optional.h
@@ -56,6 +58,7 @@ include/apr-1/apr_support.h
 include/apr-1/apr_tables.h
 include/apr-1/apr_thread_cond.h
 include/apr-1/apr_thread_mutex.h
+include/apr-1/apr_thread_pool.h
 include/apr-1/apr_thread_proc.h
 include/apr-1/apr_thread_rwlock.h
 include/apr-1/apr_time.h
@@ -76,10 +79,10 @@ lib/aprutil.exp
 lib/libapr-1.a
 lib/libapr-1.la
 lib/libapr-1.so
-lib/libapr-1.so.2
+lib/libapr-1.so.%%SHLIB_MAJOR%%
 lib/libaprutil-1.a
 lib/libaprutil-1.la
 lib/libaprutil-1.so
-lib/libaprutil-1.so.2
+lib/libaprutil-1.so.%%SHLIB_MAJOR%%
 @dirrm build-1
 @dirrm include/apr-1