- Upgrade to version 1.1.30-Dec16.

- Install the callback binary (problem reported by Roger Hardiman <roger@telepresence.dmem.strath.ac.uk>
- Allow optional FIDO support (submitted by yar).

5 files changed, 40 insertions, 38 deletions

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 678cb800bfee..0d7cbdf18033 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	mgetty
-PORTVERSION=	1.1.28.01.10
+PORTVERSION=	1.1.30.12.16
 CATEGORIES=	comms
 MASTER_SITES=	ftp://alpha.greenie.net/pub/mgetty/source/1.1/
-DISTNAME=	mgetty1.1.28-Jan10
+DISTNAME=	mgetty1.1.30-Dec16
 
 MAINTAINER=	jmz@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/mgetty-1.1.28
+WRKSRC=		${WRKDIR}/mgetty-1.1.30
 MAKE_FLAGS=	prefix=${PREFIX} -f
 MAN1=		autopvf.1 \
 		basictopvf.1 \
@@ -58,6 +58,18 @@ MLINKS=		pvf.1 pvfamp.1 \
 		pvf.1 voctopvf.1 \
 		pvf.1 wavtopvf.1
 
+CFLAGS+=	-DAUTO_PPP
+.if defined(WITH_FIDO) && ${WITH_FIDO:L} != no
+CFLAGS+=	-DFIDO
+.endif
+
+pre-everything::
+.if !defined(WITH_FIDO)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you need FIDO EMSI support, use \"make WITH_FIDO=yes\""
+	@${ECHO_MSG}
+.endif
+
 pre-install:
 	@(cd ${WRKSRC}/doc; ${MAKE} manpages)
 
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index 90d4c96945f4..4aa68ab24bfb 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1 +1 @@
-MD5 (mgetty1.1.28-Jan10.tar.gz) = dc5de3eb1cf75f37e60fb94e321cdcd7
+MD5 (mgetty1.1.30-Dec16.tar.gz) = 4b80c418bc58add3e40de3be0ac6c02a
diff --git a/comms/mgetty+sendfax/files/patch-ab b/comms/mgetty+sendfax/files/patch-ab
index 5115e4adff29..2350f5d58c98 100644
--- a/comms/mgetty+sendfax/files/patch-ab
+++ b/comms/mgetty+sendfax/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Nov 22 07:19:06 1998
-+++ Makefile	Tue Dec  1 02:11:01 1998
+--- Makefile.orig	Mon Dec 16 14:08:23 2002
++++ Makefile	Thu Jan 23 01:05:42 2003
 @@ -4,8 +4,8 @@
  #
  # this is the C compiler to use (on SunOS, the standard "cc" does not
@@ -16,7 +16,7 @@
  #
  #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
 -CFLAGS=-O2 -Wall -pipe
-+CFLAGS+=-DAUTO_PPP
++#CFLAGS=-O2 -Wall -pipe
  #CFLAGS=-O -DSVR4
  #CFLAGS=-O -DSVR4 -DSVR42
  #CFLAGS=-O -DUSE_POLL
@@ -25,7 +25,7 @@
  #
  LDFLAGS=
 -LIBS=
-+LIBS=-lutil
++LIBS= -lutil
  #LIBS=-lprot -lsocket				# SCO Unix
  #LIBS=-lsocket
  #LIBS=-lbsd					# OSF/1
@@ -39,7 +39,16 @@
  #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 @@
+@@ -220,7 +221,7 @@
+ # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER 
+ #  MUST NOT BE root or any other privileged account).
+ #
+-FAX_OUT_USER=fax
++FAX_OUT_USER=root
+ #
+ #
+ # Where section 1 manual pages should be placed
+@@ -262,7 +263,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.
@@ -48,7 +57,7 @@
  #
  #
  # An echo program that understands escapes like "\n" for newline or
-@@ -259,9 +260,9 @@
+@@ -274,9 +275,9 @@
  # please use the "mg.echo" program provided in the compat/ subdirectory.
  # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
  #
@@ -60,7 +69,7 @@
  
  #
  # for mgetty, that's it. If you want to use the voice
-@@ -301,7 +302,7 @@
+@@ -316,7 +317,7 @@
  
  all:	bin-all doc-all
  
@@ -69,7 +78,7 @@
  
  # a few C files need extra compiler arguments
  
-@@ -560,21 +561,21 @@
+@@ -581,21 +582,22 @@
  	cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *
  
  
@@ -90,13 +99,14 @@
  	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
  	-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)
+-	$(INSTALL) -s -m 755 sendfax $(SBINDIR)
++	$(INSTALL_PROGRAM) -s -m 700 mgetty $(SBINDIR)
++	$(INSTALL_PROGRAM) -s -m 755 sendfax $(SBINDIR)
++	$(INSTALL_PROGRAM) -s -m 755 callback/callback $(SBINDIR)
  #
  # data files + directories
  #
-@@ -584,10 +585,10 @@
+@@ -605,10 +607,10 @@
  		( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR))
  	test -f $(CONFDIR)/login.config || \
  		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
@@ -111,7 +121,7 @@
  	test -f $(CONFDIR)/dialin.config || \
  		$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
  	test -f $(CONFDIR)/faxrunq.config || \
-@@ -618,7 +619,7 @@
+@@ -641,7 +643,7 @@
  #
  # g3 tool programs
  #
@@ -120,12 +130,3 @@
  				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-ae b/comms/mgetty+sendfax/files/patch-ae
deleted file mode 100644
index 48329ced5d58..000000000000
--- a/comms/mgetty+sendfax/files/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
---- logfile.c.orig	Mon Aug 12 18:15:34 2002
-+++ logfile.c	Mon Aug 12 18:15:59 2002
-@@ -52,8 +52,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 b79629657f6b..3395a06b4cc7 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -86,6 +86,7 @@ lib/mgetty+sendfax/samples/new_fax.tiff
 lib/mgetty+sendfax/samples/new_fax.vacation
 lib/mgetty+sendfax/samples/printfax
 lib/mgetty+sendfax/samples/printfax.ps
+sbin/callback
 sbin/faxrunqd
 sbin/mgetty
 sbin/sendfax