Fixed pkglint warnings.

11 files changed, 26 insertions, 25 deletions

diff --git a/archivers/fastjar/distinfo b/archivers/fastjar/distinfo
index ba2f7b96c2e..4dd7428db10 100644
--- a/archivers/fastjar/distinfo
+++ b/archivers/fastjar/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/03/14 14:02:01 joerg Exp $
+$NetBSD: distinfo,v 1.12 2006/05/17 06:12:27 rillig Exp $
 
 SHA1 (fastjar-0.93.tgz) = 74acc8e8a920ea6da18a180cd0a691c5d7c4699f
 RMD160 (fastjar-0.93.tgz) = 1627f2316cc7bca6a477011d1b812b140900d987
@@ -6,4 +6,4 @@ Size (fastjar-0.93.tgz) = 62419 bytes
 SHA1 (patch-aa) = 12cc5397a89c18d239164caa3955121ca6d01de0
 SHA1 (patch-ab) = c13f46e1a3e60a3bbe656af609a5c9fb047a4ca3
 SHA1 (patch-ac) = ce8eefb978a93d0043f8b98fbf4049f022ce663c
-SHA1 (patch-ad) = c988c11e01c364d94a7a12c3eb4dc933b12861a0
+SHA1 (patch-ad) = 7fe6657b18090e0d12c8a3b528370314e6ddca97
diff --git a/archivers/fastjar/patches/patch-ad b/archivers/fastjar/patches/patch-ad
index 63a3b1b1039..88e7a1ba46d 100644
--- a/archivers/fastjar/patches/patch-ad
+++ b/archivers/fastjar/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2006/03/14 14:02:01 joerg Exp $
+$NetBSD: patch-ad,v 1.6 2006/05/17 06:12:27 rillig Exp $
 
 --- jartool.c.orig	2001-01-11 09:38:15.000000000 +0100
 +++ jartool.c
-@@ -171,4 +171,2 @@ static char rcsid[] = "$Id: jartool.c,v 
+@@ -171,4 +171,2 @@
  
 -extern int errno;
 -
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index b1cf8f2cd93..9b7308db6f6 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/04/13 18:23:29 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2006/05/17 06:12:27 rillig Exp $
 
 DISTNAME=	sharutils-4.2.1
 PKGNAME=	g${DISTNAME}
@@ -45,7 +45,7 @@ PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
 BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 
 post-patch:
-	@${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/po/sharutils.pot
+	${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/po/sharutils.pot
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index 7c63f37ec34..d7cfc924392 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:28:52 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/05/17 06:12:27 rillig Exp $
 
 DISTNAME=       hpack79src
 PKGNAME=        hpack-0.79
@@ -40,7 +40,7 @@ CONF_FILES=	${PREFIX}/share/hpack/hpack.cfg.example	\
 INSTALLATION_DIRS=	bin man/man1
 
 post-build:
-	@cd ${WRKSRC}/keycvt && ${MAKE} CFLAGS="-c -D__UNIX__ ${CFLAGS}" \
+	cd ${WRKSRC}/keycvt && ${MAKE} CFLAGS="-c -D__UNIX__ ${CFLAGS}" \
 		-f ${MAKEFILE} keycvt
 
 do-install:
diff --git a/archivers/lbrate/Makefile b/archivers/lbrate/Makefile
index 681f82bcca2..43d6c0b7371 100644
--- a/archivers/lbrate/Makefile
+++ b/archivers/lbrate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:28:53 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/05/17 06:12:27 rillig Exp $
 
 DISTNAME=	lbrate-1.1
 PKGREVISION=	1
@@ -15,7 +15,7 @@ MAKE_FLAGS+=	PREFIX=${PREFIX:Q}
 LBRATE_DOCSDIR=	${PREFIX}/share/doc/lbrate
 
 post-install:
-	@${INSTALL_DATA_DIR} ${LBRATE_DOCSDIR}
+	${INSTALL_DATA_DIR} ${LBRATE_DOCSDIR}
 	for f in COPYING ChangeLog README TODO; do		\
 	${INSTALL_DATA} ${WRKSRC}/$$f ${LBRATE_DOCSDIR}; done
 
diff --git a/archivers/makeself/Makefile b/archivers/makeself/Makefile
index cba56554eed..53d2402c4c7 100644
--- a/archivers/makeself/Makefile
+++ b/archivers/makeself/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/23 10:04:41 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/05/17 06:12:27 rillig Exp $
 
 DISTNAME=	makeself-2.1.4
 CATEGORIES=	archivers
@@ -18,9 +18,9 @@ INSTALLATION_DIRS=	bin
 # The DISPLAY thing is to prevent the script from trying to launch a xterm
 # just to extract the source.
 pre-patch:
-	(cd ${WRKDIR} && ${SETENV} DISPLAY="" ${SH} ${DISTFILES})
+	cd ${WRKDIR} && ${SETENV} DISPLAY="" ${SH} ${DISTFILES}
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/makeself.sh ${PREFIX}/bin/makeself
+	${INSTALL_SCRIPT} ${WRKSRC}/makeself.sh ${PREFIX}/bin/makeself
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index b732e8180b3..f361272fddd 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/02 19:29:09 christos Exp $
+# $NetBSD: Makefile,v 1.23 2006/05/17 06:12:27 rillig Exp $
 #
 
 DISTNAME=		pax-20060202
@@ -22,7 +22,7 @@ PKG_PRESERVE=           yes
 .include "../../mk/bsd.prefs.mk"
 
 do-extract:
-	@${CP} -R ${FILESDIR} ${WRKSRC}
+	${CP} -R ${FILESDIR} ${WRKSRC}
 
 .if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
 .  include "../../pkgtools/libnbcompat/inplace.mk"
diff --git a/archivers/ppmd/Makefile b/archivers/ppmd/Makefile
index 2a45aae36b1..6859aeb3804 100644
--- a/archivers/ppmd/Makefile
+++ b/archivers/ppmd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/19 11:30:47 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2006/05/17 06:12:27 rillig Exp $
 #
 
 DISTNAME=	ppmdi1
@@ -25,7 +25,7 @@ SUBST_CLASSES+=		d2u
 SUBST_MESSAGE.d2u=	Converting CRLF to LF.
 SUBST_STAGE.d2u=	post-extract
 SUBST_FILES.d2u=	*
-SUBST_FILTER_CMD.d2u=	tr -d '\015'
+SUBST_FILTER_CMD.d2u=	${TR} -d '\015'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC:Q}/ppmd ${PREFIX:Q}/bin
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index e5569b2e6d5..f06667c10a5 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/05/07 12:55:19 gdt Exp $
+# $NetBSD: Makefile,v 1.44 2006/05/17 06:12:27 rillig Exp $
 
 DISTNAME=		rarbsd
 PKGNAME=		rar-2.02
@@ -37,7 +37,7 @@ pre-extract:
 		${ECHO} "with options COMPAT_NOMID and COMPAT_12 (and EXEC_AOUT, if ELF)."; \
 		${FALSE};						\
 	fi
-	@${CHMOD} a+x ${DISTDIR:Q}/${DISTFILES:Q}
+	${CHMOD} a+x ${DISTDIR:Q}/${DISTFILES:Q}
 
 do-build:
 	${_PKG_SILENT}${_PKG_DEBUG} set -e; set -u;			\
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index 9857938a2d6..59fa10ce673 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/08 20:11:54 hubertf Exp $
+# $NetBSD: Makefile,v 1.18 2006/05/17 06:12:27 rillig Exp $
 #
 
 DISTNAME=	star-1.4.3
@@ -18,9 +18,9 @@ MAKE_FLAGS+=	INS_BASE=${PREFIX:Q}
 .include "../../mk/bsd.prefs.mk"
 
 pre-build:
-	@cd ${WRKSRC}/RULES && for i in arm mipsel x86_64 sparc64; do	\
+	cd ${WRKSRC}/RULES && for i in arm mipsel x86_64 sparc64; do	\
 		${LN} -s i386-netbsd-cc.rul $$i-netbsd-cc.rul; done
-	@cd ${WRKSRC}/RULES && \
+	cd ${WRKSRC}/RULES && \
 		${LN} -s os-freebsd.id os-dragonfly.id
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unace-bin/Makefile b/archivers/unace-bin/Makefile
index a5b6b4a1490..59c775032c9 100644
--- a/archivers/unace-bin/Makefile
+++ b/archivers/unace-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/03/03 22:27:44 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2006/05/17 06:12:27 rillig Exp $
 #
 
 DISTNAME=	linunace25
@@ -13,8 +13,9 @@ COMMENT=	Extract, list and test files in ACE archives (Linux binary)
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
-NO_BIN_ON_FTP=		Only original file distribution.
-NO_BIN_ON_CDROM=	Only original file distribution.
+RESTRICTED=		Only original file distribution.
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 WRKSRC=		${WRKDIR}