Honor pkgsrc CFLAGS in all configs, not just some.

19 files changed, 276 insertions, 4 deletions

diff --git a/lang/smlnj/distinfo b/lang/smlnj/distinfo
index 246992d12ad..885a0f74f31 100644
--- a/lang/smlnj/distinfo
+++ b/lang/smlnj/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2016/07/03 19:26:35 dholland Exp $
+$NetBSD: distinfo,v 1.23 2016/07/03 19:29:27 dholland Exp $
 
 SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9
 RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb
@@ -99,4 +99,21 @@ SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea7
 SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d
 SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c
 SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154
-SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = d2ede7ce4fca3c400f82ae09ee352ee6872bb1b1
+SHA1 (patch-src_runtime_objs_mk.alpha32-dunix) = 9e3a36f4663cd685459f2fbde41b8c5f154bd9c2
+SHA1 (patch-src_runtime_objs_mk.alpha32x-osf1) = 6e91f672aadb77bd1d1ab65bfa66e3d7f745846c
+SHA1 (patch-src_runtime_objs_mk.hppa-hpux) = 40ca27d05490983e734b4d20eecd268935ad2461
+SHA1 (patch-src_runtime_objs_mk.hppa-hpux11) = c7ad7769ba05b4fe609a6396d2c8dadb80256e06
+SHA1 (patch-src_runtime_objs_mk.hppa-hpux9) = 6adacac502cd12576ea65882984979ce3aa78b41
+SHA1 (patch-src_runtime_objs_mk.ppc-aix) = 509ffc0152b2cdfa4e0f6621bed026fe0f1edc99
+SHA1 (patch-src_runtime_objs_mk.ppc-darwin) = 6ae822c7b39255b5204e358e3c21aa23b93883ec
+SHA1 (patch-src_runtime_objs_mk.ppc-darwin5) = 35ddd1f10a907ebbe6b4a3310c3bded83bda8ca0
+SHA1 (patch-src_runtime_objs_mk.ppc-linux) = 171ec491a536aa782880d3b3392cf0d728fd9c03
+SHA1 (patch-src_runtime_objs_mk.x86-cygwin) = b9e1174a956a63b1023eaf70322776fe93717782
+SHA1 (patch-src_runtime_objs_mk.x86-darwin) = 7770986d2805f66f1c4d4faff2fb66b2fb4b7b8d
+SHA1 (patch-src_runtime_objs_mk.x86-freebsd) = 2420f6a04ae78ca306daeb94a312f0e4fdcd0410
+SHA1 (patch-src_runtime_objs_mk.x86-linux) = 4905280351b88b5a74f3bd68dadcdca6fd2037ac
+SHA1 (patch-src_runtime_objs_mk.x86-linux-pthreads) = 5c2730e09b05c3a00abb3ea6c732e39775973f79
+SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = 3a8e93e55ed9bba470a680c327cb4e4d22d69ff4
+SHA1 (patch-src_runtime_objs_mk.x86-netbsd2) = 98408821e7c1f3ca6f50f5d9e230c903173029e1
+SHA1 (patch-src_runtime_objs_mk.x86-openbsd) = da536769b231e01a5fb045fe7dd329eee15b6706
+SHA1 (patch-src_runtime_objs_mk.x86-solaris) = 125814c60fd42389df9a1d5dbcd4313e7cabb53c
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.alpha32-dunix b/lang/smlnj/patches/patch-src_runtime_objs_mk.alpha32-dunix
new file mode 100644
index 00000000000..eace1a0cc1d
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.alpha32-dunix
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.alpha32-dunix,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.alpha32-dunix~	2000-06-01 18:34:03.000000000 +0000
++++ src/runtime/objs/mk.alpha32-dunix
+@@ -6,7 +6,7 @@
+ SHELL	= /bin/sh
+ 
+ CC =		cc -std
+-CFLAGS =	-O
++CFLAGS =	@CFLAGS@
+ LDFLAGS =	-non_shared -T 20000000 -D 40000000
+ AS =		as -nocpp
+ AR =		/usr/ucb/ar
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.alpha32x-osf1 b/lang/smlnj/patches/patch-src_runtime_objs_mk.alpha32x-osf1
new file mode 100644
index 00000000000..297c867d7b2
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.alpha32x-osf1
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.alpha32x-osf1,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.alpha32x-osf1~	2000-06-01 18:34:03.000000000 +0000
++++ src/runtime/objs/mk.alpha32x-osf1
+@@ -4,7 +4,7 @@
+ SHELL	= /bin/sh
+ 
+ CC =		cc -std
+-CFLAGS =	-O
++CFLAGS =	@CFLAGS@
+ LDFLAGS =	-non_shared -T 20000000 -D 40000000
+ AS =		as -nocpp
+ AR =		/usr/ucb/ar
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux b/lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux
new file mode 100644
index 00000000000..2d3aec59973
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.hppa-hpux,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.hppa-hpux~	2000-06-01 18:34:03.000000000 +0000
++++ src/runtime/objs/mk.hppa-hpux
+@@ -12,7 +12,7 @@ CC =		cc -Aa -N -D__STDC__ 
+ #CC  =		gcc -ansi -D__STDC__
+ CPP =		/lib/cpp.ansi
+ 
+-CFLAGS =	-O
++CFLAGS =	@CFLAGS@
+ 
+ AS =		/usr/ccs/bin/as 
+ RANLIB =	ar ts
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux11 b/lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux11
new file mode 100644
index 00000000000..e4a54e53c31
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux11
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.hppa-hpux11,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.hppa-hpux11~	2005-07-20 14:30:18.000000000 +0000
++++ src/runtime/objs/mk.hppa-hpux11
+@@ -13,7 +13,7 @@ CC  =		gcc -ansi -D__STDC__
+ #CPP =		/lib/cpp.ansi
+ CPP =           cpp
+ 
+-CFLAGS =	-O
++CFLAGS =	@CFLAGS@
+ 
+ AS =		/usr/ccs/bin/as 
+ RANLIB =	ar ts
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux9 b/lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux9
new file mode 100644
index 00000000000..0ce074c1b81
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux9
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.hppa-hpux9,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.hppa-hpux9~	2000-06-01 18:34:03.000000000 +0000
++++ src/runtime/objs/mk.hppa-hpux9
+@@ -9,7 +9,7 @@ SHELL	= /bin/sh
+ CC =		cc -Aa -D__STDC__ 
+ CPP =		/lib/cpp.ansi
+ 
+-CFLAGS =	-O
++CFLAGS =	@CFLAGS@
+ 
+ AS =		/bin/as
+ RANLIB =	ar ts
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-aix b/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-aix
new file mode 100644
index 00000000000..f60454bf316
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-aix
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.ppc-aix,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.ppc-aix~	2000-06-01 18:34:03.000000000 +0000
++++ src/runtime/objs/mk.ppc-aix
+@@ -5,7 +5,7 @@ SHELL 		= /bin/sh
+ 
+ # note: the vendor cpp isn't expanding nested macro applications correctly.
+ CC =            cc
+-CFLAGS =        -O2
++CFLAGS =        @CFLAGS@
+ CPP =           /lib/cpp
+ 
+ #CC =            gcc -ansi
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-darwin b/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-darwin
new file mode 100644
index 00000000000..f20ac0deea7
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-darwin
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.ppc-darwin,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.ppc-darwin~	2007-10-31 16:04:18.000000000 +0000
++++ src/runtime/objs/mk.ppc-darwin
+@@ -11,7 +11,7 @@ SHELL =		/bin/sh
+ 
+ MAKE =		make
+ CC =		cc -ansi
+-CFLAGS =	-g -O2 -D_NONSTD_SOURCE
++CFLAGS =	@CFLAGS@ -D_NONSTD_SOURCE
+ CPP =           cc -x assembler-with-cpp -E -P -ansi
+ XOBJS =
+ XLIBS =         ../c-libs/dl/libunix-dynload.a
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-darwin5 b/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-darwin5
new file mode 100644
index 00000000000..029b7ac6428
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-darwin5
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.ppc-darwin5,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.ppc-darwin5~	2002-10-10 17:08:59.000000000 +0000
++++ src/runtime/objs/mk.ppc-darwin5
+@@ -9,7 +9,7 @@ SHELL =		/bin/sh
+ 
+ MAKE =		make
+ CC =		cc -ansi
+-CFLAGS =	-g -O2
++CFLAGS =	@CFLAGS@
+ CPP =           cc -x assembler-with-cpp -E -P -ansi
+ XOBJS =
+ XLIBS =	
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-linux b/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-linux
new file mode 100644
index 00000000000..cc830e54a27
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-linux
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.ppc-linux,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.ppc-linux~	2000-11-10 14:04:49.000000000 +0000
++++ src/runtime/objs/mk.ppc-linux
+@@ -6,7 +6,7 @@ SHELL =		/bin/sh
+ 
+ MAKE =		make
+ CC =		gcc -ansi
+-CFLAGS =	-O2
++CFLAGS =	@CFLAGS@
+ CPP =		gcc -x c -E -P -ansi
+ #XOBJS =	xmonitor.o
+ #LD_LIBS =	-lX11
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-cygwin b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-cygwin
new file mode 100644
index 00000000000..b04fa709168
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-cygwin
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.x86-cygwin,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.x86-cygwin~	2004-03-19 18:54:52.000000000 +0000
++++ src/runtime/objs/mk.x86-cygwin
+@@ -5,7 +5,7 @@ SHELL =		/bin/sh
+ 
+ MAKE =		make
+ CC =		gcc 
+-CFLAGS =	-O2
++CFLAGS =	@CFLAGS@
+ CPP =		gcc -x assembler-with-cpp -E -P 
+ XOBJS =
+ XLIBS =		../c-libs/dl/libunix-dynload.a
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-darwin b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-darwin
new file mode 100644
index 00000000000..608776859ee
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-darwin
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.x86-darwin,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.x86-darwin~	2009-09-13 17:50:53.000000000 +0000
++++ src/runtime/objs/mk.x86-darwin
+@@ -13,7 +13,7 @@ SHELL =		/bin/sh
+ MAKE =		make
+ AS =		/usr/bin/as -arch i386
+ CC =		cc -m32 -ansi
+-CFLAGS =	-g -O2 -D_DARWIN_C_SOURCE
++CFLAGS =	@CFLAGS@ -D_DARWIN_C_SOURCE
+ CPP =           cc -x assembler-with-cpp -E -P -ansi
+ XOBJS =
+ XLIBS =         ../c-libs/dl/libunix-dynload.a
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-freebsd b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-freebsd
new file mode 100644
index 00000000000..7c59eaae852
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-freebsd
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.x86-freebsd,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.x86-freebsd~	2006-04-20 15:28:53.000000000 +0000
++++ src/runtime/objs/mk.x86-freebsd
+@@ -9,7 +9,7 @@ MAKE =		gmake
+ 
+ ARFLAGS =	Trcv
+ CC =		gcc -ansi
+-CFLAGS =	-O2
++CFLAGS =	@CFLAGS@
+ CPP =		gcc -x assembler-with-cpp -E -P 
+ #CPP =		/usr/bin/cpp -P
+ 
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-linux b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-linux
new file mode 100644
index 00000000000..0c431309f0e
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-linux
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.x86-linux,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.x86-linux~	2006-04-20 15:28:53.000000000 +0000
++++ src/runtime/objs/mk.x86-linux
+@@ -6,7 +6,7 @@ SHELL =		/bin/sh
+ MAKE =		make
+ AS =		as --32
+ CC =		gcc -ansi
+-CFLAGS =	-O2 -m32
++CFLAGS =	@CFLAGS@ -m32
+ CPP =		gcc -x assembler-with-cpp -E -P
+ #XOBJS =	xmonitor.o
+ #LD_LIBS =	-lX11
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-linux-pthreads b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-linux-pthreads
new file mode 100644
index 00000000000..e80a4df198e
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-linux-pthreads
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.x86-linux-pthreads,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.x86-linux-pthreads~	2004-01-31 14:24:42.000000000 +0000
++++ src/runtime/objs/mk.x86-linux-pthreads
+@@ -5,7 +5,7 @@ SHELL =		/bin/sh
+ 
+ MAKE =		make
+ CC =		gcc -ansi
+-CFLAGS =	-O2 -D_REENTRANT
++CFLAGS =	@CFLAGS@ -D_REENTRANT
+ CPP =		gcc -x assembler-with-cpp -E -P
+ #XOBJS =	xmonitor.o
+ #LD_LIBS =	-lX11
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd
index c8d7feddd6c..d26b916d715 100644
--- a/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_runtime_objs_mk.x86-netbsd,v 1.2 2016/04/14 22:10:31 dholland Exp $
+$NetBSD: patch-src_runtime_objs_mk.x86-netbsd,v 1.3 2016/07/03 19:29:27 dholland Exp $
 
 Configure for pkgsrc. Build as 32-bit.
 
@@ -12,7 +12,7 @@ Configure for pkgsrc. Build as 32-bit.
  ARFLAGS =	Trcv
  CC =		gcc -ansi
 -CFLAGS =	-O2
-+CFLAGS =	-O2 -m32
++CFLAGS =	@CFLAGS@ -m32
  CPP =		gcc -x assembler-with-cpp -E -P
  #CPP =		/usr/bin/cpp -P
  
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd2 b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd2
new file mode 100644
index 00000000000..eee97d9521b
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd2
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.x86-netbsd2,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.x86-netbsd2~	2006-02-10 22:14:59.000000000 +0000
++++ src/runtime/objs/mk.x86-netbsd2
+@@ -9,7 +9,7 @@ MAKE =		gmake
+ 
+ ARFLAGS =	Trcv
+ CC =		gcc -ansi
+-CFLAGS =	-O2
++CFLAGS =	@CFLAGS@
+ CPP =		gcc -x assembler-with-cpp -E -P
+ #CPP =		/usr/bin/cpp -P
+ 
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-openbsd b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-openbsd
new file mode 100644
index 00000000000..7e7b62502fd
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-openbsd
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.x86-openbsd,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.x86-openbsd~	2008-12-02 16:50:18.000000000 +0000
++++ src/runtime/objs/mk.x86-openbsd
+@@ -9,7 +9,7 @@ MAKE =		gmake
+ 
+ ARFLAGS =	Trcv
+ CC =		gcc -ansi
+-CFLAGS =	-O2
++CFLAGS =	@CFLAGS@
+ CPP =		gcc -x assembler-with-cpp -E -P
+ #CPP =		/usr/bin/cpp -P
+ 
diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-solaris b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-solaris
new file mode 100644
index 00000000000..ec0cb6a18da
--- /dev/null
+++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-solaris
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_objs_mk.x86-solaris,v 1.1 2016/07/03 19:29:27 dholland Exp $
+
+Honor pkgsrc CFLAGS.
+
+--- src/runtime/objs/mk.x86-solaris~	2004-01-31 14:24:42.000000000 +0000
++++ src/runtime/objs/mk.x86-solaris
+@@ -12,7 +12,7 @@ AS =		gas
+ AR =		/usr/ccs/bin/ar
+ GCC =		gcc
+ CC =		$(GCC)
+-CFLAGS =	-O2
++CFLAGS =	@CFLAGS@
+ CPP =		gcc -x assembler-with-cpp -E -P
+ RANLIB =	$(AR) ts
+