Re: big apr / apr-util update

On Fri, Apr 27, 2012 at 11:53:38AM +0200, Marc Espie wrote:
Fixed.

I've tested upgrade from a set of old apr packages to the new ones.
Works fine.

===> Updating for apr-1.4.6
Upgrading from apr-1.2.11p5
apr-mt-1.2.11p5
apr-1.2.11p5+apr-mt-1.2.11p5->apr-1.4.6 forward dependencies:                  
| Dependency of apr-util-mt-1.2.10p8 on apr-mt-1.2.11 doesn't match
| Dependency of apr-util-1.2.10p8 on apr-1.2.11 doesn't match
Merging apr-util-mt-1.2.10p8->apr-util-1.4.1 (ok)
Merging apr-util-1.2.10p8->apr-util-1.4.1 (ok)
apr-1.2.11p5+apr-mt-1.2.11p5+apr-util-1.2.10p8+apr-util-mt-1.2.10p8->apr-1.4.6+apr-util-1.4.1: ok
Read shared items: ok

Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1037
diff -u -p -r1.1037 Makefile
--- devel/Makefile 23 Apr 2012 15:44:56 -0000 1.1037
+++ devel/Makefile 27 Apr 2012 07:57:09 -0000
@@ -9,11 +9,8 @@
      SUBDIR += alex
      SUBDIR += apache-ant
      SUBDIR += apr
-     SUBDIR += apr,mt
      SUBDIR += apr-util
      SUBDIR += apr-util,ldap
-     SUBDIR += apr-util,mt
-     SUBDIR += apr-util,mt,ldap
      SUBDIR += arduino
      SUBDIR += argp-standalone
      SUBDIR += argtable
Index: devel/apr/Makefile
===================================================================
RCS file: /cvs/ports/devel/apr/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- devel/apr/Makefile 18 Nov 2011 10:11:32 -0000 1.25
+++ devel/apr/Makefile 27 Apr 2012 07:47:49 -0000
@@ -2,15 +2,14 @@
 
 COMMENT= Apache Portable Runtime
 
-V= 1.2.11
+V= 1.4.6
 DISTNAME= apr-$V
 FULLPKGNAME= apr${MT}-$V
-REVISION= 5
-SHARED_LIBS += apr-1${MT}             3.0     # .2.11
+SHARED_LIBS += apr-1${MT}             3.1     # .2.11
 
 CATEGORIES= devel
 
-MAINTAINER= Aleksander Piotrowski <alek@...>
+MAINTAINER= Stefan Sperling <stsp@...>
 
 HOMEPAGE= http://apr.apache.org/
 
@@ -28,25 +27,8 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
  --includedir=${LOCALBASE}/include/apr-1${MT}/ \
  --with-installbuilddir=${LOCALBASE}/lib/apr-1${MT}/ \
  --enable-other-child \
+ --enable-threads \
  ac_cv_prog_AWK=awk
-
-FLAVORS= mt
-FLAVOR?=
-
-SUBST_VARS+= MT
-
-.if ${FLAVOR:Mmt}
-MT=-mt
-CONFIGURE_ARGS+= --enable-threads
-
-post-install:
- sed 's/{APR_LIBNAME}/{APR_LIBNAME}-mt/g' ${WRKSRC}/apr-config.out > ${PREFIX}/bin/apr-1-mt-config
-
-.else
-MT=
-CONFIGURE_ARGS+= --disable-threads
-.endif
-MAKE_ENV+= MT=${MT}
 
 pre-install:
  rm -f ${WRKSRC}/libtool
Index: devel/apr/distinfo
===================================================================
RCS file: /cvs/ports/devel/apr/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- devel/apr/distinfo 20 Sep 2007 10:17:21 -0000 1.7
+++ devel/apr/distinfo 27 Apr 2012 07:48:15 -0000
@@ -1,5 +1,5 @@
-MD5 (apr-1.2.11.tar.gz) = r8+VQdwxVRq+tsU7tCwllg==
-RMD160 (apr-1.2.11.tar.gz) = ixwYMc2Cgd4X9B+E/8XP2bbDVVM=
-SHA1 (apr-1.2.11.tar.gz) = veLItuR3dSvKxPOHrA3pZxzRXRo=
-SHA256 (apr-1.2.11.tar.gz) = /HoU6N7QAsJSz188zObNVjbwGoWYYYjjc/k0OhdMQv8=
-SIZE (apr-1.2.11.tar.gz) = 1114033
+MD5 (apr-1.4.6.tar.gz) = dsxEV/u3Hu/a+ifbqPUR+w==
+RMD160 (apr-1.4.6.tar.gz) = ra8c0WRtM7VxJ8+gaNLEbHVa0LQ=
+SHA1 (apr-1.4.6.tar.gz) = P14/H2fLT+DMRujDdAEFw1oCAwg=
+SHA256 (apr-1.4.6.tar.gz) = U41ZPYBcNphfxtIA0xv2wbX5DfKlC5F5AnQ6E7vBDgU=
+SIZE (apr-1.4.6.tar.gz) = 982243
Index: devel/apr/patches/patch-Makefile_in
===================================================================
RCS file: devel/apr/patches/patch-Makefile_in
diff -N devel/apr/patches/patch-Makefile_in
--- devel/apr/patches/patch-Makefile_in 1 Apr 2007 20:03:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2007/04/01 20:03:07 kurt Exp $
---- Makefile.in.orig Fri Feb  4 06:55:44 2005
-+++ Makefile.in Wed Mar 28 09:57:24 2007
-@@ -3,6 +3,7 @@ srcdir=@srcdir@
- VPATH=@srcdir@
- top_srcdir=@apr_srcdir@
- top_blddir=@apr_builddir@
-+MT?=
-
- #
- # APR (Apache Portable Runtime) library Makefile.
-@@ -26,9 +27,10 @@ INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_
- CLEAN_SUBDIRS= test
- INSTALL_SUBDIRS=@INSTALL_SUBDIRS@
-
--TARGET_LIB = lib@APR_LIBNAME@.la
--APR_PCFILE = apr-$(APR_MAJOR_VERSION).pc
-+TARGET_LIB = lib@APR_LIBNAME@${MT}.la
-+APR_PCFILE = apr-$(APR_MAJOR_VERSION)${MT}.pc
- APR_CONFIG = apr-$(APR_MAJOR_VERSION)-config
-+APR_INSTCONFIG = apr-$(APR_MAJOR_VERSION)${MT}-config
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-
-@@ -75,7 +77,7 @@ install: $(TARGET_LIB) apr-config.out build/apr_rules.
- done
- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
- $(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
-- $(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
-+ $(INSTALL_DATA) apr${MT}.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
- for f in libtool shlibtool; do \
-    if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \
- done
-@@ -84,7 +86,7 @@ install: $(TARGET_LIB) apr-config.out build/apr_rules.
-    $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
- done
- $(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
-- $(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
-+ $(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_INSTCONFIG)
- @if [ $(INSTALL_SUBDIRS) != "none" ]; then \
-             for i in $(INSTALL_SUBDIRS); do \
-        ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
Index: devel/apr/patches/patch-apr-config_in
===================================================================
RCS file: /cvs/ports/devel/apr/patches/patch-apr-config_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-apr-config_in
--- devel/apr/patches/patch-apr-config_in 30 Oct 2007 16:55:48 -0000 1.1
+++ devel/apr/patches/patch-apr-config_in 27 Apr 2012 07:51:34 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-apr-config_in,v 1.1 2007/10/30 16:55:48 steven Exp $
---- apr-config.in.orig Tue Oct 30 16:36:08 2007
-+++ apr-config.in Tue Oct 30 16:36:27 2007
-@@ -222,11 +222,7 @@ while test $# -gt 0; do
+--- apr-config.in.orig Fri Jun 20 17:46:02 2008
++++ apr-config.in Fri Apr 27 09:51:08 2012
+@@ -223,11 +223,7 @@ while test $# -gt 0; do
      exit 0
      ;;
      --apr-libtool)
Index: devel/apr/patches/patch-apr-mt_pc_in
===================================================================
RCS file: devel/apr/patches/patch-apr-mt_pc_in
diff -N devel/apr/patches/patch-apr-mt_pc_in
--- devel/apr/patches/patch-apr-mt_pc_in 24 Mar 2007 13:46:47 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-apr-mt_pc_in,v 1.1 2007/03/24 13:46:47 todd Exp $
---- apr-mt.pc.in.orig Thu Feb  8 14:19:40 2007
-+++ apr-mt.pc.in Thu Feb  8 14:25:06 2007
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
-+includedir=@includedir@
-+
-+Name: APR
-+Description: The Apache Portable Runtime library
-+Version: @APR_DOTTED_VERSION@
-+Libs: -L${libdir} -l@APR_LIBNAME@-mt @EXTRA_LIBS@
-+Cflags: @EXTRA_CPPFLAGS@ @EXTRA_CFLAGS@ -I${includedir}
Index: devel/apr/patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/apr/patches/patch-configure,v
retrieving revision 1.8
diff -u -p -r1.8 patch-configure
--- devel/apr/patches/patch-configure 30 Oct 2007 16:47:50 -0000 1.8
+++ devel/apr/patches/patch-configure 27 Apr 2012 07:51:35 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.8 2007/10/30 16:47:50 steven Exp $
---- configure.orig Tue Sep  4 03:42:02 2007
-+++ configure Tue Oct 30 17:41:25 2007
-@@ -4326,6 +4326,11 @@ if test "x$apr_preload_done" != "xyes" ; then
+--- configure.orig Wed Feb  8 00:17:57 2012
++++ configure Fri Apr 27 09:51:08 2012
+@@ -6633,6 +6633,11 @@ if test "x$apr_preload_done" != "xyes" ; then
          ;;
      *-openbsd*)
 
@@ -13,16 +13,16 @@ $OpenBSD: patch-configure,v 1.8 2007/10/
    if test "x$CPPFLAGS" = "x"; then
      test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-D_POSIX_THREADS\""
      CPPFLAGS="-D_POSIX_THREADS"
-@@ -23954,7 +23959,7 @@ fi
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+@@ -13934,7 +13939,7 @@ fi
+ LIBTOOL_DEPS="$ltmain"
 
  # Always use our own libtool.
 -LIBTOOL='$(SHELL) $(apr_builddir)/libtool'
 +#LIBTOOL='$(SHELL) $(apr_builddir)/libtool'
 
- # Prevent multiple expansion
 
-@@ -26156,7 +26161,7 @@ if test "${apr_cv_pthreads_lib+set}" = set; then
+
+@@ -19343,7 +19348,7 @@ if ${apr_cv_pthreads_lib+:} false; then :
  else
 
    apr_ptc_libs=$LIBS
@@ -30,8 +30,8 @@ $OpenBSD: patch-configure,v 1.8 2007/10/
 +  for lib in -pthread -lpthread -lpthreads -lc_r; do
      LIBS="$apr_ptc_libs $lib"
 
- if test "$cross_compiling" = yes; then
-@@ -26714,7 +26719,7 @@ if test "${apr_cv_pthreads_lib+set}" = set; then
+ if test "$cross_compiling" = yes; then :
+@@ -19591,7 +19596,7 @@ if ${apr_cv_pthreads_lib+:} false; then :
  else
 
    apr_ptc_libs=$LIBS
@@ -39,8 +39,8 @@ $OpenBSD: patch-configure,v 1.8 2007/10/
 +  for lib in -pthread -lpthread -lpthreads -lc_r; do
      LIBS="$apr_ptc_libs $lib"
 
- if test "$cross_compiling" = yes; then
-@@ -39676,7 +39681,7 @@ for ac_spec in func:semget func:semctl define:SEM_UNDO
+ if test "$cross_compiling" = yes; then :
+@@ -25452,7 +25457,7 @@ for ac_spec in func:semget func:semctl define:SEM_UNDO
  done
  if test ".$ac_rc" = .yes; then
      :
@@ -49,12 +49,3 @@ $OpenBSD: patch-configure,v 1.8 2007/10/
  else
      :
      hassysvser="0"
-@@ -43711,7 +43716,7 @@ esac
-
-
-
--                                                            ac_config_files="$ac_config_files Makefile include/apr.h build/apr_rules.mk build/pkg/pkginfo apr-$APR_MAJOR_VERSION-config:apr-config.in apr.pc"
-+                                                            ac_config_files="$ac_config_files Makefile include/apr.h build/apr_rules.mk build/pkg/pkginfo apr-$APR_MAJOR_VERSION-config:apr-config.in apr.pc apr-mt.pc"
-
-
- if test -d $srcdir/test; then
Index: devel/apr/patches/patch-memory_unix_apr_pools_c
===================================================================
RCS file: devel/apr/patches/patch-memory_unix_apr_pools_c
diff -N devel/apr/patches/patch-memory_unix_apr_pools_c
--- devel/apr/patches/patch-memory_unix_apr_pools_c 7 Aug 2009 04:28:28 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,61 +0,0 @@
-$OpenBSD: patch-memory_unix_apr_pools_c,v 1.2 2009/08/07 04:28:28 steven Exp $
-
-SECURITY: CVE-2009-2412 (cve.mitre.org)
-Fix overflow in pools, where size alignment was taking place.
-
---- memory/unix/apr_pools.c.orig Thu Aug  6 18:50:47 2009
-+++ memory/unix/apr_pools.c Thu Aug  6 18:53:45 2009
-@@ -168,16 +168,19 @@ APR_DECLARE(void) apr_allocator_max_free_set(apr_alloc
- }
-
- static APR_INLINE
--apr_memnode_t *allocator_alloc(apr_allocator_t *allocator, apr_size_t size)
-+apr_memnode_t *allocator_alloc(apr_allocator_t *allocator, apr_size_t in_size)
- {
-     apr_memnode_t *node, **ref;
-     apr_uint32_t max_index;
--    apr_size_t i, index;
-+    apr_size_t size, i, index;
-
-     /* Round up the block size to the next boundary, but always
-      * allocate at least a certain size (MIN_ALLOC).
-      */
--    size = APR_ALIGN(size + APR_MEMNODE_T_SIZE, BOUNDARY_SIZE);
-+    size = APR_ALIGN(in_size + APR_MEMNODE_T_SIZE, BOUNDARY_SIZE);
-+    if (size < in_size) {
-+        return NULL;
-+    }
-     if (size < MIN_ALLOC)
-         size = MIN_ALLOC;
-
-@@ -591,13 +594,19 @@ APR_DECLARE(void) apr_pool_terminate(void)
-  * Memory allocation
-  */
-
--APR_DECLARE(void *) apr_palloc(apr_pool_t *pool, apr_size_t size)
-+APR_DECLARE(void *) apr_palloc(apr_pool_t *pool, apr_size_t in_size)
- {
-     apr_memnode_t *active, *node;
-     void *mem;
--    apr_size_t free_index;
-+    apr_size_t size, free_index;
-
--    size = APR_ALIGN_DEFAULT(size);
-+    size = APR_ALIGN_DEFAULT(in_size);
-+    if (size < in_size) {
-+        if (pool->abort_fn)
-+            pool->abort_fn(APR_ENOMEM);
-+
-+        return NULL;
-+    }
-     active = pool->active;
-
-     /* If the active node has enough bytes left, use it. */
-@@ -662,7 +671,6 @@ APR_DECLARE(void *) apr_pcalloc(apr_pool_t *pool, apr_
- {
-     void *mem;
-
--    size = APR_ALIGN_DEFAULT(size);
-     if ((mem = apr_palloc(pool, size)) != NULL) {
-         memset(mem, 0, size);
-     }
Index: devel/apr/patches/patch-network_io_unix_sockets_c
===================================================================
RCS file: /cvs/ports/devel/apr/patches/patch-network_io_unix_sockets_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-network_io_unix_sockets_c
--- devel/apr/patches/patch-network_io_unix_sockets_c 26 Apr 2007 16:05:01 -0000 1.3
+++ devel/apr/patches/patch-network_io_unix_sockets_c 27 Apr 2012 07:51:34 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-network_io_unix_sockets_c,v 1.3 2007/04/26 16:05:01 kurt Exp $
---- network_io/unix/sockets.c.orig Thu Dec  8 12:24:36 2005
-+++ network_io/unix/sockets.c Thu Apr 26 11:52:13 2007
-@@ -256,6 +256,15 @@ apr_status_t apr_socket_accept(apr_socket_t **new, apr
+--- network_io/unix/sockets.c.orig Wed Mar 23 19:52:44 2011
++++ network_io/unix/sockets.c Fri Apr 27 09:51:08 2012
+@@ -312,6 +312,15 @@ apr_status_t apr_socket_accept(apr_socket_t **new, apr
  apr_status_t apr_socket_connect(apr_socket_t *sock, apr_sockaddr_t *sa)
  {
      int rc;        
Index: devel/apr/patches/patch-test_Makefile_in
===================================================================
RCS file: devel/apr/patches/patch-test_Makefile_in
diff -N devel/apr/patches/patch-test_Makefile_in
--- devel/apr/patches/patch-test_Makefile_in 5 Jul 2007 16:01:28 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-test_Makefile_in,v 1.2 2007/07/05 16:01:28 steven Exp $
---- test/Makefile.in.orig Sat Jun  2 00:02:13 2007
-+++ test/Makefile.in Tue Jun 26 08:30:40 2007
-@@ -27,7 +27,7 @@ TARGETS = $(PROGRAMS)
- # bring in rules.mk for standard functionality
- @INCLUDE_RULES@
-
--LOCAL_LIBS=../lib@APR_LIBNAME@.la
-+LOCAL_LIBS=../lib@APR_LIBNAME@${MT}.la
-
- CLEAN_TARGETS = testfile.tmp mod_test.slo proc_child@EXEEXT@ occhild@EXEEXT@ \
- readchild@EXEEXT@ tryread@EXEEXT@ sockchild@EXEEXT@ \
Index: devel/apr/pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/apr/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- devel/apr/pkg/DESCR 4 Sep 2007 21:46:25 -0000 1.2
+++ devel/apr/pkg/DESCR 27 Apr 2012 07:56:07 -0000
@@ -1,6 +1,3 @@
 The Apache Portable Run-time mission is to provide a library of
 routines that allows programmers to write a program once and be
 able to compile it anywhere.
-
-Flavor:
- mt - enable threading support
Index: devel/apr/pkg/PFRAG.mt-shared
===================================================================
RCS file: devel/apr/pkg/PFRAG.mt-shared
diff -N devel/apr/pkg/PFRAG.mt-shared
--- devel/apr/pkg/PFRAG.mt-shared 24 Mar 2007 13:46:47 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.mt-shared,v 1.1 2007/03/24 13:46:47 todd Exp $
-@lib lib/libapr-1-mt.so.${LIBapr-1-mt_VERSION}
Index: devel/apr/pkg/PFRAG.no-mt-shared
===================================================================
RCS file: devel/apr/pkg/PFRAG.no-mt-shared
diff -N devel/apr/pkg/PFRAG.no-mt-shared
--- devel/apr/pkg/PFRAG.no-mt-shared 24 Mar 2007 13:46:47 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.no-mt-shared,v 1.1 2007/03/24 13:46:47 todd Exp $
-@lib lib/libapr-1.so.${LIBapr-1_VERSION}
Index: devel/apr/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/devel/apr/pkg/PFRAG.shared,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.shared
--- devel/apr/pkg/PFRAG.shared 24 Mar 2007 13:46:47 -0000 1.3
+++ devel/apr/pkg/PFRAG.shared 27 Apr 2012 07:56:26 -0000
@@ -1,3 +1,2 @@
 @comment $OpenBSD: PFRAG.shared,v 1.3 2007/03/24 13:46:47 todd Exp $
-%%mt%%
-!%%mt%%
+@lib lib/libapr-1.so.${LIBapr-1_VERSION}
Index: devel/apr/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/apr/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- devel/apr/pkg/PLIST 30 Oct 2007 16:47:50 -0000 1.3
+++ devel/apr/pkg/PLIST 27 Apr 2012 10:17:37 -0000
@@ -1,50 +1,52 @@
 @comment $OpenBSD: PLIST,v 1.3 2007/10/30 16:47:50 steven Exp $
+@conflict apr-mt-*
+@pkgpath devel/apr,mt
 %%SHARED%%
-bin/apr-1${MT}-config
-include/apr-1${MT}/
-include/apr-1${MT}/apr.h
-include/apr-1${MT}/apr_allocator.h
-include/apr-1${MT}/apr_atomic.h
-include/apr-1${MT}/apr_dso.h
-include/apr-1${MT}/apr_env.h
-include/apr-1${MT}/apr_errno.h
-include/apr-1${MT}/apr_file_info.h
-include/apr-1${MT}/apr_file_io.h
-include/apr-1${MT}/apr_fnmatch.h
-include/apr-1${MT}/apr_general.h
-include/apr-1${MT}/apr_getopt.h
-include/apr-1${MT}/apr_global_mutex.h
-include/apr-1${MT}/apr_hash.h
-include/apr-1${MT}/apr_inherit.h
-include/apr-1${MT}/apr_lib.h
-include/apr-1${MT}/apr_mmap.h
-include/apr-1${MT}/apr_network_io.h
-include/apr-1${MT}/apr_poll.h
-include/apr-1${MT}/apr_pools.h
-include/apr-1${MT}/apr_portable.h
-include/apr-1${MT}/apr_proc_mutex.h
-include/apr-1${MT}/apr_random.h
-include/apr-1${MT}/apr_ring.h
-include/apr-1${MT}/apr_shm.h
-include/apr-1${MT}/apr_signal.h
-include/apr-1${MT}/apr_strings.h
-include/apr-1${MT}/apr_support.h
-include/apr-1${MT}/apr_tables.h
-include/apr-1${MT}/apr_thread_cond.h
-include/apr-1${MT}/apr_thread_mutex.h
-include/apr-1${MT}/apr_thread_proc.h
-include/apr-1${MT}/apr_thread_rwlock.h
-include/apr-1${MT}/apr_time.h
-include/apr-1${MT}/apr_user.h
-include/apr-1${MT}/apr_version.h
-include/apr-1${MT}/apr_want.h
-lib/apr-1${MT}/
-lib/apr-1${MT}/apr_rules.mk
-lib/apr-1${MT}/make_exports.awk
-lib/apr-1${MT}/make_var_export.awk
-lib/apr-1${MT}/mkdir.sh
+bin/apr-1-config
+include/apr-1/
+include/apr-1/apr.h
+include/apr-1/apr_allocator.h
+include/apr-1/apr_atomic.h
+include/apr-1/apr_dso.h
+include/apr-1/apr_env.h
+include/apr-1/apr_errno.h
+include/apr-1/apr_file_info.h
+include/apr-1/apr_file_io.h
+include/apr-1/apr_fnmatch.h
+include/apr-1/apr_general.h
+include/apr-1/apr_getopt.h
+include/apr-1/apr_global_mutex.h
+include/apr-1/apr_hash.h
+include/apr-1/apr_inherit.h
+include/apr-1/apr_lib.h
+include/apr-1/apr_mmap.h
+include/apr-1/apr_network_io.h
+include/apr-1/apr_poll.h
+include/apr-1/apr_pools.h
+include/apr-1/apr_portable.h
+include/apr-1/apr_proc_mutex.h
+include/apr-1/apr_random.h
+include/apr-1/apr_ring.h
+include/apr-1/apr_shm.h
+include/apr-1/apr_signal.h
+include/apr-1/apr_strings.h
+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_proc.h
+include/apr-1/apr_thread_rwlock.h
+include/apr-1/apr_time.h
+include/apr-1/apr_user.h
+include/apr-1/apr_version.h
+include/apr-1/apr_want.h
+lib/apr-1/
+lib/apr-1/apr_rules.mk
+lib/apr-1/make_exports.awk
+lib/apr-1/make_var_export.awk
+lib/apr-1/mkdir.sh
 @comment lib/apr.exp
-lib/libapr-1${MT}.a
-lib/libapr-1${MT}.la
+lib/libapr-1.a
+lib/libapr-1.la
 lib/pkgconfig/
-lib/pkgconfig/apr-1${MT}.pc
+lib/pkgconfig/apr-1.pc
Index: devel/apr-util/Makefile
===================================================================
RCS file: /cvs/ports/devel/apr-util/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- devel/apr-util/Makefile 21 Feb 2012 16:21:41 -0000 1.35
+++ devel/apr-util/Makefile 27 Apr 2012 08:38:47 -0000
@@ -2,19 +2,17 @@
 
 COMMENT= companion library to APR
 
-V= 1.2.10
+V= 1.4.1
 DISTNAME= apr-util-$V
-FULLPKGNAME= apr-util${MT}-$V${FLAVOR_EXT:S/-mt//}
-REVISION = 8
-SHARED_LIBS += aprutil-1${MT}          2.11     # .2.11
+SHARED_LIBS += aprutil-1          2.12     # .2.11
 
 CATEGORIES= devel
 
-MAINTAINER= Aleksander Piotrowski <alek@...>
+MAINTAINER= Stefan Sperling <stsp@...>
 
 HOMEPAGE= http://apr.apache.org/
 
-FLAVORS= mt ldap
+FLAVORS= ldap
 FLAVOR?=
 
 # Apache License 2.0
@@ -31,13 +29,19 @@ LIB_DEPENDS= databases/db/v4,no_java,no_
 MODULES= converters/libiconv
 USE_LIBTOOL= Yes
 CONFIGURE_STYLE=autoconf
-AUTOCONF_VERSION=2.59
+AUTOCONF_VERSION=2.68
 CONFIGURE_ARGS= --with-apr=${LOCALBASE} \
  --with-dbm=db4 \
  --with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib/db4 \
  --with-iconv=${LOCALBASE} \
- --includedir=${LOCALBASE}/include/apr-1${MT}/ \
- --with-apr=${LOCALBASE}/bin/apr-1${MT}-config
+ --includedir=${LOCALBASE}/include/apr-1/ \
+ --with-apr=${LOCALBASE}/bin/apr-1-config \
+ --with-sqlite3=no \
+ --with-pgsql=no \
+ --with-mysql=no \
+ --with-oracle=no \
+ --with-freedts=no \
+ --with-odbc=no
 
 .if ${FLAVOR:Mldap}
 CONFIGURE_ARGS+= --with-ldap-include=${LOCALBASE}/include \
@@ -45,24 +49,12 @@ CONFIGURE_ARGS+= --with-ldap-include=${L
  --with-ldap
 LIB_DEPENDS+= databases/openldap
 WANTLIB+= asn1 com_err crypto gssapi krb5 sasl2 ssl lber-2.4 ldap-2.4
+.else
+CONFIGURE_ARGS+= --with-ldap=no
 .endif
 
-MT?=
-.if ${FLAVOR:Mmt}
-MT=-mt
 CONFIGURE_ENV+= APRUTIL_EXPORT_LIBS=-pthread
-LIB_DEPENDS+= apr-mt-1.2.11:devel/apr,mt
-WANTLIB += apr-1-mt=3
-
-post-install:
- sed 's/{APRUTIL_LIBNAME}/{APRUTIL_LIBNAME}-mt/g' ${WRKSRC}/apu-config.out > ${PREFIX}/bin/apu-1-mt-config
-
-.else
-LIB_DEPENDS+= apr-1.2.11:devel/apr
+LIB_DEPENDS+= apr-1.4.6:devel/apr
 WANTLIB+= apr-1=3
-.endif
-
-SUBST_VARS+= MT
-MAKE_ENV+= MT=${MT}
 
 .include <bsd.port.mk>
Index: devel/apr-util/distinfo
===================================================================
RCS file: /cvs/ports/devel/apr-util/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- devel/apr-util/distinfo 20 Sep 2007 10:18:37 -0000 1.6
+++ devel/apr-util/distinfo 27 Apr 2012 08:05:31 -0000
@@ -1,5 +1,5 @@
-MD5 (apr-util-1.2.10.tar.gz) = dVj7os5ureg88opxZKmB+g==
-RMD160 (apr-util-1.2.10.tar.gz) = bVd7BKTXXvy0DhMv3fFfrt57KcE=
-SHA1 (apr-util-1.2.10.tar.gz) = nhNqVJIxOg6zxQFUol2iyZ3Kuxs=
-SHA256 (apr-util-1.2.10.tar.gz) = h2H+xIf/mOe52WWGQSXQRoo9St8skaRINPr/PGk+b0c=
-SIZE (apr-util-1.2.10.tar.gz) = 654083
+MD5 (apr-util-1.4.1.tar.gz) = ZmpdVgmKnev5mFEOMEyAlQ==
+RMD160 (apr-util-1.4.1.tar.gz) = zN0YoMZcd96nWxgbenf165TycHA=
+SHA1 (apr-util-1.4.1.tar.gz) = yk22MdGG6hNSb9CHrrwGeZ1MVBU=
+SHA256 (apr-util-1.4.1.tar.gz) = 1jbZ75XG5Q5H/DONUyqjde3RHl16PDDe5IvrON30q0w=
+SIZE (apr-util-1.4.1.tar.gz) = 774770
Index: devel/apr-util/patches/patch-Makefile_in
===================================================================
RCS file: devel/apr-util/patches/patch-Makefile_in
diff -N devel/apr-util/patches/patch-Makefile_in
--- devel/apr-util/patches/patch-Makefile_in 27 Dec 2008 15:33:04 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2008/12/27 15:33:04 sturm Exp $
---- Makefile.in.orig Tue May 24 14:09:35 2005
-+++ Makefile.in Thu Dec 25 10:31:01 2008
-@@ -7,6 +7,8 @@ CPP = @CPP@
- APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VERSION@
- APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@
-
-+MT?=
-+
- srcdir = @srcdir@
- VPATH = @srcdir@
-
-@@ -14,11 +16,12 @@ INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APR
- APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
- APRUTIL_LIBS = @APRUTIL_LIBS@
-
--TARGET_LIB = lib@APRUTIL_LIBNAME@.la
-+TARGET_LIB = lib@APRUTIL_LIBNAME@${MT}.la
- INSTALL_SUBDIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
- EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
--APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc
-+APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION)${MT}.pc
- APU_CONFIG = apu-$(APRUTIL_MAJOR_VERSION)-config
-+APU_INSTCONFIG = apu-$(APRUTIL_MAJOR_VERSION)${MT}-config
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-
-@@ -59,13 +62,13 @@ install: $(TARGET_LIB) apu-config.out
- for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \
- $(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
- done
-- $(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
-+ $(INSTALL_DATA) apr-util${MT}.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
- list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
- ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
- done
- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
- $(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)
-- $(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
-+ $(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_INSTCONFIG)
-
- $(TARGET_LIB): $(OBJECTS)
- $(LINK) @lib_target@ $(ALL_LIBS) $(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)
Index: devel/apr-util/patches/patch-apr-util-mt_pc_in
===================================================================
RCS file: devel/apr-util/patches/patch-apr-util-mt_pc_in
diff -N devel/apr-util/patches/patch-apr-util-mt_pc_in
--- devel/apr-util/patches/patch-apr-util-mt_pc_in 27 Dec 2008 15:33:04 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-apr-util-mt_pc_in,v 1.1 2008/12/27 15:33:04 sturm Exp $
---- apr-util-mt.pc.in.orig Thu Dec 25 10:20:05 2008
-+++ apr-util-mt.pc.in Thu Dec 25 10:20:47 2008
-@@ -0,0 +1,13 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VERSION@
-+includedir=@includedir@
-+
-+Name: APR Utils
-+Description: Companion library for APR
-+Version: @APRUTIL_DOTTED_VERSION@
-+# assume that apr-util requires libapr of same major version
-+Requires: apr-@APRUTIL_MAJOR_VERSION@
-+Libs: -L${libdir} -l@APRUTIL_LIBNAME@-mt @APRUTIL_EXPORT_LIBS@
-+Cflags: -I${includedir}
Index: devel/apr-util/patches/patch-apu-config_in
===================================================================
RCS file: devel/apr-util/patches/patch-apu-config_in
diff -N devel/apr-util/patches/patch-apu-config_in
--- devel/apr-util/patches/patch-apu-config_in 27 Dec 2008 15:33:04 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-apu-config_in,v 1.1 2008/12/27 15:33:04 sturm Exp $
-
-permit substitution in post-install
-
---- apu-config.in.orig Thu Dec 25 10:56:57 2008
-+++ apu-config.in Thu Dec 25 11:03:51 2008
-@@ -148,9 +148,9 @@ while test $# -gt 0; do
-     --link-ld)
-     if test "$location" = "installed"; then
-         ### avoid using -L if libdir is a "standard" location like /usr/lib
--        flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
-+        flags="$flags -L$libdir -l${APRUTIL_LIBNAME}"
-     else
--        flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
-+        flags="$flags -L$APU_BUILD_DIR -l${APRUTIL_LIBNAME}"
-     fi
-     ;;
-     --link-libtool)
-@@ -164,7 +164,7 @@ while test $# -gt 0; do
-         ### avoid using -L if libdir is a "standard" location like /usr/lib
-         # Since the user is specifying they are linking with libtool, we
-         # *know* that -R will be recognized by libtool.
--        flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME"
-+        flags="$flags -L$libdir -R$libdir -l${APRUTIL_LIBNAME}"
-     else
-         flags="$flags $LA_FILE"
-     fi
Index: devel/apr-util/patches/patch-buckets_apr_brigade_c
===================================================================
RCS file: devel/apr-util/patches/patch-buckets_apr_brigade_c
diff -N devel/apr-util/patches/patch-buckets_apr_brigade_c
--- devel/apr-util/patches/patch-buckets_apr_brigade_c 12 Feb 2011 21:06:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-buckets_apr_brigade_c,v 1.1 2011/02/12 21:06:57 pea Exp $
-
-Fix CVE-2010-1623
-
---- buckets/apr_brigade.c.orig Fri Feb  4 21:45:35 2005
-+++ buckets/apr_brigade.c Tue Feb  8 14:04:05 2011
-@@ -304,7 +304,18 @@ APU_DECLARE(apr_status_t) apr_brigade_split_line(apr_b
-             return APR_SUCCESS;
-         }
-         APR_BUCKET_REMOVE(e);
--        APR_BRIGADE_INSERT_TAIL(bbOut, e);
-+        if (APR_BUCKET_IS_METADATA(e) || len > APR_BUCKET_BUFF_SIZE/4) {
-+            APR_BRIGADE_INSERT_TAIL(bbOut, e);
-+        }
-+        else {
-+            if (len > 0) {
-+                rv = apr_brigade_write(bbOut, NULL, NULL, str, len);
-+                if (rv != APR_SUCCESS) {
-+                    return rv;
-+                }
-+            }
-+            apr_bucket_destroy(e);
-+        }
-         readbytes += len;
-         /* We didn't find an APR_ASCII_LF within the maximum line length. */
-         if (readbytes >= maxbytes) {
Index: devel/apr-util/patches/patch-build_apu-conf_m4
===================================================================
RCS file: devel/apr-util/patches/patch-build_apu-conf_m4
diff -N devel/apr-util/patches/patch-build_apu-conf_m4
--- devel/apr-util/patches/patch-build_apu-conf_m4 20 Sep 2007 10:18:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-build_apu-conf_m4,v 1.1 2007/09/20 10:18:37 steven Exp $
---- build/apu-conf.m4.orig Tue Sep 18 14:47:31 2007
-+++ build/apu-conf.m4 Tue Sep 18 14:47:57 2007
-@@ -144,6 +144,7 @@ AC_ARG_WITH([expat],
-       APR_ADDTO(LDFLAGS, [-L$withval/lib])
-       APR_ADDTO(CPPFLAGS, [-I$withval/include])
-       APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
-+      APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-     fi
-     # ...and refuse to fall back on the builtin expat.
-     apu_try_builtin_expat=0
Index: devel/apr-util/patches/patch-configure_in
===================================================================
RCS file: devel/apr-util/patches/patch-configure_in
diff -N devel/apr-util/patches/patch-configure_in
--- devel/apr-util/patches/patch-configure_in 27 Dec 2008 15:33:04 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.1 2008/12/27 15:33:04 sturm Exp $
---- configure.in.orig Thu Dec 25 10:47:07 2008
-+++ configure.in Thu Dec 25 10:47:31 2008
-@@ -193,7 +193,7 @@ for d in include include/private; do
- done
-
- AC_CONFIG_FILES([Makefile export_vars.sh
--                 build/pkg/pkginfo apr-util.pc
-+                 build/pkg/pkginfo apr-util.pc apr-util-mt.pc
-                  apu-$APRUTIL_MAJOR_VERSION-config:apu-config.in
-                  include/private/apu_select_dbm.h
-                  include/apr_ldap.h
Index: devel/apr-util/patches/patch-misc_apr_rmm_c
===================================================================
RCS file: devel/apr-util/patches/patch-misc_apr_rmm_c
diff -N devel/apr-util/patches/patch-misc_apr_rmm_c
--- devel/apr-util/patches/patch-misc_apr_rmm_c 7 Aug 2009 04:49:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-$OpenBSD: patch-misc_apr_rmm_c,v 1.1 2009/08/07 04:49:38 steven Exp $
-
-SECURITY: CVE-2009-2412 (cve.mitre.org)
-Fix overflow in rmm, where size alignment was taking place.
-
---- misc/apr_rmm.c.orig Fri Aug  5 11:43:16 2005
-+++ misc/apr_rmm.c Fri Aug  7 00:08:22 2009
-@@ -306,13 +306,17 @@ APU_DECLARE(apr_status_t) apr_rmm_detach(apr_rmm_t *rm
-
- APU_DECLARE(apr_rmm_off_t) apr_rmm_malloc(apr_rmm_t *rmm, apr_size_t reqsize)
- {
-+    apr_size_t size;
-     apr_rmm_off_t this;
-    
--    reqsize = APR_ALIGN_DEFAULT(reqsize) + RMM_BLOCK_SIZE;
-+    size = APR_ALIGN_DEFAULT(reqsize) + RMM_BLOCK_SIZE;
-+    if (size < reqsize) {
-+        return 0;
-+    }
-
-     APR_ANYLOCK_LOCK(&rmm->lock);
-
--    this = find_block_of_size(rmm, reqsize);
-+    this = find_block_of_size(rmm, size);
-
-     if (this) {
-         move_block(rmm, this, 0);
-@@ -325,18 +329,22 @@ APU_DECLARE(apr_rmm_off_t) apr_rmm_malloc(apr_rmm_t *r
-
- APU_DECLARE(apr_rmm_off_t) apr_rmm_calloc(apr_rmm_t *rmm, apr_size_t reqsize)
- {
-+    apr_size_t size;
-     apr_rmm_off_t this;
-        
--    reqsize = APR_ALIGN_DEFAULT(reqsize) + RMM_BLOCK_SIZE;
-+    size = APR_ALIGN_DEFAULT(reqsize) + RMM_BLOCK_SIZE;
-+    if (size < reqsize) {
-+        return 0;
-+    }
-
-     APR_ANYLOCK_LOCK(&rmm->lock);
-
--    this = find_block_of_size(rmm, reqsize);
-+    this = find_block_of_size(rmm, size);
-
-     if (this) {
-         move_block(rmm, this, 0);
-         this += RMM_BLOCK_SIZE;
--        memset((char*)rmm->base + this, 0, reqsize - RMM_BLOCK_SIZE);
-+        memset((char*)rmm->base + this, 0, size - RMM_BLOCK_SIZE);
-     }
-
-     APR_ANYLOCK_UNLOCK(&rmm->lock);
-@@ -349,16 +357,19 @@ APU_DECLARE(apr_rmm_off_t) apr_rmm_realloc(apr_rmm_t *
-     apr_rmm_off_t this;
-     apr_rmm_off_t old;
-     struct rmm_block_t *blk;
--    apr_size_t oldsize;
-+    apr_size_t size, oldsize;
-
-     if (!entity) {
-         return apr_rmm_malloc(rmm, reqsize);
-     }
-
--    reqsize = APR_ALIGN_DEFAULT(reqsize);
-+    size = APR_ALIGN_DEFAULT(reqsize);
-+    if (size < reqsize) {
-+        return 0;
-+    }
-     old = apr_rmm_offset_get(rmm, entity);
-
--    if ((this = apr_rmm_malloc(rmm, reqsize)) == 0) {
-+    if ((this = apr_rmm_malloc(rmm, size)) == 0) {
-         return 0;
-     }
-
-@@ -366,7 +377,7 @@ APU_DECLARE(apr_rmm_off_t) apr_rmm_realloc(apr_rmm_t *
-     oldsize = blk->size;
-
-     memcpy(apr_rmm_addr_get(rmm, this),
--           apr_rmm_addr_get(rmm, old), oldsize < reqsize ? oldsize : reqsize);
-+           apr_rmm_addr_get(rmm, old), oldsize < size ? oldsize : size);
-     apr_rmm_free(rmm, old);
-
-     return this;
Index: devel/apr-util/patches/patch-test_Makefile_in
===================================================================
RCS file: devel/apr-util/patches/patch-test_Makefile_in
diff -N devel/apr-util/patches/patch-test_Makefile_in
--- devel/apr-util/patches/patch-test_Makefile_in 20 Sep 2007 10:18:37 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-test_Makefile_in,v 1.3 2007/09/20 10:18:37 steven Exp $
---- test/Makefile.in.orig Sat Sep  1 11:45:39 2007
-+++ test/Makefile.in Tue Sep 18 15:12:55 2007
-@@ -8,7 +8,7 @@ TARGETS = $(PROGRAMS)
-
- APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@
- APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VERSION@
--TARGET_LIB_PATH = ../lib@APRUTIL_LIBNAME@.la
-+TARGET_LIB_PATH = ../lib@APRUTIL_LIBNAME@${MT}.la
-
- CLEAN_TARGETS = manyfile.bin testfile.txt data/sqlite*.db
-
-@@ -30,7 +30,11 @@ check: $(PROGRAMS)
- fi; \
- done; \
-        else \
-- ./$$prog; \
-+ if test $$prog = "testdbm"; then \
-+ ./$$prog auto db;  \
-+ else \
-+ ./$$prog ;\
-+ fi; \
- if test $$? = 255; then \
- echo "$$prog failed"; \
- break; \
Index: devel/apr-util/pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/apr-util/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- devel/apr-util/pkg/DESCR 4 Sep 2007 21:42:55 -0000 1.2
+++ devel/apr-util/pkg/DESCR 27 Apr 2012 08:26:46 -0000
@@ -1,5 +1,4 @@
 The APR-util provides a number of helpful abstractions on top of APR.
 
 Flavors:
- mt - Enable threading support
  ldap - Enable LDAP support
Index: devel/apr-util/pkg/PFRAG.ldap
===================================================================
RCS file: devel/apr-util/pkg/PFRAG.ldap
diff -N devel/apr-util/pkg/PFRAG.ldap
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/apr-util/pkg/PFRAG.ldap 27 Apr 2012 09:00:30 -0000
@@ -0,0 +1,3 @@
+@comment $OpenBSD$
+lib/apr-util-1/apr_ldap.a
+lib/apr-util-1/apr_ldap.la
Index: devel/apr-util/pkg/PFRAG.ldap-shared
===================================================================
RCS file: devel/apr-util/pkg/PFRAG.ldap-shared
diff -N devel/apr-util/pkg/PFRAG.ldap-shared
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/apr-util/pkg/PFRAG.ldap-shared 27 Apr 2012 09:00:12 -0000
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared,v 1.3 2007/03/24 13:45:13 todd Exp $
+lib/apr-util-1/apr_ldap-1.so
+lib/apr-util-1/apr_ldap.so
Index: devel/apr-util/pkg/PFRAG.mt-shared
===================================================================
RCS file: devel/apr-util/pkg/PFRAG.mt-shared
diff -N devel/apr-util/pkg/PFRAG.mt-shared
--- devel/apr-util/pkg/PFRAG.mt-shared 24 Mar 2007 13:45:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.mt-shared,v 1.1 2007/03/24 13:45:13 todd Exp $
-@lib lib/libaprutil-1-mt.so.${LIBaprutil-1-mt_VERSION}
Index: devel/apr-util/pkg/PFRAG.no-mt-shared
===================================================================
RCS file: devel/apr-util/pkg/PFRAG.no-mt-shared
diff -N devel/apr-util/pkg/PFRAG.no-mt-shared
--- devel/apr-util/pkg/PFRAG.no-mt-shared 24 Mar 2007 13:45:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.no-mt-shared,v 1.1 2007/03/24 13:45:13 todd Exp $
-@lib lib/libaprutil-1.so.${LIBaprutil-1_VERSION}
Index: devel/apr-util/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/devel/apr-util/pkg/PFRAG.shared,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.shared
--- devel/apr-util/pkg/PFRAG.shared 24 Mar 2007 13:45:13 -0000 1.3
+++ devel/apr-util/pkg/PFRAG.shared 27 Apr 2012 09:01:47 -0000
@@ -1,3 +1,5 @@
 @comment $OpenBSD: PFRAG.shared,v 1.3 2007/03/24 13:45:13 todd Exp $
-%%mt%%
-!%%mt%%
+%%ldap%%
+lib/apr-util-1/apr_dbm_db-1.so
+lib/apr-util-1/apr_dbm_db.so
+@lib lib/libaprutil-1.so.${LIBaprutil-1_VERSION}
Index: devel/apr-util/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/apr-util/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- devel/apr-util/pkg/PLIST 25 Mar 2007 09:59:35 -0000 1.4
+++ devel/apr-util/pkg/PLIST 27 Apr 2012 10:20:39 -0000
@@ -1,37 +1,48 @@
 @comment $OpenBSD: PLIST,v 1.4 2007/03/25 09:59:35 steven Exp $
+@conflict apr-util-mt-*
+@pkgpath devel/apr-util,mt
 %%SHARED%%
-bin/apu-1${MT}-config
-include/apr-1${MT}/
-include/apr-1${MT}/apr_anylock.h
-include/apr-1${MT}/apr_base64.h
-include/apr-1${MT}/apr_buckets.h
-include/apr-1${MT}/apr_date.h
-include/apr-1${MT}/apr_dbd.h
-include/apr-1${MT}/apr_dbm.h
-include/apr-1${MT}/apr_hooks.h
-include/apr-1${MT}/apr_ldap.h
-include/apr-1${MT}/apr_ldap_init.h
-include/apr-1${MT}/apr_ldap_option.h
-include/apr-1${MT}/apr_ldap_url.h
-include/apr-1${MT}/apr_md4.h
-include/apr-1${MT}/apr_md5.h
-include/apr-1${MT}/apr_optional.h
-include/apr-1${MT}/apr_optional_hooks.h
-include/apr-1${MT}/apr_queue.h
-include/apr-1${MT}/apr_reslist.h
-include/apr-1${MT}/apr_rmm.h
-include/apr-1${MT}/apr_sdbm.h
-include/apr-1${MT}/apr_sha1.h
-include/apr-1${MT}/apr_strmatch.h
-include/apr-1${MT}/apr_uri.h
-include/apr-1${MT}/apr_uuid.h
-include/apr-1${MT}/apr_xlate.h
-include/apr-1${MT}/apr_xml.h
-include/apr-1${MT}/apu.h
-include/apr-1${MT}/apu_version.h
-include/apr-1${MT}/apu_want.h
+bin/apu-1-config
+include/apr-1/
+include/apr-1/apr_anylock.h
+include/apr-1/apr_base64.h
+include/apr-1/apr_buckets.h
+include/apr-1/apr_crypto.h
+include/apr-1/apr_date.h
+include/apr-1/apr_dbd.h
+include/apr-1/apr_dbm.h
+include/apr-1/apr_hooks.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_md4.h
+include/apr-1/apr_md5.h
+include/apr-1/apr_memcache.h
+include/apr-1/apr_optional.h
+include/apr-1/apr_optional_hooks.h
+include/apr-1/apr_queue.h
+include/apr-1/apr_reslist.h
+include/apr-1/apr_rmm.h
+include/apr-1/apr_sdbm.h
+include/apr-1/apr_sha1.h
+include/apr-1/apr_strmatch.h
+include/apr-1/apr_thread_pool.h
+include/apr-1/apr_uri.h
+include/apr-1/apr_uuid.h
+include/apr-1/apr_xlate.h
+include/apr-1/apr_xml.h
+include/apr-1/apu.h
+include/apr-1/apu_errno.h
+include/apr-1/apu_version.h
+include/apr-1/apu_want.h
+lib/apr-util-1/
+lib/apr-util-1/apr_dbm_db.a
+lib/apr-util-1/apr_dbm_db.la
+%%ldap%%
 @comment lib/aprutil.exp
-lib/libaprutil-1${MT}.a
-lib/libaprutil-1${MT}.la
+lib/libaprutil-1.a
+lib/libaprutil-1.la
 lib/pkgconfig/
-lib/pkgconfig/apr-util-1${MT}.pc
+lib/pkgconfig/apr-util-1.pc
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- devel/quirks/Makefile 23 Apr 2012 19:29:30 -0000 1.69
+++ devel/quirks/Makefile 27 Apr 2012 07:59:13 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME = quirks-1.67
+PKGNAME = quirks-1.68
 PKG_ARCH = *
 MAINTAINER = Marc Espie <espie@...>
 
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.74
diff -u -p -r1.74 Quirks.pm
--- devel/quirks/files/Quirks.pm 23 Apr 2012 19:29:30 -0000 1.74
+++ devel/quirks/files/Quirks.pm 27 Apr 2012 07:58:18 -0000
@@ -291,7 +291,9 @@ my $stem_extensions = {
  'fileutils' => 'coreutils',
  'textutils' => 'coreutils',
  'gnome-utils' => 'gnome-search-tool',
- 'seahorse-plugins' => 'seahorse-nautilus'
+ 'seahorse-plugins' => 'seahorse-nautilus',
+ 'apr-mt' => 'apr',
+ 'apr-util-mt' => 'apr-util',
 };
 
 # ->is_base_system($handle, $state):
Index: devel/subversion/Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- devel/subversion/Makefile 23 Apr 2012 17:15:18 -0000 1.106
+++ devel/subversion/Makefile 27 Apr 2012 08:15:23 -0000
@@ -17,7 +17,7 @@ FULLPKGNAME-ruby= ruby-subversion-${VERS
 FULLPKGPATH-ruby= devel/subversion,-ruby
 FULLPKGNAME-ap2= ap2-subversion-${VERSION}
 FULLPKGPATH-ap2= devel/subversion,-ap2
-REVISION = 0
+REVISION = 1
 
 SO_VERSION= 1.3
 SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \
Index: www/ap2-mod_perl/Makefile
===================================================================
RCS file: /cvs/ports/www/ap2-mod_perl/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- www/ap2-mod_perl/Makefile 3 Dec 2010 11:46:50 -0000 1.19
+++ www/ap2-mod_perl/Makefile 27 Apr 2012 08:49:26 -0000
@@ -4,7 +4,7 @@ COMMENT= module that embeds a Perl inter
 
 DISTNAME= mod_perl-2.0.4
 PKGNAME= ap2-${DISTNAME}
-REVISION= 4
+REVISION= 5
 CATEGORIES= www net
 
 WANTLIB= c m perl util db expat apr-1 aprutil-1
Index: www/apache-httpd/Makefile
===================================================================
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- www/apache-httpd/Makefile 17 Feb 2012 08:33:03 -0000 1.29
+++ www/apache-httpd/Makefile 27 Apr 2012 08:42:07 -0000
@@ -5,7 +5,7 @@ COMMENT= apache HTTP server
 V= 2.2.20
 PKGNAME= apache-httpd-${V}
 DISTNAME= httpd-${V}
-REVISION= 0
+REVISION= 1
 
 CATEGORIES= www net
 
@@ -21,7 +21,7 @@ SHARED_ONLY= Yes
 USE_GROFF = Yes
 NO_REGRESS= Yes
 
-WANTLIB += c crypto m ssl expat apr-1-mt db>=4 z pcre pthread aprutil-1-mt>=2
+WANTLIB += c crypto m ssl expat apr-1 db>=4 z pcre pthread aprutil-1>=2
 
 LIB_DEPENDS= devel/pcre
 
@@ -32,9 +32,9 @@ FLAVOR?=
 CONFIGURE_ARGS+= --with-ldap --enable-ldap --enable-authnz-ldap
 WANTLIB+= asn1 com_err gssapi krb5 sasl2 ldap lber
 LIB_DEPENDS+= databases/openldap
-LIB_DEPENDS+= apr-util-mt-*-ldap:devel/apr-util,ldap,mt
+LIB_DEPENDS+= apr-util-*-ldap:devel/apr-util,ldap
 .else
-LIB_DEPENDS+= apr-util-mt-*-!ldap:devel/apr-util,mt
+LIB_DEPENDS+= apr-util-*-!ldap:devel/apr-util
 .endif
 
 MODULES= converters/libiconv
@@ -52,8 +52,8 @@ CONFIGURE_ARGS+= --enable-layout=OpenBSD
  --prefix=${HTTPD_DIR} \
  --exec-prefix=${LOCALBASE} \
  --sysconfdir=${CONFDIR} \
- --with-apr=${LOCALBASE}/bin/apr-1-mt-config  \
- --with-apr-util=${LOCALBASE}/bin/apu-1-mt-config \
+ --with-apr=${LOCALBASE}/bin/apr-1-config  \
+ --with-apr-util=${LOCALBASE}/bin/apu-1-config \
  --enable-ssl --with-ssl=/usr \
  --with-mpm=prefork \
  --with-program-name=httpd2 \