4 files changed, 58 insertions, 55 deletions

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 9dbfab930b8e..5406c10dde2e 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -3,17 +3,18 @@
 # Date created:         21 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.17 1997/04/05 03:55:58 jmz Exp $
+# $Id: Makefile,v 1.18 1997/04/05 16:41:27 jmz Exp $
 #
 
-DISTNAME=	mgetty-1.0.0
+DISTNAME=	mgetty1.1.9-Aug17
+PKGNAME=	mgetty-1.1.9
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/networking/communication/modem/mgetty/
-DISTFILES=	mgetty+sendfax-1.0.0.tar.gz
 
 MAINTAINER=	jmz@FreeBSD.org
 
-MAKE_FLAGS=	prefix=${PREFIX} -f 
+WRKSRC=		${WRKDIR}/mgetty-1.1.9
+MAKE_FLAGS=	prefix=${PREFIX} -f
 MAN1=		coverpg.1 fax.1 faxq.1 faxrm.1 faxrunq.1 faxspool.1 \
 		g3cat.1 g32pbm.1 pbm2g3.1
 MAN4=		mgettydefs.4
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index 676d8f648cc3..b3e859dc05fc 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1 +1 @@
-MD5 (mgetty+sendfax-1.0.0.tar.gz) = bc1a52dbb9f9e412d927e82778c76c9e
+MD5 (mgetty1.1.9-Aug17.tar.gz) = e29b4a3dcb6f0b7daf29288ce9757f10
diff --git a/comms/mgetty+sendfax/files/patch-ab b/comms/mgetty+sendfax/files/patch-ab
index 52cbc54ad815..32713aa02421 100644
--- a/comms/mgetty+sendfax/files/patch-ab
+++ b/comms/mgetty+sendfax/files/patch-ab
@@ -1,5 +1,5 @@
-*** Makefile.orig	Sat Apr  5 02:51:49 1997
---- Makefile	Sat Apr  5 02:56:32 1997
+*** Makefile.orig	Sun Aug 17 21:36:47 1997
+--- Makefile	Thu Oct 30 23:14:09 1997
 ***************
 *** 4,11 ****
   #
@@ -20,7 +20,7 @@
   #### C Compiler Flags ####
   #
 ***************
-*** 107,113 ****
+*** 108,114 ****
   # prompt first. Don't forget to activate the /AutoPPP/ line in login.config!
   #
   #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
@@ -28,7 +28,7 @@
   #CFLAGS=-O -DSVR4
   #CFLAGS=-O -DSVR4 -DSVR42
   #CFLAGS=-O -DUSE_POLL
---- 107,113 ----
+--- 108,114 ----
   # prompt first. Don't forget to activate the /AutoPPP/ line in login.config!
   #
   #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
@@ -37,24 +37,24 @@
   #CFLAGS=-O -DSVR4 -DSVR42
   #CFLAGS=-O -DUSE_POLL
 ***************
-*** 144,150 ****
-  # For FreeBSD, add "-lutil" if the linker complains about
-  # 	"utmp.o: unresolved symbod _login"
-  #
-! LDFLAGS=
-  #LDFLAGS=-lprot -lsocket
-  #LDFLAGS=-s -shlib
-  #LDFLAGS=-lsocket
---- 144,150 ----
-  # For FreeBSD, add "-lutil" if the linker complains about
-  # 	"utmp.o: unresolved symbod _login"
-  #
-! LDFLAGS= -lutil
-  #LDFLAGS=-lprot -lsocket
-  #LDFLAGS=-s -shlib
-  #LDFLAGS=-lsocket
+*** 151,157 ****
+  # For Linux, add "-lutil" if the linker complains about "updwtmp".
+  #
+  LDFLAGS=
+! LIBS=
+  #LIBS=-lprot -lsocket				# SCO Unix
+  #LIBS=-lsocket
+  #LIBS=-lbsd					# OSF/1
+--- 151,157 ----
+  # For Linux, add "-lutil" if the linker complains about "updwtmp".
+  #
+  LDFLAGS=
+! LIBS=-lutil
+  #LIBS=-lprot -lsocket				# SCO Unix
+  #LIBS=-lsocket
+  #LIBS=-lbsd					# OSF/1
 ***************
-*** 252,260 ****
+*** 260,268 ****
   # please use the "mg.echo" program provided in the compat/ subdirectory.
   # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
   #
@@ -64,7 +64,7 @@
   
   #
   # for mgetty, that's it. If you want to use the voice
---- 252,260 ----
+--- 260,268 ----
   # please use the "mg.echo" program provided in the compat/ subdirectory.
   # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
   #
@@ -75,52 +75,52 @@
   #
   # for mgetty, that's it. If you want to use the voice
 ***************
-*** 536,542 ****
+*** 555,566 ****
   install: install.bin install.doc
   
-  install.bin: mgetty sendfax kvg newslock \
+  install.bin: mgetty sendfax newslock \
 ! 		login.config mgetty.config sendfax.config 
   #
   # binaries
   #
---- 536,542 ----
+  	-test -d $(BINDIR)  || ( ./mkidirs $(BINDIR)  ; chmod 755 $(BINDIR)  )
+! 	$(INSTALL) -m 755 newslock $(BINDIR)
+  
+  	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
+  	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
+--- 555,566 ----
   install: install.bin install.doc
   
-  install.bin: mgetty sendfax kvg newslock \
+  install.bin: mgetty sendfax newslock \
 ! 		login.config #mgetty.config sendfax.config 
   #
   # binaries
   #
+  	-test -d $(BINDIR)  || ( ./mkidirs $(BINDIR)  ; chmod 755 $(BINDIR)  )
+! 	$(INSTALL) -s -m 755 newslock $(BINDIR)
+  
+  	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
+  	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
 ***************
-*** 554,568 ****
-  # data files + directories
-  #
-  	test -d $(LIBDIR)  || \
-! 		( mkdir `dirname $(LIBDIR)` $(LIBDIR) ; chmod 755 $(LIBDIR) )
-  	test -d $(CONFDIR) || \
-! 		( mkdir `dirname $(CONFDIR)` $(CONFDIR); chmod 755 $(CONFDIR))
+*** 576,585 ****
+  		( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR))
   	test -f $(CONFDIR)/login.config || \
   		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
 ! 	test -f $(CONFDIR)/mgetty.config || \
 ! 		$(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/
 ! 	test -f $(CONFDIR)/sendfax.config || \
-! 		$(INSTALL) -o root -m 600 sendfax.config $(CONFDIR)/
+! 		$(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/
   	test -f $(CONFDIR)/dialin.config || \
   		$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
   	test -f $(CONFDIR)/faxrunq.config || \
---- 554,568 ----
-  # data files + directories
-  #
-  	test -d $(LIBDIR)  || \
-! 		( mkdir -p `dirname $(LIBDIR)` $(LIBDIR) ; chmod 755 $(LIBDIR) )
-  	test -d $(CONFDIR) || \
-! 		( mkdir -p `dirname $(CONFDIR)` $(CONFDIR); chmod 755 $(CONFDIR))
+--- 576,585 ----
+  		( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR))
   	test -f $(CONFDIR)/login.config || \
   		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
 ! #	test -f $(CONFDIR)/mgetty.config || \
 ! #		$(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/
 ! #	test -f $(CONFDIR)/sendfax.config || \
-! #		$(INSTALL) -o root -m 600 sendfax.config $(CONFDIR)/
+! #		$(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/
   	test -f $(CONFDIR)/dialin.config || \
   		$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
   	test -f $(CONFDIR)/faxrunq.config || \
diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist
index 36b6bdf70c34..886fbabfc69f 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -1,21 +1,26 @@
 bin/faxspool
 bin/faxq
 bin/faxrm
-bin/faxrunq 
+bin/faxrunq
 bin/g3cat
 bin/g32pbm
-bin/kvg
 bin/newslock
 bin/mg.echo
 bin/pbm2g3
 etc/mgetty+sendfax/dialin.config
-etc/mgetty+sendfax/login.config
+etc/mgetty+sendfax/faxheader
 etc/mgetty+sendfax/faxrunq.config
+etc/mgetty+sendfax/login.config
+etc/mgetty+sendfax/mgetty.config
+etc/mgetty+sendfax/sendfax.config
+@unexec install-info --delete %D/info/mgetty.info %D/info/dir
 info/mgetty.info
 info/mgetty.info-1
 info/mgetty.info-2
 info/mgetty.info-3
 info/mgetty.info-4
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/mgetty.info %D/info/dir
 lib/mgetty+sendfax/cour25.pbm
 lib/mgetty+sendfax/cour25n.pbm
 man/man1/coverpg.1.gz
@@ -35,8 +40,5 @@ man/man8/callback.8.gz
 sbin/mgetty
 sbin/sendfax
 sbin/faxrunqd
-@cd /var/spool
-@exec mkdir -p %D/fax/incoming
-@exec mkdir -p %D/fax/outgoing
-@exec chmod -R 775 %D/fax
-@unexec rm -r %D/fax
+@dirrm etc/mgetty+sendfax
+@dirrm lib/mgetty+sendfax