6 files changed, 19 insertions, 27 deletions
diff --git a/release/picobsd/isp/crunch1/crunch.conf b/release/picobsd/isp/crunch1/crunch.conf
index 2e57298fcd0e..78dc2c78ee2e 100644
--- a/release/picobsd/isp/crunch1/crunch.conf
+++ b/release/picobsd/isp/crunch1/crunch.conf
@@ -1,5 +1,5 @@
 #
-# $Id: crunch.conf,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+# $Id: crunch.conf,v 1.2 1998/09/14 20:39:16 abial Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
@@ -24,7 +24,7 @@ srcdirs /usr/src/usr.sbin
 srcdirs /usr/src/libexec
 
 progs ash test echo hostname ln login getty
-progs inetd telnetd stty w dm kget snmpd natd
+progs inetd telnetd stty w msg kget snmpd natd
 progs init fsck ifconfig df ps ns vm cat
 progs cp rm mkdir ls chmod chown
 progs sysctl route swapon pwd_mkdb dev_mkdb
@@ -47,7 +47,7 @@ ln chown chgrp
 ln mount_msdos msdos
 ln mount_std procfs
 ln mount_std mount_procfs
-ln dm dmesg
+ln msg dmesg
 ln ns netstat
 
 # For snmpd
diff --git a/release/picobsd/net/crunch1/crunch.conf b/release/picobsd/net/crunch1/crunch.conf
index 6a94c428f7d5..9c1c4f877851 100644
--- a/release/picobsd/net/crunch1/crunch.conf
+++ b/release/picobsd/net/crunch1/crunch.conf
@@ -1,5 +1,5 @@
 #
-# $Id: crunch.conf,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $
+# $Id: crunch.conf,v 1.2 1998/09/14 20:39:24 abial Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
@@ -24,7 +24,7 @@ srcdirs /usr/src/usr.sbin
 srcdirs /usr/src/libexec
 
 progs ash test echo hostname ln login getty stty
-progs inetd telnetd w dm kget snmpd
+progs inetd telnetd w msg kget snmpd
 progs init ifconfig df sps ns vm cat
 progs cp rm mknod chmod chown mkdir ls syslogd
 progs sysctl route pwd_mkdb dev_mkdb
@@ -46,7 +46,7 @@ ln mount_msdos msdos
 ln mount_std procfs
 ln mount_std mount_procfs
 ln sps ps
-ln dm dmesg
+ln msg dmesg
 ln ns netstat
 ln chown chgrp
 
diff --git a/release/picobsd/router/crunch1/crunch.conf b/release/picobsd/router/crunch1/crunch.conf
index b6dfa31e2ff1..967f5ae8142c 100644
--- a/release/picobsd/router/crunch1/crunch.conf
+++ b/release/picobsd/router/crunch1/crunch.conf
@@ -1,19 +1,11 @@
 #
-# $Id: crunch.conf,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $
+# $Id: crunch.conf,v 1.2 1998/09/14 20:39:34 abial Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
 
 # sources for kget & vm
 srcdirs ../../tinyware
-# sources for ucd-snmp - they must be already patched & configured!
-# The necessary steps are given below:
-#  * you have to symlink subdirectory agent -> snmpd
-#  * you have to properly construct an OBJS variable in snmpd/Makefile:
-#	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.3.1
 # other sources
 srcdirs /usr/src/bin
 srcdirs /usr/src/sbin/i386
@@ -24,12 +16,11 @@ srcdirs /usr/src/usr.sbin
 srcdirs /usr/src/libexec
 
 progs hostname cat kget
-progs oinit ifconfig df sps ns vm dm
-progs cp rm ls #syslogd
+progs oinit ifconfig df sps ns vm msg
+progs cp rm ls
 progs sysctl route
 progs mount umount
 progs kill natd
-#progs mount_std snmpd
 
 progs pppd more
 progs ping traceroute routed ipfw
@@ -39,18 +30,10 @@ progs ping traceroute routed ipfw
 #ln test [
 #ln ash -sh
 #ln ash sh
-# XXX Why? Some bug in crunchgen?
-#ln newfs mfs
-#ln mount_msdos msdos
-#ln mount_std procfs
-#ln mount_std mount_procfs
 ln sps ps
 ln ns netstat
-ln dm dmesg
-#ln chown chgrp
+ln msg dmesg
 
-# For snmpd
-#libs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.3.1/snmplib/libsnmp.a
 libs -lncurses -lmytinfo -lipx -lz -lpcap -lalias
 libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm
 libs -lgnuregex -ltelnet
diff --git a/release/picobsd/tinyware/msg/Makefile b/release/picobsd/tinyware/msg/Makefile
new file mode 100644
index 000000000000..5de8c7c0e1b3
--- /dev/null
+++ b/release/picobsd/tinyware/msg/Makefile
@@ -0,0 +1,9 @@
+#	$Id$
+#
+PROG=msg
+SRCS= 	msg.c
+NOMAN=yes
+
+.include <bsd.prog.mk>
+
+
diff --git a/release/picobsd/tinyware/dm/README b/release/picobsd/tinyware/msg/README
index a38101bde5fc..a38101bde5fc 100644
--- a/release/picobsd/tinyware/dm/README
+++ b/release/picobsd/tinyware/msg/README
diff --git a/release/picobsd/tinyware/dm/dm.c b/release/picobsd/tinyware/msg/msg.c
index f3dc41080a45..f3dc41080a45 100644
--- a/release/picobsd/tinyware/dm/dm.c
+++ b/release/picobsd/tinyware/msg/msg.c