From ced46aefb8976918043e16d48f73dfacdbdc7cf6 Mon Sep 17 00:00:00 2001
From: tv <tv>
Date: Tue, 20 Apr 1999 11:57:14 +0000
Subject: Do the MANCOMPRESSED thing a little differently - only set
 MANCOMPRESSED if mk.conf sets MANZ.

Also, do not overwrite sendmail if it is already in /usr/libexec/sendmail
(use mv -i with a stdin of /dev/null).
---
 mail/mailwrapper/Makefile  | 8 +++++---
 mail/mailwrapper/pkg/PLIST | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'mail/mailwrapper')

diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile
index a4a9817ab31..b5a309acbd1 100644
--- a/mail/mailwrapper/Makefile
+++ b/mail/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/04/20 11:32:05 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/20 11:57:14 tv Exp $
 
 DISTNAME=	mailwrapper-19990412
 CATEGORIES=	mail
@@ -14,8 +14,10 @@ NO_PATCH=		yes
 IGNORE=         "is part of your NetBSD distribution"
 .endif
 
+.include "../../mk/bsd.prefs.mk"
+.if defined(MANZ)
 MANCOMPRESSED=	1
-MAKE_ENV+=	MANZ=1
+.endif
 WRKSRC=		${WRKDIR}/mailwrapper
 
 MAILER_CONF=	/etc/mailer.conf
@@ -27,7 +29,7 @@ post-install:
 	${TEST} -e ${MAILER_CONF} || \
 	${LN} -s ${PREFIX}/etc/mailer.conf.default /etc/mailer.conf
 	${MKDIR} ${LIBEXECDIR}
-	${MV} ${SENDMAIL} ${LIBEXECDIR}
+	${MV} -i ${SENDMAIL} ${LIBEXECDIR} </dev/null 2>/dev/null || ${TRUE}
 	${LN} -fs ${PREFIX}/sbin/mailwrapper /usr/bin/mailq
 	${LN} -fs ${PREFIX}/sbin/mailwrapper /usr/bin/newaliases
 	${LN} -fs ${PREFIX}/sbin/mailwrapper ${SENDMAIL}
diff --git a/mail/mailwrapper/pkg/PLIST b/mail/mailwrapper/pkg/PLIST
index 35b5f969259..c75ce3b26b9 100644
--- a/mail/mailwrapper/pkg/PLIST
+++ b/mail/mailwrapper/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/12 21:19:32 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/04/20 11:57:14 tv Exp $
 etc/mailer.conf.default
 @exec test -e /etc/mailer.conf || ln -sf %F /etc/mailer.conf
 man/cat5/mailer.conf.0.gz
@@ -7,7 +7,7 @@ man/man5/mailer.conf.5.gz
 man/man8/mailwrapper.8.gz
 sbin/mailwrapper
 @exec mkdir -p /usr/libexec/sendmail
-@exec mv /usr/sbin/sendmail /usr/libexec/sendmail
+@exec mv -i /usr/sbin/sendmail /usr/libexec/sendmail </dev/null 2>/dev/null || true
 @exec ln -fs %D/sbin/mailwrapper /usr/bin/mailq
 @exec ln -fs %D/sbin/mailwrapper /usr/bin/newaliases
 @exec ln -fs %D/sbin/mailwrapper /usr/sbin/sendmail
-- 
cgit v1.2.3