[pkgsrc/trunk]: pkgsrc/devel/boehm-gc Remove patch-ad, which breaks self test...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f630b0fb35bc
branches:  trunk
changeset: 542592:f630b0fb35bc
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu May 22 11:45:25 2008 +0000

description:
Remove patch-ad, which breaks self tests on NetBSD-4.99.63/amd64.
Replace first hunk of patch-af with CONFIGURE_ARGS.
Remove next two hunks of patch-af installing some private headers.
This shouldn't be necessary in the 7.x versions. If it is, the author
is willing to help fix the underlying problems.

patch-aa and -ab will be included in the next upstream release.

Bump PKGREVISION.

diffstat:

 devel/boehm-gc/Makefile         |   4 +++-
 devel/boehm-gc/PLIST            |   7 +------
 devel/boehm-gc/distinfo         |   4 +---
 devel/boehm-gc/patches/patch-ad |  28 ----------------------------
 devel/boehm-gc/patches/patch-af |  38 --------------------------------------
 5 files changed, 5 insertions(+), 76 deletions(-)

diffs (135 lines):

diff -r dc4c08fc0d41 -r f630b0fb35bc devel/boehm-gc/Makefile
--- a/devel/boehm-gc/Makefile   Thu May 22 11:23:35 2008 +0000
+++ b/devel/boehm-gc/Makefile   Thu May 22 11:45:25 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2008/05/21 13:47:25 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2008/05/22 11:45:25 wiz Exp $
 
 DISTNAME=      gc-7.1
 PKGNAME=       ${DISTNAME:S/gc/boehm-gc/}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
 
@@ -17,6 +18,7 @@
 USE_LIBTOOL=           YES
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --enable-cplusplus
+CONFIGURE_ARGS+=       --datadir=${PREFIX}/share/doc
 INSTALLATION_DIRS=     ${PKGMANDIR}/man3
 
 MAKE_ENV+=             COPTS=${CFLAGS:M*:Q}
diff -r dc4c08fc0d41 -r f630b0fb35bc devel/boehm-gc/PLIST
--- a/devel/boehm-gc/PLIST      Thu May 22 11:23:35 2008 +0000
+++ b/devel/boehm-gc/PLIST      Thu May 22 11:45:25 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2008/05/21 13:47:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/05/22 11:45:25 wiz Exp $
 include/gc.h
 include/gc/gc.h
 include/gc/gc_allocator.h
@@ -15,10 +15,6 @@
 include/gc/gc_version.h
 include/gc/leak_detector.h
 include/gc/new_gc_alloc.h
-include/gc/private/gc_hdrs.h
-include/gc/private/gc_locks.h
-include/gc/private/gc_priv.h
-include/gc/private/gcconfig.h
 include/gc/weakpointer.h
 include/gc_cpp.h
 lib/libcord.la
@@ -62,5 +58,4 @@
 share/doc/gc/simple_example.html
 share/doc/gc/tree.html
 @dirrm share/doc/gc
-@dirrm include/gc/private
 @dirrm include/gc
diff -r dc4c08fc0d41 -r f630b0fb35bc devel/boehm-gc/distinfo
--- a/devel/boehm-gc/distinfo   Thu May 22 11:23:35 2008 +0000
+++ b/devel/boehm-gc/distinfo   Thu May 22 11:45:25 2008 +0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.35 2008/05/21 13:47:25 wiz Exp $
+$NetBSD: distinfo,v 1.36 2008/05/22 11:45:25 wiz Exp $
 
 SHA1 (gc-7.1.tar.gz) = e84cba5d18f4ea5ed4e5fd3f1dc6a46bc190ff6f
 RMD160 (gc-7.1.tar.gz) = 9338c1128686395739e3acd9052a651d1dffffb2
 Size (gc-7.1.tar.gz) = 1077714 bytes
 SHA1 (patch-aa) = 87a5bd5e83b0201d80a1e4e4ce6745c11b2e7cfe
 SHA1 (patch-ab) = 9b5133c7aa84e6824616e29613716a2fedd1d334
-SHA1 (patch-ad) = 893b5146db0d9f82ec95acd7e217f3d910e33ea0
-SHA1 (patch-af) = 80f1b9b136f808db1b227b70801ffa378abd07c7
diff -r dc4c08fc0d41 -r f630b0fb35bc devel/boehm-gc/patches/patch-ad
--- a/devel/boehm-gc/patches/patch-ad   Thu May 22 11:23:35 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-ad,v 1.24 2007/07/07 15:21:08 wiz Exp $
-
-Needed to build with the sun studio compilers
-
---- include/gc_cpp.h.orig      2007-05-09 00:53:31.000000000 +0000
-+++ include/gc_cpp.h
-@@ -219,8 +219,8 @@ extern "C" {typedef void (*GCCleanUpFunc
- inline void* operator new( 
-     size_t size, 
-     GCPlacement gcp,
--    GCCleanUpFunc cleanup = 0,
--    void* clientData = 0 );
-+    GCCleanUpFunc cleanup,
-+    void* clientData);
-     /*
-     Allocates a collectable or uncollected object, according to the
-     value of "gcp".
-@@ -264,8 +264,8 @@ inline void* operator new( 
- inline void* operator new[](
-     size_t size, 
-     GCPlacement gcp,
--    GCCleanUpFunc cleanup = 0,
--    void* clientData = 0 );
-+    GCCleanUpFunc cleanup,
-+    void* clientData);
-     /*
-     The operator new for arrays, identical to the above. */
- 
diff -r dc4c08fc0d41 -r f630b0fb35bc devel/boehm-gc/patches/patch-af
--- a/devel/boehm-gc/patches/patch-af   Thu May 22 11:23:35 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-af,v 1.11 2007/07/07 15:21:08 wiz Exp $
-
---- Makefile.in.orig   2007-06-28 21:12:36.000000000 +0000
-+++ Makefile.in
-@@ -75,7 +75,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
-@@ -323,6 +323,10 @@ LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-+include_PRIVATE_HEADERS = include/private/gc_hdrs.h \
-+include/private/gc_locks.h include/private/gc_priv.h \
-+include/private/gcconfig.h
-+
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
- MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-@@ -895,6 +899,13 @@ install-includeHEADERS: $(include_HEADER
-         echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-         $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-       done
-+      $(mkinstalldirs) $(DESTDIR)$(pkgincludedir)/private
-+      @list='$(include_PRIVATE_HEADERS)'; for p in $$list; do \
-+        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+        f="`echo $$p | sed -e 's|^.*/||'`"; \
-+        echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/private/$$f"; \
-+        $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/private/$$f; \
-+      done
- 
- uninstall-includeHEADERS:
-       @$(NORMAL_UNINSTALL)