Rename the fax overview manpage from "fax" to "sendfax", to avoid any

conflict with the "efax" package. "efax" already has an "efax.1", the
actual man page, but "mgetty"'s "sendfax" manpage is "sendfax.8", so
"sendfax.1" is available. Closes PR pkg 14254.

5 files changed, 43 insertions, 7 deletions

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 9ede4d012b1..3cec3b49f5c 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/02/18 15:14:04 seb Exp $
+# $NetBSD: Makefile,v 1.20 2002/03/06 19:19:02 fredb Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp
 #
 
@@ -24,6 +24,9 @@ MAKE_ENV+=	MGETTY_CONFDIR=${MGETTY_CONFDIR}
 
 USE_BUILDLINK_ONLY=	# defined
 
+pre-patch:
+	${MV} ${WRKSRC}/doc/fax.1in ${WRKSRC}/doc/sendfax.1in
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
diff --git a/comms/mgetty+sendfax/PLIST b/comms/mgetty+sendfax/PLIST
index bb0ece736aa..cd6f9bc4be5 100644
--- a/comms/mgetty+sendfax/PLIST
+++ b/comms/mgetty+sendfax/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:04 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/03/06 19:19:02 fredb Exp $
 bin/autopvf
 bin/basictopvf
 bin/faxspool
@@ -43,7 +43,7 @@ info/mgetty.info-4
 lib/mgetty+sendfax/cour25.pbm
 lib/mgetty+sendfax/cour25n.pbm
 man/man1/g3cat.1
-man/man1/fax.1
+man/man1/sendfax.1
 man/man1/g32pbm.1
 man/man1/faxq.1
 man/man1/pbm2g3.1
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index 39218f15b84..b27d7ef08bc 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.4 2002/02/18 15:14:04 seb Exp $
+$NetBSD: distinfo,v 1.5 2002/03/06 19:19:02 fredb Exp $
 
 SHA1 (mgetty1.1.26-Apr16.tar.gz) = c36926dad8849f14e617f207cb7729f8e4c7f089
 Size (mgetty1.1.26-Apr16.tar.gz) = 948245 bytes
 SHA1 (patch-aa) = 249ec3d2425d359a5d89241978ff9ac6122d0eb6
 SHA1 (patch-ab) = ca2ff2961b045b66a3aedf692ce83e8fc6ecdd09
 SHA1 (patch-ac) = f37ba8521f18957931f5180c8c90f3ec0b6a707f
-SHA1 (patch-ad) = a4ae1d528791ff532c8e8f0dcdf9eda9df790b33
+SHA1 (patch-ad) = 27fcebfe959a1d24657f504b89017fa3a58ae6c1
 SHA1 (patch-ae) = bf1dde04e3c3ae0b0683481cf1bd2e590d1dddd8
 SHA1 (patch-af) = 418e87beca4f3a52ae0c6f7e337d119f86766d6c
 SHA1 (patch-ag) = 943aa837a285663ff6cf5ab07c3f908f499c2074
 SHA1 (patch-ah) = 7724a401625d25b00ba88782eeffc3cdc03387c6
 SHA1 (patch-ai) = 98eba401e1b422e2f759eca00132a75e68518f4d
+SHA1 (patch-aj) = 25e809417d438dfd1f33daeb0dcae307eaaae867
diff --git a/comms/mgetty+sendfax/patches/patch-ad b/comms/mgetty+sendfax/patches/patch-ad
index edb09012b50..8a0e388af84 100644
--- a/comms/mgetty+sendfax/patches/patch-ad
+++ b/comms/mgetty+sendfax/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2002/02/18 15:14:04 seb Exp $
+$NetBSD: patch-ad,v 1.4 2002/03/06 19:19:02 fredb Exp $
 
---- doc/Makefile.orig	Thu Nov 27 21:33:26 1997
+--- doc/Makefile.orig	Thu Nov 27 14:33:26 1997
 +++ doc/Makefile
+@@ -6,7 +6,7 @@
+ NROFF=nroff
+ #
+ #
+-MAN1PAGES=g32pbm.1 g3cat.1 pbm2g3.1 fax.1 \
++MAN1PAGES=g32pbm.1 g3cat.1 pbm2g3.1 sendfax.1 \
+ 	  faxspool.1 faxrunq.1 faxq.1 faxrm.1 coverpg.1
+ MAN4PAGES=mgettydefs.4
+ MAN5PAGES=faxqueue.5
 @@ -26,7 +26,7 @@
  
  all:
@@ -20,3 +29,12 @@ $NetBSD: patch-ad,v 1.3 2002/02/18 15:14:04 seb Exp $
  
  mgetty.ps: mgetty.dvi
  	-dvips -o mgetty.ps mgetty.dvi
+@@ -98,7 +98,7 @@
+ 
+ # explicit man page dependencies
+ 
+-fax.1: fax.1in ../sedscript
++sendfax.1: sendfax.1in ../sedscript
+ faxq.1: faxq.1in ../sedscript
+ faxqueue.5: faxqueue.5in ../sedscript
+ faxrm.1: faxrm.1in ../sedscript
diff --git a/comms/mgetty+sendfax/patches/patch-aj b/comms/mgetty+sendfax/patches/patch-aj
new file mode 100644
index 00000000000..7b3026a0b51
--- /dev/null
+++ b/comms/mgetty+sendfax/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2002/03/06 19:19:02 fredb Exp $
+
+--- doc/sendfax.1in.orig	Sun Jan 12 08:52:30 1997
++++ doc/sendfax.1in
+@@ -1,7 +1,7 @@
+-.TH fax 1 "27 Oct 94" "greenie" "mgetty+sendfax manual"
++.TH sendfax 1 "27 Oct 94" "greenie" "mgetty+sendfax manual"
+ .IX fax
+ .SH NAME
+-fax \- fax sending and receiving with mgetty+sendfax
++sendfax \- fax sending and receiving with mgetty+sendfax
+ .SH SYNOPSIS
+ .B faxspool
+ .RB [options]