diff options
| author | cube <cube@pkgsrc.org> | 2008-11-02 15:05:11 +0000 |
|---|---|---|
| committer | cube <cube@pkgsrc.org> | 2008-11-02 15:05:11 +0000 |
| commit | c3d6636abf8229b16d441879a74f61673018f7b6 (patch) | |
| tree | 8f8b270e9bae4d7783975d02902735283b897bec | |
| parent | 9f46411e3ac3211bbb4956e586af47eced97c7ea (diff) | |
| download | pkgsrc-c3d6636abf8229b16d441879a74f61673018f7b6.tar.gz | |
Don't let the build's LDFLAGS be polluted by what provides apr, because apr
doesn't know about all dependencies of apr-util. Otherwise the final binary
wouldn't have the proper RPATHs.
Bump PKGREVISION.
| -rw-r--r-- | devel/apr-util/Makefile | 3 | ||||
| -rw-r--r-- | devel/apr-util/distinfo | 6 | ||||
| -rw-r--r-- | devel/apr-util/patches/patch-aa | 4 | ||||
| -rw-r--r-- | devel/apr-util/patches/patch-ab | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/devel/apr-util/Makefile b/devel/apr-util/Makefile index 2910c7d2361..4c8f158e5eb 100644 --- a/devel/apr-util/Makefile +++ b/devel/apr-util/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2008/09/21 02:39:28 minskim Exp $ +# $NetBSD: Makefile,v 1.9 2008/11/02 15:05:11 cube Exp $ DISTNAME= apr-util-1.3.4 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE:=apr/} diff --git a/devel/apr-util/distinfo b/devel/apr-util/distinfo index f0e8d83f046..eb5a067cd3f 100644 --- a/devel/apr-util/distinfo +++ b/devel/apr-util/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2008/09/06 16:39:58 wiz Exp $ +$NetBSD: distinfo,v 1.5 2008/11/02 15:05:11 cube Exp $ SHA1 (apr-util-1.3.4.tar.gz) = c538c566447cf38b849288a40cf81e5267d9117f RMD160 (apr-util-1.3.4.tar.gz) = 741b9b8e9449ce3cae565aeac57deaeb688071d3 Size (apr-util-1.3.4.tar.gz) = 778902 bytes -SHA1 (patch-aa) = afcf1a45c408370a9094d350192c8649d0073c44 -SHA1 (patch-ab) = 823c936d2ea924a73dc31761012fae0c09f0cbe1 +SHA1 (patch-aa) = 8266136e6211c3c98a1f2dee8a33cd2bac50fbce +SHA1 (patch-ab) = 2eb58e941a54dc5f4531476b1017ac4f6ee1b4a6 diff --git a/devel/apr-util/patches/patch-aa b/devel/apr-util/patches/patch-aa index 1c9db3cfa49..f2213ec635d 100644 --- a/devel/apr-util/patches/patch-aa +++ b/devel/apr-util/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2007/04/28 06:23:04 minskim Exp $ +$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 @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1 2007/04/28 06:23:04 minskim Exp $ $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:' $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 diff --git a/devel/apr-util/patches/patch-ab b/devel/apr-util/patches/patch-ab index 17d79cdfe49..09cf93ff846 100644 --- a/devel/apr-util/patches/patch-ab +++ b/devel/apr-util/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2007/04/28 06:23:05 minskim Exp $ +$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 @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2007/04/28 06:23:05 minskim Exp $ $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:' $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) |