Deal with "unix no longer predefined" warning. Modify Makefile so we don't

need to pass in various variables through MAKE_ENV, and honor CFLAGS
passed in from environment during build.

4 files changed, 44 insertions, 46 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 526244c3424..bfe07e7be20 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/02/16 14:38:19 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/05/04 01:28:14 jlam Exp $
 # FreeBSD Id: Makefile,v 1.1 1996/11/16 01:51:25 jdp Exp
 #
 
@@ -14,13 +14,13 @@ COMMENT=		Garbage collection and memory leak detection for C and C++
 USE_GMAKE=		# defined
 
 WRKSRC=			${WRKDIR}/gc
-MAKE_ENV+=		CP="${CP}" INSTALL_DATA="${INSTALL_DATA}" \
-			INSTALL_MAN="${INSTALL_MAN}"
+MAKE_ENV+=		COPTS="${CFLAGS}"
 
 ALL_TARGET=		BSD-pkg-all
 INSTALL_TARGET=		BSD-pkg-install
 
 .include "../../mk/bsd.prefs.mk"
+
 .if defined(EXTRACT_USING_PAX)
 EXTRACT_ELEMENTS=	-u
 .endif
@@ -33,7 +33,7 @@ post-extract:
 	${MV} ${WRKSRC}/gc.man ${WRKSRC}/gc.man.in
 
 pre-build:
-	${SED} -e "s,@PREFIX@,${PREFIX},g" ${WRKSRC}/gc.man.in \
-		> ${WRKSRC}/gc.man
+	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
+		${WRKSRC}/gc.man.in > ${WRKSRC}/gc.man
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 2f9f6fc94a8..1ee43090f69 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2001/04/21 00:44:12 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/05/04 01:28:15 jlam Exp $
 
 SHA1 (gc5.3.tar.gz) = b9acd4ac18ad56ca5b16dad23e5bf589720c6b8a
 Size (gc5.3.tar.gz) = 369125 bytes
-SHA1 (patch-aa) = b83d4b426f6968cc0da47a9077f7e961bdfc44de
+SHA1 (patch-aa) = 7985474afb5efbf80c7f140df066159b4220bd2b
 SHA1 (patch-ab) = 1168c658e55389d16cf3629195f1b7a21966b1dd
 SHA1 (patch-ac) = 4ea3367e7d54b2c2c55260445f2b57c1a2bfab74
-SHA1 (patch-ad) = ae47a0e65146bd58be5b79e0302847d653ae13fe
+SHA1 (patch-ad) = 1a6fb30bf57d40b477ce08bfbb0cf860c2d25b00
 SHA1 (patch-ae) = 24aa52eec33fe25657514afa2aa025eff33b6380
 SHA1 (patch-af) = 98b8e418abfa95c34d6c6d17fa3b7256dadf41f2
 SHA1 (patch-ag) = 7beb9787669071a99c13ad4f04122eaf5a9839a4
diff --git a/devel/boehm-gc/patches/patch-aa b/devel/boehm-gc/patches/patch-aa
index ca272a82960..25fdcfdd961 100644
--- a/devel/boehm-gc/patches/patch-aa
+++ b/devel/boehm-gc/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2000/11/16 10:42:24 abs Exp $
+$NetBSD: patch-aa,v 1.10 2001/05/04 01:28:15 jlam Exp $
 
---- Makefile.orig	Thu Apr 13 12:00:20 2000
+--- Makefile.orig	Fri Sep 22 13:27:35 2000
 +++ Makefile
-@@ -10,8 +10,8 @@
+@@ -10,14 +10,32 @@
  ABI_FLAG= 
  CC=cc $(ABI_FLAG)
  HOSTCC=$(CC)
@@ -13,10 +13,11 @@ $NetBSD: patch-aa,v 1.9 2000/11/16 10:42:24 abs Exp $
  #  The above doesn't work with gas, which doesn't run cpp.
  #  Define AS as `gcc -c -x assembler-with-cpp' instead.
  #  Under Irix 6, you will have to specify the ABI (-o32, -n32, or -64)
-@@ -19,6 +19,25 @@
- 
- CFLAGS= -O -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DALL_INTERIOR_POINTERS -DSILENT
+ #  if you use something other than the default ABI on your machine.
  
+-CFLAGS= -O -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DALL_INTERIOR_POINTERS -DSILENT
++CFLAGS= -O -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DALL_INTERIOR_POINTERS -DSILENT $(COPTS)
++
 +LEAKFLAGS=$(CFLAGS) -DFIND_LEAK
 +
 +BSD-pkg-all: bsd-libgc.a bsd-libleak.a
@@ -30,16 +31,14 @@ $NetBSD: patch-aa,v 1.9 2000/11/16 10:42:24 abs Exp $
 +	mv gc.a bsd-libleak.a
 +
 +BSD-pkg-install: BSD-pkg-all
-+	${CP} bsd-libgc.a libgc.a
-+	${CP} bsd-libleak.a libleak.a
-+	${INSTALL_DATA} libleak.a libgc.a ${PREFIX}/lib
-+	${INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include
-+	${INSTALL_MAN} gc.man ${PREFIX}/man/man3/gc.3
-+
++	${BSD_INSTALL_DATA} bsd-libgc.a ${PREFIX}/lib/libgc.a
++	${BSD_INSTALL_DATA} bsd-libleak.a ${PREFIX}/lib/libleak.a
++	${BSD_INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include
++	${BSD_INSTALL_MAN} gc.man ${PREFIX}/man/man3/gc.3
+ 
  # For dynamic library builds, it may be necessary to add flags to generate
  # PIC code, e.g. -fPIC on Linux.
- 
-@@ -181,7 +200,7 @@
+@@ -181,7 +199,7 @@
      gcc_support.c mips_ultrix_mach_dep.s include/gc_alloc.h gc_alloc.h \
      include/new_gc_alloc.h include/javaxfc.h sparc_sunos4_mach_dep.s \
      solaris_threads.h backptr.h hpux_test_and_clear.s include/gc_gcj.h \
@@ -48,7 +47,7 @@ $NetBSD: patch-aa,v 1.9 2000/11/16 10:42:24 abs Exp $
  
  OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
             README test.c test_cpp.cc setjmp_t.c SMakefile.amiga \
-@@ -220,11 +239,9 @@
+@@ -220,11 +238,9 @@
  # not time-critical anyway.
  # Set SPECIALCFLAGS to -q nodirect_code on Encore.
  
@@ -62,7 +61,7 @@ $NetBSD: patch-aa,v 1.9 2000/11/16 10:42:24 abs Exp $
  
  $(OBJS) test.o dyn_load.o dyn_load_sunos53.o: $(srcdir)/gc_priv.h $(srcdir)/gc_hdrs.h $(srcdir)/gc.h \
      $(srcdir)/gcconfig.h $(srcdir)/gc_typed.h Makefile
-@@ -263,6 +280,12 @@
+@@ -263,6 +279,12 @@
  	./if_mach HP_PA HPUX $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -ldld `./threadlibs`
  	./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a `./threadlibs`
  
@@ -75,7 +74,7 @@ $NetBSD: patch-aa,v 1.9 2000/11/16 10:42:24 abs Exp $
  c++: gc_cpp.o $(srcdir)/gc_cpp.h test_cpp
  	rm -f dont_ar_4
  	./if_mach SPARC SUNOS5 touch dont_ar_4
-@@ -271,7 +294,6 @@
+@@ -271,7 +293,6 @@
  	./if_mach M68K AMIGA $(AR) -vrus gc.a gc_cpp.o
  	./if_not_there dont_ar_4 $(AR) ru gc.a gc_cpp.o
  	./if_not_there dont_ar_4 $(RANLIB) gc.a || cat /dev/null
@@ -83,7 +82,7 @@ $NetBSD: patch-aa,v 1.9 2000/11/16 10:42:24 abs Exp $
  	echo > c++
  
  dyn_load_sunos53.o: dyn_load.c
-@@ -322,6 +344,7 @@
+@@ -322,6 +343,7 @@
  	./if_mach SPARC SUNOS5 $(AS) -o mach_dep.o $(srcdir)/sparc_mach_dep.s
  	./if_mach SPARC SUNOS4 $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
  	./if_mach SPARC OPENBSD $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
diff --git a/devel/boehm-gc/patches/patch-ad b/devel/boehm-gc/patches/patch-ad
index bd093770968..93b046b0312 100644
--- a/devel/boehm-gc/patches/patch-ad
+++ b/devel/boehm-gc/patches/patch-ad
@@ -1,22 +1,21 @@
-$NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
+$NetBSD: patch-ad,v 1.7 2001/05/04 01:28:16 jlam Exp $
 
---- gcconfig.h.orig	Tue Aug 29 05:56:19 2000
-+++ gcconfig.h	Sun Feb 25 22:32:35 2001
-@@ -27,6 +27,13 @@
+--- gcconfig.h.orig	Mon Aug 28 16:56:19 2000
++++ gcconfig.h
+@@ -27,6 +27,12 @@
  #    define LINUX
  # endif
  
 +# if defined(__NetBSD__)
 +#    define NETBSD
-+#    ifndef unix
-+#       define unix	/* symbol unix is no longer defined in NetBSD */
-+#    endif
++#    undef unix
++#    define unix 1	/* symbol unix is no longer defined in NetBSD */
 +# endif
 +
  /* Determine the machine type: */
  # if defined(sun) && defined(mc68000)
  #    define M68K
-@@ -50,10 +57,13 @@
+@@ -50,10 +56,13 @@
  # endif
  # if defined(__NetBSD__) && defined(m68k)
  #    define M68K
@@ -32,7 +31,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
  #    define ARM32
  #    define NETBSD
  #    define mach_type_known
-@@ -67,6 +77,10 @@
+@@ -67,6 +76,10 @@
  #    endif
  #    define mach_type_known
  # endif
@@ -43,7 +42,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
  # if defined(mips) || defined(__mips)
  #    define MIPS
  #    if !defined(LINUX)
-@@ -81,6 +95,9 @@
+@@ -81,6 +94,9 @@
  #	 endif
  #      endif
  #    endif /* !LINUX */
@@ -53,7 +52,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
  #    define mach_type_known
  # endif
  # if defined(sequent) && defined(i386)
-@@ -114,7 +131,7 @@
+@@ -114,7 +130,7 @@
  #   define mach_type_known
  # endif
  # if defined(sparc) && defined(unix) && !defined(sun) && !defined(linux) \
@@ -62,7 +61,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
  #   define SPARC
  #   define DRSNX
  #   define mach_type_known
-@@ -123,6 +140,10 @@
+@@ -123,6 +139,10 @@
  #   define RS6000
  #   define mach_type_known
  # endif
@@ -73,7 +72,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
  # if defined(_M_XENIX) && defined(_M_SYSV) && defined(_M_I386)
  	/* The above test may need refinement	*/
  #   define I386
-@@ -172,7 +193,7 @@
+@@ -172,7 +192,7 @@
  # endif
  # if defined(__alpha) || defined(__alpha__)
  #   define ALPHA
@@ -82,7 +81,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
  #     define OSF1	/* a.k.a Digital Unix */
  #   endif
  #   define mach_type_known
-@@ -221,7 +242,6 @@
+@@ -221,7 +241,6 @@
  # endif
  # if defined(__NetBSD__) && defined(i386)
  #   define I386
@@ -90,7 +89,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
  #   define mach_type_known
  # endif
  # if defined(bsdi) && defined(i386)
-@@ -573,6 +593,14 @@
+@@ -573,6 +592,14 @@
  #     define STACKBOTTOM ((ptr_t) 0xc0000000)
  #     define DATAEND	/* not needed */
  #   endif
@@ -105,7 +104,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
  # endif
  
  # ifdef VAX
-@@ -589,6 +617,10 @@
+@@ -589,6 +616,10 @@
  #	define OS_TYPE "ULTRIX"
  #	define STACKBOTTOM ((ptr_t) 0x7fffc800)
  #   endif
@@ -116,7 +115,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
  # endif
  
  # ifdef RT
-@@ -602,7 +634,6 @@
+@@ -602,7 +633,6 @@
  #   define MACH_TYPE "SPARC"
  #   define ALIGNMENT 4	/* Required by hardware	*/
  #   define ALIGN_DOUBLE
@@ -124,7 +123,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
  #   ifdef SUNOS5
  #	define OS_TYPE "SUNOS5"
  	extern int _etext;
-@@ -674,8 +705,20 @@
+@@ -674,8 +704,20 @@
  #   ifdef OPENBSD
  #     define OS_TYPE "OPENBSD"
  #     define STACKBOTTOM ((ptr_t) 0xf8000000)
@@ -145,7 +144,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
  # endif
  
  # ifdef I386
-@@ -960,6 +1003,21 @@
+@@ -960,6 +1002,21 @@
  #	endif
  #	define DYNAMIC_LOADING
  #   endif
@@ -167,7 +166,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/25 13:36:17 kei Exp $
  # endif
  
  # ifdef RS6000
-@@ -1019,6 +1077,16 @@
+@@ -1019,6 +1076,16 @@
  	/* fp registers in some cases when the target is a 21264.  The assembly	*/
  	/* code doesn't handle that yet, and version dependencies make that a	*/
  	/* bit tricky.  Do the easy thing for now.				*/