4 files changed, 10 insertions, 50 deletions

diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 878ea14f9975..cc4368e93ed5 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	apr
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
-PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
@@ -28,8 +27,8 @@ OPTIONS=	THREADS "Enable Threads in apr"						on  \
 			MYSQL	"Enable MySQL suport in apr-util"			off \
 			PGSQL	"Enable Postgresql suport in apr-util"		off
 
-APR_VERSION=	1.3.5
-APU_VERSION=	1.3.7
+APR_VERSION=	1.3.6
+APU_VERSION=	1.3.8
 
 USE_ICONV=		yes
 USE_AUTOTOOLS=	automake:19 autoconf:262 libtool:15:env
diff --git a/devel/apr2/distinfo b/devel/apr2/distinfo
index 7e787e6109f6..13753fe8ec4c 100644
--- a/devel/apr2/distinfo
+++ b/devel/apr2/distinfo
@@ -1,6 +1,6 @@
-MD5 (apr-1.3.5.tar.gz) = 2a3f33c2186f456fd60a34a7c2989580
-SHA256 (apr-1.3.5.tar.gz) = f047422b39a5e5d933d598bd9fca2a1184e1506e4cd66364a990c7f2cd76960d
-SIZE (apr-1.3.5.tar.gz) = 1162875
-MD5 (apr-util-1.3.7.tar.gz) = 0a6802ef6d874db645150ae4a75f41fa
-SHA256 (apr-util-1.3.7.tar.gz) = fadd6a0c55596b2c21375942e3acefc33715e647ed4770dc398d08d8783a39e0
-SIZE (apr-util-1.3.7.tar.gz) = 788206
+MD5 (apr-1.3.6.tar.gz) = ebcec292a9ea6372b4e359250d6af7bc
+SHA256 (apr-1.3.6.tar.gz) = 362b238cab7d19fdafbfd1df8cdc2bd2d49f3d5a3a5e194e05fb5a7bc55378d9
+SIZE (apr-1.3.6.tar.gz) = 1163776
+MD5 (apr-util-1.3.8.tar.gz) = bb9ac31b623be73582f2ced1f65b3856
+SHA256 (apr-util-1.3.8.tar.gz) = 15ef62c09e76d0ee485c4980b69f5c556740bc4efa736d8563c6961902745700
+SIZE (apr-util-1.3.8.tar.gz) = 789031
diff --git a/devel/apr2/files/patch-apr-util-1.3.7__apu-config.in b/devel/apr2/files/patch-apr-util-1.3.7__apu-config.in
deleted file mode 100644
index 7e8f2fa0e122..000000000000
--- a/devel/apr2/files/patch-apr-util-1.3.7__apu-config.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./apr-util-1.3.7/apu-config.in.orig	2008-05-23 17:27:59.000000000 -0400
-+++ ./apr-util-1.3.7/apu-config.in	2009-06-10 01:03:50.971447822 -0400
-@@ -31,6 +31,7 @@
- INCLUDES="@APRUTIL_INCLUDES@"
- LDFLAGS="@APRUTIL_LDFLAGS@"
- LDAP_LIBS="@LDADD_ldap@"
-+DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
- 
- APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
- 
-@@ -56,6 +57,8 @@
-   --libs            print library information
-   --avoid-ldap      do not include ldap library information with --libs
-   --ldap-libs       print additional library information to link with ldap
-+  --avoid-dbm       do not include DBM library information with --libs
-+  --dbm-libs        print additional library information to link with DBM
-   --srcdir          print APR-util source directory
-   --link-ld         print link switch(es) for linking to APR-util
-   --link-libtool    print the libtool inputs for linking to APR-util
-@@ -115,12 +118,18 @@
-     --avoid-ldap)
-     LDAP_LIBS=""
-     ;;
-+    --avoid-dbm)
-+    DBM_LIBS=""
-+    ;;
-     --libs)
--    flags="$flags $LDAP_LIBS $LIBS"
-+    flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
-     ;;
-     --ldap-libs)
-     flags="$flags $LDAP_LIBS"
-     ;;
-+    --dbm-libs)
-+    flags="$flags $DBM_LIBS"
-+    ;;
-     --includedir)
-     if test "$location" = "installed"; then
-         flags="$includedir"
diff --git a/devel/apr2/files/patch-apr_hints.m4 b/devel/apr2/files/patch-apr_hints.m4
index a360c89bbf99..c6de4ba24775 100644
--- a/devel/apr2/files/patch-apr_hints.m4
+++ b/devel/apr2/files/patch-apr_hints.m4
@@ -1,5 +1,5 @@
---- apr-1.3.5/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
-+++ apr-1.3.5/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
+--- apr-1.3.6/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
++++ apr-1.3.6/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
 @@ -137,11 +137,7 @@
  	;;
      *-freebsd*)