* Remove unnecessary INSTALL and DEINSTALL scripts and replace with an

  appropriate OWN_DIRS_PERMS definition.

* Simplify the patches by overriding the value of CONFDIR at build time
  and at installation time.

* Honor PKGINFODIR and PKGMANDIR.

Bump PKGREVISION to 4 due to INSTALL script changes.

9 files changed, 49 insertions, 215 deletions

diff --git a/comms/mgetty+sendfax/DEINSTALL b/comms/mgetty+sendfax/DEINSTALL
deleted file mode 100644
index 0b86b3699ee..00000000000
--- a/comms/mgetty+sendfax/DEINSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.4 2003/08/30 20:22:50 jlam Exp $
-
-case ${STAGE} in
-DEINSTALL)
-	if [ -d /var/spool/fax ]; then
-		filecount="`${FIND} /var/spool/fax -type f 2>/dev/null | wc -l`"
-		if [ $filecount -eq 0 ]; then
-			${ECHO} "Removing empty fax spool directories..."
-			${RM} -r /var/spool/fax
-		fi
-	fi
-	;;
-esac
diff --git a/comms/mgetty+sendfax/INSTALL b/comms/mgetty+sendfax/INSTALL
deleted file mode 100755
index b6fce560133..00000000000
--- a/comms/mgetty+sendfax/INSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.5 2003/12/20 20:09:50 fredb Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	if [ ! -d /var/spool/fax ]; then
-		${ECHO} "Creating fax spool directories..."
-		${MKDIR} /var/spool/fax
-		${CHMOD} 755 /var/spool/fax
-	fi
-	if [ ! -d /var/spool/fax/incoming ]; then
-		${MKDIR} /var/spool/fax/incoming
-		${CHMOD} 755 /var/spool/fax/incoming
-	fi
-	if [ ! -d /var/spool/fax/outgoing ]; then
-		${MKDIR} /var/spool/fax/outgoing
-	fi
-	${CHMOD} 755 /var/spool/fax/outgoing
-	${CHOWN} fax /var/spool/fax/outgoing
-	;;
-esac
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index cd2debf8dac..ab597529d1d 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2006/03/14 01:14:27 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2006/03/20 04:09:37 jlam Exp $
 
 DISTNAME=	mgetty1.1.31-Jul24
 PKGNAME=	mgetty-1.1.31
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ \
 		ftp://alpha.greenie.net/pub/mgetty/source/1.1/
@@ -18,13 +18,20 @@ CONFLICTS=	hylafax-[0-9]*
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
 MAKE_ENV+=		MGETTY_CONFDIR=${PKG_SYSCONFDIR:Q}
+MAKE_FLAGS+=		prefix=${PREFIX:Q}				\
+			INFODIR=${PREFIX:Q}/${PKGINFODIR:Q}		\
+			MAN1DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man1		\
+			MAN4DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man4		\
+			MAN5DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man5		\
+			MAN8DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man8
+BUILD_MAKE_FLAGS=	${MAKE_FLAGS} CONFDIR=${PKG_SYSCONFDIR:Q}
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} CONFDIR=${EXAMPLES_DIR:Q}
 
 USE_TOOLS+=		makeinfo
-INFO_FILES=		mgetty.info
+INFO_FILES=		# PLIST
 PKG_SYSCONFSUBDIR=	mgetty+sendfax
 
-.if !defined(CONF_FILES)
-. for cfg in		dialin.config		\
+.for cfg in		dialin.config		\
 			faxheader		\
 			faxrunq.config		\
 			faxspool.rules.sample	\
@@ -32,17 +39,18 @@ PKG_SYSCONFSUBDIR=	mgetty+sendfax
 			mgetty.config		\
 			voice.conf
 
-CONF_FILES+=		${_EXAMPLES_DIR}/${cfg} ${PKG_SYSCONFDIR}/${cfg}
-. endfor
-.endif
+CONF_FILES+=		${EXAMPLES_DIR}/${cfg} ${PKG_SYSCONFDIR}/${cfg}
+.endfor
 
 PKG_GROUPS=		dialer
 PKG_USERS=		fax:dialer
 
-_EXAMPLES_DIR=		${PREFIX}/share/examples/mgetty+sendfax
-MAKE_DIRS_PERMS+=	/var/spool/fax ${ROOT_USER} ${ROOT_GROUP} 755
-MAKE_DIRS_PERMS+=	/var/spool/fax/incoming ${ROOT_USER} ${ROOT_GROUP} 755
-MAKE_DIRS_PERMS+=	/var/spool/fax/outgoing fax ${ROOT_GROUP} 755
+EXAMPLES_DIR=		${PREFIX}/share/examples/mgetty+sendfax
+OWN_DIRS_PERMS+=	/var/spool/fax ${ROOT_USER} ${ROOT_GROUP} 755
+OWN_DIRS_PERMS+=	/var/spool/fax/incoming ${ROOT_USER} ${ROOT_GROUP} 755
+OWN_DIRS_PERMS+=	/var/spool/fax/outgoing fax ${ROOT_GROUP} 755
+
+.include "../../graphics/netpbm/buildlink3.mk"
 
 do-configure:
 	${MV} ${WRKSRC}/doc/fax.1in ${WRKSRC}/doc/sendfax.1in
@@ -56,5 +64,4 @@ do-configure:
 	&& cd ${.CURDIR}					\
 	&& ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
-.include "../../graphics/netpbm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/mgetty+sendfax/PLIST b/comms/mgetty+sendfax/PLIST
index a8abb626a31..73f3275e947 100644
--- a/comms/mgetty+sendfax/PLIST
+++ b/comms/mgetty+sendfax/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/07/01 10:16:28 hira Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/03/20 04:09:37 jlam Exp $
 bin/autopvf
 bin/basictopvf
 bin/faxq
@@ -34,6 +34,7 @@ bin/sff2g3
 bin/vm
 bin/voctopvf
 bin/wavtopvf
+info/mgetty.info
 lib/mgetty+sendfax/cour25.pbm
 lib/mgetty+sendfax/cour25n.pbm
 lib/mgetty+sendfax/faxq-helper
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index 2cfd5649313..acef1d9b079 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.24 2006/01/05 17:32:52 joerg Exp $
+$NetBSD: distinfo,v 1.25 2006/03/20 04:09:37 jlam Exp $
 
 SHA1 (mgetty1.1.31-Jul24.tar.gz) = a6f20da26b49bbfa695791edec7d0a2247b79e2d
 RMD160 (mgetty1.1.31-Jul24.tar.gz) = 255eec0838ce5bfad04c53d478a4505e74111a07
 Size (mgetty1.1.31-Jul24.tar.gz) = 998462 bytes
 SHA1 (patch-aa) = 9b6d9d6af2245f3dfea235bc2e044a2151bc4187
-SHA1 (patch-ab) = 25c7ac6eb05551ac45ddc3b1fa85c47ea2823b66
-SHA1 (patch-ac) = 983ee9598151a2234022bfc65047926841102c65
-SHA1 (patch-ad) = 7c4a96eaf7c83e9d907a74317252f752b4c689e6
+SHA1 (patch-ab) = 1638b3b7162bcff0d5fae7fbe42626b5008fe1e9
+SHA1 (patch-ac) = bdc69ccc3430634bb74742fd105ee8f3fcde4d21
+SHA1 (patch-ad) = a24776252e36cfe84b10b7a1b03a43b15d7049d0
 SHA1 (patch-ae) = 04f35280e337fb766152b7d9badcd0c417aa1739
 SHA1 (patch-af) = c3d141a0952c54c392e99399fd05efebd55f0267
 SHA1 (patch-ag) = f12e39005c78a94f641ccbdbbfa51b5181821148
 SHA1 (patch-ah) = 2d9de861d3bce7b454eee957d32ffe67996e27c7
-SHA1 (patch-ai) = a69003a5a28196c5a57bf538b20a31e2371683c7
 SHA1 (patch-aj) = 37d88c1a4f8d5826f7113dd120c32e89cc442e5d
 SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475
 SHA1 (patch-al) = 2a6dcf13d65446d2064228b1024517e599892a60
diff --git a/comms/mgetty+sendfax/patches/patch-ab b/comms/mgetty+sendfax/patches/patch-ab
index 536c2b936d2..e7795c93fbd 100644
--- a/comms/mgetty+sendfax/patches/patch-ab
+++ b/comms/mgetty+sendfax/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.8 2005/02/23 16:58:26 jwise Exp $
+$NetBSD: patch-ab,v 1.9 2006/03/20 04:09:37 jlam Exp $
 
 --- Makefile.orig	2004-07-24 14:53:47.000000000 -0400
-+++ Makefile	2005-02-23 11:07:40.000000000 -0500
++++ Makefile
 @@ -4,8 +4,8 @@
  #
  # this is the C compiler to use (on SunOS, the standard "cc" does not
@@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.8 2005/02/23 16:58:26 jwise Exp $
  #
  #### C Compiler Flags ####
  #
-@@ -102,7 +102,7 @@
+@@ -102,7 +102,7 @@ CC=gcc
  #	    USTAT	  - ustat(), no statfs etc.
  #
  #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.8 2005/02/23 16:58:26 jwise Exp $
  #CFLAGS=-O -DSVR4
  #CFLAGS=-O -DSVR4 -DSVR42
  #CFLAGS=-O -DUSE_POLL
-@@ -144,7 +144,7 @@
+@@ -144,7 +144,7 @@ CFLAGS=-O2 -Wall -pipe
  # For Linux, add "-lutil" if the linker complains about "updwtmp".
  #
  LDFLAGS=
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.8 2005/02/23 16:58:26 jwise Exp $
  #LIBS=-lprot -lsocket				# SCO Unix
  #LIBS=-lsocket
  #LIBS=-lbsd					# OSF/1
-@@ -164,15 +164,15 @@
+@@ -164,8 +164,8 @@ LIBS=
  #
  # if your systems doesn't have one, use the shell script that I provide
  # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
@@ -42,67 +42,7 @@ $NetBSD: patch-ab,v 1.8 2005/02/23 16:58:26 jwise Exp $
  #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
  #INSTALL=/usr/bin/X11/bsdinst -c -o bin 	# IRIX
- #
- # prefix, where most (all?) of the stuff lives, usually /usr/local or /usr
- #
--prefix=/usr/local
-+prefix=${PREFIX}
- #
- # prefix for all the spool directories (usually /usr/spool or /var/spool)
- #
-@@ -180,20 +180,20 @@
- #
- # where the mgetty + sendfax binaries live (used for "make install")
- #
--SBINDIR=$(prefix)/sbin
-+SBINDIR=${PREFIX}/sbin
- #
- # where the user executable binaries live
- #
--BINDIR=$(prefix)/bin
-+BINDIR=${PREFIX}/bin
- #
- # where the font+coverpage files go
- #
--LIBDIR=$(prefix)/lib/mgetty+sendfax
-+LIBDIR=${PREFIX}/lib/mgetty+sendfax
- #
- # where the configuration files (*.config, aliases, fax.allow/deny) go to
- #
--CONFDIR=$(prefix)/etc/mgetty+sendfax
--#CONFDIR=/etc/default/
-+CONFDIR=${MGETTY_CONFDIR}
-+CONF_EXAMPLES_DIR=${PREFIX}/share/examples/mgetty+sendfax
- #
- #
- # where mgetty PID files (mgetty.pid) go to
-@@ -220,20 +220,20 @@
- #
- #
- # Where section 1 manual pages should be placed
--MAN1DIR=$(prefix)/man/man1
-+MAN1DIR=${PREFIX}/man/man1
- #
- # Where section 4 manual pages (mgettydefs.4) should be placed
--MAN4DIR=$(prefix)/man/man4
-+MAN4DIR=${PREFIX}/man/man4
- #
- # Section 5 man pages (faxqueue.5)
--MAN5DIR=$(prefix)/man/man5
-+MAN5DIR=${PREFIX}/man/man5
- #
- # Section 8 man pages (sendfax.8)
--MAN8DIR=$(prefix)/man/man8
-+MAN8DIR=${PREFIX}/man/man8
- #
- # Where the GNU Info-Files are located
- #
--INFODIR=$(prefix)/info
-+INFODIR=${PREFIX}/info
- #
- #
- # A shell that understands bourne-shell syntax
-@@ -258,7 +258,7 @@
+@@ -258,7 +258,7 @@ PERL="/usr/bin/perl -w"
  # 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.
@@ -111,7 +51,7 @@ $NetBSD: patch-ab,v 1.8 2005/02/23 16:58:26 jwise Exp $
  #
  #
  # An echo program that understands escapes like "\n" for newline or
-@@ -270,9 +270,9 @@
+@@ -270,9 +270,9 @@ TKPERL=/usr/bin/tkperl
  # please use the "mg.echo" program provided in the compat/ subdirectory.
  # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
  #
@@ -123,7 +63,7 @@ $NetBSD: patch-ab,v 1.8 2005/02/23 16:58:26 jwise Exp $
  
  #
  # for mgetty, that's it. If you want to use the voice
-@@ -280,7 +280,7 @@
+@@ -280,7 +280,7 @@ ECHO="echo"
  
  # To maintain security, I recommend creating a new group for
  # users who are allowed to manipulate the recorded voice messages.
@@ -132,7 +72,7 @@ $NetBSD: patch-ab,v 1.8 2005/02/23 16:58:26 jwise Exp $
  PHONE_PERMS=770
  
  # Add -DNO_STRSTR to CFLAGS if you don't have strstr().
-@@ -312,7 +312,7 @@
+@@ -312,7 +312,7 @@ SFAXOBJ=sendfax.o logfile.o locks.o mode
  
  all:	bin-all doc-all
  
@@ -141,18 +81,18 @@ $NetBSD: patch-ab,v 1.8 2005/02/23 16:58:26 jwise Exp $
  
  # a few C files need extra compiler arguments
  
-@@ -564,8 +564,8 @@
+@@ -564,8 +564,8 @@ newslock: compat/newslock.c
  # internal: use this to create a "clean" mgetty+sendfax tree
  bindist: all doc-all sedscript
  	-rm -rf bindist
 -	./mkidirs bindist$(prefix) bindist$(spool)
 -	bd=`pwd`/bindist; PATH=`pwd`:"$$PATH" $(MAKE) prefix=$$bd$(prefix) \
-+	./mkidirs bindist${PREFIX}/ bindist$(spool)
-+	bd=`pwd`/bindist; PATH=`pwd`:"$$PATH" $(MAKE) prefix=$$bd${PREFIX}/ \
++	./mkidirs bindist$(prefix)/ bindist$(spool)
++	bd=`pwd`/bindist; PATH=`pwd`:"$$PATH" $(MAKE) prefix=$$bd$(prefix)/ \
  		BINDIR=$$bd$(BINDIR) SBINDIR=$$bd$(SBINDIR) \
  		LIBDIR=$$bd$(LIBDIR) CONFDIR=$$bd$(CONFDIR) \
  		spool=$$bd$(spool) FAX_SPOOL=$$bd$(FAX_SPOOL) \
-@@ -577,7 +577,7 @@
+@@ -577,7 +577,7 @@ bindist: all doc-all sedscript
  	cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *
  
  
@@ -161,7 +101,7 @@ $NetBSD: patch-ab,v 1.8 2005/02/23 16:58:26 jwise Exp $
  
  install.bin: mgetty sendfax newslock \
  		login.config mgetty.config sendfax.config 
-@@ -585,7 +585,7 @@
+@@ -585,7 +585,7 @@ install.bin: mgetty sendfax newslock \
  # binaries
  #
  	-test -d $(BINDIR)  || ( ./mkidirs $(BINDIR)  ; chmod 755 $(BINDIR)  )
@@ -170,30 +110,3 @@ $NetBSD: patch-ab,v 1.8 2005/02/23 16:58:26 jwise Exp $
  
  	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
  	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
-@@ -597,18 +597,14 @@
- #
- 	test -d $(LIBDIR)  || \
- 		( ./mkidirs $(LIBDIR) &&  chmod 755 $(LIBDIR) )
--	test -d $(CONFDIR) || \
--		( ./mkidirs $(CONFDIR) && chmod 755 $(CONFDIR))
--	test -f $(CONFDIR)/login.config || \
--		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
--	test -f $(CONFDIR)/mgetty.config || \
--		$(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/
--	test -f $(CONFDIR)/sendfax.config || \
--		$(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/
--	test -f $(CONFDIR)/dialin.config || \
--		$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
--	test -f $(CONFDIR)/faxrunq.config || \
--		$(INSTALL) -o root -m 644 faxrunq.config $(CONFDIR)/
-+	test -d $(CONF_EXAMPLES_DIR) || \
-+		( ./mkidirs $(CONF_EXAMPLES_DIR); chmod 755 $(CONF_EXAMPLES_DIR))
-+	$(INSTALL) -o root -m 600 login.config $(CONF_EXAMPLES_DIR)/
-+	$(INSTALL) -o root -m 600 mgetty.config $(CONF_EXAMPLES_DIR)/
-+	$(INSTALL) -o root -m 644 sendfax.config $(CONF_EXAMPLES_DIR)/
-+	$(INSTALL) -o root -m 600 dialin.config $(CONF_EXAMPLES_DIR)/
-+	$(INSTALL) -o root -m 644 faxrunq.config $(CONF_EXAMPLES_DIR)/
-+
- #
- # test for outdated stuff
- #
diff --git a/comms/mgetty+sendfax/patches/patch-ac b/comms/mgetty+sendfax/patches/patch-ac
index e0ea986780f..64f9145f7c1 100644
--- a/comms/mgetty+sendfax/patches/patch-ac
+++ b/comms/mgetty+sendfax/patches/patch-ac
@@ -1,17 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2005/06/12 14:29:53 hira Exp $
+$NetBSD: patch-ac,v 1.7 2006/03/20 04:09:37 jlam Exp $
 
---- voice/Makefile.orig	2001-12-24 00:08:13.000000000 +0900
-+++ voice/Makefile	2005-06-12 23:03:21.000000000 +0900
-@@ -26,6 +26,8 @@
- 
- PROGRAMDIRS=pvftools vgetty vm
- 
-+CONF_EXAMPLES_DIR=${PREFIX}/share/examples/mgetty+sendfax
-+
- PVFTOOLS=pvfamp pvfcut pvfecho pvffile pvffilter pvffft pvfmix pvfnoise \
- 	pvfreverse pvfsine pvfspeed pvftormd rmdtopvf rmdfile pvftovoc \
- 	voctopvf pvftolin lintopvf pvftobasic basictopvf pvftoau autopvf \
-@@ -92,11 +94,12 @@
+--- voice/Makefile.orig	2001-12-23 10:08:13.000000000 -0500
++++ voice/Makefile
+@@ -92,11 +92,12 @@ vgetty-install: vgetty-all
  	$(INSTALL) -m 644 man/man1/zplay.1 $(MAN1DIR)
  	$(INSTALL) -m 644 man/man1/pvf.1 $(MAN1DIR)
  	$(INSTALL) -m 644 man/man8/vgetty.8 $(MAN8DIR)
@@ -20,7 +11,7 @@ $NetBSD: patch-ac,v 1.6 2005/06/12 14:29:53 hira Exp $
 -	do \
 -	     $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \
 -	done
-+	$(INSTALL) -m 644 voice.conf-dist $(CONF_EXAMPLES_DIR)/voice.conf
++	$(INSTALL) -m 644 voice.conf-dist $(CONFDIR)/voice.conf
 +#	cd $(MAN1DIR); \
 +#	for i in $(PVFTOOLS); \
 +#	do \
diff --git a/comms/mgetty+sendfax/patches/patch-ad b/comms/mgetty+sendfax/patches/patch-ad
index 06ff5794b6c..cd531b6f42f 100644
--- a/comms/mgetty+sendfax/patches/patch-ad
+++ b/comms/mgetty+sendfax/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.6 2005/02/23 16:58:26 jwise Exp $
+$NetBSD: patch-ad,v 1.7 2006/03/20 04:09:37 jlam Exp $
 
 --- doc/Makefile.orig	2004-07-17 11:21:19.000000000 -0400
-+++ doc/Makefile	2005-02-23 11:10:20.000000000 -0500
++++ doc/Makefile
 @@ -6,7 +6,7 @@
  NROFF=nroff
  #
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.6 2005/02/23 16:58:26 jwise Exp $
  	  faxspool.1 faxrunq.1 faxq.1 faxrm.1 coverpg.1
  MAN4PAGES=mgettydefs.4
  MAN5PAGES=faxqueue.5
-@@ -26,7 +26,7 @@
+@@ -26,7 +26,7 @@ MAN_FMT_PRG=$(NROFF) -man
  
  all:
  
@@ -20,16 +20,7 @@ $NetBSD: patch-ad,v 1.6 2005/02/23 16:58:26 jwise Exp $
  
  manpages: $(MANSRC)
  
-@@ -43,7 +43,7 @@
- 	-texi2html -verbose mgetty.texi
- 
- mgetty.info: mgetty.texi
--	-makeinfo mgetty.texi
-+	-${MAKEINFO} mgetty.texi
- 
- mgetty.ps: mgetty.dvi
- 	-dvips -o mgetty.ps mgetty.dvi
-@@ -98,7 +98,7 @@
+@@ -98,7 +98,7 @@ doc-tar: ../mgetty0$(VS)doc.tar.gz
  
  # explicit man page dependencies
  
diff --git a/comms/mgetty+sendfax/patches/patch-ai b/comms/mgetty+sendfax/patches/patch-ai
deleted file mode 100644
index 246ed79be1d..00000000000
--- a/comms/mgetty+sendfax/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2005/03/07 11:29:28 wiz Exp $
-
---- fax/Makefile.orig	2003-10-09 14:38:49.000000000 +0200
-+++ fax/Makefile
-@@ -12,6 +12,9 @@ FAX_SCRIPTS=faxspool faxrunq faxq faxrm 
- zigzag: 
- 	cd .. ; $(MAKE) subdirs
- 
-+CONFDIR=${MGETTY_CONFDIR}
-+CONF_EXAMPLES_DIR=${PREFIX}/share/examples/mgetty+sendfax
-+
- all: $(FAX_SCRIPTS) faxrunqd faxheader faxq-helper
- 
- faxspool: faxspool.in ../sedscript
-@@ -68,8 +71,8 @@ install: all
- #
- 	$(INSTALL) -m 644 cour25.pbm $(LIBDIR)
- 	$(INSTALL) -m 644 cour25n.pbm $(LIBDIR)
--	-test -f $(CONFDIR)/faxheader || \
--		$(INSTALL) -m 644 faxheader $(CONFDIR)
-+	-test -f $(CONF_EXAMPLES_DIR)/faxheader || \
-+		$(INSTALL) -m 644 faxheader $(CONF_EXAMPLES_DIR)
- #
- # /etc/magic
- #
-@@ -82,4 +85,4 @@ install: all
- #
- # faxspool.rules sample file
- #
--	$(INSTALL) -m 644 faxspool.rules $(CONFDIR)/faxspool.rules.sample
-+	$(INSTALL) -m 644 faxspool.rules $(CONF_EXAMPLES_DIR)/faxspool.rules.sample