From 4998ed1120ceba68dfd376a31c35cc7e7560d644 Mon Sep 17 00:00:00 2001 From: hubertf Date: Sun, 25 Feb 2001 04:17:35 +0000 Subject: Cleanup MKDIR usage => INSTALL_*_DIR XXX need to teach pkglint to be more picky about this --- mail/exim/Makefile | 10 ++++------ mail/mailagent/Makefile | 6 +++--- mail/mailwrapper/Makefile | 4 ++-- mail/postfix-current/Makefile | 6 +++--- mail/postfix/Makefile | 6 +++--- mail/rblcheck/Makefile | 4 ++-- mail/sendmail/Makefile | 4 ++-- mail/sendmail88/Makefile | 4 ++-- mail/smtpfeed/Makefile | 4 ++-- mail/xfmail/Makefile | 4 ++-- 10 files changed, 25 insertions(+), 27 deletions(-) (limited to 'mail') diff --git a/mail/exim/Makefile b/mail/exim/Makefile index bbe6e5b903f..3ef47d40eac 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/02/17 18:24:45 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2001/02/25 04:17:58 hubertf Exp $ DISTNAME= exim-3.20 CATEGORIES= mail net @@ -23,8 +23,8 @@ pre-configure: > ${WRKSRC}/Local/Makefile pre-install: - ${MKDIR} ${PREFIX}/etc/exim - ${MKDIR} /var/log/exim + ${INSTALL_DATA_DIR} ${PREFIX}/etc/exim + ${INSTALL_DATA_DIR} /var/log/exim ${CHMOD} 750 /var/log/exim strip ${WRKSRC}/build*/exim strip ${WRKSRC}/build*/exim_dbmbuild @@ -34,7 +34,6 @@ pre-install: strip ${WRKSRC}/build*/exim_lock post-install: - ${MKDIR} ${PREFIX}/etc/rc.d ${SED} -e 's:@PREFIX@:${PREFIX}:' \ < ${FILESDIR}/exim.sh \ > ${PREFIX}/etc/rc.d/exim @@ -45,9 +44,8 @@ post-install: ${SED} -e 's:@PREFIX@:${PREFIX}:' \ < ${FILESDIR}/mailer.conf.exim \ > ${PREFIX}/etc/exim/mailer.conf.exim - ${MKDIR} ${PREFIX}/man/man8 ${CP} ${FILESDIR}/exim.8 ${PREFIX}/man/man8/exim.8 - ${MKDIR} ${PREFIX}/share/doc/exim + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/exim ${RM} ${WRKDIR}/exim-html-3.20/doc/html/spec ${CP} -R ${WRKDIR}/exim-html-3.20/doc/html/* ${PREFIX}/share/doc/exim diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile index dcb273a5ad9..f935c2bed4f 100644 --- a/mail/mailagent/Makefile +++ b/mail/mailagent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 18:24:50 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:58 hubertf Exp $ # FreeBSD: ports/mail/mailagent/Makefile,v 1.28 1999/08/31 06:47:24 mharo Exp # @@ -35,8 +35,8 @@ pre-extract: ${FALSE}; fi post-install: - @${MKDIR} ${PREFIX}/share/examples/mailagent - @${MKDIR} ${PREFIX}/share/examples/mailagent/misc + @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailagent + @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailagent/misc ${CP} -pR ${WRKSRC}/misc/* ${PREFIX}/share/examples/mailagent/misc @${LN} -fs ${PREFIX}/lib/mailagent/examples \ ${PREFIX}/share/examples/mailagent/agent diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile index c7f52148254..7c750b732dd 100644 --- a/mail/mailwrapper/Makefile +++ b/mail/mailwrapper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/17 18:24:52 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/02/25 04:17:58 hubertf Exp $ DISTNAME= mailwrapper-19990412 CATEGORIES= mail @@ -26,7 +26,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/mailer.conf ${PREFIX}/etc/mailer.conf.default ${TEST} -e ${MAILER_CONF} || \ ${LN} -s ${PREFIX}/etc/mailer.conf.default /etc/mailer.conf - ${MKDIR} ${LIBEXECDIR} + ${INSTALL_DATA_DIR} ${LIBEXECDIR} ${MV} -i ${SENDMAIL} ${LIBEXECDIR} /dev/null || ${TRUE} ${LN} -fs ${PREFIX}/sbin/mailwrapper /usr/bin/mailq ${LN} -fs ${PREFIX}/sbin/mailwrapper /usr/bin/newaliases diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index e717c6960dd..ba700bf9d9c 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/02/17 18:25:01 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2001/02/25 04:17:58 hubertf Exp $ DISTNAME= snapshot-20010204 PKGNAME= postfix-20010204 @@ -56,7 +56,7 @@ post-build: <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix pre-install: - ${MKDIR} /etc/postfix ${PREFIX}/share/postfix \ + ${INSTALL_DATA_DIR} /etc/postfix ${PREFIX}/share/postfix \ ${PREFIX}/share/doc/postfix ${PREFIX}/libexec/postfix ${CHOWN} root:wheel ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix ${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix @@ -65,7 +65,7 @@ pre-install: post-install: ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${PREFIX}/etc ${LN} -sf ${PREFIX}/share/postfix/postfix-script /etc/postfix - -${MKDIR} ${POSTFIX_SPOOL} + -${INSTALL_DATA_DIR} ${POSTFIX_SPOOL} ${CHMOD} 755 ${POSTFIX_SPOOL} ${TEST} -f /etc/postfix/main.cf || \ ${INSTALL_DATA} ${PREFIX}/share/postfix/main.cf /etc/postfix diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 511b9a1a607..70494158876 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/02/17 18:25:00 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2001/02/25 04:17:59 hubertf Exp $ DISTNAME= postfix-19991231-pl13 PKGNAME= postfix-19991231pl13 @@ -61,7 +61,7 @@ post-build: <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix pre-install: - ${MKDIR} /etc/postfix ${PREFIX}/share/postfix \ + ${INSTALL_DATA_DIR} /etc/postfix ${PREFIX}/share/postfix \ ${PREFIX}/share/doc/postfix ${PREFIX}/libexec/postfix ${CHOWN} root:wheel ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix ${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix @@ -69,7 +69,7 @@ pre-install: post-install: ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${PREFIX}/etc ${LN} -sf ${PREFIX}/share/postfix/postfix-script /etc/postfix - -${MKDIR} ${POSTFIX_SPOOL} + -${INSTALL_DATA_DIR} ${POSTFIX_SPOOL} ${CHMOD} 755 ${POSTFIX_SPOOL} ${TEST} -f /etc/postfix/main.cf || ${INSTALL_DATA} ${PREFIX}/share/postfix/main.cf /etc/postfix ${TEST} -f /etc/postfix/master.cf || ${INSTALL_DATA} ${PREFIX}/share/postfix/master.cf /etc/postfix diff --git a/mail/rblcheck/Makefile b/mail/rblcheck/Makefile index 9c26e310b6e..61cb3af21c1 100644 --- a/mail/rblcheck/Makefile +++ b/mail/rblcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 18:25:03 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:59 hubertf Exp $ # FreeBSD: ports/mail/rblcheck/Makefile,v 1.6 1999/08/25 06:50:47 obrien Exp # @@ -17,7 +17,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rblcheck ${PREFIX}/bin .if !defined(NOPORTDOCS) dst=${PREFIX}/share/doc/rblcheck; \ - ${MKDIR} $$dst; \ + ${INSTALL_DATA_DIR} $$dst; \ for i in ${DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/docs/$$i $$dst; \ done diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index cde731183a9..bdcffa8a4d6 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/02/17 18:25:04 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2001/02/25 04:17:59 hubertf Exp $ DISTNAME= sendmail.8.11.2 PKGNAME= sendmail-8.11.2 @@ -98,7 +98,7 @@ post-build: .endif pre-install: - ${MKDIR} ${PREFIX}/libexec/sendmail + ${INSTALL_DATA_DIR} ${PREFIX}/libexec/sendmail post-install: ${INSTALL_DATA} ${WRKDIR}/mailer.conf.sendmail ${PREFIX}/etc diff --git a/mail/sendmail88/Makefile b/mail/sendmail88/Makefile index f3d9ae30501..b4c7b26ac2a 100644 --- a/mail/sendmail88/Makefile +++ b/mail/sendmail88/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 18:25:05 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:59 hubertf Exp $ DISTNAME= sendmail.8.8.8 PKGNAME= sendmail-8.8.8 @@ -123,7 +123,7 @@ do-configure: done pre-install: - ${MKDIR} ${PREFIX}/libexec/sendmail ${M4DIR} ${M4DIR}/cf \ + ${INSTALL_DATA_DIR} ${PREFIX}/libexec/sendmail ${M4DIR} ${M4DIR}/cf \ ${M4DIR}/domain ${M4DIR}/feature ${M4DIR}/hack ${M4DIR}/m4 \ ${M4DIR}/mailer ${M4DIR}/ostype ${M4DIR}/siteconfig \ ${M4DIR}/mailer ${M4DIR}/sh diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile index c59f44287f5..56d5131ca29 100644 --- a/mail/smtpfeed/Makefile +++ b/mail/smtpfeed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/02/17 18:25:05 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2001/02/25 04:17:59 hubertf Exp $ # Based on FreeBSD Id: Makefile,v 1.27 1999/04/03 08:25:18 itojun Exp # @@ -37,7 +37,7 @@ CONFIGURE_ARGS+=--enable-ipv6 post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} for i in ${DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${DOCDIR}; \ done diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile index 97bd6c8c984..fdd0a8b2f06 100644 --- a/mail/xfmail/Makefile +++ b/mail/xfmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/17 18:25:10 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/02/25 04:18:00 hubertf Exp $ # DISTNAME= xfmail-1.3 @@ -24,7 +24,7 @@ USE_XPM= YES GNU_CONFIGURE= YES post-install: - ${MKDIR} ${PREFIX}/share/doc/xfmail + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfmail ${INSTALL_DATA} ${WRKSRC}/Copyright ${PREFIX}/share/doc/xfmail .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3