From 57a6fddd9364bc28c9c6234c7c3263b1d71a4b4f Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Thu, 1 Dec 2005 19:45:11 +0000
Subject: Fix lots of pkglint warnings.

---
 news/trn/Makefile   | 72 ++++++++++++++++++++++++++---------------------------
 news/trn/options.mk |  6 ++---
 2 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'news')

diff --git a/news/trn/Makefile b/news/trn/Makefile
index 8ac042ff7dc..4b1324d083f 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/01 19:29:26 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/01 19:45:11 wiz Exp $
 
 DISTNAME=		trn-4.0-test76
 PKGNAME=		trn-4.76
@@ -25,50 +25,50 @@ TRN_HOSTBITS?=		0
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
-CONFIGURE_ENV=		PREFIX=${PREFIX}
+CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
 USE_TOOLS+=		awk basename cat cp diff echo egrep expr grep mkdir mv
 USE_TOOLS+=		perl:run rm sed tail tr
-CONFIGURE_ENV+=		TOOLS_AWK="${TOOLS_AWK}"
-CONFIGURE_ENV+=		TOOLS_BASENAME="${TOOLS_BASENAME}"
-CONFIGURE_ENV+=		TOOLS_CAT="${TOOLS_CAT}"
-CONFIGURE_ENV+=		TOOLS_CP="${TOOLS_CP}"
-CONFIGURE_ENV+=		TOOLS_DIFF="${TOOLS_DIFF}"
-CONFIGURE_ENV+=		TOOLS_ECHO="${TOOLS_ECHO}"
-CONFIGURE_ENV+=		TOOLS_EGREP="${TOOLS_EGREP}"
-CONFIGURE_ENV+=		TOOLS_EXPR="${TOOLS_EXPR}"
-CONFIGURE_ENV+=		TOOLS_GREP="${TOOLS_GREP}"
-CONFIGURE_ENV+=		TOOLS_MKDIR="${TOOLS_MKDIR}"
-CONFIGURE_ENV+=		TOOLS_MV="${TOOLS_MV}"
-CONFIGURE_ENV+=		TOOLS_RM="${TOOLS_RM}"
-CONFIGURE_ENV+=		TOOLS_SED="${TOOLS_SED}"
-CONFIGURE_ENV+=		TOOLS_TAIL="${TOOLS_TAIL}"
-CONFIGURE_ENV+=		TOOLS_TR="${TOOLS_TR}"
-CONFIGURE_ARGS=		-d -e -D bin=${PREFIX}/bin \
-			-D binexp=${PREFIX}/bin \
+CONFIGURE_ENV+=		TOOLS_AWK=${TOOLS_AWK:Q}
+CONFIGURE_ENV+=		TOOLS_BASENAME=${TOOLS_BASENAME:Q}
+CONFIGURE_ENV+=		TOOLS_CAT=${TOOLS_CAT:Q}
+CONFIGURE_ENV+=		TOOLS_CP=${TOOLS_CP:Q}
+CONFIGURE_ENV+=		TOOLS_DIFF=${TOOLS_DIFF:Q}
+CONFIGURE_ENV+=		TOOLS_ECHO=${TOOLS_ECHO:Q}
+CONFIGURE_ENV+=		TOOLS_EGREP=${TOOLS_EGREP:Q}
+CONFIGURE_ENV+=		TOOLS_EXPR=${TOOLS_EXPR:Q}
+CONFIGURE_ENV+=		TOOLS_GREP=${TOOLS_GREP:Q}
+CONFIGURE_ENV+=		TOOLS_MKDIR=${TOOLS_MKDIR:Q}
+CONFIGURE_ENV+=		TOOLS_MV=${TOOLS_MV:Q}
+CONFIGURE_ENV+=		TOOLS_RM=${TOOLS_RM:Q}
+CONFIGURE_ENV+=		TOOLS_SED=${TOOLS_SED:Q}
+CONFIGURE_ENV+=		TOOLS_TAIL=${TOOLS_TAIL:Q}
+CONFIGURE_ENV+=		TOOLS_TR=${TOOLS_TR:Q}
+CONFIGURE_ARGS+=	-d -e -D bin=${PREFIX:Q}/bin \
+			-D binexp=${PREFIX:Q}/bin \
 			-D phost=${PKG_SYSCONFDIR}'/domainname' \
-			-D filexp=${PREFIX}'/share/trn/filexp' \
-			-D hostbits=${TRN_HOSTBITS} \
-			-D installbin=${PREFIX}'/bin' \
-			-D installmansrc=${PREFIX}'/man/man1' \
-			-D installprivlib=${PREFIX}'/share/trn' \
-			-D libpth=${PREFIX}'/lib /usr/lib' \
-			-D mansrc=${PREFIX}'/man/man1' \
-			-D mansrcexp=${PREFIX}'/man/man1' \
-			-D mimecap=${PREFIX}'/etc/mimecap' \
+			-D filexp=${PREFIX:Q}'/share/trn/filexp' \
+			-D hostbits=${TRN_HOSTBITS:Q} \
+			-D installbin=${PREFIX:Q}'/bin' \
+			-D installmansrc=${PREFIX:Q}'/man/man1' \
+			-D installprivlib=${PREFIX:Q}'/share/trn' \
+			-D libpth=${PREFIX:Q}'/lib /usr/lib' \
+			-D mansrc=${PREFIX:Q}'/man/man1' \
+			-D mansrcexp=${PREFIX:Q}'/man/man1' \
+			-D mimecap=${PREFIX:Q}'/etc/mimecap' \
 			-D orgname=${PKG_SYSCONFDIR}'/organization' \
-			-D perl=${PERL5} \
-			-D perlpath=${PERL5} \
-			-D prefix=${PREFIX} \
-			-D prefixexp=${PREFIX} \
-			-D privlib=${PREFIX}'/share/trn' \
-			-D privlibexp=${PREFIX}'/share/trn' \
+			-D perl=${PERL5:Q} \
+			-D perlpath=${PERL5:Q} \
+			-D prefix=${PREFIX:Q} \
+			-D prefixexp=${PREFIX:Q} \
+			-D privlib=${PREFIX:Q}'/share/trn' \
+			-D privlibexp=${PREFIX:Q}'/share/trn' \
 			-D servername=${PKG_SYSCONFDIR}'/server' \
 			-D d_nntp \
 			-U d_local \
 			-D libs=' ' \
 			-D usevfork=false \
-			-D inews=${PREFIX}'/bin/inews' \
-			-D useinews=${PREFIX}'/bin/inews'
+			-D inews=${PREFIX:Q}'/bin/inews' \
+			-D useinews=${PREFIX:Q}'/bin/inews'
 
 post-install:
 	@${RM} -f ${PREFIX}/bin/rn ${PREFIX}/man/man1/rn.1 \
diff --git a/news/trn/options.mk b/news/trn/options.mk
index fa5653cc52c..c2b990a7b6a 100644
--- a/news/trn/options.mk
+++ b/news/trn/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/12/01 19:29:26 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2005/12/01 19:45:11 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.trn
 PKG_OPTIONS_REQUIRED_GROUPS=	nntpclient
@@ -10,7 +10,7 @@ PKG_OPTIONS_LEGACY_VARS+=	USE_INN:trn-inn
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minn)
-DEPENDS=		inn>=2.2:../../news/inn
+DEPENDS+=		inn>=2.2:../../news/inn
 .else
-DEPENDS=		nntpclnt>=1.6.1:../../news/nntpclnt
+DEPENDS+=		nntpclnt>=1.6.1:../../news/nntpclnt
 .endif
-- 
cgit v1.2.3