Fixed warnings found by pkglint -Wall.

5 files changed, 32 insertions, 32 deletions

diff --git a/editors/jave/Makefile b/editors/jave/Makefile
index 21f62352ae1..cc231712ed6 100644
--- a/editors/jave/Makefile
+++ b/editors/jave/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:56 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/17 07:43:36 martti Exp $
 
 DISTNAME=		jave_6.0_M7
 PKGNAME=		jave-6.0m7
 PKGREVISION=		1
 CATEGORIES=		editors
 MASTER_SITES=		http://www.jave.de/developer/ http://www.jave.de/figlet/
-DISTFILES=		jave_6.0_M7${EXTRACT_SUFX} figletfonts37${EXTRACT_SUFX}
 EXTRACT_SUFX=		.zip
+DISTFILES=		jave_6.0_M7${EXTRACT_SUFX} figletfonts37${EXTRACT_SUFX}
 
 MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.jave.de/
@@ -15,21 +15,21 @@ COMMENT=		Java ASCII Versatile Editor
 USE_JAVA=		run
 PKG_JVMS_ACCEPTED=	sun-jdk14 sun-jdk15
 
-WRKSRC=			${WRKDIR}
+WRKSRC=			${WRKDIR:Q}
 
 post-extract:
-	${MKDIR} ${WRKDIR}/.workdir
-	${MV} ${WRKDIR}/* ${WRKDIR}/.workdir/
+	${MKDIR} ${WRKDIR:Q}/.workdir
+	${MV} ${WRKDIR:Q}/* ${WRKDIR:Q}/.workdir/
 
 do-build:
-	${SED}	-e "s#@PKG_JAVA_HOME@#${PKG_JAVA_HOME}#g"	\
-		-e "s#@PREFIX@#${PREFIX}#g"			\
-		< ${FILESDIR}/jave > ${WRKDIR}/jave
+	${SED}	-e "s#@PKG_JAVA_HOME@#${PKG_JAVA_HOME:Q}#g"	\
+		-e "s#@PREFIX@#${PREFIX:Q}#g"			\
+		< ${FILESDIR:Q}/jave > ${WRKDIR:Q}/jave
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/jave ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/jave
-	(cd ${WRKDIR}/.workdir && ${PAX} -rw * ${PREFIX}/share/jave)
+	${INSTALL_SCRIPT} ${WRKDIR:Q}/jave ${PREFIX:Q}/bin
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/jave
+	(cd ${WRKDIR:Q}/.workdir && ${PAX} -rw * ${PREFIX:Q}/share/jave)
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/corkscrew/Makefile b/net/corkscrew/Makefile
index adda020936c..d0008156acb 100644
--- a/net/corkscrew/Makefile
+++ b/net/corkscrew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/06 11:23:26 martti Exp $
+# $NetBSD: Makefile,v 1.2 2006/02/17 07:48:02 martti Exp $
 
 DISTNAME=	corkscrew-2.0
 CATEGORIES=	net
@@ -11,7 +11,7 @@ COMMENT=	Tool for tunneling SSH through HTTP proxies
 GNU_CONFIGURE=	YES
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/corkscrew
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/corkscrew
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/corkscrew
+	${INSTALL_DATA} ${WRKSRC:Q}/README ${PREFIX:Q}/share/doc/corkscrew
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index a231dba6987..a154086584c 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/02/05 23:10:29 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2006/02/17 07:46:50 martti Exp $
 
 DISTNAME=	proftpd-1.3.0rc3
 PKGREVISION=	2
@@ -25,28 +25,28 @@ CONFIGURE_ARGS+=	--enable-ctrls
 
 RCD_SCRIPTS=	proftpd
 
-CONF_FILES=	${PREFIX}/share/examples/proftpd/basic.conf \
-		${PKG_SYSCONFDIR}/proftpd.conf
+CONF_FILES=	${PREFIX:Q}/share/examples/proftpd/basic.conf \
+		${PKG_SYSCONFDIR:Q}/proftpd.conf
 
 SUBST_CLASSES+=		man
-SUBST_MESSAGE.man=	"Fixing paths in manual pages."
+SUBST_MESSAGE.man=	Fixing paths in manual pages.
 SUBST_STAGE.man=	pre-configure
 SUBST_FILES.man=	utils/ftpcount.1.in utils/ftptop.1.in utils/ftpwho.1.in
-SUBST_SED.man=		-e s,@LOCALSTATEDIR@/run/proftpd,${VARBASE}/run,
+SUBST_SED.man=		-e s,@LOCALSTATEDIR@/run/proftpd,${VARBASE:Q}/run,
 
 .include "options.mk"
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/proftpd
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/proftpd
 .for i in NEWS README README.IPv6 README.LDAP README.PAM README.capabilities \
           README.classes README.controls README.facl README.modules
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/proftpd
+	${INSTALL_DATA} ${WRKSRC:Q}/${i} ${PREFIX:Q}/share/doc/proftpd
 .endfor
 .for i in Configuration.html faq.html license.txt
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/proftpd
+	${INSTALL_DATA} ${WRKSRC:Q}/doc/${i} ${PREFIX:Q}/share/doc/proftpd
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/proftpd
-	${INSTALL_DATA} ${WRKSRC}/sample-configurations/*.conf \
-		${PREFIX}/share/examples/proftpd
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/examples/proftpd
+	${INSTALL_DATA} ${WRKSRC:Q}/sample-configurations/*.conf \
+		${PREFIX:Q}/share/examples/proftpd
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index d5142a8dccd..17ffb995c20 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/10/28 05:29:54 martti Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/17 07:51:24 martti Exp $
 
 DISTNAME=	keychain-2.6.1
 CATEGORIES=	security
@@ -20,9 +20,9 @@ NO_BUILD=		yes
 INSTALLATION_DIRS=	bin man/man1 share/doc/${PKGBASE}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/keychain ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/keychain.1 ${PREFIX}/man/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/keychain
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/keychain
+	${INSTALL_SCRIPT} ${WRKSRC:Q}/keychain ${PREFIX:Q}/bin
+	${INSTALL_MAN} ${WRKSRC:Q}/keychain.1 ${PREFIX:Q}/man/man1
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/keychain
+	${INSTALL_DATA} ${WRKSRC:Q}/README ${PREFIX:Q}/share/doc/keychain
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 535c2c7fac8..d253e8c828b 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/12/29 06:22:12 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2006/02/17 07:48:52 martti Exp $
 
 DISTNAME=		stunnel-4.07
 PKGREVISION=		2
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q} \
 PKG_SYSCONFSUBDIR=	stunnel
 
 RCD_SCRIPTS=		stunnel
-REPLACE_PERL=		src/stunnel3.in
+REPLACE_PERL+=		src/stunnel3.in
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"