Fold the buildopts into the existing crunch.inc file.

Deprecate the "global" crunch.inc file and the CRUNCHFLAGS global build
options.  Tools not policy.  Move these global settings out into each
picobsd distribution.

release/picobsd/bridge/crunch1/crunch.inc

@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+
+OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also...
+# i.e.
+# ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end

release/picobsd/build/Makefile.crunch

@@ -2,7 +2,6 @@
 # $FreeBSD$
 #
 SRC?=/usr/src
-CRUNCHFLAGS+= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
 
 all: crunch
 
@@ -11,17 +10,11 @@ crunch:
 	@( if [ -f crunch.inc ] ; then \
 		crunchgen -h ./crunch.inc ./crunch1.conf ; \
 	else \
-		crunchgen -h ../../build/crunch.inc ./crunch1.conf ; \
+		crunchgen ./crunch1.conf ; \
 	fi )
 	@perl -pi -e 's#${OBJ}#${PICO_OBJ}#g' crunch1.mk ;
 	../../build/munge_crunchmk.pl crunch1.mk ;
-	@( if [ -f buildopts.inc ] ; then \
-		echo '.include "buildopts.inc"' > crunch1.mk.tmp ; \
-		cat crunch1.mk >> crunch1.mk.tmp ; \
-		mv crunch1.mk.tmp crunch1.mk ; \
-	fi )
-	@env MAKEOBJDIRPREFIX=${PICO_OBJ} ${MAKE} -f crunch1.mk $(CRUNCHFLAGS) all \
-	    "CFLAGS=${CFLAGS} ${CRUNCHFLAGS}" #2>&1 >/dev/null
+	@env MAKEOBJDIRPREFIX=${PICO_OBJ} ${MAKE} -f crunch1.mk all
 	strip --remove-section=.note --remove-section=.comment crunch1
 
 

release/picobsd/build/crunch.inc

@@ -1,7 +0,0 @@
-# header file for crunch1.mk
-RELEASE_CRUNCH=yes
-NOCRYPT=yes
-NOPAM=yes
-NOSECURE=yes
-NONETGRAPH=yes
-NOIPSEC=yes

release/picobsd/custom/crunch1/crunch.inc

@@ -1,2 +1,13 @@
 # You can add make variables and targets for the crunch building process
-# in this file.
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+# i.e:
+# OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also by defining prog_OPTS:
+# ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end

release/picobsd/dial/crunch1/crunch.inc

@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+
+OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also...
+#ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end

release/picobsd/install/crunch1/crunch.inc

@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+
+OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also...
+#ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end

release/picobsd/isp/crunch1/crunch.inc

@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+
+OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also...
+#ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end

release/picobsd/net/crunch1/buildopts.inc

@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-OPTS= -DNOPAM
-ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
-
-#end

release/picobsd/net/crunch1/crunch.inc

@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+
+OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also...
+
+ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end

release/picobsd/router/crunch1/crunch.inc

@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+# Anything that you add to OPTS will be added to the build rules for each
+# program built.
+
+OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
+
+# Per program options can be added also...
+#ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH
+
+#end