Upgrade to 1.1.19, don't split info page.

6 files changed, 103 insertions, 37 deletions

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 706636e0a2c3..dc504afd6f6e 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,25 +1,37 @@
 # New ports collection makefile for:    mgetty+sendfax
-# Version required:     1.1.16
+# Version required:     1.1.19
 # Date created:         20 April 1998
 # Whom:                 rkw
 #
-# $Id: Makefile,v 1.24 1998/04/20 20:07:44 jmz Exp $
+# $Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp $
 #
 
-DISTNAME=	mgetty1.1.16-Jul05
-PKGNAME=	mgetty-1.1.16
+DISTNAME=	mgetty1.1.19-Nov24
+PKGNAME=	mgetty-1.1.19
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/
 
 MAINTAINER=	jmz@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/mgetty-1.1.16
+WRKSRC=		${WRKDIR}/mgetty-1.1.19
 MAKE_FLAGS=	prefix=${PREFIX} -f
-MAN1=		coverpg.1 fax.1 faxq.1 faxrm.1 faxrunq.1 faxspool.1 \
-		g3cat.1 g32pbm.1 pbm2g3.1 pvf.1 zplay.1
+MAN1=		coverpg.1 \
+		fax.1 \
+		faxq.1 \
+		faxrm.1 \
+		faxrunq.1 \
+		faxspool.1 \
+		g3cat.1 \
+		g32pbm.1 \
+		pbm2g3.1 \
+		pvf.1 \
+		zplay.1
 MAN4=		mgettydefs.4
 MAN5=		faxqueue.5
-MAN8=		sendfax.8 mgetty.8 callback.8 faxrunqd.8
+MAN8=		callback.8 \
+		faxrunqd.8 \
+		mgetty.8 \
+		sendfax.8 
 
 pre-install:
 	@(cd ${WRKSRC}/doc; ${MAKE} manpages)
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index 7b99ddd2f982..80facd250d2b 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1 +1 @@
-MD5 (mgetty1.1.16-Jul05.tar.gz) = 6d2999cd3e73b739b0c51c7a4484061f
+MD5 (mgetty1.1.19-Nov24.tar.gz) = 67cc819004b210c7f48db6decb1ed5e5
diff --git a/comms/mgetty+sendfax/files/patch-ab b/comms/mgetty+sendfax/files/patch-ab
index eb725772d96b..5115e4adff29 100644
--- a/comms/mgetty+sendfax/files/patch-ab
+++ b/comms/mgetty+sendfax/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Jul  6 05:24:36 1998
-+++ Makefile	Thu Jul 16 14:04:54 1998
+--- Makefile.orig	Sun Nov 22 07:19:06 1998
++++ Makefile	Tue Dec  1 02:11:01 1998
 @@ -4,8 +4,8 @@
  #
  # this is the C compiler to use (on SunOS, the standard "cc" does not
@@ -29,7 +29,17 @@
  #LIBS=-lprot -lsocket				# SCO Unix
  #LIBS=-lsocket
  #LIBS=-lbsd					# OSF/1
-@@ -247,7 +247,7 @@
+@@ -169,7 +169,8 @@
+ #
+ # if your systems doesn't have one, use the shell script that I provide
+ # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
+-INSTALL=install -c -o bin -g bin
++INSTALL=install -c -o root -g wheel
++INSTALL_PROGRAM=install -s -c -o root -g wheel
+ #INSTALL=install -c -o root -g wheel		# NeXT/BSD
+ #INSTALL=/usr/ucb/install -c -o bin -g bin	# AIX, Solaris 2.x
+ #INSTALL=installbsd -c -o bin -g bin		# OSF/1, AIX 4.1, 4.2
+@@ -247,7 +248,7 @@
  # If you have Perl with TK extentions, define it here. This may be the
  # same as PERL=... above, or different, if you have TkPerl statically
  # linked.
@@ -38,7 +48,7 @@
  #
  #
  # An echo program that understands escapes like "\n" for newline or
-@@ -259,9 +259,9 @@
+@@ -259,9 +260,9 @@
  # please use the "mg.echo" program provided in the compat/ subdirectory.
  # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
  #
@@ -50,16 +60,7 @@
  
  #
  # for mgetty, that's it. If you want to use the voice
-@@ -269,7 +269,7 @@
- 
- # To maintain security, I recommend creating a new group for
- # users who are allowed to manipulate the recorded voice messages.
--PHONE_GROUP=phone
-+PHONE_GROUP=uucp
- PHONE_PERMS=770
- 
- # Add -DNO_STRSTR to CFLAGS if you don't have strstr().
-@@ -301,7 +301,7 @@
+@@ -301,7 +302,7 @@
  
  all:	bin-all doc-all
  
@@ -68,7 +69,7 @@
  
  # a few C files need extra compiler arguments
  
-@@ -560,15 +560,15 @@
+@@ -560,21 +561,21 @@
  	cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *
  
  
@@ -83,11 +84,19 @@
  #
  	-test -d $(BINDIR)  || ( ./mkidirs $(BINDIR)  ; chmod 755 $(BINDIR)  )
 -	$(INSTALL) -m 755 newslock $(BINDIR)
-+	$(INSTALL) -s -m 755 newslock $(BINDIR)
++	$(INSTALL_PROGRAM) -m 755 newslock $(BINDIR)
  
  	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
  	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
-@@ -584,10 +584,10 @@
+ 	-mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
+-	$(INSTALL) -s -m 700 mgetty $(SBINDIR)
+-	$(INSTALL) -s -m 700 sendfax $(SBINDIR)
++	$(INSTALL_PROGRAM) -m 700 mgetty $(SBINDIR)
++	$(INSTALL_PROGRAM) -m 700 sendfax $(SBINDIR)
+ #
+ # data files + directories
+ #
+@@ -584,10 +585,10 @@
  		( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR))
  	test -f $(CONFDIR)/login.config || \
  		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
@@ -102,3 +111,21 @@
  	test -f $(CONFDIR)/dialin.config || \
  		$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
  	test -f $(CONFDIR)/faxrunq.config || \
+@@ -618,7 +619,7 @@
+ #
+ # g3 tool programs
+ #
+-	cd g3 ; $(MAKE) install INSTALL="$(INSTALL)" \
++	cd g3 ; $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \
+ 				BINDIR=$(BINDIR) \
+ 				LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR)
+ #
+@@ -633,7 +634,7 @@
+ 	if [ ! -z "$(INSTALL_MECHO)" ] ; then \
+ 	    cd compat ; \
+ 	    $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
+-	    $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
++	    $(INSTALL_PROGRAM) -m 755 mg.echo $(BINDIR) ; \
+ 	fi
+ 
+ #
diff --git a/comms/mgetty+sendfax/files/patch-ac b/comms/mgetty+sendfax/files/patch-ac
index 7890b81826bb..16172c88d5e5 100644
--- a/comms/mgetty+sendfax/files/patch-ac
+++ b/comms/mgetty+sendfax/files/patch-ac
@@ -1,6 +1,26 @@
---- voice/Makefile.orig	Mon Dec 29 23:06:36 1997
-+++ voice/Makefile	Mon Dec 29 23:07:18 1997
-@@ -89,11 +89,11 @@
+--- voice/Makefile.orig	Thu Sep 10 05:06:12 1998
++++ voice/Makefile	Tue Dec  1 01:39:38 1998
+@@ -13,6 +13,8 @@
+ LN=ln
+ MV=mv
+ RM=rm
++INSTALL=install -c -o root -g wheel
++INSTALL_PROGRAM=install -s -c -o root -g wheel
+ 
+ MGETTYLIB=../../getdisk.o ../../goodies.o ../../io.o \
+ 	../../locks.o ../../tio.o ../../modem.o \
+@@ -82,19 +84,19 @@
+ 	@echo "  Installing the voice extensions"
+ 	@echo "  -------------------------------"
+ 	@echo ""
+-	$(INSTALL) -m 700 vgetty/vgetty $(SBINDIR)
+-	$(INSTALL) -m 755 vm/vm $(BINDIR)
++	$(INSTALL_PROGRAM) -m 700 vgetty/vgetty $(SBINDIR)
++	$(INSTALL_PROGRAM) -m 755 vm/vm $(BINDIR)
+ 	for i in $(PVFTOOLS); \
+ 	do \
+-	     $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \
++	     $(INSTALL_PROGRAM) -m 755 pvftools/$$i $(BINDIR); \
  	done
  	$(INSTALL) -m 644 man/man1/zplay.1 $(MAN1DIR)
  	$(INSTALL) -m 644 man/man1/pvf.1 $(MAN1DIR)
diff --git a/comms/mgetty+sendfax/files/patch-ad b/comms/mgetty+sendfax/files/patch-ad
index 24ded4ca74e0..13d8848d3b4f 100644
--- a/comms/mgetty+sendfax/files/patch-ad
+++ b/comms/mgetty+sendfax/files/patch-ad
@@ -1,5 +1,5 @@
 --- doc/Makefile.orig	Fri Nov 28 04:33:26 1997
-+++ doc/Makefile	Mon Dec 29 22:31:59 1997
++++ doc/Makefile	Tue Dec  1 00:49:56 1998
 @@ -26,7 +26,7 @@
  
  all:
@@ -9,3 +9,12 @@
  
  manpages: $(MANSRC)
  
+@@ -43,7 +43,7 @@
+ 	-texi2html -verbose mgetty.texi
+ 
+ mgetty.info: mgetty.texi
+-	-makeinfo mgetty.texi
++	-makeinfo --no-split mgetty.texi
+ 
+ mgetty.ps: mgetty.dvi
+ 	-dvips -o mgetty.ps mgetty.dvi
diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist
index eac026cf6d8f..b22819424393 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -1,22 +1,24 @@
 bin/autopvf
 bin/basictopvf
-bin/faxspool
 bin/faxq
 bin/faxrm
 bin/faxrunq
-bin/g3cat
+bin/faxspool
 bin/g32pbm
+bin/g3cat
 bin/g3topbm
-bin/newslock
 bin/lintopvf
 bin/mg.echo
+bin/newslock
 bin/pbm2g3
 bin/pvfamp
 bin/pvfcut
 bin/pvfecho
 bin/pvffft
 bin/pvffile
+bin/pvffilter
 bin/pvfmix
+bin/pvfnoise
 bin/pvfreverse
 bin/pvfsine
 bin/pvfspeed
@@ -38,10 +40,6 @@ etc/mgetty+sendfax/login.config
 @unexec rm -f %D/etc/mgetty+sendfax/faxheader %D/etc/mgetty+sendfax/mgetty.config* %D/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