From ef197774195fa582fbf8f86e36b9fbd9be761e7d Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 9 Jan 2000 01:29:06 +0000
Subject: replaced some commands by their ${COMMAND} counterparts

---
 mail/nmh/Makefile      | 4 ++--
 mail/postfix/Makefile  | 6 +++---
 mail/sendmail/Makefile | 8 +++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'mail')

diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index d2f4ee390f4..3f966226bdf 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 1999/10/30 17:09:09 sakamoto Exp $
+# $NetBSD: Makefile,v 1.32 2000/01/09 01:29:06 wiz Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
@@ -66,6 +66,6 @@ post-install:
 	    ${INSTALL_DATA} ${WRKSRC}/`basename $$f` ${PREFIX}/${DOCDIR}; \
 	done
 	@${INSTALL_DATA} ${FILESDIR}/mhn.defaults ${PREFIX}/etc/nmh
-	@PKG_PREFIX='${PREFIX}' sh -f ${PKGDIR}/INSTALL
+	@PKG_PREFIX='${PREFIX}' ${SH} -f ${PKGDIR}/INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 4258f790bd4..afb03a6b54e 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1999/09/13 02:02:27 simonb Exp $
+# $NetBSD: Makefile,v 1.16 2000/01/09 01:29:07 wiz Exp $
 
 DISTNAME=	postfix-19990906-pl02
 PKGNAME=	postfix-19990906pl02
@@ -37,8 +37,8 @@ post-build:
 pre-install:
 	${MKDIR} /etc/postfix ${PREFIX}/share/postfix \
 	  ${PREFIX}/share/doc/postfix ${PREFIX}/libexec/postfix
-	chown root:wheel ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
-	chmod 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
+	${CHOWN} root:wheel ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
+	${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${PREFIX}/etc
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 2108cba931b..381e8d08c47 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/01/02 17:46:47 itojun Exp $
+# $NetBSD: Makefile,v 1.12 2000/01/09 01:29:07 wiz Exp $
 
 DISTNAME=	sendmail.8.9.3
 PKGNAME=	sendmail-8.9.3
@@ -24,7 +24,6 @@ MAKE_ENV+=	BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
 		BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}"
 
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
-OBJDIR!=	echo obj.`uname -srm | tr \  .`
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
 BUILD_DEFS+=    USE_INET6
@@ -49,7 +48,7 @@ MAKE_ENV+=	DB_ENVDEF="" DB_LIBS=""
 
 post-patch:
 .if defined(USE_INET6) && ${USE_INET6} == YES
-	@(cp ${FILESDIR}/site.config-v6 ${WRKSRC})
+	@(${CP} ${FILESDIR}/site.config-v6 ${WRKSRC})
 .endif
 
 post-build:
@@ -79,3 +78,6 @@ post-install:
 .endif
 
 .include "../../mk/bsd.pkg.mk"
+
+# has to be below include for bsd.pkg.mk, else substition fails
+OBJDIR!=	${ECHO} obj.`uname -srm | ${TR} \  .`
-- 
cgit v1.2.3