- Upgrade to 1.0.0.

- Add APR_UTIL_WITH_LDAP knob.

Approved by:	maintainer (Craig Rodrigues), lev (active in this area)

24 files changed, 408 insertions, 712 deletions

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 0839b490ad35..c97e3c27768f 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -12,20 +12,18 @@
 # APR_UTIL_WITHOUT_BERKELEY_DB:	unconditionally disable the use of db4
 # (the database bindings are detected and recorded automatically if these
 # switches are not set)
+# APR_UTIL_WITH_LDAP:		force dependency on OpenLDAP
 
 PORTNAME=	apr
-PORTVERSION=	0.9.4
-PORTREVISION=	9
+PORTVERSION=	1.0.0
 CATEGORIES=	devel
-#MASTER_SITES=	http://www.apache.org/dist/apr/
-#DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
-DISTFILES=	apr-APR_0_9_BRANCH_20040113112838.tar.gz apr-util-APU_0_9_BRANCH_20040113112849.tar.gz
+MASTER_SITES=	http://www.apache.org/dist/apr/
+DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
 
 MAINTAINER=	rodrigc@crodrigues.org
 COMMENT=	The Apache Group's Portability Library
 
+BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
@@ -34,6 +32,8 @@ USE_AUTOCONF_VER=	259
 WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_GMAKE=		yes
+USE_PYTHON=		yes
+PYTHON_NO_DEPENDS=	yes
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 WRKSRC=	${WRKDIR}
@@ -77,6 +77,17 @@ PKGNAMESUFFIX=	-db4
 .endif
 .endif
 
+.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
+.if defined(PKGNAMESUFFIX)
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap
+.else
+PKGNAMESUFFIX=	-ldap
+.endif
+.endif
+
 pre-extract:
 	@${ECHO_MSG} ""
 .if defined(APR_UTIL_WITHOUT_THREADS)
diff --git a/devel/apr/distinfo b/devel/apr/distinfo
index b20bfa027113..b6c03aa1d33c 100644
--- a/devel/apr/distinfo
+++ b/devel/apr/distinfo
@@ -1,4 +1,4 @@
-MD5 (apr-APR_0_9_BRANCH_20040113112838.tar.gz) = c074dcd0339d047773c58ac139ef3209
-SIZE (apr-APR_0_9_BRANCH_20040113112838.tar.gz) = 799764
-MD5 (apr-util-APU_0_9_BRANCH_20040113112849.tar.gz) = 1e73691c1e4f63f1f07720dc4866f1ab
-SIZE (apr-util-APU_0_9_BRANCH_20040113112849.tar.gz) = 274060
+MD5 (apr-1.0.0.tar.gz) = ccd5c21292581be4ba9db10ad5cc8ced
+SIZE (apr-1.0.0.tar.gz) = 967569
+MD5 (apr-util-1.0.0.tar.gz) = 2e39100d4890802822719a4743d8ad7e
+SIZE (apr-util-1.0.0.tar.gz) = 502699
diff --git a/devel/apr/files/patch-apr_atomic.h b/devel/apr/files/patch-apr_atomic.h
deleted file mode 100644
index c4e031f3ffd5..000000000000
--- a/devel/apr/files/patch-apr_atomic.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- apr-0.9.4/include/apr_atomic.h.orig	Sun Nov  2 01:57:08 2003
-+++ apr-0.9.4/include/apr_atomic.h	Sun Nov  2 02:20:37 2003
-@@ -206,10 +206,16 @@
- 
- #define apr_atomic_t apr_uint32_t
- #define apr_atomic_add(mem, val)     atomic_add_int(mem,val)
--#define apr_atomic_dec(mem)          atomic_subtract_int(mem,1)
- #define apr_atomic_inc(mem)          atomic_add_int(mem,1)
- #define apr_atomic_set(mem, val)     atomic_set_int(mem, val)
- #define apr_atomic_read(mem)         (*mem)
-+
-+#define apr_atomic_dec(mem)                                     \
-+({                                                              \
-+   atomic_subtract_int(mem,1);                                  \
-+   *(int *)mem;                                                 \
-+  })
-+
- 
- #elif (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC
- 
diff --git a/devel/apr/files/patch-apr_hints.m4 b/devel/apr/files/patch-apr_hints.m4
deleted file mode 100644
index dacf60b85454..000000000000
--- a/devel/apr/files/patch-apr_hints.m4
+++ /dev/null
@@ -1,29 +0,0 @@
---- apr-0.9.4/build/apr_hints.m4.orig	Mon Dec 22 18:26:10 2003
-+++ apr-0.9.4/build/apr_hints.m4	Fri Jan 30 22:53:49 2004
-@@ -129,14 +129,19 @@
- 	APR_ADDTO(CPPFLAGS, [-DNETBSD])
- 	;;
-     *-freebsd*)
--	case $host in
--	    *freebsd[2345]*)
--		APR_ADDTO(CFLAGS, [-funsigned-char])
--		;;
--	esac
--	APR_SETIFNULL(enable_threads, [no])
-+	os_version=`sysctl -n kern.osreldate`
-+	APR_ADDTO(CFLAGS, [-funsigned-char])
-         APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
--	APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE])
-+	if test $os_version -lt "500016"; then
-+		ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT"
-+		ac_cv_pthreads_lib="-pthread"
-+	elif test $os_version -lt "502102"; then
-+		ac_cv_pthreads_cflags="none"
-+		ac_cv_pthreads_lib="c_r"
-+	else
-+		ac_cv_pthreads_cflags="none"
-+		ac_cv_pthreads_lib="pthread"
-+	fi
- 	;;
-     *-next-nextstep*)
- 	APR_SETIFNULL(CFLAGS, [-O])
diff --git a/devel/apr/files/patch-apr_threads.m4 b/devel/apr/files/patch-apr_threads.m4
deleted file mode 100644
index 23e679ddc031..000000000000
--- a/devel/apr/files/patch-apr_threads.m4
+++ /dev/null
@@ -1,44 +0,0 @@
---- apr-0.9.4/build/apr_threads.m4.orig	Sun Nov 16 02:42:33 2003
-+++ apr-0.9.4/build/apr_threads.m4	Wed Jan 28 17:52:33 2004
-@@ -110,6 +110,7 @@
- 
- AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
- [apr_ptc_cflags=$CFLAGS
-+ if test "x$ac_cv_pthreads_cflags" = "x"; then
-  for flag in none -kthread -pthread -pthreads -mthreads -Kthread -threads; do 
-     CFLAGS=$apr_ptc_cflags
-     test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
-@@ -118,6 +119,11 @@
-       break
-     ])
-  done
-+ else
-+  if test "$ac_cv_pthreads_cflags" != "none"; then
-+   apr_cv_pthreads_cflags="$ac_cv_pthreads_cflags"
-+  fi
-+ fi
-  CFLAGS=$apr_ptc_cflags
- ])
- 
-@@ -136,6 +142,7 @@
- 
- AC_CACHE_CHECK([for LIBS needed for pthreads], [apr_cv_pthreads_lib], [
-   apr_ptc_libs=$LIBS
-+  if test "x$ac_cv_pthreads_lib" = "x"; then
-   for lib in -lpthread -lpthreads -lc_r; do
-     LIBS="$apr_ptc_libs $lib"
-     APR_PTHREADS_TRY_RUN([
-@@ -143,6 +150,13 @@
-       break
-     ])
-   done
-+  else
-+    case x$ac_cv_pthreads_lib in
-+      x-*) apr_cv_pthreads_lib="$ac_cv_pthreads_lib" ;;
-+      xnone|x) : ;;
-+      *) apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
-+    esac
-+  fi
-   LIBS=$apr_ptc_libs
- ])
- 
diff --git a/devel/apr/pkg-plist b/devel/apr/pkg-plist
index 926204d0b0a9..2a4cd14e90ec 100644
--- a/devel/apr/pkg-plist
+++ b/devel/apr/pkg-plist
@@ -1,76 +1,82 @@
-bin/apr-config
-bin/apu-config
-build/apr_rules.mk
-build/libtool
-include/apr-0/apr.h
-include/apr-0/apr_allocator.h
-include/apr-0/apr_anylock.h
-include/apr-0/apr_atomic.h
-include/apr-0/apr_base64.h
-include/apr-0/apr_buckets.h
-include/apr-0/apr_compat.h
-include/apr-0/apr_date.h
-include/apr-0/apr_dbm.h
-include/apr-0/apr_dso.h
-include/apr-0/apr_env.h
-include/apr-0/apr_errno.h
-include/apr-0/apr_file_info.h
-include/apr-0/apr_file_io.h
-include/apr-0/apr_fnmatch.h
-include/apr-0/apr_general.h
-include/apr-0/apr_getopt.h
-include/apr-0/apr_global_mutex.h
-include/apr-0/apr_hash.h
-include/apr-0/apr_hooks.h
-include/apr-0/apr_inherit.h
-include/apr-0/apr_ldap.h
-include/apr-0/apr_ldap_url.h
-include/apr-0/apr_lib.h
-include/apr-0/apr_md4.h
-include/apr-0/apr_md5.h
-include/apr-0/apr_mmap.h
-include/apr-0/apr_network_io.h
-include/apr-0/apr_optional.h
-include/apr-0/apr_optional_hooks.h
-include/apr-0/apr_poll.h
-include/apr-0/apr_pools.h
-include/apr-0/apr_portable.h
-include/apr-0/apr_proc_mutex.h
-include/apr-0/apr_queue.h
-include/apr-0/apr_reslist.h
-include/apr-0/apr_ring.h
-include/apr-0/apr_rmm.h
-include/apr-0/apr_sdbm.h
-include/apr-0/apr_sha1.h
-include/apr-0/apr_shm.h
-include/apr-0/apr_signal.h
-include/apr-0/apr_strings.h
-include/apr-0/apr_strmatch.h
-include/apr-0/apr_support.h
-include/apr-0/apr_tables.h
-include/apr-0/apr_thread_cond.h
-include/apr-0/apr_thread_mutex.h
-include/apr-0/apr_thread_proc.h
-include/apr-0/apr_thread_rwlock.h
-include/apr-0/apr_time.h
-include/apr-0/apr_uri.h
-include/apr-0/apr_user.h
-include/apr-0/apr_uuid.h
-include/apr-0/apr_version.h
-include/apr-0/apr_want.h
-include/apr-0/apr_xlate.h
-include/apr-0/apr_xml.h
-include/apr-0/apu.h
-include/apr-0/apu_compat.h
-include/apr-0/apu_version.h
-include/apr-0/apu_want.h
+bin/apr-1-config
+bin/apu-1-config
+build-1/apr_rules.mk
+build-1/libtool
+build-1/make_exports.awk
+build-1/make_var_export.awk
+build-1/mkdir.sh
+include/apr-1/apr.h
+include/apr-1/apr_allocator.h
+include/apr-1/apr_anylock.h
+include/apr-1/apr_atomic.h
+include/apr-1/apr_base64.h
+include/apr-1/apr_buckets.h
+include/apr-1/apr_date.h
+include/apr-1/apr_dbm.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_hooks.h
+include/apr-1/apr_inherit.h
+include/apr-1/apr_ldap.h
+include/apr-1/apr_ldap_init.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_mmap.h
+include/apr-1/apr_network_io.h
+include/apr-1/apr_optional.h
+include/apr-1/apr_optional_hooks.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_queue.h
+include/apr-1/apr_random.h
+include/apr-1/apr_reslist.h
+include/apr-1/apr_ring.h
+include/apr-1/apr_rmm.h
+include/apr-1/apr_sdbm.h
+include/apr-1/apr_sha1.h
+include/apr-1/apr_shm.h
+include/apr-1/apr_signal.h
+include/apr-1/apr_strings.h
+include/apr-1/apr_strmatch.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_uri.h
+include/apr-1/apr_user.h
+include/apr-1/apr_uuid.h
+include/apr-1/apr_version.h
+include/apr-1/apr_want.h
+include/apr-1/apr_xlate.h
+include/apr-1/apr_xml.h
+include/apr-1/apu.h
+include/apr-1/apu_version.h
+include/apr-1/apu_want.h
+lib/pkgconfig/apr-1.pc
+lib/pkgconfig/apr-util-1.pc
 lib/apr.exp
 lib/aprutil.exp
-lib/libapr-0.a
-lib/libapr-0.so
-lib/libapr-0.so.9
-lib/libaprutil-0.a
-lib/libaprutil-0.so
-lib/libaprutil-0.so.9
-@dirrm build
-@dirrm include/apr-0
+lib/libapr-1.a
+lib/libapr-1.so
+lib/libapr-1.so.0
+lib/libaprutil-1.a
+lib/libaprutil-1.so
+lib/libaprutil-1.so.0
+@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
+@dirrm build-1
+@dirrm include/apr-1
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 0839b490ad35..c97e3c27768f 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -12,20 +12,18 @@
 # APR_UTIL_WITHOUT_BERKELEY_DB:	unconditionally disable the use of db4
 # (the database bindings are detected and recorded automatically if these
 # switches are not set)
+# APR_UTIL_WITH_LDAP:		force dependency on OpenLDAP
 
 PORTNAME=	apr
-PORTVERSION=	0.9.4
-PORTREVISION=	9
+PORTVERSION=	1.0.0
 CATEGORIES=	devel
-#MASTER_SITES=	http://www.apache.org/dist/apr/
-#DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
-DISTFILES=	apr-APR_0_9_BRANCH_20040113112838.tar.gz apr-util-APU_0_9_BRANCH_20040113112849.tar.gz
+MASTER_SITES=	http://www.apache.org/dist/apr/
+DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
 
 MAINTAINER=	rodrigc@crodrigues.org
 COMMENT=	The Apache Group's Portability Library
 
+BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
@@ -34,6 +32,8 @@ USE_AUTOCONF_VER=	259
 WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_GMAKE=		yes
+USE_PYTHON=		yes
+PYTHON_NO_DEPENDS=	yes
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 WRKSRC=	${WRKDIR}
@@ -77,6 +77,17 @@ PKGNAMESUFFIX=	-db4
 .endif
 .endif
 
+.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
+.if defined(PKGNAMESUFFIX)
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap
+.else
+PKGNAMESUFFIX=	-ldap
+.endif
+.endif
+
 pre-extract:
 	@${ECHO_MSG} ""
 .if defined(APR_UTIL_WITHOUT_THREADS)
diff --git a/devel/apr0/distinfo b/devel/apr0/distinfo
index b20bfa027113..b6c03aa1d33c 100644
--- a/devel/apr0/distinfo
+++ b/devel/apr0/distinfo
@@ -1,4 +1,4 @@
-MD5 (apr-APR_0_9_BRANCH_20040113112838.tar.gz) = c074dcd0339d047773c58ac139ef3209
-SIZE (apr-APR_0_9_BRANCH_20040113112838.tar.gz) = 799764
-MD5 (apr-util-APU_0_9_BRANCH_20040113112849.tar.gz) = 1e73691c1e4f63f1f07720dc4866f1ab
-SIZE (apr-util-APU_0_9_BRANCH_20040113112849.tar.gz) = 274060
+MD5 (apr-1.0.0.tar.gz) = ccd5c21292581be4ba9db10ad5cc8ced
+SIZE (apr-1.0.0.tar.gz) = 967569
+MD5 (apr-util-1.0.0.tar.gz) = 2e39100d4890802822719a4743d8ad7e
+SIZE (apr-util-1.0.0.tar.gz) = 502699
diff --git a/devel/apr0/files/patch-apr_atomic.h b/devel/apr0/files/patch-apr_atomic.h
deleted file mode 100644
index c4e031f3ffd5..000000000000
--- a/devel/apr0/files/patch-apr_atomic.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- apr-0.9.4/include/apr_atomic.h.orig	Sun Nov  2 01:57:08 2003
-+++ apr-0.9.4/include/apr_atomic.h	Sun Nov  2 02:20:37 2003
-@@ -206,10 +206,16 @@
- 
- #define apr_atomic_t apr_uint32_t
- #define apr_atomic_add(mem, val)     atomic_add_int(mem,val)
--#define apr_atomic_dec(mem)          atomic_subtract_int(mem,1)
- #define apr_atomic_inc(mem)          atomic_add_int(mem,1)
- #define apr_atomic_set(mem, val)     atomic_set_int(mem, val)
- #define apr_atomic_read(mem)         (*mem)
-+
-+#define apr_atomic_dec(mem)                                     \
-+({                                                              \
-+   atomic_subtract_int(mem,1);                                  \
-+   *(int *)mem;                                                 \
-+  })
-+
- 
- #elif (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC
- 
diff --git a/devel/apr0/files/patch-apr_hints.m4 b/devel/apr0/files/patch-apr_hints.m4
deleted file mode 100644
index dacf60b85454..000000000000
--- a/devel/apr0/files/patch-apr_hints.m4
+++ /dev/null
@@ -1,29 +0,0 @@
---- apr-0.9.4/build/apr_hints.m4.orig	Mon Dec 22 18:26:10 2003
-+++ apr-0.9.4/build/apr_hints.m4	Fri Jan 30 22:53:49 2004
-@@ -129,14 +129,19 @@
- 	APR_ADDTO(CPPFLAGS, [-DNETBSD])
- 	;;
-     *-freebsd*)
--	case $host in
--	    *freebsd[2345]*)
--		APR_ADDTO(CFLAGS, [-funsigned-char])
--		;;
--	esac
--	APR_SETIFNULL(enable_threads, [no])
-+	os_version=`sysctl -n kern.osreldate`
-+	APR_ADDTO(CFLAGS, [-funsigned-char])
-         APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
--	APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE])
-+	if test $os_version -lt "500016"; then
-+		ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT"
-+		ac_cv_pthreads_lib="-pthread"
-+	elif test $os_version -lt "502102"; then
-+		ac_cv_pthreads_cflags="none"
-+		ac_cv_pthreads_lib="c_r"
-+	else
-+		ac_cv_pthreads_cflags="none"
-+		ac_cv_pthreads_lib="pthread"
-+	fi
- 	;;
-     *-next-nextstep*)
- 	APR_SETIFNULL(CFLAGS, [-O])
diff --git a/devel/apr0/files/patch-apr_threads.m4 b/devel/apr0/files/patch-apr_threads.m4
deleted file mode 100644
index 23e679ddc031..000000000000
--- a/devel/apr0/files/patch-apr_threads.m4
+++ /dev/null
@@ -1,44 +0,0 @@
---- apr-0.9.4/build/apr_threads.m4.orig	Sun Nov 16 02:42:33 2003
-+++ apr-0.9.4/build/apr_threads.m4	Wed Jan 28 17:52:33 2004
-@@ -110,6 +110,7 @@
- 
- AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
- [apr_ptc_cflags=$CFLAGS
-+ if test "x$ac_cv_pthreads_cflags" = "x"; then
-  for flag in none -kthread -pthread -pthreads -mthreads -Kthread -threads; do 
-     CFLAGS=$apr_ptc_cflags
-     test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
-@@ -118,6 +119,11 @@
-       break
-     ])
-  done
-+ else
-+  if test "$ac_cv_pthreads_cflags" != "none"; then
-+   apr_cv_pthreads_cflags="$ac_cv_pthreads_cflags"
-+  fi
-+ fi
-  CFLAGS=$apr_ptc_cflags
- ])
- 
-@@ -136,6 +142,7 @@
- 
- AC_CACHE_CHECK([for LIBS needed for pthreads], [apr_cv_pthreads_lib], [
-   apr_ptc_libs=$LIBS
-+  if test "x$ac_cv_pthreads_lib" = "x"; then
-   for lib in -lpthread -lpthreads -lc_r; do
-     LIBS="$apr_ptc_libs $lib"
-     APR_PTHREADS_TRY_RUN([
-@@ -143,6 +150,13 @@
-       break
-     ])
-   done
-+  else
-+    case x$ac_cv_pthreads_lib in
-+      x-*) apr_cv_pthreads_lib="$ac_cv_pthreads_lib" ;;
-+      xnone|x) : ;;
-+      *) apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
-+    esac
-+  fi
-   LIBS=$apr_ptc_libs
- ])
- 
diff --git a/devel/apr0/pkg-plist b/devel/apr0/pkg-plist
index 926204d0b0a9..2a4cd14e90ec 100644
--- a/devel/apr0/pkg-plist
+++ b/devel/apr0/pkg-plist
@@ -1,76 +1,82 @@
-bin/apr-config
-bin/apu-config
-build/apr_rules.mk
-build/libtool
-include/apr-0/apr.h
-include/apr-0/apr_allocator.h
-include/apr-0/apr_anylock.h
-include/apr-0/apr_atomic.h
-include/apr-0/apr_base64.h
-include/apr-0/apr_buckets.h
-include/apr-0/apr_compat.h
-include/apr-0/apr_date.h
-include/apr-0/apr_dbm.h
-include/apr-0/apr_dso.h
-include/apr-0/apr_env.h
-include/apr-0/apr_errno.h
-include/apr-0/apr_file_info.h
-include/apr-0/apr_file_io.h
-include/apr-0/apr_fnmatch.h
-include/apr-0/apr_general.h
-include/apr-0/apr_getopt.h
-include/apr-0/apr_global_mutex.h
-include/apr-0/apr_hash.h
-include/apr-0/apr_hooks.h
-include/apr-0/apr_inherit.h
-include/apr-0/apr_ldap.h
-include/apr-0/apr_ldap_url.h
-include/apr-0/apr_lib.h
-include/apr-0/apr_md4.h
-include/apr-0/apr_md5.h
-include/apr-0/apr_mmap.h
-include/apr-0/apr_network_io.h
-include/apr-0/apr_optional.h
-include/apr-0/apr_optional_hooks.h
-include/apr-0/apr_poll.h
-include/apr-0/apr_pools.h
-include/apr-0/apr_portable.h
-include/apr-0/apr_proc_mutex.h
-include/apr-0/apr_queue.h
-include/apr-0/apr_reslist.h
-include/apr-0/apr_ring.h
-include/apr-0/apr_rmm.h
-include/apr-0/apr_sdbm.h
-include/apr-0/apr_sha1.h
-include/apr-0/apr_shm.h
-include/apr-0/apr_signal.h
-include/apr-0/apr_strings.h
-include/apr-0/apr_strmatch.h
-include/apr-0/apr_support.h
-include/apr-0/apr_tables.h
-include/apr-0/apr_thread_cond.h
-include/apr-0/apr_thread_mutex.h
-include/apr-0/apr_thread_proc.h
-include/apr-0/apr_thread_rwlock.h
-include/apr-0/apr_time.h
-include/apr-0/apr_uri.h
-include/apr-0/apr_user.h
-include/apr-0/apr_uuid.h
-include/apr-0/apr_version.h
-include/apr-0/apr_want.h
-include/apr-0/apr_xlate.h
-include/apr-0/apr_xml.h
-include/apr-0/apu.h
-include/apr-0/apu_compat.h
-include/apr-0/apu_version.h
-include/apr-0/apu_want.h
+bin/apr-1-config
+bin/apu-1-config
+build-1/apr_rules.mk
+build-1/libtool
+build-1/make_exports.awk
+build-1/make_var_export.awk
+build-1/mkdir.sh
+include/apr-1/apr.h
+include/apr-1/apr_allocator.h
+include/apr-1/apr_anylock.h
+include/apr-1/apr_atomic.h
+include/apr-1/apr_base64.h
+include/apr-1/apr_buckets.h
+include/apr-1/apr_date.h
+include/apr-1/apr_dbm.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_hooks.h
+include/apr-1/apr_inherit.h
+include/apr-1/apr_ldap.h
+include/apr-1/apr_ldap_init.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_mmap.h
+include/apr-1/apr_network_io.h
+include/apr-1/apr_optional.h
+include/apr-1/apr_optional_hooks.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_queue.h
+include/apr-1/apr_random.h
+include/apr-1/apr_reslist.h
+include/apr-1/apr_ring.h
+include/apr-1/apr_rmm.h
+include/apr-1/apr_sdbm.h
+include/apr-1/apr_sha1.h
+include/apr-1/apr_shm.h
+include/apr-1/apr_signal.h
+include/apr-1/apr_strings.h
+include/apr-1/apr_strmatch.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_uri.h
+include/apr-1/apr_user.h
+include/apr-1/apr_uuid.h
+include/apr-1/apr_version.h
+include/apr-1/apr_want.h
+include/apr-1/apr_xlate.h
+include/apr-1/apr_xml.h
+include/apr-1/apu.h
+include/apr-1/apu_version.h
+include/apr-1/apu_want.h
+lib/pkgconfig/apr-1.pc
+lib/pkgconfig/apr-util-1.pc
 lib/apr.exp
 lib/aprutil.exp
-lib/libapr-0.a
-lib/libapr-0.so
-lib/libapr-0.so.9
-lib/libaprutil-0.a
-lib/libaprutil-0.so
-lib/libaprutil-0.so.9
-@dirrm build
-@dirrm include/apr-0
+lib/libapr-1.a
+lib/libapr-1.so
+lib/libapr-1.so.0
+lib/libaprutil-1.a
+lib/libaprutil-1.so
+lib/libaprutil-1.so.0
+@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
+@dirrm build-1
+@dirrm include/apr-1
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 0839b490ad35..c97e3c27768f 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -12,20 +12,18 @@
 # APR_UTIL_WITHOUT_BERKELEY_DB:	unconditionally disable the use of db4
 # (the database bindings are detected and recorded automatically if these
 # switches are not set)
+# APR_UTIL_WITH_LDAP:		force dependency on OpenLDAP
 
 PORTNAME=	apr
-PORTVERSION=	0.9.4
-PORTREVISION=	9
+PORTVERSION=	1.0.0
 CATEGORIES=	devel
-#MASTER_SITES=	http://www.apache.org/dist/apr/
-#DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
-DISTFILES=	apr-APR_0_9_BRANCH_20040113112838.tar.gz apr-util-APU_0_9_BRANCH_20040113112849.tar.gz
+MASTER_SITES=	http://www.apache.org/dist/apr/
+DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
 
 MAINTAINER=	rodrigc@crodrigues.org
 COMMENT=	The Apache Group's Portability Library
 
+BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
@@ -34,6 +32,8 @@ USE_AUTOCONF_VER=	259
 WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_GMAKE=		yes
+USE_PYTHON=		yes
+PYTHON_NO_DEPENDS=	yes
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 WRKSRC=	${WRKDIR}
@@ -77,6 +77,17 @@ PKGNAMESUFFIX=	-db4
 .endif
 .endif
 
+.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
+.if defined(PKGNAMESUFFIX)
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap
+.else
+PKGNAMESUFFIX=	-ldap
+.endif
+.endif
+
 pre-extract:
 	@${ECHO_MSG} ""
 .if defined(APR_UTIL_WITHOUT_THREADS)
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
index b20bfa027113..b6c03aa1d33c 100644
--- a/devel/apr1/distinfo
+++ b/devel/apr1/distinfo
@@ -1,4 +1,4 @@
-MD5 (apr-APR_0_9_BRANCH_20040113112838.tar.gz) = c074dcd0339d047773c58ac139ef3209
-SIZE (apr-APR_0_9_BRANCH_20040113112838.tar.gz) = 799764
-MD5 (apr-util-APU_0_9_BRANCH_20040113112849.tar.gz) = 1e73691c1e4f63f1f07720dc4866f1ab
-SIZE (apr-util-APU_0_9_BRANCH_20040113112849.tar.gz) = 274060
+MD5 (apr-1.0.0.tar.gz) = ccd5c21292581be4ba9db10ad5cc8ced
+SIZE (apr-1.0.0.tar.gz) = 967569
+MD5 (apr-util-1.0.0.tar.gz) = 2e39100d4890802822719a4743d8ad7e
+SIZE (apr-util-1.0.0.tar.gz) = 502699
diff --git a/devel/apr1/files/patch-apr_atomic.h b/devel/apr1/files/patch-apr_atomic.h
deleted file mode 100644
index c4e031f3ffd5..000000000000
--- a/devel/apr1/files/patch-apr_atomic.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- apr-0.9.4/include/apr_atomic.h.orig	Sun Nov  2 01:57:08 2003
-+++ apr-0.9.4/include/apr_atomic.h	Sun Nov  2 02:20:37 2003
-@@ -206,10 +206,16 @@
- 
- #define apr_atomic_t apr_uint32_t
- #define apr_atomic_add(mem, val)     atomic_add_int(mem,val)
--#define apr_atomic_dec(mem)          atomic_subtract_int(mem,1)
- #define apr_atomic_inc(mem)          atomic_add_int(mem,1)
- #define apr_atomic_set(mem, val)     atomic_set_int(mem, val)
- #define apr_atomic_read(mem)         (*mem)
-+
-+#define apr_atomic_dec(mem)                                     \
-+({                                                              \
-+   atomic_subtract_int(mem,1);                                  \
-+   *(int *)mem;                                                 \
-+  })
-+
- 
- #elif (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC
- 
diff --git a/devel/apr1/files/patch-apr_hints.m4 b/devel/apr1/files/patch-apr_hints.m4
deleted file mode 100644
index dacf60b85454..000000000000
--- a/devel/apr1/files/patch-apr_hints.m4
+++ /dev/null
@@ -1,29 +0,0 @@
---- apr-0.9.4/build/apr_hints.m4.orig	Mon Dec 22 18:26:10 2003
-+++ apr-0.9.4/build/apr_hints.m4	Fri Jan 30 22:53:49 2004
-@@ -129,14 +129,19 @@
- 	APR_ADDTO(CPPFLAGS, [-DNETBSD])
- 	;;
-     *-freebsd*)
--	case $host in
--	    *freebsd[2345]*)
--		APR_ADDTO(CFLAGS, [-funsigned-char])
--		;;
--	esac
--	APR_SETIFNULL(enable_threads, [no])
-+	os_version=`sysctl -n kern.osreldate`
-+	APR_ADDTO(CFLAGS, [-funsigned-char])
-         APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
--	APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE])
-+	if test $os_version -lt "500016"; then
-+		ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT"
-+		ac_cv_pthreads_lib="-pthread"
-+	elif test $os_version -lt "502102"; then
-+		ac_cv_pthreads_cflags="none"
-+		ac_cv_pthreads_lib="c_r"
-+	else
-+		ac_cv_pthreads_cflags="none"
-+		ac_cv_pthreads_lib="pthread"
-+	fi
- 	;;
-     *-next-nextstep*)
- 	APR_SETIFNULL(CFLAGS, [-O])
diff --git a/devel/apr1/files/patch-apr_threads.m4 b/devel/apr1/files/patch-apr_threads.m4
deleted file mode 100644
index 23e679ddc031..000000000000
--- a/devel/apr1/files/patch-apr_threads.m4
+++ /dev/null
@@ -1,44 +0,0 @@
---- apr-0.9.4/build/apr_threads.m4.orig	Sun Nov 16 02:42:33 2003
-+++ apr-0.9.4/build/apr_threads.m4	Wed Jan 28 17:52:33 2004
-@@ -110,6 +110,7 @@
- 
- AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
- [apr_ptc_cflags=$CFLAGS
-+ if test "x$ac_cv_pthreads_cflags" = "x"; then
-  for flag in none -kthread -pthread -pthreads -mthreads -Kthread -threads; do 
-     CFLAGS=$apr_ptc_cflags
-     test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
-@@ -118,6 +119,11 @@
-       break
-     ])
-  done
-+ else
-+  if test "$ac_cv_pthreads_cflags" != "none"; then
-+   apr_cv_pthreads_cflags="$ac_cv_pthreads_cflags"
-+  fi
-+ fi
-  CFLAGS=$apr_ptc_cflags
- ])
- 
-@@ -136,6 +142,7 @@
- 
- AC_CACHE_CHECK([for LIBS needed for pthreads], [apr_cv_pthreads_lib], [
-   apr_ptc_libs=$LIBS
-+  if test "x$ac_cv_pthreads_lib" = "x"; then
-   for lib in -lpthread -lpthreads -lc_r; do
-     LIBS="$apr_ptc_libs $lib"
-     APR_PTHREADS_TRY_RUN([
-@@ -143,6 +150,13 @@
-       break
-     ])
-   done
-+  else
-+    case x$ac_cv_pthreads_lib in
-+      x-*) apr_cv_pthreads_lib="$ac_cv_pthreads_lib" ;;
-+      xnone|x) : ;;
-+      *) apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
-+    esac
-+  fi
-   LIBS=$apr_ptc_libs
- ])
- 
diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist
index 926204d0b0a9..2a4cd14e90ec 100644
--- a/devel/apr1/pkg-plist
+++ b/devel/apr1/pkg-plist
@@ -1,76 +1,82 @@
-bin/apr-config
-bin/apu-config
-build/apr_rules.mk
-build/libtool
-include/apr-0/apr.h
-include/apr-0/apr_allocator.h
-include/apr-0/apr_anylock.h
-include/apr-0/apr_atomic.h
-include/apr-0/apr_base64.h
-include/apr-0/apr_buckets.h
-include/apr-0/apr_compat.h
-include/apr-0/apr_date.h
-include/apr-0/apr_dbm.h
-include/apr-0/apr_dso.h
-include/apr-0/apr_env.h
-include/apr-0/apr_errno.h
-include/apr-0/apr_file_info.h
-include/apr-0/apr_file_io.h
-include/apr-0/apr_fnmatch.h
-include/apr-0/apr_general.h
-include/apr-0/apr_getopt.h
-include/apr-0/apr_global_mutex.h
-include/apr-0/apr_hash.h
-include/apr-0/apr_hooks.h
-include/apr-0/apr_inherit.h
-include/apr-0/apr_ldap.h
-include/apr-0/apr_ldap_url.h
-include/apr-0/apr_lib.h
-include/apr-0/apr_md4.h
-include/apr-0/apr_md5.h
-include/apr-0/apr_mmap.h
-include/apr-0/apr_network_io.h
-include/apr-0/apr_optional.h
-include/apr-0/apr_optional_hooks.h
-include/apr-0/apr_poll.h
-include/apr-0/apr_pools.h
-include/apr-0/apr_portable.h
-include/apr-0/apr_proc_mutex.h
-include/apr-0/apr_queue.h
-include/apr-0/apr_reslist.h
-include/apr-0/apr_ring.h
-include/apr-0/apr_rmm.h
-include/apr-0/apr_sdbm.h
-include/apr-0/apr_sha1.h
-include/apr-0/apr_shm.h
-include/apr-0/apr_signal.h
-include/apr-0/apr_strings.h
-include/apr-0/apr_strmatch.h
-include/apr-0/apr_support.h
-include/apr-0/apr_tables.h
-include/apr-0/apr_thread_cond.h
-include/apr-0/apr_thread_mutex.h
-include/apr-0/apr_thread_proc.h
-include/apr-0/apr_thread_rwlock.h
-include/apr-0/apr_time.h
-include/apr-0/apr_uri.h
-include/apr-0/apr_user.h
-include/apr-0/apr_uuid.h
-include/apr-0/apr_version.h
-include/apr-0/apr_want.h
-include/apr-0/apr_xlate.h
-include/apr-0/apr_xml.h
-include/apr-0/apu.h
-include/apr-0/apu_compat.h
-include/apr-0/apu_version.h
-include/apr-0/apu_want.h
+bin/apr-1-config
+bin/apu-1-config
+build-1/apr_rules.mk
+build-1/libtool
+build-1/make_exports.awk
+build-1/make_var_export.awk
+build-1/mkdir.sh
+include/apr-1/apr.h
+include/apr-1/apr_allocator.h
+include/apr-1/apr_anylock.h
+include/apr-1/apr_atomic.h
+include/apr-1/apr_base64.h
+include/apr-1/apr_buckets.h
+include/apr-1/apr_date.h
+include/apr-1/apr_dbm.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_hooks.h
+include/apr-1/apr_inherit.h
+include/apr-1/apr_ldap.h
+include/apr-1/apr_ldap_init.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_mmap.h
+include/apr-1/apr_network_io.h
+include/apr-1/apr_optional.h
+include/apr-1/apr_optional_hooks.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_queue.h
+include/apr-1/apr_random.h
+include/apr-1/apr_reslist.h
+include/apr-1/apr_ring.h
+include/apr-1/apr_rmm.h
+include/apr-1/apr_sdbm.h
+include/apr-1/apr_sha1.h
+include/apr-1/apr_shm.h
+include/apr-1/apr_signal.h
+include/apr-1/apr_strings.h
+include/apr-1/apr_strmatch.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_uri.h
+include/apr-1/apr_user.h
+include/apr-1/apr_uuid.h
+include/apr-1/apr_version.h
+include/apr-1/apr_want.h
+include/apr-1/apr_xlate.h
+include/apr-1/apr_xml.h
+include/apr-1/apu.h
+include/apr-1/apu_version.h
+include/apr-1/apu_want.h
+lib/pkgconfig/apr-1.pc
+lib/pkgconfig/apr-util-1.pc
 lib/apr.exp
 lib/aprutil.exp
-lib/libapr-0.a
-lib/libapr-0.so
-lib/libapr-0.so.9
-lib/libaprutil-0.a
-lib/libaprutil-0.so
-lib/libaprutil-0.so.9
-@dirrm build
-@dirrm include/apr-0
+lib/libapr-1.a
+lib/libapr-1.so
+lib/libapr-1.so.0
+lib/libaprutil-1.a
+lib/libaprutil-1.so
+lib/libaprutil-1.so.0
+@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
+@dirrm build-1
+@dirrm include/apr-1
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 0839b490ad35..c97e3c27768f 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -12,20 +12,18 @@
 # APR_UTIL_WITHOUT_BERKELEY_DB:	unconditionally disable the use of db4
 # (the database bindings are detected and recorded automatically if these
 # switches are not set)
+# APR_UTIL_WITH_LDAP:		force dependency on OpenLDAP
 
 PORTNAME=	apr
-PORTVERSION=	0.9.4
-PORTREVISION=	9
+PORTVERSION=	1.0.0
 CATEGORIES=	devel
-#MASTER_SITES=	http://www.apache.org/dist/apr/
-#DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
-DISTFILES=	apr-APR_0_9_BRANCH_20040113112838.tar.gz apr-util-APU_0_9_BRANCH_20040113112849.tar.gz
+MASTER_SITES=	http://www.apache.org/dist/apr/
+DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
 
 MAINTAINER=	rodrigc@crodrigues.org
 COMMENT=	The Apache Group's Portability Library
 
+BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
@@ -34,6 +32,8 @@ USE_AUTOCONF_VER=	259
 WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_GMAKE=		yes
+USE_PYTHON=		yes
+PYTHON_NO_DEPENDS=	yes
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 WRKSRC=	${WRKDIR}
@@ -77,6 +77,17 @@ PKGNAMESUFFIX=	-db4
 .endif
 .endif
 
+.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
+.if defined(PKGNAMESUFFIX)
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap
+.else
+PKGNAMESUFFIX=	-ldap
+.endif
+.endif
+
 pre-extract:
 	@${ECHO_MSG} ""
 .if defined(APR_UTIL_WITHOUT_THREADS)
diff --git a/devel/apr2/distinfo b/devel/apr2/distinfo
index b20bfa027113..b6c03aa1d33c 100644
--- a/devel/apr2/distinfo
+++ b/devel/apr2/distinfo
@@ -1,4 +1,4 @@
-MD5 (apr-APR_0_9_BRANCH_20040113112838.tar.gz) = c074dcd0339d047773c58ac139ef3209
-SIZE (apr-APR_0_9_BRANCH_20040113112838.tar.gz) = 799764
-MD5 (apr-util-APU_0_9_BRANCH_20040113112849.tar.gz) = 1e73691c1e4f63f1f07720dc4866f1ab
-SIZE (apr-util-APU_0_9_BRANCH_20040113112849.tar.gz) = 274060
+MD5 (apr-1.0.0.tar.gz) = ccd5c21292581be4ba9db10ad5cc8ced
+SIZE (apr-1.0.0.tar.gz) = 967569
+MD5 (apr-util-1.0.0.tar.gz) = 2e39100d4890802822719a4743d8ad7e
+SIZE (apr-util-1.0.0.tar.gz) = 502699
diff --git a/devel/apr2/files/patch-apr_atomic.h b/devel/apr2/files/patch-apr_atomic.h
deleted file mode 100644
index c4e031f3ffd5..000000000000
--- a/devel/apr2/files/patch-apr_atomic.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- apr-0.9.4/include/apr_atomic.h.orig	Sun Nov  2 01:57:08 2003
-+++ apr-0.9.4/include/apr_atomic.h	Sun Nov  2 02:20:37 2003
-@@ -206,10 +206,16 @@
- 
- #define apr_atomic_t apr_uint32_t
- #define apr_atomic_add(mem, val)     atomic_add_int(mem,val)
--#define apr_atomic_dec(mem)          atomic_subtract_int(mem,1)
- #define apr_atomic_inc(mem)          atomic_add_int(mem,1)
- #define apr_atomic_set(mem, val)     atomic_set_int(mem, val)
- #define apr_atomic_read(mem)         (*mem)
-+
-+#define apr_atomic_dec(mem)                                     \
-+({                                                              \
-+   atomic_subtract_int(mem,1);                                  \
-+   *(int *)mem;                                                 \
-+  })
-+
- 
- #elif (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC
- 
diff --git a/devel/apr2/files/patch-apr_hints.m4 b/devel/apr2/files/patch-apr_hints.m4
deleted file mode 100644
index dacf60b85454..000000000000
--- a/devel/apr2/files/patch-apr_hints.m4
+++ /dev/null
@@ -1,29 +0,0 @@
---- apr-0.9.4/build/apr_hints.m4.orig	Mon Dec 22 18:26:10 2003
-+++ apr-0.9.4/build/apr_hints.m4	Fri Jan 30 22:53:49 2004
-@@ -129,14 +129,19 @@
- 	APR_ADDTO(CPPFLAGS, [-DNETBSD])
- 	;;
-     *-freebsd*)
--	case $host in
--	    *freebsd[2345]*)
--		APR_ADDTO(CFLAGS, [-funsigned-char])
--		;;
--	esac
--	APR_SETIFNULL(enable_threads, [no])
-+	os_version=`sysctl -n kern.osreldate`
-+	APR_ADDTO(CFLAGS, [-funsigned-char])
-         APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
--	APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE])
-+	if test $os_version -lt "500016"; then
-+		ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT"
-+		ac_cv_pthreads_lib="-pthread"
-+	elif test $os_version -lt "502102"; then
-+		ac_cv_pthreads_cflags="none"
-+		ac_cv_pthreads_lib="c_r"
-+	else
-+		ac_cv_pthreads_cflags="none"
-+		ac_cv_pthreads_lib="pthread"
-+	fi
- 	;;
-     *-next-nextstep*)
- 	APR_SETIFNULL(CFLAGS, [-O])
diff --git a/devel/apr2/files/patch-apr_threads.m4 b/devel/apr2/files/patch-apr_threads.m4
deleted file mode 100644
index 23e679ddc031..000000000000
--- a/devel/apr2/files/patch-apr_threads.m4
+++ /dev/null
@@ -1,44 +0,0 @@
---- apr-0.9.4/build/apr_threads.m4.orig	Sun Nov 16 02:42:33 2003
-+++ apr-0.9.4/build/apr_threads.m4	Wed Jan 28 17:52:33 2004
-@@ -110,6 +110,7 @@
- 
- AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
- [apr_ptc_cflags=$CFLAGS
-+ if test "x$ac_cv_pthreads_cflags" = "x"; then
-  for flag in none -kthread -pthread -pthreads -mthreads -Kthread -threads; do 
-     CFLAGS=$apr_ptc_cflags
-     test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
-@@ -118,6 +119,11 @@
-       break
-     ])
-  done
-+ else
-+  if test "$ac_cv_pthreads_cflags" != "none"; then
-+   apr_cv_pthreads_cflags="$ac_cv_pthreads_cflags"
-+  fi
-+ fi
-  CFLAGS=$apr_ptc_cflags
- ])
- 
-@@ -136,6 +142,7 @@
- 
- AC_CACHE_CHECK([for LIBS needed for pthreads], [apr_cv_pthreads_lib], [
-   apr_ptc_libs=$LIBS
-+  if test "x$ac_cv_pthreads_lib" = "x"; then
-   for lib in -lpthread -lpthreads -lc_r; do
-     LIBS="$apr_ptc_libs $lib"
-     APR_PTHREADS_TRY_RUN([
-@@ -143,6 +150,13 @@
-       break
-     ])
-   done
-+  else
-+    case x$ac_cv_pthreads_lib in
-+      x-*) apr_cv_pthreads_lib="$ac_cv_pthreads_lib" ;;
-+      xnone|x) : ;;
-+      *) apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
-+    esac
-+  fi
-   LIBS=$apr_ptc_libs
- ])
- 
diff --git a/devel/apr2/pkg-plist b/devel/apr2/pkg-plist
index 926204d0b0a9..2a4cd14e90ec 100644
--- a/devel/apr2/pkg-plist
+++ b/devel/apr2/pkg-plist
@@ -1,76 +1,82 @@
-bin/apr-config
-bin/apu-config
-build/apr_rules.mk
-build/libtool
-include/apr-0/apr.h
-include/apr-0/apr_allocator.h
-include/apr-0/apr_anylock.h
-include/apr-0/apr_atomic.h
-include/apr-0/apr_base64.h
-include/apr-0/apr_buckets.h
-include/apr-0/apr_compat.h
-include/apr-0/apr_date.h
-include/apr-0/apr_dbm.h
-include/apr-0/apr_dso.h
-include/apr-0/apr_env.h
-include/apr-0/apr_errno.h
-include/apr-0/apr_file_info.h
-include/apr-0/apr_file_io.h
-include/apr-0/apr_fnmatch.h
-include/apr-0/apr_general.h
-include/apr-0/apr_getopt.h
-include/apr-0/apr_global_mutex.h
-include/apr-0/apr_hash.h
-include/apr-0/apr_hooks.h
-include/apr-0/apr_inherit.h
-include/apr-0/apr_ldap.h
-include/apr-0/apr_ldap_url.h
-include/apr-0/apr_lib.h
-include/apr-0/apr_md4.h
-include/apr-0/apr_md5.h
-include/apr-0/apr_mmap.h
-include/apr-0/apr_network_io.h
-include/apr-0/apr_optional.h
-include/apr-0/apr_optional_hooks.h
-include/apr-0/apr_poll.h
-include/apr-0/apr_pools.h
-include/apr-0/apr_portable.h
-include/apr-0/apr_proc_mutex.h
-include/apr-0/apr_queue.h
-include/apr-0/apr_reslist.h
-include/apr-0/apr_ring.h
-include/apr-0/apr_rmm.h
-include/apr-0/apr_sdbm.h
-include/apr-0/apr_sha1.h
-include/apr-0/apr_shm.h
-include/apr-0/apr_signal.h
-include/apr-0/apr_strings.h
-include/apr-0/apr_strmatch.h
-include/apr-0/apr_support.h
-include/apr-0/apr_tables.h
-include/apr-0/apr_thread_cond.h
-include/apr-0/apr_thread_mutex.h
-include/apr-0/apr_thread_proc.h
-include/apr-0/apr_thread_rwlock.h
-include/apr-0/apr_time.h
-include/apr-0/apr_uri.h
-include/apr-0/apr_user.h
-include/apr-0/apr_uuid.h
-include/apr-0/apr_version.h
-include/apr-0/apr_want.h
-include/apr-0/apr_xlate.h
-include/apr-0/apr_xml.h
-include/apr-0/apu.h
-include/apr-0/apu_compat.h
-include/apr-0/apu_version.h
-include/apr-0/apu_want.h
+bin/apr-1-config
+bin/apu-1-config
+build-1/apr_rules.mk
+build-1/libtool
+build-1/make_exports.awk
+build-1/make_var_export.awk
+build-1/mkdir.sh
+include/apr-1/apr.h
+include/apr-1/apr_allocator.h
+include/apr-1/apr_anylock.h
+include/apr-1/apr_atomic.h
+include/apr-1/apr_base64.h
+include/apr-1/apr_buckets.h
+include/apr-1/apr_date.h
+include/apr-1/apr_dbm.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_hooks.h
+include/apr-1/apr_inherit.h
+include/apr-1/apr_ldap.h
+include/apr-1/apr_ldap_init.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_mmap.h
+include/apr-1/apr_network_io.h
+include/apr-1/apr_optional.h
+include/apr-1/apr_optional_hooks.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_queue.h
+include/apr-1/apr_random.h
+include/apr-1/apr_reslist.h
+include/apr-1/apr_ring.h
+include/apr-1/apr_rmm.h
+include/apr-1/apr_sdbm.h
+include/apr-1/apr_sha1.h
+include/apr-1/apr_shm.h
+include/apr-1/apr_signal.h
+include/apr-1/apr_strings.h
+include/apr-1/apr_strmatch.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_uri.h
+include/apr-1/apr_user.h
+include/apr-1/apr_uuid.h
+include/apr-1/apr_version.h
+include/apr-1/apr_want.h
+include/apr-1/apr_xlate.h
+include/apr-1/apr_xml.h
+include/apr-1/apu.h
+include/apr-1/apu_version.h
+include/apr-1/apu_want.h
+lib/pkgconfig/apr-1.pc
+lib/pkgconfig/apr-util-1.pc
 lib/apr.exp
 lib/aprutil.exp
-lib/libapr-0.a
-lib/libapr-0.so
-lib/libapr-0.so.9
-lib/libaprutil-0.a
-lib/libaprutil-0.so
-lib/libaprutil-0.so.9
-@dirrm build
-@dirrm include/apr-0
+lib/libapr-1.a
+lib/libapr-1.so
+lib/libapr-1.so.0
+lib/libaprutil-1.a
+lib/libaprutil-1.so
+lib/libaprutil-1.so.0
+@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
+@dirrm build-1
+@dirrm include/apr-1