From aebe2793ada24381740cb508db2039c63a53bcdf Mon Sep 17 00:00:00 2001
From: martti <martti>
Date: Mon, 16 Oct 2006 09:54:49 +0000
Subject: Fixed few pkglint warnings.

---
 mail/postfix-current/Makefile | 9 ++++-----
 mail/postfix/Makefile         | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'mail')

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 5d01a2899ad..4e6b3c17328 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.67 2006/10/16 09:48:00 martti Exp $
+# $NetBSD: Makefile,v 1.68 2006/10/16 09:54:49 martti Exp $
 
 DISTNAME=	postfix-2.4-20061015
 #PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/
+DIST_SUBDIR=	postfix
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.postfix.org/
 COMMENT=	Postfix SMTP server and tools
 
-DIST_SUBDIR=	postfix
-
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
@@ -84,7 +83,7 @@ MESSAGE_SRC+=		${PKGDIR}/MESSAGE.${OPSYS}
 PLIST_SRC+=		${PKGDIR}/PLIST
 
 BUILD_TARGET=		# empty
-MAKE_ENV+=		CC=${CC:Q} OPT=${CFLAGS:M*:Q}
+MAKE_ENV+=		CC=${CC:Q} OPT=${CFLAGS:Q}
 MAKE_ENV+=		AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
 
 RCD_SCRIPTS=		postfix
@@ -134,7 +133,7 @@ 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
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 03d6dff843b..930a0b98076 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.187 2006/08/31 18:44:50 martti Exp $
+# $NetBSD: Makefile,v 1.188 2006/10/16 09:54:49 martti Exp $
 
 DISTNAME=	postfix-2.3.3
 #PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
+DIST_SUBDIR=	postfix
 
 MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.postfix.org/
 COMMENT=	Postfix SMTP server and tools
 
-DIST_SUBDIR=	postfix
-
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
@@ -84,7 +83,7 @@ MESSAGE_SRC+=		${PKGDIR}/MESSAGE.${OPSYS}
 PLIST_SRC+=		${PKGDIR}/PLIST
 
 BUILD_TARGET=		# empty
-MAKE_ENV+=		CC=${CC:Q} OPT=${CFLAGS:M*:Q}
+MAKE_ENV+=		CC=${CC:Q} OPT=${CFLAGS:Q}
 MAKE_ENV+=		AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
 
 RCD_SCRIPTS=		postfix
@@ -134,7 +133,7 @@ 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
-- 
cgit v1.2.3