Upgrade to version 1.1.27.

Install a default new_fax program.
Install sample files.

10 files changed, 74 insertions, 65 deletions

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 162d5b4e674f..faa53f023321 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	mgetty
-PORTVERSION=	1.1.25.02.01
+PORTVERSION=	1.1.27.10.21
 CATEGORIES=	comms
 MASTER_SITES=	ftp://alpha.greenie.net/pub/mgetty/source/1.1/
-DISTNAME=	mgetty1.1.25-Feb01
+DISTNAME=	mgetty1.1.27-Oct21
 
 MAINTAINER=	jmz@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/mgetty-1.1.25
+WRKSRC=		${WRKDIR}/mgetty-1.1.27
 MAKE_FLAGS=	prefix=${PREFIX} -f
 MAN1=		coverpg.1 \
 		fax.1 \
@@ -45,6 +45,7 @@ post-install:
 		${PREFIX}/etc/mgetty+sendfax/faxrunq.config.dist
 	@${CP} ${PREFIX}/etc/mgetty+sendfax/login.config \
 		${PREFIX}/etc/mgetty+sendfax/login.config.dist
+	@${TAR}  -cf - -C ${WRKSRC} samples | ${TAR}  -xf - -C ${PREFIX}/lib/mgetty+sendfax/
 	@install-info ${PREFIX}/info/mgetty.info ${PREFIX}/info/dir
 .if !defined(BATCH)
 	@(cd ${PKGDIR}; export PKG_PREFIX=${PREFIX}; ${PERL5} ${PKGINSTALL} _ POST-INSTALL)
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index 5a4b94b227ee..701148b52a13 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1 +1 @@
-MD5 (mgetty1.1.25-Feb01.tar.gz) = f59183d231d34e74e4d28567c573a101
+MD5 (mgetty1.1.27-Oct21.tar.gz) = f732f67087c0c9a0f3fa729783ee90c6
diff --git a/comms/mgetty+sendfax/files/mgettycfg.in b/comms/mgetty+sendfax/files/mgettycfg.in
index 68d8f57c50d1..37ac6dec0b36 100644
--- a/comms/mgetty+sendfax/files/mgettycfg.in
+++ b/comms/mgetty+sendfax/files/mgettycfg.in
@@ -104,6 +104,23 @@ open (F, ">/etc/ttys");
 print F @ttys;
 close (F);
 
+# install new_fax
+if (-e "$prefix/lib/mgetty+sendfax/lib/new_fax") {
+    print STDERR "$prefix/lib/mgetty+sendfax/lib/new_fax already exists - not changed\n";
+} else {
+    print STDERR "installing $prefix/lib/mgetty+sendfax/lib/samples/new_fax.mail as new_fax\n";
+    open (F, "$prefix/lib/mgetty+sendfax/lib/samples/new_fax.mail");
+    open (G, "$prefix/lib/mgetty+sendfax/lib/new_fax");
+    while (<F>) {
+      s:/usr/local/bin/:$prefix:;
+      s:/usr/lib/sendmail:/usr/sbin/sendmail:;
+      s/^MAILTO=.*/$def{'notify'}\n/;
+      print G "$_";
+    }
+    close F;
+    close G;
+    chmod 0755, "$prefix/lib/mgetty+sendfax/lib/new_fax";
+}
 print STDERR "\n\n*** WARNING the directory /var/spool/fax/outgoing/ is world writable.\n*** This is potentially insecure\n";
 
 exit 0;
diff --git a/comms/mgetty+sendfax/files/patch-ae b/comms/mgetty+sendfax/files/patch-ae
deleted file mode 100644
index 927dd18aa440..000000000000
--- a/comms/mgetty+sendfax/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- mgetty.c.orig	Tue Sep  1 20:22:57 1998
-+++ mgetty.c	Tue Jan  5 18:57:26 1999
-@@ -64,7 +64,10 @@
- /* prototypes for system functions (that are missing in some 
-  * system header files)
-  */
--#ifndef __NetBSD__
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+#if !(defined(BSD) && (BSD >= 199306))
- time_t		time _PROTO(( long * tloc ));
- #endif
- 
diff --git a/comms/mgetty+sendfax/files/patch-af b/comms/mgetty+sendfax/files/patch-af
deleted file mode 100644
index b75dd3277778..000000000000
--- a/comms/mgetty+sendfax/files/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
---- faxrec.c.orig	Tue Dec 16 20:39:24 1997
-+++ faxrec.c	Tue Jan  5 18:59:48 1999
-@@ -35,7 +35,10 @@
- extern time_t call_start;		/* in faxrecp.c, set in mgetty.c */
- static time_t call_done;
- 
--#ifndef __NetBSD__
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+#if !(defined(BSD) && (BSD >= 199306))
- time_t	time _PROTO(( long * tloc ));
- #endif
- 
diff --git a/comms/mgetty+sendfax/files/patch-ag b/comms/mgetty+sendfax/files/patch-ag
deleted file mode 100644
index 1fd854ba5228..000000000000
--- a/comms/mgetty+sendfax/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- sendfax.c.orig	Fri Feb 18 10:06:53 2000
-+++ sendfax.c	Fri Feb 18 10:07:37 2000
-@@ -41,7 +41,7 @@
- 
- /* seems to missing nearly everywhere */
- #ifndef __NetBSD__
--time_t	time _PROTO(( long * tloc ));
-+time_t	time _PROTO(( time_t * tloc ));
- #endif
- 
- void exit_usage _P2( (program, msg ),
diff --git a/comms/mgetty+sendfax/files/patch-ah b/comms/mgetty+sendfax/files/patch-ah
deleted file mode 100644
index 1d9ba91108b8..000000000000
--- a/comms/mgetty+sendfax/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- callback/callback.c.orig	Fri Feb 18 10:08:43 2000
-+++ callback/callback.c	Fri Feb 18 10:08:54 2000
-@@ -69,7 +69,7 @@
-  * system header files)
-  */
- #ifndef __NetBSD__
--time_t		time _PROTO(( long * tloc ));
-+time_t		time _PROTO(( time_t * tloc ));
- #endif
- 
- /* conf_cb.c */
diff --git a/comms/mgetty+sendfax/files/patch-ai b/comms/mgetty+sendfax/files/patch-ai
deleted file mode 100644
index 983c37a74b11..000000000000
--- a/comms/mgetty+sendfax/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- voice/libvoice/voice_fax.c.orig	Fri Feb 18 10:10:12 2000
-+++ voice/libvoice/voice_fax.c	Fri Feb 18 10:10:28 2000
-@@ -30,7 +30,7 @@
- 
- /* seems to missing nearly everywhere */
- #ifndef __NetBSD__
--time_t    time _PROTO(( long * tloc ));
-+time_t    time _PROTO(( time_t * tloc ));
- #endif
- 
- /* from faxrecp.c */
diff --git a/comms/mgetty+sendfax/pkg-install b/comms/mgetty+sendfax/pkg-install
index 68d8f57c50d1..37ac6dec0b36 100644
--- a/comms/mgetty+sendfax/pkg-install
+++ b/comms/mgetty+sendfax/pkg-install
@@ -104,6 +104,23 @@ open (F, ">/etc/ttys");
 print F @ttys;
 close (F);
 
+# install new_fax
+if (-e "$prefix/lib/mgetty+sendfax/lib/new_fax") {
+    print STDERR "$prefix/lib/mgetty+sendfax/lib/new_fax already exists - not changed\n";
+} else {
+    print STDERR "installing $prefix/lib/mgetty+sendfax/lib/samples/new_fax.mail as new_fax\n";
+    open (F, "$prefix/lib/mgetty+sendfax/lib/samples/new_fax.mail");
+    open (G, "$prefix/lib/mgetty+sendfax/lib/new_fax");
+    while (<F>) {
+      s:/usr/local/bin/:$prefix:;
+      s:/usr/lib/sendmail:/usr/sbin/sendmail:;
+      s/^MAILTO=.*/$def{'notify'}\n/;
+      print G "$_";
+    }
+    close F;
+    close G;
+    chmod 0755, "$prefix/lib/mgetty+sendfax/lib/new_fax";
+}
 print STDERR "\n\n*** WARNING the directory /var/spool/fax/outgoing/ is world writable.\n*** This is potentially insecure\n";
 
 exit 0;
diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist
index ffad41e5787c..b79629657f6b 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -53,9 +53,44 @@ info/mgetty.info
 @exec install-info %D/info/mgetty.info %D/info/dir
 lib/mgetty+sendfax/cour25.pbm
 lib/mgetty+sendfax/cour25n.pbm
+lib/mgetty+sendfax/samples/answer_fax.sh
+lib/mgetty+sendfax/samples/coverpg-pl.ps
+lib/mgetty+sendfax/samples/coverpg.pbm
+lib/mgetty+sendfax/samples/coverpg.ps
+lib/mgetty+sendfax/samples/fax
+lib/mgetty+sendfax/samples/faxmemo
+lib/mgetty+sendfax/samples/faxview.th
+lib/mgetty+sendfax/samples/new_fax.NeXT
+lib/mgetty+sendfax/samples/new_fax.all/INSTALL
+lib/mgetty+sendfax/samples/new_fax.all/README
+lib/mgetty+sendfax/samples/new_fax.all/archive.module
+lib/mgetty+sendfax/samples/new_fax.all/delete.module
+lib/mgetty+sendfax/samples/new_fax.all/fax.module
+lib/mgetty+sendfax/samples/new_fax.all/faxlist
+lib/mgetty+sendfax/samples/new_fax.all/faxlist.dist
+lib/mgetty+sendfax/samples/new_fax.all/list.module
+lib/mgetty+sendfax/samples/new_fax.all/mail.module
+lib/mgetty+sendfax/samples/new_fax.all/new_fax
+lib/mgetty+sendfax/samples/new_fax.all/notify.module
+lib/mgetty+sendfax/samples/new_fax.all/print.module
+lib/mgetty+sendfax/samples/new_fax.all/write.module
+lib/mgetty+sendfax/samples/new_fax.hpa
+lib/mgetty+sendfax/samples/new_fax.lj
+lib/mgetty+sendfax/samples/new_fax.mail
+lib/mgetty+sendfax/samples/new_fax.mime1
+lib/mgetty+sendfax/samples/new_fax.mime3
+lib/mgetty+sendfax/samples/new_fax.mime4
+lib/mgetty+sendfax/samples/new_fax.pbm
+lib/mgetty+sendfax/samples/new_fax.th
+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/faxrunqd
 sbin/mgetty
 sbin/sendfax
 sbin/vgetty
 @unexec rmdir %D/etc/mgetty+sendfax 2>/dev/null || true
+@dirrm lib/mgetty+sendfax/samples/new_fax.all
+@dirrm lib/mgetty+sendfax/samples
 @dirrm lib/mgetty+sendfax