awk -> ${AWK}

basename -> ${BASENAME}
cat -> ${CAT}
cp -> ${CP}
ldconfig -> ${LDCONFIG}
mkdir -> ${MKDIR}

17 files changed, 46 insertions, 46 deletions

diff --git a/mail/adcomplain/Makefile b/mail/adcomplain/Makefile
index 507e55905df5..7c40c08d3b1d 100644
--- a/mail/adcomplain/Makefile
+++ b/mail/adcomplain/Makefile
@@ -4,7 +4,7 @@
 # Date created: 13 Sep 1997
 # Whom:         ache@FreeBSD.org
 #
-# $Id: Makefile,v 1.26 1999/05/12 01:33:31 asami Exp $
+# $Id: Makefile,v 1.27 1999/05/16 22:58:21 ache Exp $
 #
 
 DISTNAME=       adcomplain-3.52
@@ -24,7 +24,7 @@ NO_BUILD=       YES
 
 post-patch:
 	cd ${WRKSRC}; \
-	cp adcomplain.pl adcomplain.pl.old; \
+	${CP} adcomplain.pl adcomplain.pl.old; \
 	sed 's=%PERL5%=${PERL}=' < adcomplain.pl.old > adcomplain.pl
 
 do-install:
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 878d5d23ee72..2940365f8077 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -4,7 +4,7 @@
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.51 1998/09/19 00:16:08 hoek Exp $
+# $Id: Makefile,v 1.52 1999/04/07 18:28:33 ache Exp $
 #
 
 DISTNAME=       elm-2.4ME+54
@@ -27,7 +27,7 @@ CONFIGURE_ENV=  PREFIX="${PREFIX}"
 CONFIGURE_ARGS= -S
 
 post-configure:
-	cp ${FILESDIR}/elm.mimecharsets ${WRKSRC}/bin
+	${CP} ${FILESDIR}/elm.mimecharsets ${WRKSRC}/bin
 
 post-install:
 	perl -pi -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 878d5d23ee72..2940365f8077 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -4,7 +4,7 @@
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.51 1998/09/19 00:16:08 hoek Exp $
+# $Id: Makefile,v 1.52 1999/04/07 18:28:33 ache Exp $
 #
 
 DISTNAME=       elm-2.4ME+54
@@ -27,7 +27,7 @@ CONFIGURE_ENV=  PREFIX="${PREFIX}"
 CONFIGURE_ARGS= -S
 
 post-configure:
-	cp ${FILESDIR}/elm.mimecharsets ${WRKSRC}/bin
+	${CP} ${FILESDIR}/elm.mimecharsets ${WRKSRC}/bin
 
 post-install:
 	perl -pi -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index b13c51ed22c3..d4a41ce6f7d3 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1999/08/04 13:52:58 billf Exp $
+# $Id: Makefile,v 1.4 1999/08/22 18:59:00 mharo Exp $
 #
 
 DISTNAME=	postfix-19990601
@@ -52,7 +52,7 @@ do-install:
 	done
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
-	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
+	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
 	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
@@ -76,7 +76,7 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
-	@mkdir -p -m 0755 /var/spool/postfix
+	@${MKDIR} -m 0755 /var/spool/postfix
 	@if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \
 		${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \
 			${PREFIX}/etc/postfix/main.cf; \
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index b13c51ed22c3..d4a41ce6f7d3 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1999/08/04 13:52:58 billf Exp $
+# $Id: Makefile,v 1.4 1999/08/22 18:59:00 mharo Exp $
 #
 
 DISTNAME=	postfix-19990601
@@ -52,7 +52,7 @@ do-install:
 	done
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
-	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
+	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
 	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
@@ -76,7 +76,7 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
-	@mkdir -p -m 0755 /var/spool/postfix
+	@${MKDIR} -m 0755 /var/spool/postfix
 	@if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \
 		${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \
 			${PREFIX}/etc/postfix/main.cf; \
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index b13c51ed22c3..d4a41ce6f7d3 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1999/08/04 13:52:58 billf Exp $
+# $Id: Makefile,v 1.4 1999/08/22 18:59:00 mharo Exp $
 #
 
 DISTNAME=	postfix-19990601
@@ -52,7 +52,7 @@ do-install:
 	done
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
-	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
+	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
 	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
@@ -76,7 +76,7 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
-	@mkdir -p -m 0755 /var/spool/postfix
+	@${MKDIR} -m 0755 /var/spool/postfix
 	@if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \
 		${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \
 			${PREFIX}/etc/postfix/main.cf; \
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index b13c51ed22c3..d4a41ce6f7d3 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1999/08/04 13:52:58 billf Exp $
+# $Id: Makefile,v 1.4 1999/08/22 18:59:00 mharo Exp $
 #
 
 DISTNAME=	postfix-19990601
@@ -52,7 +52,7 @@ do-install:
 	done
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
-	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
+	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
 	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
@@ -76,7 +76,7 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
-	@mkdir -p -m 0755 /var/spool/postfix
+	@${MKDIR} -m 0755 /var/spool/postfix
 	@if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \
 		${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \
 			${PREFIX}/etc/postfix/main.cf; \
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index b13c51ed22c3..d4a41ce6f7d3 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1999/08/04 13:52:58 billf Exp $
+# $Id: Makefile,v 1.4 1999/08/22 18:59:00 mharo Exp $
 #
 
 DISTNAME=	postfix-19990601
@@ -52,7 +52,7 @@ do-install:
 	done
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
-	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
+	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
 	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
@@ -76,7 +76,7 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
-	@mkdir -p -m 0755 /var/spool/postfix
+	@${MKDIR} -m 0755 /var/spool/postfix
 	@if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \
 		${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \
 			${PREFIX}/etc/postfix/main.cf; \
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index b13c51ed22c3..d4a41ce6f7d3 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1999/08/04 13:52:58 billf Exp $
+# $Id: Makefile,v 1.4 1999/08/22 18:59:00 mharo Exp $
 #
 
 DISTNAME=	postfix-19990601
@@ -52,7 +52,7 @@ do-install:
 	done
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
-	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
+	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
 	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
@@ -76,7 +76,7 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
-	@mkdir -p -m 0755 /var/spool/postfix
+	@${MKDIR} -m 0755 /var/spool/postfix
 	@if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \
 		${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \
 			${PREFIX}/etc/postfix/main.cf; \
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index b13c51ed22c3..d4a41ce6f7d3 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1999/08/04 13:52:58 billf Exp $
+# $Id: Makefile,v 1.4 1999/08/22 18:59:00 mharo Exp $
 #
 
 DISTNAME=	postfix-19990601
@@ -52,7 +52,7 @@ do-install:
 	done
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
-	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
+	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
 	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
@@ -76,7 +76,7 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
-	@mkdir -p -m 0755 /var/spool/postfix
+	@${MKDIR} -m 0755 /var/spool/postfix
 	@if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \
 		${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \
 			${PREFIX}/etc/postfix/main.cf; \
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index b13c51ed22c3..d4a41ce6f7d3 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1999/08/04 13:52:58 billf Exp $
+# $Id: Makefile,v 1.4 1999/08/22 18:59:00 mharo Exp $
 #
 
 DISTNAME=	postfix-19990601
@@ -52,7 +52,7 @@ do-install:
 	done
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
-	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
+	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
 	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
@@ -76,7 +76,7 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
-	@mkdir -p -m 0755 /var/spool/postfix
+	@${MKDIR} -m 0755 /var/spool/postfix
 	@if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \
 		${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \
 			${PREFIX}/etc/postfix/main.cf; \
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index b13c51ed22c3..d4a41ce6f7d3 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1999/08/04 13:52:58 billf Exp $
+# $Id: Makefile,v 1.4 1999/08/22 18:59:00 mharo Exp $
 #
 
 DISTNAME=	postfix-19990601
@@ -52,7 +52,7 @@ do-install:
 	done
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
-	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
+	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
 	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
@@ -76,7 +76,7 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
-	@mkdir -p -m 0755 /var/spool/postfix
+	@${MKDIR} -m 0755 /var/spool/postfix
 	@if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \
 		${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \
 			${PREFIX}/etc/postfix/main.cf; \
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index b13c51ed22c3..d4a41ce6f7d3 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1999/08/04 13:52:58 billf Exp $
+# $Id: Makefile,v 1.4 1999/08/22 18:59:00 mharo Exp $
 #
 
 DISTNAME=	postfix-19990601
@@ -52,7 +52,7 @@ do-install:
 	done
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
-	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
+	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
 	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
@@ -76,7 +76,7 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
-	@mkdir -p -m 0755 /var/spool/postfix
+	@${MKDIR} -m 0755 /var/spool/postfix
 	@if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \
 		${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \
 			${PREFIX}/etc/postfix/main.cf; \
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index b13c51ed22c3..d4a41ce6f7d3 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1999/08/04 13:52:58 billf Exp $
+# $Id: Makefile,v 1.4 1999/08/22 18:59:00 mharo Exp $
 #
 
 DISTNAME=	postfix-19990601
@@ -52,7 +52,7 @@ do-install:
 	done
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
-	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
+	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
 	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
@@ -76,7 +76,7 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
-	@mkdir -p -m 0755 /var/spool/postfix
+	@${MKDIR} -m 0755 /var/spool/postfix
 	@if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \
 		${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \
 			${PREFIX}/etc/postfix/main.cf; \
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index b13c51ed22c3..d4a41ce6f7d3 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1999/08/04 13:52:58 billf Exp $
+# $Id: Makefile,v 1.4 1999/08/22 18:59:00 mharo Exp $
 #
 
 DISTNAME=	postfix-19990601
@@ -52,7 +52,7 @@ do-install:
 	done
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
-	@mkdir -p -m 0755 ${PREFIX}/libexec/postfix
+	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
 	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
@@ -76,7 +76,7 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
-	@mkdir -p -m 0755 /var/spool/postfix
+	@${MKDIR} -m 0755 /var/spool/postfix
 	@if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \
 		${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \
 			${PREFIX}/etc/postfix/main.cf; \
diff --git a/mail/premail/Makefile b/mail/premail/Makefile
index 6f0acbf86d40..c3f665514f6d 100644
--- a/mail/premail/Makefile
+++ b/mail/premail/Makefile
@@ -5,7 +5,7 @@
 # Date created:         31 Jan 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.11 1998/10/07 10:14:36 ache Exp $
+# $Id: Makefile,v 1.12 1999/01/13 12:14:53 ache Exp $
 #
 
 DISTNAME=       premail-0.46
@@ -24,7 +24,7 @@ RESTRICTED=     "Author treats it as ITAR subject"
 
 post-patch:
 	cd ${WRKSRC}; \
-	cp premail premail.old; \
+	${CP} premail premail.old; \
 	sed 's=#!/usr/local/bin/perl=#!${PERL} -w=' < premail.old > premail
 
 do-install:
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index 877a567a64e7..893270a7677b 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 November 1998
 # Whom:			Neil Blakey-Milner <nbm@rucus.ru.ac.za>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/05/03 02:46:44 steve Exp $
 
 DISTNAME=	qmailanalog-0.70
 CATEGORIES=	mail
@@ -51,6 +51,6 @@ pre-install:
 	@echo ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX
 	@diff ${WRKDIR}/.[PI]PREFIX > /dev/null \
 	|| (echo ${DIFF_MSG} && exit 1)
-	@mkdir -p ${QMPREFIX}
+	@${MKDIR} ${QMPREFIX}
 
 .include <bsd.port.mk>