mv -> ${MV}

cp -> ${CP}
install -> ${INSTALL}
mkdir -> ${MKDIR}

PR:		ports/10934

12 files changed, 300 insertions, 276 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 8c8e340a8706..5da40f0feb9f 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
 #
 
 DISTNAME=	postfix-19990317-pl03
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default
+ALL_TARGET=	default "OPT=${CFLAGS}"
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
 
@@ -30,13 +30,15 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
 
+SHAREMODE=	0644
+
 do-install:
-	@mkdir -p -m 755 ${PREFIX}/etc/postfix
+	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@chown root:wheel ${PREFIX}/etc/postfix
-	@install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/sample-$$f ; \
 	done
 	@exit
@@ -45,35 +47,35 @@ do-install:
 		sample-rate.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/$$f ;\
 	done
-	@install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+	@${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
 	@for f in bounce cleanup fsstone local master pickup pipe \
 		qmgr showq smtp smtp-sink smtp-source smtpd \
 		trivial-rewrite ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
 	@for f in sendmail postalias postcat postconf postfix \
 		postkick postlock postlog postmap postsuper ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
+	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
 		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
 	done
 	@for f in ${MAN5} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
 			${PREFIX}/man/man5/$$f ;\
 	done
 	@for f in ${MAN8} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
 	@mkdir -p -m 0755 /var/spool/postfix
@@ -85,38 +87,38 @@ do-install:
 		${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \
 			${PREFIX}/etc/postfix/master.cf; \
 	fi
-	@echo "--------------------------------------------------"
-	@echo "- To replace your existing sendmail with postfix -"
-	@echo "- type \"make replace\"                           "
-	@echo "--------------------------------------------------"
+	@${ECHO_MSG} "--------------------------------------------------"
+	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
+	@${ECHO_MSG} "- type \"make replace\"                          -"
+	@${ECHO_MSG} "--------------------------------------------------"
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 replace:
-	@echo "===> Replacing sendmail"
+	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \
 		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
 		chmod 0 /usr/sbin/sendmail.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
 	fi
-	@echo "===> Replacing mailq"
+	@${ECHO_MSG} "===> Replacing mailq"
 	@if [ -e /usr/bin/mailq ]; then \
 		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
 		chmod 0 /usr/bin/mailq.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
 	fi
-	@echo "===> Replacing newaliases"
+	@${ECHO_MSG} "===> Replacing newaliases"
 	@if [ -e /usr/bin/newaliases ]; then \
 		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
 		chmod 0 /usr/bin/newaliases.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 8c8e340a8706..5da40f0feb9f 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
 #
 
 DISTNAME=	postfix-19990317-pl03
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default
+ALL_TARGET=	default "OPT=${CFLAGS}"
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
 
@@ -30,13 +30,15 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
 
+SHAREMODE=	0644
+
 do-install:
-	@mkdir -p -m 755 ${PREFIX}/etc/postfix
+	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@chown root:wheel ${PREFIX}/etc/postfix
-	@install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/sample-$$f ; \
 	done
 	@exit
@@ -45,35 +47,35 @@ do-install:
 		sample-rate.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/$$f ;\
 	done
-	@install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+	@${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
 	@for f in bounce cleanup fsstone local master pickup pipe \
 		qmgr showq smtp smtp-sink smtp-source smtpd \
 		trivial-rewrite ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
 	@for f in sendmail postalias postcat postconf postfix \
 		postkick postlock postlog postmap postsuper ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
+	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
 		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
 	done
 	@for f in ${MAN5} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
 			${PREFIX}/man/man5/$$f ;\
 	done
 	@for f in ${MAN8} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
 	@mkdir -p -m 0755 /var/spool/postfix
@@ -85,38 +87,38 @@ do-install:
 		${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \
 			${PREFIX}/etc/postfix/master.cf; \
 	fi
-	@echo "--------------------------------------------------"
-	@echo "- To replace your existing sendmail with postfix -"
-	@echo "- type \"make replace\"                           "
-	@echo "--------------------------------------------------"
+	@${ECHO_MSG} "--------------------------------------------------"
+	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
+	@${ECHO_MSG} "- type \"make replace\"                          -"
+	@${ECHO_MSG} "--------------------------------------------------"
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 replace:
-	@echo "===> Replacing sendmail"
+	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \
 		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
 		chmod 0 /usr/sbin/sendmail.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
 	fi
-	@echo "===> Replacing mailq"
+	@${ECHO_MSG} "===> Replacing mailq"
 	@if [ -e /usr/bin/mailq ]; then \
 		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
 		chmod 0 /usr/bin/mailq.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
 	fi
-	@echo "===> Replacing newaliases"
+	@${ECHO_MSG} "===> Replacing newaliases"
 	@if [ -e /usr/bin/newaliases ]; then \
 		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
 		chmod 0 /usr/bin/newaliases.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 8c8e340a8706..5da40f0feb9f 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
 #
 
 DISTNAME=	postfix-19990317-pl03
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default
+ALL_TARGET=	default "OPT=${CFLAGS}"
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
 
@@ -30,13 +30,15 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
 
+SHAREMODE=	0644
+
 do-install:
-	@mkdir -p -m 755 ${PREFIX}/etc/postfix
+	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@chown root:wheel ${PREFIX}/etc/postfix
-	@install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/sample-$$f ; \
 	done
 	@exit
@@ -45,35 +47,35 @@ do-install:
 		sample-rate.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/$$f ;\
 	done
-	@install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+	@${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
 	@for f in bounce cleanup fsstone local master pickup pipe \
 		qmgr showq smtp smtp-sink smtp-source smtpd \
 		trivial-rewrite ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
 	@for f in sendmail postalias postcat postconf postfix \
 		postkick postlock postlog postmap postsuper ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
+	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
 		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
 	done
 	@for f in ${MAN5} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
 			${PREFIX}/man/man5/$$f ;\
 	done
 	@for f in ${MAN8} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
 	@mkdir -p -m 0755 /var/spool/postfix
@@ -85,38 +87,38 @@ do-install:
 		${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \
 			${PREFIX}/etc/postfix/master.cf; \
 	fi
-	@echo "--------------------------------------------------"
-	@echo "- To replace your existing sendmail with postfix -"
-	@echo "- type \"make replace\"                           "
-	@echo "--------------------------------------------------"
+	@${ECHO_MSG} "--------------------------------------------------"
+	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
+	@${ECHO_MSG} "- type \"make replace\"                          -"
+	@${ECHO_MSG} "--------------------------------------------------"
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 replace:
-	@echo "===> Replacing sendmail"
+	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \
 		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
 		chmod 0 /usr/sbin/sendmail.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
 	fi
-	@echo "===> Replacing mailq"
+	@${ECHO_MSG} "===> Replacing mailq"
 	@if [ -e /usr/bin/mailq ]; then \
 		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
 		chmod 0 /usr/bin/mailq.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
 	fi
-	@echo "===> Replacing newaliases"
+	@${ECHO_MSG} "===> Replacing newaliases"
 	@if [ -e /usr/bin/newaliases ]; then \
 		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
 		chmod 0 /usr/bin/newaliases.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index 8c8e340a8706..5da40f0feb9f 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
 #
 
 DISTNAME=	postfix-19990317-pl03
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default
+ALL_TARGET=	default "OPT=${CFLAGS}"
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
 
@@ -30,13 +30,15 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
 
+SHAREMODE=	0644
+
 do-install:
-	@mkdir -p -m 755 ${PREFIX}/etc/postfix
+	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@chown root:wheel ${PREFIX}/etc/postfix
-	@install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/sample-$$f ; \
 	done
 	@exit
@@ -45,35 +47,35 @@ do-install:
 		sample-rate.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/$$f ;\
 	done
-	@install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+	@${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
 	@for f in bounce cleanup fsstone local master pickup pipe \
 		qmgr showq smtp smtp-sink smtp-source smtpd \
 		trivial-rewrite ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
 	@for f in sendmail postalias postcat postconf postfix \
 		postkick postlock postlog postmap postsuper ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
+	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
 		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
 	done
 	@for f in ${MAN5} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
 			${PREFIX}/man/man5/$$f ;\
 	done
 	@for f in ${MAN8} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
 	@mkdir -p -m 0755 /var/spool/postfix
@@ -85,38 +87,38 @@ do-install:
 		${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \
 			${PREFIX}/etc/postfix/master.cf; \
 	fi
-	@echo "--------------------------------------------------"
-	@echo "- To replace your existing sendmail with postfix -"
-	@echo "- type \"make replace\"                           "
-	@echo "--------------------------------------------------"
+	@${ECHO_MSG} "--------------------------------------------------"
+	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
+	@${ECHO_MSG} "- type \"make replace\"                          -"
+	@${ECHO_MSG} "--------------------------------------------------"
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 replace:
-	@echo "===> Replacing sendmail"
+	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \
 		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
 		chmod 0 /usr/sbin/sendmail.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
 	fi
-	@echo "===> Replacing mailq"
+	@${ECHO_MSG} "===> Replacing mailq"
 	@if [ -e /usr/bin/mailq ]; then \
 		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
 		chmod 0 /usr/bin/mailq.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
 	fi
-	@echo "===> Replacing newaliases"
+	@${ECHO_MSG} "===> Replacing newaliases"
 	@if [ -e /usr/bin/newaliases ]; then \
 		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
 		chmod 0 /usr/bin/newaliases.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index 8c8e340a8706..5da40f0feb9f 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
 #
 
 DISTNAME=	postfix-19990317-pl03
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default
+ALL_TARGET=	default "OPT=${CFLAGS}"
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
 
@@ -30,13 +30,15 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
 
+SHAREMODE=	0644
+
 do-install:
-	@mkdir -p -m 755 ${PREFIX}/etc/postfix
+	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@chown root:wheel ${PREFIX}/etc/postfix
-	@install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/sample-$$f ; \
 	done
 	@exit
@@ -45,35 +47,35 @@ do-install:
 		sample-rate.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/$$f ;\
 	done
-	@install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+	@${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
 	@for f in bounce cleanup fsstone local master pickup pipe \
 		qmgr showq smtp smtp-sink smtp-source smtpd \
 		trivial-rewrite ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
 	@for f in sendmail postalias postcat postconf postfix \
 		postkick postlock postlog postmap postsuper ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
+	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
 		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
 	done
 	@for f in ${MAN5} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
 			${PREFIX}/man/man5/$$f ;\
 	done
 	@for f in ${MAN8} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
 	@mkdir -p -m 0755 /var/spool/postfix
@@ -85,38 +87,38 @@ do-install:
 		${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \
 			${PREFIX}/etc/postfix/master.cf; \
 	fi
-	@echo "--------------------------------------------------"
-	@echo "- To replace your existing sendmail with postfix -"
-	@echo "- type \"make replace\"                           "
-	@echo "--------------------------------------------------"
+	@${ECHO_MSG} "--------------------------------------------------"
+	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
+	@${ECHO_MSG} "- type \"make replace\"                          -"
+	@${ECHO_MSG} "--------------------------------------------------"
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 replace:
-	@echo "===> Replacing sendmail"
+	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \
 		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
 		chmod 0 /usr/sbin/sendmail.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
 	fi
-	@echo "===> Replacing mailq"
+	@${ECHO_MSG} "===> Replacing mailq"
 	@if [ -e /usr/bin/mailq ]; then \
 		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
 		chmod 0 /usr/bin/mailq.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
 	fi
-	@echo "===> Replacing newaliases"
+	@${ECHO_MSG} "===> Replacing newaliases"
 	@if [ -e /usr/bin/newaliases ]; then \
 		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
 		chmod 0 /usr/bin/newaliases.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index 8c8e340a8706..5da40f0feb9f 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
 #
 
 DISTNAME=	postfix-19990317-pl03
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default
+ALL_TARGET=	default "OPT=${CFLAGS}"
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
 
@@ -30,13 +30,15 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
 
+SHAREMODE=	0644
+
 do-install:
-	@mkdir -p -m 755 ${PREFIX}/etc/postfix
+	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@chown root:wheel ${PREFIX}/etc/postfix
-	@install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/sample-$$f ; \
 	done
 	@exit
@@ -45,35 +47,35 @@ do-install:
 		sample-rate.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/$$f ;\
 	done
-	@install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+	@${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
 	@for f in bounce cleanup fsstone local master pickup pipe \
 		qmgr showq smtp smtp-sink smtp-source smtpd \
 		trivial-rewrite ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
 	@for f in sendmail postalias postcat postconf postfix \
 		postkick postlock postlog postmap postsuper ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
+	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
 		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
 	done
 	@for f in ${MAN5} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
 			${PREFIX}/man/man5/$$f ;\
 	done
 	@for f in ${MAN8} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
 	@mkdir -p -m 0755 /var/spool/postfix
@@ -85,38 +87,38 @@ do-install:
 		${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \
 			${PREFIX}/etc/postfix/master.cf; \
 	fi
-	@echo "--------------------------------------------------"
-	@echo "- To replace your existing sendmail with postfix -"
-	@echo "- type \"make replace\"                           "
-	@echo "--------------------------------------------------"
+	@${ECHO_MSG} "--------------------------------------------------"
+	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
+	@${ECHO_MSG} "- type \"make replace\"                          -"
+	@${ECHO_MSG} "--------------------------------------------------"
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 replace:
-	@echo "===> Replacing sendmail"
+	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \
 		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
 		chmod 0 /usr/sbin/sendmail.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
 	fi
-	@echo "===> Replacing mailq"
+	@${ECHO_MSG} "===> Replacing mailq"
 	@if [ -e /usr/bin/mailq ]; then \
 		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
 		chmod 0 /usr/bin/mailq.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
 	fi
-	@echo "===> Replacing newaliases"
+	@${ECHO_MSG} "===> Replacing newaliases"
 	@if [ -e /usr/bin/newaliases ]; then \
 		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
 		chmod 0 /usr/bin/newaliases.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index 8c8e340a8706..5da40f0feb9f 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
 #
 
 DISTNAME=	postfix-19990317-pl03
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default
+ALL_TARGET=	default "OPT=${CFLAGS}"
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
 
@@ -30,13 +30,15 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
 
+SHAREMODE=	0644
+
 do-install:
-	@mkdir -p -m 755 ${PREFIX}/etc/postfix
+	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@chown root:wheel ${PREFIX}/etc/postfix
-	@install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/sample-$$f ; \
 	done
 	@exit
@@ -45,35 +47,35 @@ do-install:
 		sample-rate.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/$$f ;\
 	done
-	@install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+	@${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
 	@for f in bounce cleanup fsstone local master pickup pipe \
 		qmgr showq smtp smtp-sink smtp-source smtpd \
 		trivial-rewrite ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
 	@for f in sendmail postalias postcat postconf postfix \
 		postkick postlock postlog postmap postsuper ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
+	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
 		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
 	done
 	@for f in ${MAN5} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
 			${PREFIX}/man/man5/$$f ;\
 	done
 	@for f in ${MAN8} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
 	@mkdir -p -m 0755 /var/spool/postfix
@@ -85,38 +87,38 @@ do-install:
 		${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \
 			${PREFIX}/etc/postfix/master.cf; \
 	fi
-	@echo "--------------------------------------------------"
-	@echo "- To replace your existing sendmail with postfix -"
-	@echo "- type \"make replace\"                           "
-	@echo "--------------------------------------------------"
+	@${ECHO_MSG} "--------------------------------------------------"
+	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
+	@${ECHO_MSG} "- type \"make replace\"                          -"
+	@${ECHO_MSG} "--------------------------------------------------"
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 replace:
-	@echo "===> Replacing sendmail"
+	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \
 		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
 		chmod 0 /usr/sbin/sendmail.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
 	fi
-	@echo "===> Replacing mailq"
+	@${ECHO_MSG} "===> Replacing mailq"
 	@if [ -e /usr/bin/mailq ]; then \
 		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
 		chmod 0 /usr/bin/mailq.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
 	fi
-	@echo "===> Replacing newaliases"
+	@${ECHO_MSG} "===> Replacing newaliases"
 	@if [ -e /usr/bin/newaliases ]; then \
 		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
 		chmod 0 /usr/bin/newaliases.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index 8c8e340a8706..5da40f0feb9f 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
 #
 
 DISTNAME=	postfix-19990317-pl03
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default
+ALL_TARGET=	default "OPT=${CFLAGS}"
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
 
@@ -30,13 +30,15 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
 
+SHAREMODE=	0644
+
 do-install:
-	@mkdir -p -m 755 ${PREFIX}/etc/postfix
+	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@chown root:wheel ${PREFIX}/etc/postfix
-	@install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/sample-$$f ; \
 	done
 	@exit
@@ -45,35 +47,35 @@ do-install:
 		sample-rate.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/$$f ;\
 	done
-	@install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+	@${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
 	@for f in bounce cleanup fsstone local master pickup pipe \
 		qmgr showq smtp smtp-sink smtp-source smtpd \
 		trivial-rewrite ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
 	@for f in sendmail postalias postcat postconf postfix \
 		postkick postlock postlog postmap postsuper ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
+	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
 		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
 	done
 	@for f in ${MAN5} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
 			${PREFIX}/man/man5/$$f ;\
 	done
 	@for f in ${MAN8} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
 	@mkdir -p -m 0755 /var/spool/postfix
@@ -85,38 +87,38 @@ do-install:
 		${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \
 			${PREFIX}/etc/postfix/master.cf; \
 	fi
-	@echo "--------------------------------------------------"
-	@echo "- To replace your existing sendmail with postfix -"
-	@echo "- type \"make replace\"                           "
-	@echo "--------------------------------------------------"
+	@${ECHO_MSG} "--------------------------------------------------"
+	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
+	@${ECHO_MSG} "- type \"make replace\"                          -"
+	@${ECHO_MSG} "--------------------------------------------------"
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 replace:
-	@echo "===> Replacing sendmail"
+	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \
 		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
 		chmod 0 /usr/sbin/sendmail.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
 	fi
-	@echo "===> Replacing mailq"
+	@${ECHO_MSG} "===> Replacing mailq"
 	@if [ -e /usr/bin/mailq ]; then \
 		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
 		chmod 0 /usr/bin/mailq.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
 	fi
-	@echo "===> Replacing newaliases"
+	@${ECHO_MSG} "===> Replacing newaliases"
 	@if [ -e /usr/bin/newaliases ]; then \
 		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
 		chmod 0 /usr/bin/newaliases.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index 8c8e340a8706..5da40f0feb9f 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
 #
 
 DISTNAME=	postfix-19990317-pl03
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default
+ALL_TARGET=	default "OPT=${CFLAGS}"
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
 
@@ -30,13 +30,15 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
 
+SHAREMODE=	0644
+
 do-install:
-	@mkdir -p -m 755 ${PREFIX}/etc/postfix
+	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@chown root:wheel ${PREFIX}/etc/postfix
-	@install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/sample-$$f ; \
 	done
 	@exit
@@ -45,35 +47,35 @@ do-install:
 		sample-rate.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/$$f ;\
 	done
-	@install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+	@${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
 	@for f in bounce cleanup fsstone local master pickup pipe \
 		qmgr showq smtp smtp-sink smtp-source smtpd \
 		trivial-rewrite ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
 	@for f in sendmail postalias postcat postconf postfix \
 		postkick postlock postlog postmap postsuper ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
+	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
 		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
 	done
 	@for f in ${MAN5} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
 			${PREFIX}/man/man5/$$f ;\
 	done
 	@for f in ${MAN8} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
 	@mkdir -p -m 0755 /var/spool/postfix
@@ -85,38 +87,38 @@ do-install:
 		${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \
 			${PREFIX}/etc/postfix/master.cf; \
 	fi
-	@echo "--------------------------------------------------"
-	@echo "- To replace your existing sendmail with postfix -"
-	@echo "- type \"make replace\"                           "
-	@echo "--------------------------------------------------"
+	@${ECHO_MSG} "--------------------------------------------------"
+	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
+	@${ECHO_MSG} "- type \"make replace\"                          -"
+	@${ECHO_MSG} "--------------------------------------------------"
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 replace:
-	@echo "===> Replacing sendmail"
+	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \
 		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
 		chmod 0 /usr/sbin/sendmail.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
 	fi
-	@echo "===> Replacing mailq"
+	@${ECHO_MSG} "===> Replacing mailq"
 	@if [ -e /usr/bin/mailq ]; then \
 		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
 		chmod 0 /usr/bin/mailq.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
 	fi
-	@echo "===> Replacing newaliases"
+	@${ECHO_MSG} "===> Replacing newaliases"
 	@if [ -e /usr/bin/newaliases ]; then \
 		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
 		chmod 0 /usr/bin/newaliases.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 8c8e340a8706..5da40f0feb9f 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
 #
 
 DISTNAME=	postfix-19990317-pl03
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default
+ALL_TARGET=	default "OPT=${CFLAGS}"
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
 
@@ -30,13 +30,15 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
 
+SHAREMODE=	0644
+
 do-install:
-	@mkdir -p -m 755 ${PREFIX}/etc/postfix
+	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@chown root:wheel ${PREFIX}/etc/postfix
-	@install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/sample-$$f ; \
 	done
 	@exit
@@ -45,35 +47,35 @@ do-install:
 		sample-rate.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/$$f ;\
 	done
-	@install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+	@${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
 	@for f in bounce cleanup fsstone local master pickup pipe \
 		qmgr showq smtp smtp-sink smtp-source smtpd \
 		trivial-rewrite ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
 	@for f in sendmail postalias postcat postconf postfix \
 		postkick postlock postlog postmap postsuper ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
+	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
 		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
 	done
 	@for f in ${MAN5} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
 			${PREFIX}/man/man5/$$f ;\
 	done
 	@for f in ${MAN8} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
 	@mkdir -p -m 0755 /var/spool/postfix
@@ -85,38 +87,38 @@ do-install:
 		${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \
 			${PREFIX}/etc/postfix/master.cf; \
 	fi
-	@echo "--------------------------------------------------"
-	@echo "- To replace your existing sendmail with postfix -"
-	@echo "- type \"make replace\"                           "
-	@echo "--------------------------------------------------"
+	@${ECHO_MSG} "--------------------------------------------------"
+	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
+	@${ECHO_MSG} "- type \"make replace\"                          -"
+	@${ECHO_MSG} "--------------------------------------------------"
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 replace:
-	@echo "===> Replacing sendmail"
+	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \
 		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
 		chmod 0 /usr/sbin/sendmail.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
 	fi
-	@echo "===> Replacing mailq"
+	@${ECHO_MSG} "===> Replacing mailq"
 	@if [ -e /usr/bin/mailq ]; then \
 		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
 		chmod 0 /usr/bin/mailq.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
 	fi
-	@echo "===> Replacing newaliases"
+	@${ECHO_MSG} "===> Replacing newaliases"
 	@if [ -e /usr/bin/newaliases ]; then \
 		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
 		chmod 0 /usr/bin/newaliases.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 8c8e340a8706..5da40f0feb9f 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
 #
 
 DISTNAME=	postfix-19990317-pl03
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default
+ALL_TARGET=	default "OPT=${CFLAGS}"
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
 
@@ -30,13 +30,15 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
 
+SHAREMODE=	0644
+
 do-install:
-	@mkdir -p -m 755 ${PREFIX}/etc/postfix
+	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@chown root:wheel ${PREFIX}/etc/postfix
-	@install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/sample-$$f ; \
 	done
 	@exit
@@ -45,35 +47,35 @@ do-install:
 		sample-rate.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/$$f ;\
 	done
-	@install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+	@${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
 	@for f in bounce cleanup fsstone local master pickup pipe \
 		qmgr showq smtp smtp-sink smtp-source smtpd \
 		trivial-rewrite ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
 	@for f in sendmail postalias postcat postconf postfix \
 		postkick postlock postlog postmap postsuper ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
+	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
 		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
 	done
 	@for f in ${MAN5} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
 			${PREFIX}/man/man5/$$f ;\
 	done
 	@for f in ${MAN8} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
 	@mkdir -p -m 0755 /var/spool/postfix
@@ -85,38 +87,38 @@ do-install:
 		${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \
 			${PREFIX}/etc/postfix/master.cf; \
 	fi
-	@echo "--------------------------------------------------"
-	@echo "- To replace your existing sendmail with postfix -"
-	@echo "- type \"make replace\"                           "
-	@echo "--------------------------------------------------"
+	@${ECHO_MSG} "--------------------------------------------------"
+	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
+	@${ECHO_MSG} "- type \"make replace\"                          -"
+	@${ECHO_MSG} "--------------------------------------------------"
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 replace:
-	@echo "===> Replacing sendmail"
+	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \
 		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
 		chmod 0 /usr/sbin/sendmail.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
 	fi
-	@echo "===> Replacing mailq"
+	@${ECHO_MSG} "===> Replacing mailq"
 	@if [ -e /usr/bin/mailq ]; then \
 		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
 		chmod 0 /usr/bin/mailq.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
 	fi
-	@echo "===> Replacing newaliases"
+	@${ECHO_MSG} "===> Replacing newaliases"
 	@if [ -e /usr/bin/newaliases ]; then \
 		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
 		chmod 0 /usr/bin/newaliases.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 8c8e340a8706..5da40f0feb9f 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1999
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/29 20:15:08 torstenb Exp $
 #
 
 DISTNAME=	postfix-19990317-pl03
@@ -19,7 +19,7 @@ MASTER_SITES=	ftp://ftp.merit.edu/postfix/ \
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-ALL_TARGET=	default
+ALL_TARGET=	default "OPT=${CFLAGS}"
 
 SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
 
@@ -30,13 +30,15 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8
 
+SHAREMODE=	0644
+
 do-install:
-	@mkdir -p -m 755 ${PREFIX}/etc/postfix
+	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@chown root:wheel ${PREFIX}/etc/postfix
-	@install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
 	@for f in access main.cf master.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/sample-$$f ; \
 	done
 	@exit
@@ -45,35 +47,35 @@ do-install:
 		sample-rate.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
+		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
 		${PREFIX}/etc/postfix/$$f ;\
 	done
-	@install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+	@${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
 	@for f in bounce cleanup fsstone local master pickup pipe \
 		qmgr showq smtp smtp-sink smtp-source smtpd \
 		trivial-rewrite ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
 	done
 	@for f in sendmail postalias postcat postconf postfix \
 		postkick postlock postlog postmap postsuper ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \
 			${PREFIX}/sbin/$$f ;\
 	done
-	@install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
+	@${INSTALL} -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \
 		${PREFIX}/sbin/postdrop
 	@for f in ${MAN1} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
 			${PREFIX}/man/man1/$$f ;\
 	done
 	@for f in ${MAN5} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
 			${PREFIX}/man/man5/$$f ;\
 	done
 	@for f in ${MAN8} ; do \
-		install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
+		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
 	@mkdir -p -m 0755 /var/spool/postfix
@@ -85,38 +87,38 @@ do-install:
 		${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \
 			${PREFIX}/etc/postfix/master.cf; \
 	fi
-	@echo "--------------------------------------------------"
-	@echo "- To replace your existing sendmail with postfix -"
-	@echo "- type \"make replace\"                           "
-	@echo "--------------------------------------------------"
+	@${ECHO_MSG} "--------------------------------------------------"
+	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
+	@${ECHO_MSG} "- type \"make replace\"                          -"
+	@${ECHO_MSG} "--------------------------------------------------"
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 replace:
-	@echo "===> Replacing sendmail"
+	@${ECHO_MSG} "===> Replacing sendmail"
 	@if [ -e /usr/sbin/sendmail ]; then \
 		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
 		chmod 0 /usr/sbin/sendmail.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
 	fi
-	@echo "===> Replacing mailq"
+	@${ECHO_MSG} "===> Replacing mailq"
 	@if [ -e /usr/bin/mailq ]; then \
 		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
 		chmod 0 /usr/bin/mailq.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
 	fi
-	@echo "===> Replacing newaliases"
+	@${ECHO_MSG} "===> Replacing newaliases"
 	@if [ -e /usr/bin/newaliases ]; then \
 		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
 		chmod 0 /usr/bin/newaliases.OFF; \
 	fi
 	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
+		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
 	fi
 
 .include <bsd.port.mk>