- Update to apr: 0.9.19, apr-util 0.9.19

Security:   http://www.vuxml.org/freebsd/dd943fbb-d0fe-11df-95a8-00219b0fc4d8.html
Changes:    http://www.apache.org/dist/apr/CHANGES-APR-0.9
Changes:    http://www.apache.org/dist/apr/CHANGES-APR-UTIL-0.9
With Hat:   apache@

9 files changed, 20 insertions, 136 deletions

diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 73a805b25026..3d8b333f6626 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/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
@@ -27,8 +26,8 @@ OPTIONS=	THREADS "Enable Threads in apr"				on  \
 		NDBM	"Enable NDBM support in apr-util"		off \
 		DEVRANDOM "Use /dev/random or compatible in apr"	on
 
-APR_VERSION=	0.9.18
-APU_VERSION=	0.9.17
+APR_VERSION=	0.9.19
+APU_VERSION=	0.9.19
 
 NO_LATEST_LINK=	yes
 
@@ -58,11 +57,6 @@ APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
 ########## APR Options
 .if defined(WITHOUT_THREADS)
 APR_CONF_ARGS+=	--disable-threads
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nothr
-.else
-PKGNAMESUFFIX=	-nothr
-.endif
 .else
 APR_CONF_ARGS+=	--enable-threads
 .endif
@@ -71,22 +65,12 @@ APR_CONF_ARGS+=	--enable-threads
 APR_CONF_ARGS+=	--disable-ipv6
 .else
 APR_CONF_ARGS+=	--enable-ipv6
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ipv6
-.else
-PKGNAMESUFFIX=	-ipv6
-.endif
 .endif
 
 .if defined(WITHOUT_DEVRANDOM)
 APR_CONF_ARGS+=	--without-devrandom
 .else
 APR_CONF_ARGS+=	--with-devrandom
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-devrandom
-.else
-PKGNAMESUFFIX=	-devrandom
-.endif
 .endif
 
 ######### APR-Util Options
@@ -97,11 +81,6 @@ APU_CONF_ARGS+=	--without-gdbm
 PLIST_SUB+=	GDBM=""
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
 APU_CONF_ARGS+=	--with-gdbm=${LOCALBASE}
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gdbm
-.else
-PKGNAMESUFFIX=	-gdbm
-.endif
 .endif
 
 .if defined(WITHOUT_BDB)
@@ -112,21 +91,11 @@ PLIST_SUB+=	BDB=""
 USE_BDB=	42+
 INVALID_BDB_VER=	50
 APU_CONF_ARGS+=	--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
-.else
-PKGNAMESUFFIX=	-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
-.endif
 .endif
 
 .if defined(WITH_NDBM)
 PLIST_SUB+=	NDBM=""
 APU_CONF_ARGS+=	--with-ndbm=/usr
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ndbm
-.else
-PKGNAMESUFFIX=	-ndbm
-.endif
 .else
 PLIST_SUB+=	NDBM="@comment "
 APU_CONF_ARGS+=	--without-ndbm
@@ -137,11 +106,6 @@ PLIST_SUB+=	LDAP=""
 USE_OPENLDAP=	yes
 APU_CONF_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
 	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-ldap${OPENLDAP_VER}
-.else
-PKGNAMESUFFIX=	-ldap
-.endif
 .else
 PLIST_SUB+=	LDAP="@comment "
 .endif
diff --git a/devel/apr0/distinfo b/devel/apr0/distinfo
index 5327bb44f52a..7df24ad8425b 100644
--- a/devel/apr0/distinfo
+++ b/devel/apr0/distinfo
@@ -1,6 +1,6 @@
-MD5 (apr-0.9.18.tar.gz) = d5e7642baf892fb532968340f37aeabb
-SHA256 (apr-0.9.18.tar.gz) = dad08e2156f3d5dd31f2d9cc24f9dfbcf952531077b7fae2b7f0ae50e2de7cc6
-SIZE (apr-0.9.18.tar.gz) = 1074982
-MD5 (apr-util-0.9.17.tar.gz) = 2d819c1c95e324f4fb05d13cac008fc8
-SHA256 (apr-util-0.9.17.tar.gz) = 7b994cf80e54104f0f19eb35a8d4fafe4f90b383b0303f1184218448d276a4e1
-SIZE (apr-util-0.9.17.tar.gz) = 613970
+MD5 (apr-0.9.19.tar.gz) = 65f48c67b92f6bd669fae6fe1a418cec
+SHA256 (apr-0.9.19.tar.gz) = bd2124a53fdc2a3ff2868554bef6381b96a1f9e0bdb20d1a71dbe5497025c8e4
+SIZE (apr-0.9.19.tar.gz) = 1068153
+MD5 (apr-util-0.9.19.tar.gz) = 56c6ab1f728dae7528ffaef62ddc6fbf
+SHA256 (apr-util-0.9.19.tar.gz) = 9ffa9f5a1a0d2eddddd1c114e99a8f5e49aa8018db6f0bc6eeab4724d9eaa085
+SIZE (apr-util-0.9.19.tar.gz) = 591729
diff --git a/devel/apr0/files/patch-apr-0.9.18__build__buildcheck.sh b/devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh
index 59898637b6e5..b6b4ab1dba0c 100644
--- a/devel/apr0/files/patch-apr-0.9.18__build__buildcheck.sh
+++ b/devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh
@@ -1,5 +1,5 @@
---- ./apr-0.9.18/build/buildcheck.sh.orig	2004-11-24 18:10:04.000000000 -0500
-+++ ./apr-0.9.18/build/buildcheck.sh	2010-05-13 16:34:13.409617834 -0400
+--- ./apr-0.9.19/build/buildcheck.sh.orig	2004-11-24 23:10:04.000000000 +0000
++++ ./apr-0.9.19/build/buildcheck.sh	2010-10-20 21:08:11.853623919 +0000
 @@ -26,7 +26,7 @@
  # output is multiline from 1.5 onwards
  
diff --git a/devel/apr0/files/patch-apr_buildconf b/devel/apr0/files/patch-apr-0.9.19__buildconf
index 242a802e108a..69b4a7eb9878 100644
--- a/devel/apr0/files/patch-apr_buildconf
+++ b/devel/apr0/files/patch-apr-0.9.19__buildconf
@@ -1,5 +1,5 @@
---- ./apr-0.9.18/buildconf.orig	2006-09-20 12:04:09.000000000 -0400
-+++ ./apr-0.9.18/buildconf	2010-05-13 16:34:13.412618222 -0400
+--- ./apr-0.9.19/buildconf.orig	2006-09-20 16:04:09.000000000 +0000
++++ ./apr-0.9.19/buildconf	2010-10-20 21:08:11.863623823 +0000
 @@ -23,7 +23,7 @@
  #
  build/buildcheck.sh || exit 1
diff --git a/devel/apr0/files/patch-apr-0.9.18__config.layout b/devel/apr0/files/patch-apr-0.9.19__config.layout
index 26ca03741d1b..17374250fada 100644
--- a/devel/apr0/files/patch-apr-0.9.18__config.layout
+++ b/devel/apr0/files/patch-apr-0.9.19__config.layout
@@ -1,5 +1,5 @@
---- ./apr-0.9.18/config.layout.orig	2004-11-24 18:02:04.000000000 -0500
-+++ ./apr-0.9.18/config.layout	2010-05-13 16:34:13.416618739 -0400
+--- ./apr-0.9.19/config.layout.orig	2004-11-24 23:02:04.000000000 +0000
++++ ./apr-0.9.19/config.layout	2010-10-20 21:08:11.854622653 +0000
 @@ -229,3 +229,7 @@
      infodir:       ${exec_prefix}/share/info
      libsuffix:    -${APR_MAJOR_VERSION}
diff --git a/devel/apr0/files/patch-apr-0.9.18__configure.in b/devel/apr0/files/patch-apr-0.9.19__configure.in
index e156abd6d609..3bed2536ac27 100644
--- a/devel/apr0/files/patch-apr-0.9.18__configure.in
+++ b/devel/apr0/files/patch-apr-0.9.19__configure.in
@@ -1,5 +1,5 @@
---- ./apr-0.9.18/configure.in.orig	2008-06-20 13:32:47.000000000 -0400
-+++ ./apr-0.9.18/configure.in	2010-05-13 16:34:13.421618268 -0400
+--- ./apr-0.9.19/configure.in.orig	2008-06-20 17:32:47.000000000 +0000
++++ ./apr-0.9.19/configure.in	2010-10-20 21:08:11.857624440 +0000
 @@ -7,6 +7,7 @@
  AC_INIT(build/apr_common.m4)
  AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
diff --git a/devel/apr0/files/patch-apr-0.9.18__threadproc__unix__procsup.c b/devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c
index c9ccf13bda48..acbb2b4cf7f0 100644
--- a/devel/apr0/files/patch-apr-0.9.18__threadproc__unix__procsup.c
+++ b/devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c
@@ -1,5 +1,5 @@
---- ./apr-0.9.18/threadproc/unix/procsup.c.orig	2006-09-20 12:04:09.000000000 -0400
-+++ ./apr-0.9.18/threadproc/unix/procsup.c	2010-05-13 16:34:13.426619474 -0400
+--- ./apr-0.9.19/threadproc/unix/procsup.c.orig	2006-09-20 16:04:09.000000000 +0000
++++ ./apr-0.9.19/threadproc/unix/procsup.c	2010-10-20 21:08:11.859622744 +0000
 @@ -21,6 +21,7 @@
      int x;
  
diff --git a/devel/apr0/files/patch-apr-util-0.9.17__build__dbm.m4 b/devel/apr0/files/patch-apr-util-0.9.17__build__dbm.m4
deleted file mode 100644
index c58d317c5cb4..000000000000
--- a/devel/apr0/files/patch-apr-util-0.9.17__build__dbm.m4
+++ /dev/null
@@ -1,80 +0,0 @@
---- ./apr-util-0.9.17/build/dbm.m4.orig	2008-11-24 02:30:29.000000000 -0500
-+++ ./apr-util-0.9.17/build/dbm.m4	2010-05-13 16:34:13.400617508 -0400
-@@ -298,8 +298,8 @@
-   fi
-   APU_CHECK_BERKELEY_DB(1, -1, -1,
-     "$places",
--    "db_185.h",
--    "db"
-+    "db.h",
-+    "c"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=185
-@@ -341,7 +341,7 @@
-   APU_CHECK_BERKELEY_DB(3, -1, -1,
-     "$places",
-     "db3/db.h db.h",
--    "db3 db"
-+    "db3"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=3
-@@ -361,8 +361,8 @@
-   fi
-   APU_CHECK_BERKELEY_DB("4", "0", "-1",
-     "$places",
--    "db4/db.h db.h",
--    "db-4.0 db4 db"
-+    "db4/db.h",
-+    "db4"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=4
-@@ -382,8 +382,8 @@
-   fi
-   APU_CHECK_BERKELEY_DB("4", "1", "-1",
-     "$places",
--    "db41/db.h db4/db.h db.h",
--    "db-4.1 db4 db"
-+    "db41/db.h",
-+    "db41"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=4
-@@ -403,13 +403,14 @@
-   fi
-   APU_CHECK_BERKELEY_DB("4", "2", "-1",
-     "$places",
--    "db42/db.h db4/db.h db.h",
--    "db-4.2 db4 db"
-+    "db42/db.h",
-+    "db-4.2"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=4
-   fi
- ])
-+
- dnl
- dnl APU_CHECK_DB43: is DB4.3 present?
- dnl
-@@ -422,8 +423,8 @@
-   fi
-   APU_CHECK_BERKELEY_DB("4", "3", "-1",
-     "$places",
--    "db43/db.h db4/db.h db.h",
--    "db-4.3 db43 db4 db"
-+    "db43/db.h",
-+    "db-4.3"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=4
-@@ -579,6 +580,7 @@
-       fi
-     fi
-   fi
-+
-   AC_MSG_CHECKING(for Berkeley DB)
-   if test "$apu_have_db" = "1"; then
-     AC_MSG_RESULT(found db$apu_db_version)
diff --git a/devel/apr0/files/patch-apr-util-0.9.17__config.layout b/devel/apr0/files/patch-apr-util-0.9.19__config.layout
index 5c76ba73bb5e..9d05446f3ca7 100644
--- a/devel/apr0/files/patch-apr-util-0.9.17__config.layout
+++ b/devel/apr0/files/patch-apr-util-0.9.19__config.layout
@@ -1,5 +1,5 @@
---- ./apr-util-0.9.17/config.layout.orig	2004-11-24 18:45:40.000000000 -0500
-+++ ./apr-util-0.9.17/config.layout	2010-05-13 16:34:13.405620669 -0400
+--- ./apr-util-0.9.19/config.layout.orig	2004-11-24 23:45:40.000000000 +0000
++++ ./apr-util-0.9.19/config.layout	2010-10-20 21:08:11.861623284 +0000
 @@ -229,3 +229,7 @@
      infodir:       ${exec_prefix}/share/info
      libsuffix     -${APRUTIL_MAJOR_VERSION}