From eafaf83404a7964ff88fa68cbb1c72948cd1cbfd Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sun, 3 Sep 2000 13:22:31 +0000
Subject: Cleanup; don't hardcode /usr/pkg in MESSAGE

---
 security/smtpd/Makefile      | 16 +++++-----------
 security/smtpd/pkg/DEINSTALL |  3 +--
 security/smtpd/pkg/MESSAGE   |  4 ++--
 3 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'security/smtpd')

diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile
index fe07873e669..2d34c46d6fe 100644
--- a/security/smtpd/Makefile
+++ b/security/smtpd/Makefile
@@ -1,33 +1,27 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/04/21 10:57:33 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2000/09/03 13:22:31 wiz Exp $
 #
 
 DISTNAME=	smtpd-2.0
 CATEGORIES=	mail security
 MASTER_SITES=	ftp://ftp.obtuse.com/pub/smtpd/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCHFILES=	patch-smtpd-2.0-RBL.gz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.obtuse.com/smtpd.html
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
 SPOOL=		/var/spool/smtpd
+MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 pre-install:
-		-${MKDIR} -p ${SPOOL}/etc
+		-${MKDIR} ${SPOOL}/etc
 		for f in antirelay_check_rules_example antispam_check_rules.example smtpd_check_rules.example ; do ${INSTALL_DATA} ${WRKSRC}/$$f ${SPOOL}/etc; done
 		${CHOWN} -R uucp.mail ${SPOOL}
 		${CHMOD} -R g=,o= ${SPOOL}
 		${CP} /etc/localtime /etc/resolv.conf ${SPOOL}/etc
-		
 
 post-build:
-		@cd ${PKGDIR}; \
-		for f in DEINSTALL MESSAGE; do \
-		  ${SED} -e 's#@PREFIX@#${PREFIX}#g' <$$f >$$f.1; \
-		  ${MV} -f $$f.1 $$f; \
-		done
+		${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE \
+			>${MESSAGE_FILE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/smtpd/pkg/DEINSTALL b/security/smtpd/pkg/DEINSTALL
index 4bfc80cc99b..f70b41f4eee 100644
--- a/security/smtpd/pkg/DEINSTALL
+++ b/security/smtpd/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1.1.1 2000/04/21 10:57:33 mjl Exp $
+# $NetBSD: DEINSTALL,v 1.2 2000/09/03 13:22:31 wiz Exp $
 #
 
 case "$2" in
@@ -15,4 +15,3 @@ remove those by hand, if you no longer need them.
 EOF
         ;;
 esac
-
diff --git a/security/smtpd/pkg/MESSAGE b/security/smtpd/pkg/MESSAGE
index 8e6c49a1a4c..ceac3b1a2d6 100644
--- a/security/smtpd/pkg/MESSAGE
+++ b/security/smtpd/pkg/MESSAGE
@@ -1,5 +1,5 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2000/04/21 10:57:33 mjl Exp $
+$NetBSD: MESSAGE,v 1.2 2000/09/03 13:22:31 wiz Exp $
 
 The necessary spool and configuration directories were created
 under /var/spool/smtpd. Please edit /var/spool/smtpd/etc/smtp_check_rules
@@ -7,7 +7,7 @@ according to your taste.
 
 You will want to start smtpfwdd in rc.local, and add a line like
 
-smtp	stream	tcp	nowait	root	/usr/pkg/sbin/smtpd	smtpd
+smtp	stream	tcp	nowait	root	@PREFIX@/sbin/smtpd	smtpd
 
 to your /etc/inetd.conf when you are done.
 ==========================================================================
-- 
cgit v1.2.3