From 27e83c3ef74638e9e711508cc67b7dc093be2d0a Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Sun, 18 Jun 2006 07:04:15 +0000
Subject: Fixed pkglint warnings.

---
 archivers/bicom/Makefile      |  7 ++++---
 archivers/freeze/Makefile     |  6 +++---
 archivers/gcpio/Makefile      | 10 +++++-----
 archivers/gsharutils/Makefile |  4 ++--
 archivers/gtar-base/Makefile  |  4 ++--
 archivers/gtar-info/Makefile  |  8 ++++----
 archivers/gzip-info/Makefile  |  6 +++---
 archivers/lbrate/Makefile     |  7 ++++---
 archivers/lha/Makefile        |  8 ++++----
 archivers/pax/Makefile        | 10 +++++-----
 archivers/rar/Makefile        |  4 ++--
 archivers/star/Makefile       |  5 +++--
 archivers/unarj/Makefile      |  6 +++---
 archivers/unzip/Makefile      |  6 +++---
 archivers/unzoo/Makefile      |  4 ++--
 archivers/zoo/Makefile        | 10 +++++-----
 archivers/zziplib/Makefile    |  4 ++--
 17 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index e142ba12281..5d9aaaf704f 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/05/10 17:12:00 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/06/18 07:04:15 rillig Exp $
 #
 
 DISTNAME=		bicom101
@@ -27,11 +27,12 @@ USE_LANGUAGES=		c++
 INSTALLATION_DIRS=	bin
 
 do-build:
+	set -e;								\
 	for i in bialib bicom; do					\
-		cd ${WRKSRC}/$$i &&					\
+		cd ${WRKSRC}/"$$i" &&					\
 		for f in *.cpp; do					\
 			${CXX} ${CXXFLAGS} -I./ -I../bialib		\
-				-c $$f;				\
+				-c "$$f";				\
 		done;							\
 	done
 	cd ${WRKSRC}/bicom &&						\
diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile
index 144a10c23e8..0d9f5e8ff95 100644
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:28:52 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/06/18 07:04:15 rillig Exp $
 
-DISTNAME=       freeze-2.5
+DISTNAME=	freeze-2.5
 PKGREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/compression/
 
-MAINTAINER=     pkgsrc-users@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	FREEZE / MELT compression program - often used in QNX
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index 4e602a4893f..688f6937232 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.33 2006/06/05 19:04:32 minskim Exp $
+# $NetBSD: Makefile,v 1.34 2006/06/18 07:04:15 rillig Exp $
 #
 
-DISTNAME=       cpio-2.6
-PKGREVISION=	4
+DISTNAME=	cpio-2.6
 PKGNAME=	g${DISTNAME}
+PKGREVISION=	4
 CATEGORIES=	archivers
-MASTER_SITES=   ${MASTER_SITE_GNU:=cpio/}
+MASTER_SITES=	${MASTER_SITE_GNU:=cpio/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/cpio/cpio.html
@@ -17,7 +17,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	makeinfo
-INFO_FILES=	# PLIST
+INFO_FILES=	yes
 
 TEST_TARGET=	check
 
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index 9b7308db6f6..ddf658c8705 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/05/17 06:12:27 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2006/06/18 07:04:15 rillig Exp $
 
 DISTNAME=	sharutils-4.2.1
 PKGNAME=	g${DISTNAME}
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
 INSTALL_TARGET=		install install-man
-INFO_FILES=		# PLIST
+INFO_FILES=		yes
 USE_TOOLS+=		makeinfo msgfmt sh:run mktemp:run
 
 CONFIGURE_ARGS+=	--disable-uucode
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index 470ec442738..cd85ebf177c 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2006/04/13 18:23:29 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2006/06/18 07:04:16 rillig Exp $
 #
 
-DISTNAME=       tar-1.15.1
+DISTNAME=	tar-1.15.1
 PKGNAME=	gtar-base-1.15.1
 PKGREVISION=	2
 SVR4_PKGNAME=	gtarb
diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile
index d68c8f60ec2..059e372da41 100644
--- a/archivers/gtar-info/Makefile
+++ b/archivers/gtar-info/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2006/03/20 18:15:37 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/06/18 07:04:16 rillig Exp $
 #
 
-DISTNAME=       tar-1.15.1
+DISTNAME=	tar-1.15.1
 PKGNAME=	gtar-info-1.15.1
-SVR4_PKGNAME=	gtari
 PKGREVISION=	1
+SVR4_PKGNAME=	gtari
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
 
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-INFO_FILES=	# PLIST
+INFO_FILES=	yes
 
 INSTALLATION_DIRS=	${PKGINFODIR}
 
diff --git a/archivers/gzip-info/Makefile b/archivers/gzip-info/Makefile
index 60f214f14b5..c4b24e3ae00 100644
--- a/archivers/gzip-info/Makefile
+++ b/archivers/gzip-info/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2006/03/20 18:15:37 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/06/18 07:04:16 rillig Exp $
 
 DISTNAME=	gzip-1.2.4a
 PKGNAME=	gzip-info-1.2.4a
 SVR4_PKGNAME=	gzipi
 CATEGORIES=	archivers
-MASTER_SITES=   ${MASTER_SITE_GNU:=gzip/}
+MASTER_SITES=	${MASTER_SITE_GNU:=gzip/}
 EXTRACT_SUFX=	.shar
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-INFO_FILES=	# PLIST
+INFO_FILES=	yes
 
 INSTALLATION_DIRS=	${PKGINFODIR}
 
diff --git a/archivers/lbrate/Makefile b/archivers/lbrate/Makefile
index 43d6c0b7371..7aa68bd7598 100644
--- a/archivers/lbrate/Makefile
+++ b/archivers/lbrate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/05/17 06:12:27 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2006/06/18 07:04:16 rillig Exp $
 
 DISTNAME=	lbrate-1.1
 PKGREVISION=	1
@@ -16,7 +16,8 @@ LBRATE_DOCSDIR=	${PREFIX}/share/doc/lbrate
 
 post-install:
 	${INSTALL_DATA_DIR} ${LBRATE_DOCSDIR}
-	for f in COPYING ChangeLog README TODO; do		\
-	${INSTALL_DATA} ${WRKSRC}/$$f ${LBRATE_DOCSDIR}; done
+.for f in COPYING ChangeLog README TODO
+	${INSTALL_DATA} ${WRKSRC}/${f} ${LBRATE_DOCSDIR}
+.endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 7bedd16a0f4..bce6bc5aa59 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.27 2006/03/04 21:28:53 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/06/18 07:04:16 rillig Exp $
 
-DISTNAME=       lha-114i
+DISTNAME=	lha-114i
 PKGNAME=	lha-114.9
 PKGREVISION=	2
 CATEGORIES=	archivers
-MASTER_SITES=   http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \
+MASTER_SITES=	http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \
 		ftp://ftp.win.ne.jp/pub/misc/
 
-MAINTAINER=     pkgsrc-users@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm
 COMMENT=	Archive files using LZW compression (.lzh files)
 
diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index f361272fddd..98822b54bd3 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/05/17 06:12:27 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2006/06/18 07:04:16 rillig Exp $
 #
 
 DISTNAME=		pax-20060202
@@ -14,10 +14,10 @@ GNU_CONFIGURE=		yes
 
 NO_PKGTOOLS_REQD_CHECK=	yes
 NO_CHECKSUM=		yes
-NO_MTREE=               yes
-NO_PKG_REGISTER=        yes
-NO_PACKAGE=             Deinstallation is not permitted
-PKG_PRESERVE=           yes
+NO_MTREE=		yes
+NO_PKG_REGISTER=	yes
+NO_PACKAGE=		Deinstallation is not permitted
+PKG_PRESERVE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index f06667c10a5..b4c7cf1de0f 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/05/17 06:12:27 rillig Exp $
+# $NetBSD: Makefile,v 1.45 2006/06/18 07:04:16 rillig Exp $
 
 DISTNAME=		rarbsd
 PKGNAME=		rar-2.02
@@ -18,7 +18,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
 WRKSRC=			${WRKDIR}
-EXTRACT_CMD=		${DOWNLOADED_DISTFILE} >/dev/null
+EXTRACT_CMD=		exec "$$extract_file" >/dev/null
 
 pre-extract:
 	${_PKG_SILENT}${_PKG_DEBUG} set -e; set -u;			\
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index 59fa10ce673..af306f4500c 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/05/17 06:12:27 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/06/18 07:04:16 rillig Exp $
 #
 
 DISTNAME=	star-1.4.3
@@ -18,8 +18,9 @@ MAKE_FLAGS+=	INS_BASE=${PREFIX:Q}
 .include "../../mk/bsd.prefs.mk"
 
 pre-build:
+	set -e; \
 	cd ${WRKSRC}/RULES && for i in arm mipsel x86_64 sparc64; do	\
-		${LN} -s i386-netbsd-cc.rul $$i-netbsd-cc.rul; done
+		${LN} -s i386-netbsd-cc.rul "$$i"-netbsd-cc.rul; done
 	cd ${WRKSRC}/RULES && \
 		${LN} -s os-freebsd.id os-dragonfly.id
 
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index af49db9dc09..58438af83e6 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2006/04/22 09:22:05 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2006/06/18 07:04:16 rillig Exp $
 
-DISTNAME=       unarj-2.65
+DISTNAME=	unarj-2.65
 PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
-MAINTAINER=     pkgsrc-users@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.arjsoftware.com/
 COMMENT=	Allows files to be extracted from ARJ archives
 
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index f9633fc170f..42acdecff65 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2006/06/15 13:34:27 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2006/06/18 07:04:16 rillig Exp $
 
 DISTNAME=	unzip552
 PKGNAME=	unzip-5.52
@@ -24,8 +24,8 @@ BUILD_TARGET=	generic_zlib unzipsfx
 CFLAGS+=	-DBSD
 .endif
 CFLAGS+=	-I. -DUNIX -Dunix -DUSE_UNSHRINK
-MAKE_FLAGS+=	CF=${CPPFLAGS:Q}\ ${CFLAGS:Q}
-MAKE_FLAGS+=	LF2=${_STRIPFLAG_CC:Q}\ ${LDFLAGS:Q}\ -lz
+MAKE_FLAGS+=	CF=${CPPFLAGS:M*:Q}\ ${CFLAGS:M*:Q}
+MAKE_FLAGS+=	LF2=${_STRIPFLAG_CC:Q}\ ${LDFLAGS:M*:Q}\ -lz
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc
 
diff --git a/archivers/unzoo/Makefile b/archivers/unzoo/Makefile
index ebe73ab35dd..5091ea66ab7 100644
--- a/archivers/unzoo/Makefile
+++ b/archivers/unzoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/10/16 15:02:36 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/06/18 07:04:16 rillig Exp $
 #
 
 DISTNAME=	unzoo.c
@@ -18,7 +18,7 @@ NO_CONFIGURE=	YES
 INSTALLATION_DIRS=	bin
 
 do-extract:
-	${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}
+	cd ${DISTDIR} && ${CP} ${DISTFILES} ${WRKSRC}
 
 do-build:
 	cd ${WRKSRC} &&	${CC} ${CFLAGS} -DSYS_IS_UNIX -DSYS_HAS_MKDIR -o unzoo unzoo.c
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index e7ce66650dd..19434ad07e8 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2006/06/10 17:18:48 adrianp Exp $
+# $NetBSD: Makefile,v 1.26 2006/06/18 07:04:16 rillig Exp $
 
-DISTNAME=       zoo-2.10pl1
+DISTNAME=	zoo-2.10pl1
 PKGNAME=	zoo-2.10.1
 PKGREVISION=	1
 CATEGORIES=	archivers
-MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/arcers/
+MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/arcers/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Manipulate archives of files in compressed form
@@ -16,8 +16,8 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 
-BUILD_TARGET=     bsdansi
-MAKEFILE=       makefile
+BUILD_TARGET=	bsdansi
+MAKEFILE=	makefile
 
 INSTALLATION_DIRS=	bin man/man1
 
diff --git a/archivers/zziplib/Makefile b/archivers/zziplib/Makefile
index 83970ef810c..549a19a63f5 100644
--- a/archivers/zziplib/Makefile
+++ b/archivers/zziplib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2006/04/09 08:57:54 heinz Exp $
+# $NetBSD: Makefile,v 1.12 2006/06/18 07:04:16 rillig Exp $
 #
 
 DISTNAME=	zziplib-0.10.82
 PKGREVISION=	1
 CATEGORIES=	archivers
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=zziplib/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zziplib/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-- 
cgit v1.2.3