Fixed all pkglint warnings in the category, except for update requests.

7 files changed, 18 insertions, 17 deletions

diff --git a/geography/gpsdrive/Makefile b/geography/gpsdrive/Makefile
index c2273303281..4a1d0a92b95 100644
--- a/geography/gpsdrive/Makefile
+++ b/geography/gpsdrive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/17 13:46:30 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/05/11 11:05:54 rillig Exp $
 
 DISTNAME=	gpsdrive-1.31
 PKGREVISION=	10
@@ -15,7 +15,7 @@ DEPENDS+=	wget>=1:../../net/wget
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 
-USE_LANGUAGE=	c c++
+USE_LANGUAGES=	c c++
 
 # XXX make this an option
 CONFIGURE_ARGS+=	--disable-mysql
diff --git a/geography/gpspoint/Makefile b/geography/gpspoint/Makefile
index 5b68adb7f98..1980cb2bb36 100644
--- a/geography/gpspoint/Makefile
+++ b/geography/gpspoint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/11 10:07:50 ghen Exp $
+# $NetBSD: Makefile,v 1.8 2006/05/11 11:05:54 rillig Exp $
 
 DISTNAME=		gpspoint-2.030521
 PKGREVISION=		1
@@ -11,9 +11,9 @@ COMMENT=		Program to download and upload waypoints to and from your GPS device
 
 DEPENDS+=		dialog>=0.6:../../misc/dialog
 
-USE_PKGLOCALEDIR=       yes
-USE_LIBTOOL=            yes
-GNU_CONFIGURE=          yes
+USE_PKGLOCALEDIR=	yes
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 
 REPLACE_INTERPRETER+=	bash
 REPLACE.bash.old=	/bin/bash
diff --git a/geography/gpsutils/Makefile b/geography/gpsutils/Makefile
index 06a55c77a2c..2897ddde9ec 100644
--- a/geography/gpsutils/Makefile
+++ b/geography/gpsutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:56 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/05/11 11:05:54 rillig Exp $
 #
 
 DISTNAME=		gpsutils-0.4.0
@@ -13,8 +13,8 @@ WRKSRC=			${WRKDIR}/gpsutils-0.4.0/src
 INSTALLATION_DIRS=	bin
 
 do-install:
-.for PROGRAM in capture switchmode gbindiff
-	${INSTALL_PROGRAM} ${WRKSRC}/${PROGRAM} ${PREFIX}/bin
+.for f in capture switchmode gbindiff
+	${INSTALL_PROGRAM} ${WRKSRC}/${f:Q} ${PREFIX}/bin
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile
index 47105d0ae6b..7487f2dbd80 100644
--- a/geography/mapserver/Makefile
+++ b/geography/mapserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/04/17 13:46:30 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/05/11 11:05:54 rillig Exp $
 #
 
 DISTNAME=		mapserver-4.0
@@ -23,9 +23,9 @@ INSTALLATION_DIRS=	bin include lib
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libmap.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/map.h ${PREFIX}/include
-.for PROGRAM in shp2img shp2pdf mapserv legend shptree shptreevis 	\
+.for f in shp2img shp2pdf mapserv legend shptree shptreevis		\
 	shptreetst scalebar sortshp
-	${INSTALL_PROGRAM} ${WRKSRC}/${PROGRAM} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${f:Q} ${PREFIX}/bin
 .endfor
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/geography/vis5d+/Makefile b/geography/vis5d+/Makefile
index 8a1b3cadb6a..da4af96ce49 100644
--- a/geography/vis5d+/Makefile
+++ b/geography/vis5d+/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/13 18:23:33 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/05/11 11:05:54 rillig Exp $
 #
 
 DISTNAME=		vis5d+-1.2.1
@@ -11,7 +11,7 @@ HOMEPAGE=		http://vis5d.sourceforge.net/
 COMMENT=		Volumetric Visualization program for scientific datasets
 
 USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=       yes
+USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt
 
 GNU_CONFIGURE=		yes
diff --git a/geography/xrmap-base/Makefile b/geography/xrmap-base/Makefile
index 8fb2a6bb355..34f9aa3e159 100644
--- a/geography/xrmap-base/Makefile
+++ b/geography/xrmap-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:29:45 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/05/11 11:05:54 rillig Exp $
 #
 
 DISTNAME=		xrmap-2.29
@@ -16,6 +16,6 @@ USE_IMAKE=		yes
 
 # directory shared by factbook_text and factbook_html
 post-install:
-	${MKDIR} -p ${PREFIX}/share/rmap/factbook
+	${INSTALL_DATA_DIR} ${PREFIX}/share/rmap/factbook
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/xrmap/Makefile b/geography/xrmap/Makefile
index 542459a4b8f..defacb1c657 100644
--- a/geography/xrmap/Makefile
+++ b/geography/xrmap/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:29:45 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/05/11 11:05:54 rillig Exp $
 #
 
 DISTNAME=		xrmap-2.29
 PKGREVISION=		1
 CATEGORIES=		geography
+MASTER_SITES=		# none
 DISTFILES=		# empty
 
 MAINTAINER=		pkgsrc-users@NetBSD.org