6 files changed, 46 insertions, 59 deletions

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 83397a6205de..03a2e8657ce1 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -3,13 +3,13 @@
 # Date created:         21 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.8 1995/04/15 04:58:59 asami Exp $
+# $Id: Makefile,v 1.9 1996/03/13 00:36:40 jmz Exp $
 #
 
-DISTNAME=	mgetty-0.98
+DISTNAME=	mgetty-0.99
 CATEGORIES+=	comms
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/networking/communication/modem/mgetty/
-DISTFILES=	mgetty+sendfax-0.98.tar.gz
+DISTFILES=	mgetty099-Aug07.tar.gz
 
 MAINTAINER=	jmz@FreeBSD.org
 
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index 1766cba7dc21..27b214333e87 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1 +1 @@
-MD5 (mgetty+sendfax-0.98.tar.gz) = b2f2a1ef828ce50aa685224e4aad7a77
+MD5 (mgetty099-Aug07.tar.gz) = f53e6cd16b8b9f6b6d58c512b95522e2
diff --git a/comms/mgetty+sendfax/files/patch-ab b/comms/mgetty+sendfax/files/patch-ab
index c50d3d0785ca..ea1af28a84dd 100644
--- a/comms/mgetty+sendfax/files/patch-ab
+++ b/comms/mgetty+sendfax/files/patch-ab
@@ -1,5 +1,5 @@
-*** Makefile.orig	Wed Aug 30 12:47:16 1995
---- Makefile	Sun Mar 17 04:52:26 1996
+*** Makefile~	Sat Jul 13 12:46:57 1996
+--- Makefile	Fri Sep 13 03:15:16 1996
 ***************
 *** 4,11 ****
   #
@@ -20,16 +20,16 @@
   #### C Compiler Flags ####
   #
 ***************
-*** 96,102 ****
-  #	    USTAT	  - ustat(), no statfs etc.
+*** 107,113 ****
+  # prompt first. Don't forget to activate the /AutoPPP/ line in login.config!
   #
   #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
 ! CFLAGS=-O2 -Wall -pipe
   #CFLAGS=-O -DSVR4
   #CFLAGS=-O -DSVR4 -DSVR42
   #CFLAGS=-O -DUSE_POLL
---- 96,102 ----
-  #	    USTAT	  - ustat(), no statfs etc.
+--- 107,113 ----
+  # prompt first. Don't forget to activate the /AutoPPP/ line in login.config!
   #
   #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
 ! #CFLAGS=-O2 -Wall -pipe
@@ -37,7 +37,7 @@
   #CFLAGS=-O -DSVR4 -DSVR42
   #CFLAGS=-O -DUSE_POLL
 ***************
-*** 132,138 ****
+*** 144,150 ****
   # For FreeBSD, add "-lutil" if the linker complains about
   # 	"utmp.o: unresolved symbod _login"
   #
@@ -45,7 +45,7 @@
   #LDFLAGS=-lprot -lsocket
   #LDFLAGS=-s -shlib
   #LDFLAGS=-lsocket
---- 132,138 ----
+--- 144,150 ----
   # For FreeBSD, add "-lutil" if the linker complains about
   # 	"utmp.o: unresolved symbod _login"
   #
@@ -54,7 +54,7 @@
   #LDFLAGS=-s -shlib
   #LDFLAGS=-lsocket
 ***************
-*** 227,235 ****
+*** 251,259 ****
   # please use the "mg.echo" program provided in the compat/ subdirectory.
   # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
   #
@@ -63,8 +63,8 @@
 ! # INSTALL_MECHO=mg.echo
   
   #
-  # for mgetty, that's it. If you want to use Klaus Weidner's voice
---- 227,235 ----
+  # for mgetty, that's it. If you want to use the voice
+--- 251,259 ----
   # please use the "mg.echo" program provided in the compat/ subdirectory.
   # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
   #
@@ -73,26 +73,26 @@
 ! INSTALL_MECHO=mg.echo
   
   #
-  # for mgetty, that's it. If you want to use Klaus Weidner's voice
+  # for mgetty, that's it. If you want to use the voice
 ***************
 *** 530,536 ****
+  install: install.bin install.doc
   
-  install: install-bin install-doc
-  
-! install-bin: mgetty sendfax login.config mgetty.config sendfax.config
+  install.bin: mgetty sendfax kvg newslock \
+! 		login.config mgetty.config sendfax.config 
   #
   # binaries
   #
 --- 530,536 ----
+  install: install.bin install.doc
   
-  install: install-bin install-doc
-  
-! install-bin: mgetty sendfax login.config #mgetty.config sendfax.config
+  install.bin: mgetty sendfax kvg newslock \
+! 		login.config #mgetty.config sendfax.config 
   #
   # binaries
   #
 ***************
-*** 547,561 ****
+*** 548,562 ****
   # data files + directories
   #
   	test -d $(LIBDIR)  || \
@@ -108,7 +108,7 @@
   	test -f $(CONFDIR)/dialin.config || \
   		$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
   #
---- 547,561 ----
+--- 548,562 ----
   # data files + directories
   #
   	test -d $(LIBDIR)  || \
diff --git a/comms/mgetty+sendfax/files/patch-ac b/comms/mgetty+sendfax/files/patch-ac
deleted file mode 100644
index 0c6485fce78a..000000000000
--- a/comms/mgetty+sendfax/files/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-*** kvg~	Tue May 30 21:54:12 1995
---- kvg	Tue Mar 12 03:27:45 1996
-***************
-*** 7,21 ****
-  
-  if [ $# -ne 1 ] ; then
-  	echo "$0: kill mgetty/vgetty process on a given tty" >&2
-! 	echo "syntax: kvg [signal] tty<x>" >&2
-  	exit 1
-  fi
-  
-! if [ ! -f /etc/mg-pid.tty$1 ] ; then
-! 	echo "no mgetty/vgetty on tty /dev/tty$1" >&2
-  	exit 2;
-  fi
-  
-! pid=`cat /etc/mg-pid.tty$1`
-! echo "killing mgetty/vgetty on tty$1, pid $pid, with signal $SIG..."
-  kill $SIG $pid
---- 7,21 ----
-  
-  if [ $# -ne 1 ] ; then
-  	echo "$0: kill mgetty/vgetty process on a given tty" >&2
-! 	echo "syntax: kvg [signal] cuaa<x>" >&2
-  	exit 1
-  fi
-  
-! if [ ! -f /var/run/mg-pid.cuaa$1 ] ; then
-! 	echo "no mgetty/vgetty on tty /dev/cuaa$1" >&2
-  	exit 2;
-  fi
-  
-! pid=`cat /var/run/mg-pid.cuaa$1`
-! echo "killing mgetty/vgetty on cuaa$1, pid $pid, with signal $SIG..."
-  kill $SIG $pid
diff --git a/comms/mgetty+sendfax/files/patch-ad b/comms/mgetty+sendfax/files/patch-ad
new file mode 100644
index 000000000000..47807f04e1f5
--- /dev/null
+++ b/comms/mgetty+sendfax/files/patch-ad
@@ -0,0 +1,19 @@
+*** doc/Makefile~	Mon Jul 29 18:44:40 1996
+--- doc/Makefile	Fri Sep 13 22:06:59 1996
+***************
+*** 26,32 ****
+  
+  all:
+  
+! doc-all: mgetty.asc mgetty.info mgetty.dvi mgetty.ps fmt-manpages
+  
+  manpages: $(MANSRC)
+  
+--- 26,32 ----
+  
+  all:
+  
+! doc-all: mgetty.asc mgetty.info fmt-manpages
+  
+  manpages: $(MANSRC)
+  
diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist
index ab1502b58ec3..e0db938da127 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -5,6 +5,7 @@ bin/faxrunq
 bin/g3cat
 bin/g3topbm
 bin/kvg
+bin/newslock
 bin/mg.echo
 bin/pbmtog3
 etc/mgetty+sendfax/dialin.config
@@ -28,8 +29,10 @@ man/man4/mgettydefs.4
 man/man5/faxqueue.5
 man/man8/sendfax.8
 man/man8/mgetty.8
+man/man8/callback.8
 sbin/mgetty
 sbin/sendfax
+sbin/faxrunqd
 @cd /var/spool
 @exec mkdir -p %D/fax/incoming
 @exec mkdir -p %D/fax/outgoing