- update to apr-1.4.5

- update to apr-util-1.3.12
- add new make target "test:"

Changes for APR 1.4.5
  *) Security: CVE-2011-1928
     apr_fnmatch(): Fix high CPU loop.  [William Rowe]
  *) Fix top_builddir in installed apr_rules.mk.  [Bojan Smojver]

Changes with APR-util 1.3.12
  *) apr_ldap: Fix crash because of NULL cleanup registered by
     apr_ldap_rebind_init().  [Rainer Jung]

commit with hat apache@

4 files changed, 14 insertions, 21 deletions

diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 45984a42b62f..c8159b775e8a 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	apr
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
@@ -30,8 +29,8 @@ OPTIONS=	THREADS "Enable Threads in apr"				on  \
 		SQLITE  "Enable SQLite3 support in apr-util"		off \
 		DEVRANDOM "Use /dev/random or compatible in apr"	on
 
-APR_VERSION=	1.4.4
-APU_VERSION=	1.3.11
+APR_VERSION=	1.4.5
+APU_VERSION=	1.3.12
 
 USE_ICONV=		yes
 USE_AUTOTOOLS=	automake autoconf libtool:env
@@ -247,6 +246,12 @@ do-install:
 	cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
 	cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
 
+test: build
+	@(cd ${APR_WRKDIR}; ${MAKE} test)
+	@(cd ${APU_WRKDIR}; ${MAKE} test)
+
+#regression-test: test
+
 debug_autoconf:
 	@${ECHO} "LIBTOOL: ${LIBTOOL_VERSION}"
 	@${ECHO} "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}"
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
index 182e1d15dcf6..a9d269cce695 100644
--- a/devel/apr1/distinfo
+++ b/devel/apr1/distinfo
@@ -1,4 +1,4 @@
-SHA256 (apr-1.4.4.tar.gz) = 49819f4f28f7856995886193d822edde47062c3dd00597d4fbe575ef2bda16c8
-SIZE (apr-1.4.4.tar.gz) = 995954
-SHA256 (apr-util-1.3.11.tar.gz) = 6590d663927bf609d614ad407406dcc84af78d031650f60ab48853e9b3f4d87f
-SIZE (apr-util-1.3.11.tar.gz) = 769021
+SHA256 (apr-1.4.5.tar.gz) = 7323d5f72d6bddf7d1ecb63e4326df82a66210018bb2f1e8f6d97357e68302df
+SIZE (apr-1.4.5.tar.gz) = 994320
+SHA256 (apr-util-1.3.12.tar.gz) = 815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8
+SIZE (apr-util-1.3.12.tar.gz) = 769076
diff --git a/devel/apr1/files/patch-apr-1__Makefile.in b/devel/apr1/files/patch-apr-1__Makefile.in
deleted file mode 100644
index 7afecd96406d..000000000000
--- a/devel/apr1/files/patch-apr-1__Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./apr-1.4.4/Makefile.in.orig	2011-05-16 18:25:57.000000000 +0200
-+++ ./apr-1.4.4/Makefile.in	2011-05-16 18:30:47.000000000 +0200
-@@ -66,7 +66,8 @@
- 
- # Create apr_rules.mk suitable for the install tree
- build/apr_rules.out: build/apr_rules.mk
--	sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
-+	sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' \
-+	-e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
- 
- install: $(TARGETS)
- 	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
diff --git a/devel/apr1/files/patch-apr_hints.m4 b/devel/apr1/files/patch-apr_hints.m4
index 3726568f3e93..d335b20571eb 100644
--- a/devel/apr1/files/patch-apr_hints.m4
+++ b/devel/apr1/files/patch-apr_hints.m4
@@ -1,5 +1,5 @@
---- apr-1.4.4/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
-+++ apr-1.4.4/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
+--- 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
 @@ -159,11 +159,7 @@
  	;;
      *-freebsd*)