Update to 6.1nb1, from Marc Recht in PR 20008: Install shared libs.

8 files changed, 35 insertions, 72 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 5a893851e37..a0842b7a518 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,24 +1,25 @@
-# $NetBSD: Makefile,v 1.23 2002/09/25 18:18:51 wiz Exp $
-# FreeBSD Id: Makefile,v 1.1 1996/11/16 01:51:25 jdp Exp
+# $NetBSD: Makefile,v 1.24 2003/02/14 18:50:50 wiz Exp $
 #
 
 DISTNAME=		gc6.1
 PKGNAME=		boehm-gc-6.1
+PKGREVISION=		1
+WRKSRC=			${WRKDIR}/gc6.1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		marc@informatik.uni-bremen.de
 HOMEPAGE=		http://www.hpl.hp.com/personal/Hans_Boehm/gc/
 COMMENT=		Garbage collection and memory leak detection for C and C++
 
+GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 MAKE_ENV+=		COPTS="${CFLAGS}"
 
-ALL_TARGET=		BSD-pkg-all
-INSTALL_TARGET=		BSD-pkg-install
-
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(EXTRACT_USING_PAX)
@@ -35,12 +36,12 @@ post-extract:
 pre-build:
 	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
 		${WRKSRC}/doc/gc.man.in > ${WRKSRC}/doc/gc.man
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/bsd-libgc.a ${PREFIX}/lib/libgc.a
+post-install:
+	@cd ${WRKSRC}; \
+	${MAKE} -f ${WRKSRC}/Makefile.direct bsd-libleak.a
 	${INSTALL_DATA} ${WRKSRC}/bsd-libleak.a ${PREFIX}/lib/libleak.a
 	${INSTALL_DATA} ${WRKSRC}/include/gc.h ${WRKSRC}/include/gc_cpp.h \
-	    ${PREFIX}/include
+	    ${WRKSRC}/include/gc_backptr.h ${PREFIX}/include
 	${INSTALL_MAN} ${WRKSRC}/doc/gc.man ${PREFIX}/man/man3/gc.3
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/boehm-gc/PLIST b/devel/boehm-gc/PLIST
index cc38f7f6f1c..faecf20a1d0 100644
--- a/devel/boehm-gc/PLIST
+++ b/devel/boehm-gc/PLIST
@@ -1,6 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:22:31 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/02/14 18:50:50 wiz Exp $
 include/gc.h
+include/gc_backptr.h
 include/gc_cpp.h
 lib/libgc.a
+lib/libgc.la
+lib/libgc.so
+lib/libgc.so.1
+lib/libgc.so.1.1
 lib/libleak.a
 man/man3/gc.3
diff --git a/devel/boehm-gc/buildlink2.mk b/devel/boehm-gc/buildlink2.mk
index 7f13759bae2..51e3cab540f 100644
--- a/devel/boehm-gc/buildlink2.mk
+++ b/devel/boehm-gc/buildlink2.mk
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:26 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/02/14 18:50:50 wiz Exp $
 
 .if !defined(BOEHM_GC_BUILDLINK2_MK)
 BOEHM_GC_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=		boehm-gc
-BUILDLINK_DEPENDS.boehm-gc?=	boehm-gc>=5.3
-BUILDLINK_PKGSRCDIR.boehm-gc?=	../../devel/boehm-gc
-BUILDLINK_DEPMETHOD.boehm-gc?=	build
+BUILDLINK_PACKAGES+=			boehm-gc
+BUILDLINK_DEPENDS.boehm-gc?=		boehm-gc>=6.1nb1
+BUILDLINK_PKGSRCDIR.boehm-gc?=		../../devel/boehm-gc
 
-EVAL_PREFIX+=				BUILDLINK_PREFIX.boehm-gc=boehm-gc
+EVAL_PREFIX+=	BUILDLINK_PREFIX.boehm-gc=boehm-gc
 BUILDLINK_PREFIX.boehm-gc_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.boehm-gc=		include/gc.h
-BUILDLINK_FILES.boehm-gc+=		include/gc_cpp.h
-BUILDLINK_FILES.boehm-gc+=		lib/libgc.a
-BUILDLINK_FILES.boehm-gc+=		lib/libleak.a
+BUILDLINK_FILES.boehm-gc+=	include/gc.h
+BUILDLINK_FILES.boehm-gc+=	include/gc_backptr.h
+BUILDLINK_FILES.boehm-gc+=	include/gc_cpp.h
+BUILDLINK_FILES.boehm-gc+=	lib/libgc.*
+BUILDLINK_FILES.boehm-gc+=	lib/libleak.*
 
 BUILDLINK_TARGETS+=	boehm-gc-buildlink
 
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 8b49022a5c7..fc64ae0b38a 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.10 2003/02/12 09:39:30 agc Exp $
+$NetBSD: distinfo,v 1.11 2003/02/14 18:50:50 wiz Exp $
 
 SHA1 (gc6.1.tar.gz) = 043d51316ebb7f0ac919e4a72c456f269e604d2f
 Size (gc6.1.tar.gz) = 673024 bytes
-SHA1 (patch-aa) = 6455a30d927f95e37788bca022eccb9801382478
+SHA1 (patch-aa) = 5fa6985255d8e3078e53f2be7dcc0666264230fc
 SHA1 (patch-ab) = a50c81392d8ca7ffd8451f0ab471ce2bf258c660
 SHA1 (patch-ac) = 38b22813cf2861dcbc9739d70f9fefe69acf3210
-SHA1 (patch-ad) = e8b18db664428a0339b6c32481e0137fd3a7eca6
-SHA1 (patch-ai) = aabb71b2e064d033290e595fa6addc9b779add15
-SHA1 (patch-aj) = 879beac6b0d674cfd162f3bc7cf87eb60c0fea3d
+SHA1 (patch-ad) = 75e1ac84a2863b5f1d37c1048a75f31ed46d80ce
diff --git a/devel/boehm-gc/patches/patch-aa b/devel/boehm-gc/patches/patch-aa
index 62774bfbd28..4f3f99fa287 100644
--- a/devel/boehm-gc/patches/patch-aa
+++ b/devel/boehm-gc/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.12 2002/09/25 18:18:52 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2003/02/14 18:50:51 wiz Exp $
 
---- Makefile.orig	Mon Sep  9 14:50:58 2002
-+++ Makefile	Mon Sep  9 14:52:54 2002
+--- Makefile.direct.orig	Thu Aug  1 05:19:26 2002
++++ Makefile.direct	Thu Jan 23 09:19:39 2003
 @@ -20,8 +20,8 @@
  # executables.
  
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.12 2002/09/25 18:18:52 wiz Exp $
  	mv gc.a bsd-libgc.a
  
 +bsd-libleak.a:
-+	$(MAKE) CFLAGS="$(LEAKFLAGS)" clean c++-nt
++	$(MAKE) -f Makefile.direct CFLAGS="$(LEAKFLAGS)" clean c++-nt
 +	mv gc.a bsd-libleak.a
 +
  BSD-pkg-install: BSD-pkg-all
diff --git a/devel/boehm-gc/patches/patch-ad b/devel/boehm-gc/patches/patch-ad
index 1a6637be227..134372bc3f8 100644
--- a/devel/boehm-gc/patches/patch-ad
+++ b/devel/boehm-gc/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.11 2003/02/10 14:08:21 kei Exp $
+$NetBSD: patch-ad,v 1.12 2003/02/14 18:50:51 wiz Exp $
 
 --- include/private/gcconfig.h.orig	Wed Aug  7 03:49:22 2002
 +++ include/private/gcconfig.h	Mon Feb 10 22:54:58 2003
@@ -31,14 +31,3 @@ $NetBSD: patch-ad,v 1.11 2003/02/10 14:08:21 kei Exp $
  # if defined(mips) || defined(__mips) || defined(_mips)
  #    define MIPS
  #    if defined(nec_ews) || defined(_nec_ews)
-@@ -752,6 +756,10 @@
- #   ifdef ULTRIX
- #	define OS_TYPE "ULTRIX"
- #	define STACKBOTTOM ((ptr_t) 0x7fffc800)
-+#   endif
-+#   ifdef NETBSD
-+#      define OS_TYPE "NETBSD"
-+#      define HEURISTIC2
- #   endif
- # endif
- 
diff --git a/devel/boehm-gc/patches/patch-ai b/devel/boehm-gc/patches/patch-ai
deleted file mode 100644
index c84ed2d2a41..00000000000
--- a/devel/boehm-gc/patches/patch-ai
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2001/09/08 00:36:10 kei Exp $
-
-*** include/gc.h.orig	Thu Mar 29 19:57:39 2001
---- include/gc.h	Thu Mar 29 20:00:24 2001
-***************
-*** 370,375 ****
---- 370,380 ----
-  #   define GC_RETURN_ADDR (GC_word)__return_address
-  #endif
-  
-+ #if defined(__GNUC__)
-+ #   define GC_ADD_CALLER
-+ #   define GC_RETURN_ADDR (GC_word)__builtin_return_address(0)
-+ #endif
-+ 
-  #ifdef GC_ADD_CALLER
-  #  define GC_EXTRAS GC_RETURN_ADDR, __FILE__, __LINE__
-  #  define GC_EXTRA_PARAMS GC_word ra, GC_CONST char * s, int i
diff --git a/devel/boehm-gc/patches/patch-aj b/devel/boehm-gc/patches/patch-aj
deleted file mode 100644
index 9a978be2ff0..00000000000
--- a/devel/boehm-gc/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/09/25 18:18:52 wiz Exp $
-
---- os_dep.c.orig	Mon Sep  9 14:59:29 2002
-+++ os_dep.c	Mon Sep  9 15:00:00 2002
-@@ -3165,7 +3165,6 @@
- # endif
- #endif
- 
--#include <execinfo.h>
- #ifdef LINUX
- #   include <unistd.h>
- #endif