diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/apr-util/Makefile | 5 | ||||
-rw-r--r-- | devel/apr-util/distinfo | 11 | ||||
-rw-r--r-- | devel/apr-util/patches/patch-aa | 13 | ||||
-rw-r--r-- | devel/apr-util/patches/patch-ab | 13 |
4 files changed, 13 insertions, 29 deletions
diff --git a/devel/apr-util/Makefile b/devel/apr-util/Makefile index 6d6325278b0..cf5f3fc6f06 100644 --- a/devel/apr-util/Makefile +++ b/devel/apr-util/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2010/09/16 08:04:14 adam Exp $ +# $NetBSD: Makefile,v 1.17 2010/10/13 19:21:15 tron Exp $ -DISTNAME= apr-util-1.3.9 -PKGREVISION= 2 +DISTNAME= apr-util-1.3.10 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE:=apr/} diff --git a/devel/apr-util/distinfo b/devel/apr-util/distinfo index 86ff8d74612..c03e3d5bf61 100644 --- a/devel/apr-util/distinfo +++ b/devel/apr-util/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.8 2009/08/07 10:39:23 tron Exp $ +$NetBSD: distinfo,v 1.9 2010/10/13 19:21:15 tron Exp $ -SHA1 (apr-util-1.3.9.tar.gz) = fd2a76352353e6bc2f7cc7da80e2ab3842795199 -RMD160 (apr-util-1.3.9.tar.gz) = f6180ba186e8ed73831b1da78de7ec57fc1cb162 -Size (apr-util-1.3.9.tar.gz) = 790952 bytes -SHA1 (patch-aa) = 8266136e6211c3c98a1f2dee8a33cd2bac50fbce -SHA1 (patch-ab) = 2eb58e941a54dc5f4531476b1017ac4f6ee1b4a6 +SHA1 (apr-util-1.3.10.tar.gz) = f5aaf15542209fee479679299dc4cb1ac0924a59 +RMD160 (apr-util-1.3.10.tar.gz) = 2ec11a87c8ddc9ee80850fae80fd754461117d1d +Size (apr-util-1.3.10.tar.gz) = 768634 bytes +SHA1 (patch-aa) = c778c6c5b9ea1d51aa6899fd885f00e4a5e9242b diff --git a/devel/apr-util/patches/patch-aa b/devel/apr-util/patches/patch-aa index f2213ec635d..88f08e681d0 100644 --- a/devel/apr-util/patches/patch-aa +++ b/devel/apr-util/patches/patch-aa @@ -1,13 +1,12 @@ -$NetBSD: patch-aa,v 1.2 2008/11/02 15:05:11 cube Exp $ - ---- configure.in.orig 2005-05-05 12:24:29.000000000 -0700 -+++ configure.in -@@ -164,7 +164,7 @@ dnl copy apr's rules.mk into our build d +$NetBSD: patch-aa,v 1.3 2010/10/13 19:21:16 tron Exp $ +--- configure.orig 2010-10-01 14:56:47.000000000 +0300 ++++ configure 2010-10-10 10:00:59.000000000 +0300 +@@ -33407,7 +33407,7 @@ if test ! -d ./build; then $mkdir_p build fi -cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk +sed -e 's:^LIBTOOL=.*:LIBTOOL=$(WRAPPER_DIR)/bin/libtool:' -e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk - dnl - dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles + case "$host_alias" in + *bsdi* | BSD/OS) diff --git a/devel/apr-util/patches/patch-ab b/devel/apr-util/patches/patch-ab deleted file mode 100644 index 09cf93ff846..00000000000 --- a/devel/apr-util/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2008/11/02 15:05:11 cube Exp $ - ---- configure.orig 2006-11-29 03:48:46.000000000 -0800 -+++ configure -@@ -39658,7 +39658,7 @@ APRUTIL_LIBNAME="aprutil${libsuffix}" - if test ! -d ./build; then - $mkdir_p build - fi --cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk -+sed -e 's:^LIBTOOL=.*:LIBTOOL=$(WRAPPER_DIR)/bin/libtool:' -e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk - - case "$host_alias" in - *bsdi* | BSD/OS) |