diff options
author | wiz <wiz@pkgsrc.org> | 2012-03-02 15:24:48 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2012-03-02 15:24:48 +0000 |
commit | 6708332a4b8a62bfab978b313cba63b5da35505b (patch) | |
tree | 14d1a6ab9cbc4cba28046b6c48cf24280e774d80 | |
parent | c584da8dcd8ed8e8e8987c0868c875538712fa5e (diff) | |
download | pkgsrc-6708332a4b8a62bfab978b313cba63b5da35505b.tar.gz |
regen patches with better line numbers (no change)
-rw-r--r-- | devel/pcre/distinfo | 6 | ||||
-rw-r--r-- | devel/pcre/patches/patch-aa | 6 | ||||
-rw-r--r-- | devel/pcre/patches/patch-ab | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo index 57ead0a09e5..7b424142969 100644 --- a/devel/pcre/distinfo +++ b/devel/pcre/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.45 2012/03/02 14:10:42 wiz Exp $ +$NetBSD: distinfo,v 1.46 2012/03/02 15:24:48 wiz Exp $ SHA1 (pcre-8.30.tar.bz2) = 68d28fb383325b8af9e3d481d30f586b46c56022 RMD160 (pcre-8.30.tar.bz2) = bddee68c7e2b8b8224a835a2a9cdadc6b7cc9fd2 Size (pcre-8.30.tar.bz2) = 1248556 bytes -SHA1 (patch-aa) = 569d204319817c8c478db57ab731fc50bcf5dd53 -SHA1 (patch-ab) = 0da1392febca936ad89a8bda66c7114240a0fe4b +SHA1 (patch-aa) = 02c03145827eaf5ce5d267836d0a4c5f6c00ba99 +SHA1 (patch-ab) = 007ea10e4e74391b867df85518d970ce651b34e2 diff --git a/devel/pcre/patches/patch-aa b/devel/pcre/patches/patch-aa index 57473a95dde..9b5c4367b5e 100644 --- a/devel/pcre/patches/patch-aa +++ b/devel/pcre/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.14 2011/12/15 15:39:21 drochner Exp $ +$NetBSD: patch-aa,v 1.15 2012/03/02 15:24:48 wiz Exp $ Use pkgsrc's COMPILER_RPATH_FLAG variable, so this works on all pkgsrc platforms. ---- pcre-config.in.orig 2011-12-07 16:32:02.000000000 +0000 +--- pcre-config.in.orig 2012-01-21 16:00:28.000000000 +0000 +++ pcre-config.in -@@ -15,15 +15,7 @@ if test $# -eq 0; then +@@ -28,15 +28,7 @@ if test $# -eq 0; then exit 1 fi diff --git a/devel/pcre/patches/patch-ab b/devel/pcre/patches/patch-ab index 746215b87fc..b0ae78176dd 100644 --- a/devel/pcre/patches/patch-ab +++ b/devel/pcre/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.6 2011/08/22 12:58:08 wiz Exp $ +$NetBSD: patch-ab,v 1.7 2012/03/02 15:24:48 wiz Exp $ Remove a feeble attempt at providing ABI compatibility for the C++ portion of the PCRE library. Relying on the C++ compiler to crunch symbols in a @@ -6,9 +6,9 @@ particular way is platform dependent at best, and the comments indicate that this was done for OSX. Also, the test misfired on SunOS leading to breakage (PR pkg/38768). ---- configure.orig 2008-05-07 18:22:58.000000000 +0200 +--- configure.orig 2012-02-04 12:55:43.000000000 +0000 +++ configure -@@ -20901,6 +20901,8 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS +@@ -16189,6 +16189,8 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -17,7 +17,7 @@ Also, the test misfired on SunOS leading to breakage (PR pkg/38768). # Older versions of pcre defined pcrecpp::no_arg, but in new versions # it's called pcrecpp::RE::no_arg. For backwards ABI compatibility, -@@ -20968,6 +20970,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -16231,6 +16233,9 @@ rm -f core conftest.err conftest.$ac_obj done LDFLAGS="$OLD_LDFLAGS" |