- - Use standard ${PKG_SYSCONFDIR} handling; bump ${PKGREVISION}.

- - Reorganize Makefile #defines into global toggles, global settings,
    local settings.
- - Reorganize and consolidate override targets.

6 files changed, 60 insertions, 64 deletions

diff --git a/comms/mgetty+sendfax/DEINSTALL b/comms/mgetty+sendfax/DEINSTALL
index 358f82dcf75..29e50910820 100644
--- a/comms/mgetty+sendfax/DEINSTALL
+++ b/comms/mgetty+sendfax/DEINSTALL
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+
 if [ -d /var/spool/fax ]; then
 	filecount="`find /var/spool/fax -type f 2>/dev/null | wc -l`"
 	if [ $filecount -eq 0 ]; then
@@ -7,3 +8,4 @@ if [ -d /var/spool/fax ]; then
 		rm -r /var/spool/fax
 	fi
 fi
+
diff --git a/comms/mgetty+sendfax/INSTALL b/comms/mgetty+sendfax/INSTALL
index 1256c857028..8d3985358c0 100755
--- a/comms/mgetty+sendfax/INSTALL
+++ b/comms/mgetty+sendfax/INSTALL
@@ -1,22 +1,28 @@
 #!/bin/sh
 #
 
-if [ x"$2" != xPOST-INSTALL ]
+if [ x"$2" = xPOST-INSTALL ]
 then
-	exit
+	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
+		${CHMOD} 1777 /var/spool/fax/outgoing
+	fi
+	if [ ! -d /var/spool/fax/outgoing/locks ]
+	then
+		${MKDIR} /var/spool/fax/outgoing/locks
+		${CHMOD} 777 /var/spool/fax/outgoing/locks
+	fi
 fi
 
-${INSTALL_DATA_DIR} ${MGETTY_CONFDIR}
-(cd ${PREFIX}/share/examples/mgetty+sendfax;
-	${PAX} -r -w -pe -k * ${MGETTY_CONFDIR})
-
-test -d /var/spool ||  \
-	( mkdir /var/spool ; chmod 755 /var/spool )
-test -d /var/spool/fax ||  \
-	( mkdir /var/spool/fax ; chmod 755 /var/spool/fax )
-test -d /var/spool/fax/incoming ||  \
-	( mkdir /var/spool/fax/incoming ; chmod 755 /var/spool/fax/incoming )
-test -d /var/spool/fax/outgoing ||  \
-	( mkdir /var/spool/fax/outgoing ; chmod 1777 /var/spool/fax/outgoing )
-test -d /var/spool/fax/outgoing/locks ||  \
-	( mkdir /var/spool/fax/outgoing/locks ; chmod 777 /var/spool/fax/outgoing/locks )
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 7e195ece1b7..4bb456699b5 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2003/02/26 21:45:43 fredb Exp $
+# $NetBSD: Makefile,v 1.26 2003/02/27 17:13:37 fredb Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp
 #
 
 DISTNAME=	mgetty1.1.28-Jan10
 PKGNAME=	mgetty-1.1.28
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ \
 		ftp://alpha.greenie.net/pub/mgetty/source/1.1/
@@ -15,37 +15,39 @@ COMMENT=	Handle external logins, send and receive faxes
 
 CONFLICTS=	hylafax-[0-9]*
 
-WRKSRC=		${WRKDIR}/${PKGNAME:C/nb[0-9]//}
-INFO_FILES=	mgetty.info
-INSTALL_FILE=	${WRKDIR}/INSTALL
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 
-MGETTY_CONFDIR=	${PREFIX}/etc/mgetty+sendfax
-#MGETTY_CONFDIR=/etc/mgetty
-MAKE_ENV+=	MGETTY_CONFDIR=${MGETTY_CONFDIR}
+MAKE_ENV=		MGETTY_CONFDIR=${PKG_SYSCONFDIR}
+WRKSRC=			${WRKDIR}/${PKGNAME:C/nb[0-9]//}
 
-USE_BUILDLINK2=	# defined
+INFO_FILES=		mgetty.info
+PKG_SYSCONFSUBDIR=	mgetty+sendfax
 
-pre-patch:
-	${MV} ${WRKSRC}/doc/fax.1in ${WRKSRC}/doc/sendfax.1in
+.ifndef CONF_FILES
+. for cfg in		dialin.config		\
+			faxheader		\
+			faxrunq.config		\
+			faxspool.rules.sample	\
+			login.config		\
+			mgetty.config
+CONF_FILES+=		${_EXAMPLES_DIR}/${cfg} ${PKG_SYSCONFDIR}/${cfg}
+. endfor
+.endif
+
+_EXAMPLES_DIR=		${PREFIX}/share/examples/mgetty+sendfax
 
 do-configure:
-	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-
-post-configure:
-	${SED} -e 's#$${INSTALL_DATA_DIR}#${INSTALL_DATA_DIR}#' \
-		-e 's#$${MGETTY_CONFDIR}#${MGETTY_CONFDIR}#' \
-		-e 's#$${PAX}#${PAX}#' \
-		-e 's#$${PREFIX}#${PREFIX}#' \
-		${PKGDIR}/INSTALL > ${INSTALL_FILE}
-	cd ${WRKSRC}; \
-	    ${MV} faxrunq.config faxrunq.config.old; \
-	    ${SED} 's#/usr/local#${PREFIX}#' \
-		    faxrunq.config.old > faxrunq.config
-
-post-install:
-	${INSTALL_DATA_DIR} ${MGETTY_CONFDIR}
-	cd ${PREFIX}/share/examples/mgetty+sendfax; \
-	    ${PAX} -r -w -pe -k * ${MGETTY_CONFDIR}
+	${MV} ${WRKSRC}/doc/fax.1in ${WRKSRC}/doc/sendfax.1in
+	cd ${WRKSRC}						\
+	&& for _file in faxrunq.config policy.h-dist;		\
+	do							\
+		${MV} $$_file $${_file}.orig;			\
+		${SED} 's|/usr/local|${PREFIX}|'		\
+		    $${_file}.orig > $$_file;			\
+	done							\
+	&& cd ${.CURDIR}					\
+	&& ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
 .include "../../graphics/netpbm/buildlink2.mk"
 .include "../../mk/texinfo.mk"
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index 21b2ca4cb6a..c37fee958bf 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2003/02/26 21:45:44 fredb Exp $
+$NetBSD: distinfo,v 1.10 2003/02/27 17:13:38 fredb Exp $
 
 SHA1 (mgetty1.1.28-Jan10.tar.gz) = b0c33bf5f5137f17f8d1fbd529c5ba6f0afb9dbc
 Size (mgetty1.1.28-Jan10.tar.gz) = 964610 bytes
@@ -8,9 +8,8 @@ SHA1 (patch-ac) = 1ff9866dd8a54fca4fa59d5144117fa3b46a9b4f
 SHA1 (patch-ad) = 27fcebfe959a1d24657f504b89017fa3a58ae6c1
 SHA1 (patch-ae) = f274db8059463f8b915c2d2faa86aa0e956e5a2c
 SHA1 (patch-ag) = 943aa837a285663ff6cf5ab07c3f908f499c2074
-SHA1 (patch-ah) = 7724a401625d25b00ba88782eeffc3cdc03387c6
 SHA1 (patch-ai) = 98eba401e1b422e2f759eca00132a75e68518f4d
-SHA1 (patch-aj) = 25e809417d438dfd1f33daeb0dcae307eaaae867
+SHA1 (patch-aj) = d03345166f70270d05ae478287165089bd832c16
 SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475
-SHA1 (patch-al) = 7dc2be52ca8ed6b035a0f0d4afcd3d1a949e5182
+SHA1 (patch-al) = 854ac984c6763aabfc4ec6e98eb535c066f2a8be
 SHA1 (patch-am) = 6b7516b3f857f65c0ecc7963f39e433e4ef8771d
diff --git a/comms/mgetty+sendfax/patches/patch-ah b/comms/mgetty+sendfax/patches/patch-ah
deleted file mode 100644
index bed1c15bda1..00000000000
--- a/comms/mgetty+sendfax/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1999/08/23 21:06:23 tron Exp $
-
---- policy.h-dist.orig	Fri Aug  7 19:42:16 1998
-+++ policy.h-dist	Mon Aug 23 22:52:58 1999
-@@ -588,7 +588,7 @@
-  * If you don't want this type of service, do not define it at all
-  * Absolute path name has to be used here!
-  */
--#define FAX_NOTIFY_PROGRAM "/usr/local/lib/mgetty+sendfax/new_fax"
-+#define FAX_NOTIFY_PROGRAM PREFIX "/lib/mgetty+sendfax/new_fax"
- 
- /* default minimum space required on spooling partition for receiving a FAX
-  * (in KILObytes)
diff --git a/comms/mgetty+sendfax/patches/patch-aj b/comms/mgetty+sendfax/patches/patch-aj
index 7b3026a0b51..d569b36639e 100644
--- a/comms/mgetty+sendfax/patches/patch-aj
+++ b/comms/mgetty+sendfax/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 2002/03/06 19:19:02 fredb Exp $
+$NetBSD: patch-aj,v 1.2 2003/02/27 17:13:38 fredb Exp $
 
---- doc/sendfax.1in.orig	Sun Jan 12 08:52:30 1997
-+++ doc/sendfax.1in
+--- doc/fax.1in.orig	Sun Jan 12 08:52:30 1997
++++ doc/fax.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"