Re-do Makefile patches for version 4.12.

2 files changed, 70 insertions, 91 deletions

diff --git a/devel/boehm-gc/patches/patch-aa b/devel/boehm-gc/patches/patch-aa
index 4094520cbbd..43765b2fed2 100644
--- a/devel/boehm-gc/patches/patch-aa
+++ b/devel/boehm-gc/patches/patch-aa
@@ -1,90 +1,69 @@
-*** Makefile.orig	Mon Feb 19 09:45:47 1996
---- Makefile	Fri Nov 15 14:19:11 1996
-***************
-*** 13,19 ****
-  #  The above doesn't work with gas, which doesn't run cpp.
-  #  Define AS as `gcc -c -x assembler-with-cpp' instead.
-  
-! CFLAGS= -O -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DSILENT
-  
-  # Setjmp_test may yield overly optimistic results when compiled
-  # without optimization.
---- 13,45 ----
-  #  The above doesn't work with gas, which doesn't run cpp.
-  #  Define AS as `gcc -c -x assembler-with-cpp' instead.
-  
-! # We want this to be a drop-in linkable library, hence the -DREDIRECT.
-! # The new c++-t and c++-nt (test and notest) are because we don't want
-! # to fill anyone's log with leak messages! - MMCG
-! 
-! CFLAGS= -O -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DSILENT \
-!     	-DREDIRECT_MALLOC=GC_malloc
-! 
-! LEAKFLAGS=$(CFLAGS) -DFIND_LEAK
-! 
-! all: gc.a gctest
-! 
-! FreeBSD-pkg-all: fbsd-libgc.a fbsd-libleak.a
-! 
-! fbsd-libgc.a:
-! 	make CFLAGS="$(CFLAGS)" clean c++-t
-! 	mv gc.a fbsd-libgc.a
-! 
-! fbsd-libleak.a:
-! 	make CFLAGS="$(LEAKFLAGS)" clean c++-nt
-! 	mv gc.a fbsd-libleak.a
-! 
-! FreeBSD-pkg-install: FreeBSD-pkg-all
-! 	${CP} fbsd-libgc.a libgc.a
-! 	${CP} fbsd-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
-  
-  # Setjmp_test may yield overly optimistic results when compiled
-  # without optimization.
-***************
-*** 124,131 ****
-  # not time-critical anyway.
-  # Set SPECIALCFLAGS to -q nodirect_code on Encore.
-  
-- all: gc.a gctest
-- 
-  pcr: PCR-Makefile gc_private.h gc_hdrs.h gc.h config.h mach_dep.o $(SRCS)
-  	make -f PCR-Makefile depend
-  	make -f PCR-Makefile
---- 150,155 ----
-***************
-*** 170,182 ****
-  	./if_mach SPARC SUNOS5 $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -lthread -ldl
-  	./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a
-  
-  c++: gc_cpp.o $(srcdir)/gc_cpp.h test_cpp
-  	rm -f on_sparc_sunos5
-  	./if_mach SPARC SUNOS5 touch on_sparc_sunos5
-  	./if_mach SPARC SUNOS5 $(AR) rus gc.a gc_cpp.o
-  	./if_not_there on_sparc_sunos5 $(AR) ru gc.a gc_cpp.o
-  	./if_not_there on_sparc_sunos5 $(RANLIB) gc.a || cat /dev/null
-- 	./test_cpp 1
-  
-  dyn_load_sunos53.o: dyn_load.c
-  	$(CC) $(CFLAGS) -DSUNOS53_SHARED_LIB -c $(srcdir)/dyn_load.c -o $@
---- 194,211 ----
-  	./if_mach SPARC SUNOS5 $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -lthread -ldl
-  	./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a
-  
-+ c++-t: c++
-+ 	./test_cpp 1
-+ 
-+ c++-nt: c++
-+ 	@echo "Use ./test_cpp 1 to test the leak library"
-+ 
-  c++: gc_cpp.o $(srcdir)/gc_cpp.h test_cpp
-  	rm -f on_sparc_sunos5
-  	./if_mach SPARC SUNOS5 touch on_sparc_sunos5
-  	./if_mach SPARC SUNOS5 $(AR) rus gc.a gc_cpp.o
-  	./if_not_there on_sparc_sunos5 $(AR) ru gc.a gc_cpp.o
-  	./if_not_there on_sparc_sunos5 $(RANLIB) gc.a || cat /dev/null
-  
-  dyn_load_sunos53.o: dyn_load.c
-  	$(CC) $(CFLAGS) -DSUNOS53_SHARED_LIB -c $(srcdir)/dyn_load.c -o $@
+--- Makefile.orig	Thu Aug 21 01:17:10 1997
++++ Makefile	Thu Feb 26 16:36:41 1998
+@@ -8,15 +8,35 @@
+ #	 c++ interface to gc.a
+ # cord/de - builds dumb editor based on cords.
+ CC=cc
+-CXX=CC
++CXX=c++
+ AS=as
+ #  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 for as if you specify
+ #  it for the C compiler.
+ 
+-CFLAGS= -O -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DATOMIC_UNCOLLECTABLE -DNO_EXECUTE_PERMISSION -DSILENT
++CFLAGS= -O -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DATOMIC_UNCOLLECTABLE \
++	-DNO_EXECUTE_PERMISSION -DSILENT -DREDIRECT_MALLOC=GC_malloc
+ 
++LEAKFLAGS=$(CFLAGS) -DFIND_LEAK
++
++BSD-pkg-all: bsd-libgc.a bsd-libleak.a
++
++bsd-libgc.a:
++	make CFLAGS="$(CFLAGS)" clean c++-t
++	mv gc.a bsd-libgc.a
++
++bsd-libleak.a:
++	make CFLAGS="$(LEAKFLAGS)" clean c++-nt
++	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
++  
+ # Setjmp_test may yield overly optimistic results when compiled
+ # without optimization.
+ # -DSILENT disables statistics printing, and improves performance.
+@@ -162,8 +182,6 @@
+ # not time-critical anyway.
+ # Set SPECIALCFLAGS to -q nodirect_code on Encore.
+ 
+-all: gc.a gctest
+-
+ pcr: PCR-Makefile gc_private.h gc_hdrs.h gc.h config.h mach_dep.o $(SRCS)
+ 	make -f PCR-Makefile depend
+ 	make -f PCR-Makefile
+@@ -210,13 +228,18 @@
+ 	./if_mach HP_PA "" $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -ldld
+ 	./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a `./threadlibs`
+ 
++c++-t: c++
++	./test_cpp 1
++
++c++-nt: c++
++	@echo "Use ./test_cpp 1 to test the leak library"
++
+ c++: gc_cpp.o $(srcdir)/gc_cpp.h test_cpp
+ 	rm -f on_sparc_sunos5
+ 	./if_mach SPARC SUNOS5 touch on_sparc_sunos5
+ 	./if_mach SPARC SUNOS5 $(AR) rus gc.a gc_cpp.o
+ 	./if_not_there on_sparc_sunos5 $(AR) ru gc.a gc_cpp.o
+ 	./if_not_there on_sparc_sunos5 $(RANLIB) gc.a || cat /dev/null
+-	./test_cpp 1
+ 	echo > c++
+ 
+ dyn_load_sunos53.o: dyn_load.c
diff --git a/devel/boehm-gc/patches/patch-ab b/devel/boehm-gc/patches/patch-ab
index 6790f5583e2..ba73e93bd90 100644
--- a/devel/boehm-gc/patches/patch-ab
+++ b/devel/boehm-gc/patches/patch-ab
@@ -28,7 +28,7 @@
 + .LP
 + .SH "PORT INFORMATION"
 + .LP
-+ In this (FreeBSD package) installation,
++ In this (BSD package) installation,
 + .I gc.h
 + and
 + .I gc_cpp.h