7 files changed, 25 insertions, 52 deletions

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 17881c4b0b80..91d55a42af0d 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	mgetty
-PORTVERSION=	1.1.31
+PORTVERSION=	1.1.33
 PORTREVISION=	0
 CATEGORIES=	comms
 MASTER_SITES=	ftp://alpha.greenie.net/pub/mgetty/source/1.1/
-DISTNAME=	${PORTNAME}${PORTVERSION}-Jul24
+DISTNAME=	${PORTNAME}${PORTVERSION}-Apr10
 
 MAINTAINER=	jmz@FreeBSD.org
 COMMENT=	Handle external logins, send and receive faxes
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index a54dd645549b..9d0bddf87c42 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1,2 +1,2 @@
-MD5 (mgetty1.1.31-Jul24.tar.gz) = 3462a0acbdb2e7165540ef95097d49fb
-SIZE (mgetty1.1.31-Jul24.tar.gz) = 998462
+MD5 (mgetty1.1.33-Apr10.tar.gz) = d61a2bd343111be35250496710393bd5
+SIZE (mgetty1.1.33-Apr10.tar.gz) = 1024596
diff --git a/comms/mgetty+sendfax/files/patch-aa b/comms/mgetty+sendfax/files/patch-aa
index 089b30176afa..dc10c2457132 100644
--- a/comms/mgetty+sendfax/files/patch-aa
+++ b/comms/mgetty+sendfax/files/patch-aa
@@ -1,9 +1,9 @@
---- fax/faxspool.in.orig	Fri Aug  8 21:43:55 1997
-+++ fax/faxspool.in	Mon Dec 29 22:31:59 1997
-@@ -299,11 +299,11 @@
- # user name (for authentification)
- ##########
+--- fax/faxspool.in~	Sat Jul  9 14:25:15 2005
++++ fax/faxspool.in	Sat Jul  9 14:30:44 2005
+@@ -401,11 +401,11 @@
  
+ # user name (for fax header only! auth is done by faxq-helper via getuid())
+ ##########
 -if user=`logname 2>/dev/null`
 -then :
 +if [ `id -u` = 0 ]; then
diff --git a/comms/mgetty+sendfax/files/patch-ab b/comms/mgetty+sendfax/files/patch-ab
index 2350f5d58c98..c9029169b1e8 100644
--- a/comms/mgetty+sendfax/files/patch-ab
+++ b/comms/mgetty+sendfax/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Dec 16 14:08:23 2002
-+++ Makefile	Thu Jan 23 01:05:42 2003
+--- Makefile.orig	Sun Mar 13 18:59:34 2005
++++ Makefile	Sat Jul  9 14:37:08 2005
 @@ -4,8 +4,8 @@
  #
  # this is the C compiler to use (on SunOS, the standard "cc" does not
@@ -11,8 +11,8 @@
  #
  #### C Compiler Flags ####
  #
-@@ -107,7 +107,7 @@
- # prompt first. Don't forget to activate the /AutoPPP/ line in login.config!
+@@ -102,7 +102,7 @@
+ #	    USTAT	  - ustat(), no statfs etc.
  #
  #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
 -CFLAGS=-O2 -Wall -pipe
@@ -20,7 +20,7 @@
  #CFLAGS=-O -DSVR4
  #CFLAGS=-O -DSVR4 -DSVR42
  #CFLAGS=-O -DUSE_POLL
-@@ -149,7 +149,7 @@
+@@ -144,7 +144,7 @@
  # For Linux, add "-lutil" if the linker complains about "updwtmp".
  #
  LDFLAGS=
@@ -29,7 +29,7 @@
  #LIBS=-lprot -lsocket				# SCO Unix
  #LIBS=-lsocket
  #LIBS=-lbsd					# OSF/1
-@@ -169,7 +169,8 @@
+@@ -164,7 +164,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
@@ -39,7 +39,7 @@
  #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
-@@ -220,7 +221,7 @@
+@@ -216,7 +217,7 @@
  # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER 
  #  MUST NOT BE root or any other privileged account).
  #
@@ -48,7 +48,7 @@
  #
  #
  # Where section 1 manual pages should be placed
-@@ -262,7 +263,7 @@
+@@ -263,7 +264,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.
@@ -57,7 +57,7 @@
  #
  #
  # An echo program that understands escapes like "\n" for newline or
-@@ -274,9 +275,9 @@
+@@ -275,9 +276,9 @@
  # please use the "mg.echo" program provided in the compat/ subdirectory.
  # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
  #
@@ -69,16 +69,16 @@
  
  #
  # for mgetty, that's it. If you want to use the voice
-@@ -316,7 +317,7 @@
+@@ -317,7 +318,7 @@
  
  all:	bin-all doc-all
  
--bin-all: mgetty sendfax newslock subdirs call-back 
-+bin-all: mgetty sendfax newslock subdirs call-back vgetty
+-bin-all: mgetty sendfax newslock sedscript subdirs call-back 
++bin-all: mgetty sendfax newslock sedscript subdirs call-back vgetty
  
  # a few C files need extra compiler arguments
  
-@@ -581,21 +582,22 @@
+@@ -583,21 +584,22 @@
  	cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *
  
  
@@ -106,8 +106,8 @@
  #
  # data files + directories
  #
-@@ -605,10 +607,10 @@
- 		( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR))
+@@ -607,10 +609,10 @@
+ 		( ./mkidirs $(CONFDIR) && chmod 755 $(CONFDIR))
  	test -f $(CONFDIR)/login.config || \
  		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
 -	test -f $(CONFDIR)/mgetty.config || \
@@ -121,7 +121,7 @@
  	test -f $(CONFDIR)/dialin.config || \
  		$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
  	test -f $(CONFDIR)/faxrunq.config || \
-@@ -641,7 +643,7 @@
+@@ -643,7 +645,7 @@
  #
  # g3 tool programs
  #
diff --git a/comms/mgetty+sendfax/files/patch-d1 b/comms/mgetty+sendfax/files/patch-d1
deleted file mode 100644
index 4ef060241629..000000000000
--- a/comms/mgetty+sendfax/files/patch-d1
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/mgetty.texi-in.orig	Sat Apr 28 12:57:00 2001
-+++ doc/mgetty.texi-in	Sat Apr 28 13:03:46 2001
-@@ -11,6 +11,11 @@
- package.
- 
- Copyright @copyright{} 1993-2000 Gert Doering
-+@format
-+START-INFO-DIR-ENTRY
-+* Mgetty: (mgetty).		Mgetty: an advanced getty that can manage faxes.
-+END-INFO-DIR-ENTRY
-+@end format
- @end ifinfo
- 
- @titlepage
diff --git a/comms/mgetty+sendfax/files/patch-e b/comms/mgetty+sendfax/files/patch-e
deleted file mode 100644
index e5b24790a922..000000000000
--- a/comms/mgetty+sendfax/files/patch-e
+++ /dev/null
@@ -1,12 +0,0 @@
---- logfile.c.orig	Wed Feb  5 21:21:46 2003
-+++ logfile.c	Wed Feb  5 21:22:20 2003
-@@ -56,8 +56,8 @@
- /* Most systems have these variables but do not declare them. On many
-    of those systems that _do_ declare them, it won't hurt */
- 
--extern int sys_nerr;
- #if !defined(__NetBSD__) && !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__)
-+extern int sys_nerr;
- extern char *sys_errlist[];
- #endif
- 
diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist
index 126d1ebf9ddc..671900af8307 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -6,7 +6,6 @@ bin/faxrunq
 bin/faxspool
 bin/g32pbm
 bin/g3cat
-bin/g3topbm
 bin/lintopvf
 bin/mg.echo
 bin/newslock