Major PicoBSD update by luigi with some debugging help from myself.

. Now builds on -STABLE (-CURRENT is broken due to bugs)
. etc directory contents centralized instead of in each
  type directory (can exclude & override as desired)
. Removed extraneous language files (lang files for rc really necessary?)
. dialog-based build tool with support for custom floppy builds
. MFS image loads as a mfs_root module instead of compiled into kernel

THIS IS BROKEN ON CURRENT.  I'll MFC to -STABLE immediately following.
luigi tells me I have an OK from jkh on the MFC.

Submitted by:	luigi

3 files changed, 30 insertions, 37 deletions

diff --git a/release/picobsd/net/crunch1/Makefile b/release/picobsd/net/crunch1/Makefile
index 8ee9026..339ce32 100644
--- a/release/picobsd/net/crunch1/Makefile
+++ b/release/picobsd/net/crunch1/Makefile
@@ -1,24 +1,24 @@
 #
-# $Id: Makefile,v 1.2 1998/10/15 21:40:03 abial Exp $
+# $Id: Makefile,v 1.3 1999/01/19 23:12:50 abial Exp $
 #
 SRC?=/usr/src
 
 all: crunch
 
 crunch:
-	@if [ ! -f .patched ]; then \
+	@if [ ! -f /usr/src/usr.bin/passwd/.picobsd.patched ]; then \
 		cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -p0); \
-		touch .patched; \
+		touch /usr/src/usr.bin/passwd/.picobsd.patched; \
 	fi
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@crunchgen ./crunch1.conf
 	@${MAKE} -f crunch1.mk -DNOPAM all \
-	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
+	    "CFLAGS=${CFLAGS} -DRELEASE_CRUNCH -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
 
 clean:
-	@if [ -f .patched ]; then \
+	@if [ -f /usr/src/usr.bin/passwd/.picobsd.patched ]; then \
 		cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -R -p0); \
-		rm .patched; \
+		rm /usr/src/usr.bin/passwd/.picobsd.patched; \
 	fi
 	rm  -f *.o *.stub *.lo *_stub.c *.mk \
 		crunch.cache \
diff --git a/release/picobsd/net/crunch1/crunch.conf b/release/picobsd/net/crunch1/crunch.conf
index 27ae9d3..9809a94 100644
--- a/release/picobsd/net/crunch1/crunch.conf
+++ b/release/picobsd/net/crunch1/crunch.conf
@@ -1,5 +1,5 @@
 #
-# $Id: crunch.conf,v 1.5.2.3 1999/05/21 15:39:02 roger Exp $
+# $Id: crunch.conf,v 1.5.2.2 1999/05/07 10:03:06 abial Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
@@ -41,4 +41,5 @@ ln chown chgrp
 
 libs -lncurses -lmytinfo -lipx -lz -lpcap -lalias -lwrap
 libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm
-libs -lgnuregex -ltelnet -lradius
+libs -lgnuregex -ltelnet
+libs -lradius # used by ppp
diff --git a/release/picobsd/net/crunch1/passwd.diff b/release/picobsd/net/crunch1/passwd.diff
index aa356f7..1684111 100644
--- a/release/picobsd/net/crunch1/passwd.diff
+++ b/release/picobsd/net/crunch1/passwd.diff
@@ -1,48 +1,40 @@
-*** Makefile.orig	Sat Aug  1 20:39:04 1998
---- Makefile	Sat Aug  1 20:40:38 1998
 ***************
-*** 2,24 ****
-  # $Id: passwd.diff,v 1.2 1998/08/02 12:23:45 abial Exp $
+*** 2,20 ****
+  # $Id: Makefile,v 1.30.2.2 1999/07/29 16:37:09 sheldonh Exp $
   
   PROG=	passwd
-! SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
-! 	yp_passwd.c ypxfr_misc.c ${GENSRCS}
+- SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
+- 	yp_passwd.c ypxfr_misc.c ${GENSRCS}
   GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
   	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
-  CFLAGS+=-Wall
+  CFLAGS+=-Wall -DPASSWD_IGNORE_COMMENTS
   
-! DPADD=	${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
-! LDADD=	-lcrypt -lrpcsvc -lutil
+- DPADD=	${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
+- LDADD=	-lcrypt -lrpcsvc -lutil
   .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
-! 	${.CURDIR}/../rlogin ${.CURDIR}/../../libexec/ypxfr \
-! 	${.CURDIR}/../../usr.sbin/rpc.yppasswdd
+- 	${.CURDIR}/../rlogin ${.CURDIR}/../../libexec/ypxfr \
+- 	${.CURDIR}/../../usr.sbin/rpc.yppasswdd
   
-! CFLAGS+= -DLOGIN_CAP -DCRYPT -DYP -I. -I${.CURDIR} \
+- CFLAGS+= -DLOGIN_CAP -DCRYPT -DYP -I. -I${.CURDIR} \
   	-I${.CURDIR}/../../usr.sbin/vipw \
   	-I${.CURDIR}/../../usr.bin/chpass \
-- 	-I${.CURDIR}/../../libexec/ypxfr \
-- 	-I${.CURDIR}/../../usr.sbin/rpc.yppasswdd \
-  	-Dyp_error=warnx -DLOGGING
-  
-  CLEANFILES= ${GENSRCS}
---- 2,21 ----
-  # $Id: passwd.diff,v 1.2 1998/08/02 12:23:45 abial Exp $
+  	-I${.CURDIR}/../../libexec/ypxfr \
+--- 2,19 ----
+  # $Id: Makefile,v 1.30.2.2 1999/07/29 16:37:09 sheldonh Exp $
   
   PROG=	passwd
-! SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c 
-! 
++ SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c
++ 
   GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
   	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
-  CFLAGS+=-Wall
+  CFLAGS+=-Wall -DPASSWD_IGNORE_COMMENTS
   
-! DPADD=	${LIBCRYPT} ${LIBUTIL}
-! LDADD=	-lcrypt -lutil
++ DPADD=	${LIBCRYPT} ${LIBUTIL}
++ LDADD=	-lcrypt -lutil
   .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
-! 	${.CURDIR}/../rlogin 
++ 	${.CURDIR}/../rlogin
   
-! CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CURDIR} \
++ CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CURDIR} \
   	-I${.CURDIR}/../../usr.sbin/vipw \
   	-I${.CURDIR}/../../usr.bin/chpass \
-  	-Dyp_error=warnx -DLOGGING
-  
-  CLEANFILES= ${GENSRCS}
+  	-I${.CURDIR}/../../libexec/ypxfr \