[pkgsrc/trunk]: pkgsrc/devel/pcre Remove a feeble attempt at providing ABI co...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dd58d8f16b40
branches:  trunk
changeset: 542787:dd58d8f16b40
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue May 27 16:20:52 2008 +0000

description:
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
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).
I'm not bumping the ABI depends because I'm not aware of
any packages using the C++ library. Bump PKGREVISION, however.

diffstat:

 devel/pcre/Makefile         |   3 ++-
 devel/pcre/distinfo         |   3 ++-
 devel/pcre/patches/patch-ab |  23 +++++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r 44ebbc2535bc -r dd58d8f16b40 devel/pcre/Makefile
--- a/devel/pcre/Makefile       Tue May 27 15:46:03 2008 +0000
+++ b/devel/pcre/Makefile       Tue May 27 16:20:52 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2008/05/25 17:39:32 tnn Exp $
+# $NetBSD: Makefile,v 1.50 2008/05/27 16:20:52 tnn Exp $
 
 DISTNAME=      pcre-7.7
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \
                ${MASTER_SITE_SOURCEFORGE:=pcre/}
diff -r 44ebbc2535bc -r dd58d8f16b40 devel/pcre/distinfo
--- a/devel/pcre/distinfo       Tue May 27 15:46:03 2008 +0000
+++ b/devel/pcre/distinfo       Tue May 27 16:20:52 2008 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.31 2008/05/24 10:45:17 wiz Exp $
+$NetBSD: distinfo,v 1.32 2008/05/27 16:20:52 tnn Exp $
 
 SHA1 (pcre-7.7.tar.bz2) = f1f54d3e13e6cb427de962e62eaaee32c74cba38
 RMD160 (pcre-7.7.tar.bz2) = fdf7785b982879ce91847130960fa1531caffaeb
 Size (pcre-7.7.tar.bz2) = 818897 bytes
 SHA1 (patch-aa) = 2bca13cdd4a398ae3dbf26f75fd94557cb076dbe
+SHA1 (patch-ab) = a51a173c41825effd94c104f3b7eea3e48d019f9
diff -r 44ebbc2535bc -r dd58d8f16b40 devel/pcre/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pcre/patches/patch-ab       Tue May 27 16:20:52 2008 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.5 2008/05/27 16:20:52 tnn Exp $
+
+--- configure.orig     2008-05-07 18:22:58.000000000 +0200
++++ configure
+@@ -20901,6 +20901,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
+ 
++# XXX pkgsrc
++if false; then
+ 
+ # 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
+ done
+ LDFLAGS="$OLD_LDFLAGS"
+ 
++# XXX pkgsrc
++fi
++
+ # We could be more clever here, given we're doing AC_SUBST with this
+ # (eg set a var to be the name of the include file we want). But we're not
+ # so it's easy to change back to 'regular' autoconf vars if we needed to.