2 files changed, 8 insertions, 11 deletions

diff --git a/release/picobsd/net/crunch1/Makefile b/release/picobsd/net/crunch1/Makefile
index 0966f3830be6..8ee9026bb125 100644
--- a/release/picobsd/net/crunch1/Makefile
+++ b/release/picobsd/net/crunch1/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $
+# $Id: Makefile,v 1.2 1998/10/15 21:40:03 abial Exp $
 #
 SRC?=/usr/src
 
@@ -7,21 +7,17 @@ all: crunch
 
 crunch:
 	@if [ ! -f .patched ]; then \
-		cat login.diff|(cd /usr/src/usr.bin/login; patch -p0); \
 		cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -p0); \
-		cat ppp.diff|(cd /usr/src/usr.sbin/ppp; patch -p0); \
 		touch .patched; \
 	fi
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@crunchgen ./crunch1.conf
-	@${MAKE} -f crunch1.mk all \
+	@${MAKE} -f crunch1.mk -DNOPAM all \
 	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
 
 clean:
 	@if [ -f .patched ]; then \
-		cat login.diff|(cd /usr/src/usr.bin/login; patch -R -p0); \
 		cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -R -p0); \
-		cat ppp.diff|(cd /usr/src/usr.sbin/ppp; patch -R -p0); \
 		rm .patched; \
 	fi
 	rm  -f *.o *.stub *.lo *_stub.c *.mk \
@@ -42,7 +38,7 @@ install:
 	done
 	rm /mnt/stand/crunch
 	# Install the MIB files
-	cp mibs/*.txt /mnt/usr/local/share/snmp/mibs/
+	#cp mibs/*.txt /mnt/usr/local/share/snmp/mibs/
 
 
 .include <bsd.prog.mk>
diff --git a/release/picobsd/net/crunch1/crunch.conf b/release/picobsd/net/crunch1/crunch.conf
index 7aa5e1d1e593..1114f069002d 100644
--- a/release/picobsd/net/crunch1/crunch.conf
+++ b/release/picobsd/net/crunch1/crunch.conf
@@ -1,5 +1,5 @@
 #
-# $Id: crunch.conf,v 1.3 1998/09/15 07:35:38 abial Exp $
+# $Id: crunch.conf,v 1.4 1998/09/15 11:12:25 abial Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
@@ -16,7 +16,7 @@ srcdirs ../../tinyware
 #	OBJS=${MIBOBJS} ${AGENTOBJS}
 #  * we install a special version of MIB files - stripped of comments and
 #    descriptions. These MIBs are included here to save you the stripping.
-srcdirs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5
+#srcdirs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5.3
 # other sources
 srcdirs /usr/src/bin
 srcdirs /usr/src/sbin/i386
@@ -27,12 +27,13 @@ srcdirs /usr/src/usr.sbin
 srcdirs /usr/src/libexec
 
 progs ash test echo hostname ln login getty stty
-progs inetd telnetd w msg kget snmpd
+progs inetd telnetd w msg kget
 progs init ifconfig df sps ns vm cat
 progs cp rm mknod chmod chown mkdir ls syslogd
 progs sysctl route pwd_mkdb dev_mkdb
 progs mount mount_msdos umount
 progs kill mount_std natd
+#progs snmpd
 
 progs pwd ppp telnet more
 progs passwd date
@@ -54,7 +55,7 @@ ln ns netstat
 ln chown chgrp
 
 # For snmpd
-libs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5/snmplib/libsnmp.a
+#libs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5.3/snmplib/libsnmp.a
 libs -lncurses -lmytinfo -lipx -lz -lpcap -lalias
 libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm
 libs -lgnuregex -ltelnet