aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2000-10-08 10:23:48 +0000
committerSatoshi Asami <asami@FreeBSD.org>2000-10-08 10:23:48 +0000
commit7acef1cd7a4173168980125b140340c62b38c8d6 (patch)
tree8e913f3c1574a206914a5852d584d77c40e8b447 /mail
parent99ebbc27f8ee31dc95b87b630c22c993a1639de8 (diff)
downloadports-7acef1cd7a4173168980125b140340c62b38c8d6.tar.gz
ports-7acef1cd7a4173168980125b140340c62b38c8d6.zip
Notes
Diffstat (limited to 'mail')
-rw-r--r--mail/biffer/Makefile2
-rw-r--r--mail/cyrus-imapd/Makefile4
-rw-r--r--mail/cyrus-imapd2/Makefile4
-rw-r--r--mail/cyrus-imapd22/Makefile4
-rw-r--r--mail/cyrus-imapd23/Makefile4
-rw-r--r--mail/cyrus-imapd24/Makefile4
-rw-r--r--mail/cyrus/Makefile4
-rw-r--r--mail/ezmlm-idx/Makefile2
-rw-r--r--mail/ezmlm-web/Makefile2
-rw-r--r--mail/imap-uw/Makefile2
-rw-r--r--mail/listar/Makefile2
-rw-r--r--mail/popa3d/Makefile4
-rw-r--r--mail/postfix-current/Makefile2
-rw-r--r--mail/postfix/Makefile4
-rw-r--r--mail/postfix1/Makefile4
-rw-r--r--mail/postfix20/Makefile4
-rw-r--r--mail/postfix21/Makefile4
-rw-r--r--mail/postfix22/Makefile4
-rw-r--r--mail/postfix23/Makefile4
-rw-r--r--mail/postfix24/Makefile4
-rw-r--r--mail/postfix25/Makefile4
-rw-r--r--mail/postfix26/Makefile4
-rw-r--r--mail/postfix27/Makefile4
-rw-r--r--mail/postfix28/Makefile4
-rw-r--r--mail/rlytest/Makefile2
-rw-r--r--mail/smtpd/Makefile2
-rw-r--r--mail/smtpfeed/Makefile2
-rw-r--r--mail/xpbiff-youbin/Makefile4
-rw-r--r--mail/youbin/Makefile6
-rw-r--r--mail/zmailer/Makefile2
30 files changed, 51 insertions, 51 deletions
diff --git a/mail/biffer/Makefile b/mail/biffer/Makefile
index c2b33a73f09a..25f635fe367f 100644
--- a/mail/biffer/Makefile
+++ b/mail/biffer/Makefile
@@ -29,7 +29,7 @@ do-install:
cd ${WRKDIR}/${DISTNAME}/biffer_comsat && ${MAKE} ${MFLAGS} install
post-install:
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} \
+ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
POST-INSTALL
.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 60aaef03cb3b..0e3be212312c 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -41,7 +41,7 @@ post-configure:
pre-install:
@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
- @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @${PKGINSTALL} ${PKGNAME} PRE-INSTALL
DOCS= README acl-extension anoncvs bugs changes copyrights install \
mailing-list overview quota-extension server-design
@@ -101,6 +101,6 @@ post-install:
@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
>${PREFIX}/etc/rc.d/cyrus.sh
@${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh
- @PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 60aaef03cb3b..0e3be212312c 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -41,7 +41,7 @@ post-configure:
pre-install:
@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
- @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @${PKGINSTALL} ${PKGNAME} PRE-INSTALL
DOCS= README acl-extension anoncvs bugs changes copyrights install \
mailing-list overview quota-extension server-design
@@ -101,6 +101,6 @@ post-install:
@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
>${PREFIX}/etc/rc.d/cyrus.sh
@${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh
- @PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 60aaef03cb3b..0e3be212312c 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -41,7 +41,7 @@ post-configure:
pre-install:
@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
- @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @${PKGINSTALL} ${PKGNAME} PRE-INSTALL
DOCS= README acl-extension anoncvs bugs changes copyrights install \
mailing-list overview quota-extension server-design
@@ -101,6 +101,6 @@ post-install:
@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
>${PREFIX}/etc/rc.d/cyrus.sh
@${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh
- @PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 60aaef03cb3b..0e3be212312c 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -41,7 +41,7 @@ post-configure:
pre-install:
@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
- @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @${PKGINSTALL} ${PKGNAME} PRE-INSTALL
DOCS= README acl-extension anoncvs bugs changes copyrights install \
mailing-list overview quota-extension server-design
@@ -101,6 +101,6 @@ post-install:
@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
>${PREFIX}/etc/rc.d/cyrus.sh
@${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh
- @PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 60aaef03cb3b..0e3be212312c 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -41,7 +41,7 @@ post-configure:
pre-install:
@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
- @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @${PKGINSTALL} ${PKGNAME} PRE-INSTALL
DOCS= README acl-extension anoncvs bugs changes copyrights install \
mailing-list overview quota-extension server-design
@@ -101,6 +101,6 @@ post-install:
@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
>${PREFIX}/etc/rc.d/cyrus.sh
@${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh
- @PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 60aaef03cb3b..0e3be212312c 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -41,7 +41,7 @@ post-configure:
pre-install:
@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
- @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @${PKGINSTALL} ${PKGNAME} PRE-INSTALL
DOCS= README acl-extension anoncvs bugs changes copyrights install \
mailing-list overview quota-extension server-design
@@ -101,6 +101,6 @@ post-install:
@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
>${PREFIX}/etc/rc.d/cyrus.sh
@${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh
- @PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 357a75c5b6c3..0a5dec5d95ba 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -120,6 +120,6 @@ do-install:
@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ezmlm-idx
.endfor
.endif
- @${CAT} ${PKGDIR}/MESSAGE
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/mail/ezmlm-web/Makefile b/mail/ezmlm-web/Makefile
index f1e4c9fd32a1..7ec12bb05622 100644
--- a/mail/ezmlm-web/Makefile
+++ b/mail/ezmlm-web/Makefile
@@ -37,7 +37,7 @@ do-install:
.endfor
post-install:
- @${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGDIR}/MESSAGE
+ @${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
@${ECHO}
.include <bsd.port.mk>
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index a8b2b5c4d500..8dc910382bbc 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -36,7 +36,7 @@ MAN8= ipopd.8 imapd.8
pre-extract:
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
- @${SH} ${PKGDIR}/INSTALL foo PRE-INSTALL || ${FALSE}
+ @${SH} ${PKGINSTALL} foo PRE-INSTALL || ${FALSE}
.endif
post-build:
diff --git a/mail/listar/Makefile b/mail/listar/Makefile
index 346c400fa62a..d236aa147763 100644
--- a/mail/listar/Makefile
+++ b/mail/listar/Makefile
@@ -23,7 +23,7 @@ pre-patch:
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@ ${MKDIR} ${PREFIX}/listar
@ ${CP} -R ${WRKDIR}/${DISTNAME}/* ${PREFIX}/listar
@ ${RM} -R ${PREFIX}/listar/src/
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 75c4957945ff..0e2a4135ac5d 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -28,9 +28,9 @@ do-install:
.endif
pre-install:
- @ ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @ ${CAT} ${PKGDIR}/MESSAGE
+ @ ${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 5ed4b8ba53a8..1dca2be8dd36 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -76,7 +76,7 @@ post-patch:
${ECHO} "all: default" >> Makefile)
pre-install:
- @/bin/sh ${PKGDIR}/INSTALL Postfix PRE-INSTALL
+ @/bin/sh ${PKGINSTALL} Postfix PRE-INSTALL
do-install:
@${MKDIR} -m 755 ${PREFIX}/etc/postfix
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 2cef938289a9..9c96356d0ccd 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -105,10 +105,10 @@ do-install:
@${ECHO_MSG} "--------------------------------------------------"
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.pre.mk>
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 2cef938289a9..9c96356d0ccd 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -105,10 +105,10 @@ do-install:
@${ECHO_MSG} "--------------------------------------------------"
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.pre.mk>
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index 2cef938289a9..9c96356d0ccd 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -105,10 +105,10 @@ do-install:
@${ECHO_MSG} "--------------------------------------------------"
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.pre.mk>
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index 2cef938289a9..9c96356d0ccd 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -105,10 +105,10 @@ do-install:
@${ECHO_MSG} "--------------------------------------------------"
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.pre.mk>
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index 2cef938289a9..9c96356d0ccd 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -105,10 +105,10 @@ do-install:
@${ECHO_MSG} "--------------------------------------------------"
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.pre.mk>
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index 2cef938289a9..9c96356d0ccd 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -105,10 +105,10 @@ do-install:
@${ECHO_MSG} "--------------------------------------------------"
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.pre.mk>
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index 2cef938289a9..9c96356d0ccd 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -105,10 +105,10 @@ do-install:
@${ECHO_MSG} "--------------------------------------------------"
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.pre.mk>
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index 2cef938289a9..9c96356d0ccd 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -105,10 +105,10 @@ do-install:
@${ECHO_MSG} "--------------------------------------------------"
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.pre.mk>
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 2cef938289a9..9c96356d0ccd 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -105,10 +105,10 @@ do-install:
@${ECHO_MSG} "--------------------------------------------------"
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.pre.mk>
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 2cef938289a9..9c96356d0ccd 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -105,10 +105,10 @@ do-install:
@${ECHO_MSG} "--------------------------------------------------"
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.pre.mk>
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 2cef938289a9..9c96356d0ccd 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -105,10 +105,10 @@ do-install:
@${ECHO_MSG} "--------------------------------------------------"
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.pre.mk>
diff --git a/mail/rlytest/Makefile b/mail/rlytest/Makefile
index f53f1cb805ca..2085f81e4e12 100644
--- a/mail/rlytest/Makefile
+++ b/mail/rlytest/Makefile
@@ -25,6 +25,6 @@ do-install:
${INSTALL_SCRIPT} ${WRKDIR}/rlytest ${PREFIX}/bin/rlytest
post-install:
- ${CAT} ${PKGDIR}/MESSAGE
+ ${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/mail/smtpd/Makefile b/mail/smtpd/Makefile
index 615087c7a0c8..dd850790edb2 100644
--- a/mail/smtpd/Makefile
+++ b/mail/smtpd/Makefile
@@ -65,6 +65,6 @@ post-install:
@${ECHO} "Done!"
- @${CAT} ${PKGDIR}/MESSAGE
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index f3099db47491..65f94c6561c3 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -54,7 +54,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/$$i ${DOCDIR}; \
done
.endif
- @${SED} -e 's#/usr/local#${PREFIX}#' ${PKGDIR}/MESSAGE
+ @${SED} -e 's#/usr/local#${PREFIX}#' ${PKGMESSAGE}
install-sendmail:
(cd ${WRKSRC_SENDMAIL}; sh makesendmail install)
diff --git a/mail/xpbiff-youbin/Makefile b/mail/xpbiff-youbin/Makefile
index fa698e567cda..72ee2f78f67f 100644
--- a/mail/xpbiff-youbin/Makefile
+++ b/mail/xpbiff-youbin/Makefile
@@ -14,8 +14,8 @@ MAINTAINER= sanpei@FreeBSD.org
YOUBIN= yes
MASTERDIR= ${.CURDIR}/../xpbiff
-PKGDIR= ${.CURDIR}/pkg
-PLIST= ${MASTERDIR}/pkg/PLIST
+PKGDIR= ${.CURDIR}
+PLIST= ${MASTERDIR}/pkg-plist
RUN_DEPENDS= youbin:${PORTSDIR}/mail/youbin
diff --git a/mail/youbin/Makefile b/mail/youbin/Makefile
index 29cdf4a20e81..c51727fc3d20 100644
--- a/mail/youbin/Makefile
+++ b/mail/youbin/Makefile
@@ -25,10 +25,10 @@ MAN8= youbind.8
STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/youbind.sh.sample
pre-build:
- @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGDIR}/REQ ${PKGNAME} BUILD
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGREQ} ${PKGNAME} BUILD
pre-install:
- @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
post-install:
@if [ ! -f ${STARTUP_SCRIPT} ]; then \
@@ -37,6 +37,6 @@ post-install:
> ${STARTUP_SCRIPT} ; \
${CHMOD} 755 ${STARTUP_SCRIPT} ; \
fi
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index ce6c73aad666..abf8816fac36 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -60,7 +60,7 @@ PKGMESSAGE= ${WRKDIR}/MESSAGE
post-configure:
${SED} -e s:@PREFIX@:${PREFIX}:g -e s:@PORTSDIR@:${PORTSDIR}:g \
- ${PKGDIR}/MESSAGE > ${PKGMESSAGE}
+ ${PKGDIR}/pkg-message > ${PKGMESSAGE}
post-install:
@${INSTALL_SCRIPT} ${FILESDIR}/zmailer.sh.sample \