Upgrade to 1.1.16.

6 files changed, 30 insertions, 18 deletions

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index f9a13bcdc5b7..706636e0a2c3 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:    mgetty+sendfax
-# Version required:     1.1.14
+# Version required:     1.1.16
 # Date created:         20 April 1998
 # Whom:                 rkw
 #
-# $Id: Makefile,v 1.23 1998/03/07 23:26:11 jmz Exp $
+# $Id: Makefile,v 1.24 1998/04/20 20:07:44 jmz Exp $
 #
 
-DISTNAME=	mgetty1.1.14-Apr02
-PKGNAME=	mgetty-1.1.14
+DISTNAME=	mgetty1.1.16-Jul05
+PKGNAME=	mgetty-1.1.16
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/
 
 MAINTAINER=	jmz@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/mgetty-1.1.14
+WRKSRC=		${WRKDIR}/mgetty-1.1.16
 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
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index 3fa2d9511e04..7b99ddd2f982 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1 +1 @@
-MD5 (mgetty1.1.14-Apr02.tar.gz) = d7d8961036b7c1a09ddb529e78bf36cd
+MD5 (mgetty1.1.16-Jul05.tar.gz) = 6d2999cd3e73b739b0c51c7a4484061f
diff --git a/comms/mgetty+sendfax/files/mgettycfg.in b/comms/mgetty+sendfax/files/mgettycfg.in
index 15ab65c757c7..e27793182268 100644
--- a/comms/mgetty+sendfax/files/mgettycfg.in
+++ b/comms/mgetty+sendfax/files/mgettycfg.in
@@ -193,7 +193,7 @@ sub inq_m {
      lines!",   $def{'port-owner'});
 
     $settings .= " port-group";
-    $def{'port-group'} = "modem" if !$def{'port-group'};
+    $def{'port-group'} = "uucp" if !$def{'port-group'};
     $def{'port-group'} = &ask ("   - `port-group' 
      If set, mgetty will `chgrp' the tty line to this group id (which
      can be given as group name, or as integer gid). If it's not given,
diff --git a/comms/mgetty+sendfax/files/patch-ab b/comms/mgetty+sendfax/files/patch-ab
index 1b8f538642f7..eb725772d96b 100644
--- a/comms/mgetty+sendfax/files/patch-ab
+++ b/comms/mgetty+sendfax/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Dec 16 21:44:14 1997
-+++ Makefile	Mon Dec 29 22:41:35 1997
+--- Makefile.orig	Mon Jul  6 05:24:36 1998
++++ Makefile	Thu Jul 16 14:04:54 1998
 @@ -4,8 +4,8 @@
  #
  # this is the C compiler to use (on SunOS, the standard "cc" does not
@@ -11,16 +11,16 @@
  #
  #### C Compiler Flags ####
  #
-@@ -108,7 +108,7 @@
+@@ -107,7 +107,7 @@
  # 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=-O2 -Wall -pipe
++CFLAGS+=-DAUTO_PPP
  #CFLAGS=-O -DSVR4
  #CFLAGS=-O -DSVR4 -DSVR42
  #CFLAGS=-O -DUSE_POLL
-@@ -151,7 +151,7 @@
+@@ -149,7 +149,7 @@
  # For Linux, add "-lutil" if the linker complains about "updwtmp".
  #
  LDFLAGS=
@@ -29,7 +29,16 @@
  #LIBS=-lprot -lsocket				# SCO Unix
  #LIBS=-lsocket
  #LIBS=-lbsd					# OSF/1
-@@ -261,9 +261,9 @@
+@@ -247,7 +247,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.
+-TKPERL=/usr/bin/tkperl
++#TKPERL=/usr/bin/tkperl
+ #
+ #
+ # An echo program that understands escapes like "\n" for newline or
+@@ -259,9 +259,9 @@
  # please use the "mg.echo" program provided in the compat/ subdirectory.
  # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
  #
@@ -41,7 +50,7 @@
  
  #
  # for mgetty, that's it. If you want to use the voice
-@@ -271,7 +271,7 @@
+@@ -269,7 +269,7 @@
  
  # To maintain security, I recommend creating a new group for
  # users who are allowed to manipulate the recorded voice messages.
@@ -50,7 +59,7 @@
  PHONE_PERMS=770
  
  # Add -DNO_STRSTR to CFLAGS if you don't have strstr().
-@@ -303,7 +303,7 @@
+@@ -301,7 +301,7 @@
  
  all:	bin-all doc-all
  
@@ -59,7 +68,7 @@
  
  # a few C files need extra compiler arguments
  
-@@ -562,15 +562,15 @@
+@@ -560,15 +560,15 @@
  	cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *
  
  
@@ -78,7 +87,7 @@
  
  	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
  	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
-@@ -586,10 +586,10 @@
+@@ -584,10 +584,10 @@
  		( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR))
  	test -f $(CONFDIR)/login.config || \
  		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
diff --git a/comms/mgetty+sendfax/pkg-install b/comms/mgetty+sendfax/pkg-install
index 15ab65c757c7..e27793182268 100644
--- a/comms/mgetty+sendfax/pkg-install
+++ b/comms/mgetty+sendfax/pkg-install
@@ -193,7 +193,7 @@ sub inq_m {
      lines!",   $def{'port-owner'});
 
     $settings .= " port-group";
-    $def{'port-group'} = "modem" if !$def{'port-group'};
+    $def{'port-group'} = "uucp" if !$def{'port-group'};
     $def{'port-group'} = &ask ("   - `port-group' 
      If set, mgetty will `chgrp' the tty line to this group id (which
      can be given as group name, or as integer gid). If it's not given,
diff --git a/comms/mgetty+sendfax/scripts/configure b/comms/mgetty+sendfax/scripts/configure
index e5cc709d8b75..b0683330b4a6 100644
--- a/comms/mgetty+sendfax/scripts/configure
+++ b/comms/mgetty+sendfax/scripts/configure
@@ -22,6 +22,9 @@ cat >> policy.h <<END
 #undef MAILER
 #define MAILER		"/usr/sbin/sendmail"
 
+#undef DEVICE_GROUP
+#define DEVICE_GROUP	"uucp"
+
 END
 
 exit 0