summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartti <martti>2006-10-16 10:43:32 +0000
committermartti <martti>2006-10-16 10:43:32 +0000
commitf86cc8a6664e526709015082f29732a905823d26 (patch)
treee24246aac396576cc272f43e69e10a98d4058b55
parent19cc733d1c8ed5f0a70ab35d9b99c36035675244 (diff)
downloadpkgsrc-f86cc8a6664e526709015082f29732a905823d26.tar.gz
Fixed few pkglint warnings.
-rw-r--r--mail/postfix-current/Makefile10
-rw-r--r--mail/postfix/Makefile10
2 files changed, 10 insertions, 10 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index c9155544582..5451d3baf9d 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2006/10/16 10:04:01 martti Exp $
+# $NetBSD: Makefile,v 1.70 2006/10/16 10:43:33 martti Exp $
DISTNAME= postfix-2.4-20061015
#PKGREVISION= 1
@@ -118,11 +118,11 @@ SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
SUBST_STAGE.paths= post-patch
post-extract:
- ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
+ cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
do-configure:
cd ${WRKSRC} && \
- ${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
+ env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
post-build:
@@ -134,14 +134,14 @@ do-install:
${INSTALL_DATA_DIR} ${LIBEXECDIR}
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
${INSTALL_DATA_DIR} ${DOCDIR}
- ${RM} -f ${WRKSRC}/conf/*.orig
+ rm -f ${WRKSRC}/conf/*.orig
.if !empty(PKG_OPTIONS:Msasl)
${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
.endif
${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR}
${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR}
${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf
- cd ${WRKSRC}; ${SH} ./postfix-install -non-interactive \
+ cd ${WRKSRC}; sh ./postfix-install -non-interactive \
config_directory="${EXAMPLEDIR}"
${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
${PREFIX}/sbin/qshape
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 4589aa1906b..2a3cf3ba044 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.189 2006/10/16 10:04:01 martti Exp $
+# $NetBSD: Makefile,v 1.190 2006/10/16 10:43:32 martti Exp $
DISTNAME= postfix-2.3.3
#PKGREVISION= 1
@@ -118,11 +118,11 @@ SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
SUBST_STAGE.paths= post-patch
post-extract:
- ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
+ cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
do-configure:
cd ${WRKSRC} && \
- ${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
+ env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
post-build:
@@ -134,14 +134,14 @@ do-install:
${INSTALL_DATA_DIR} ${LIBEXECDIR}
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
${INSTALL_DATA_DIR} ${DOCDIR}
- ${RM} -f ${WRKSRC}/conf/*.orig
+ rm -f ${WRKSRC}/conf/*.orig
.if !empty(PKG_OPTIONS:Msasl)
${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
.endif
${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR}
${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR}
${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf
- cd ${WRKSRC}; ${SH} ./postfix-install -non-interactive \
+ cd ${WRKSRC}; sh ./postfix-install -non-interactive \
config_directory="${EXAMPLEDIR}"
${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
${PREFIX}/sbin/qshape