pkglint USE_LANGUAGES cleanup. Patch from Sergey Svishchev.

34 files changed, 86 insertions, 86 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index b26895695cc..9548e2f3959 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2007/01/13 21:28:11 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/02/22 19:30:02 wiz Exp $
 
 DISTNAME=	audacity-src-1.2.4b
 PKGNAME=	audacity-1.2.4b
@@ -15,7 +15,7 @@ DEPENDS+=	zip>=0.0:../../archivers/zip
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		autoconf gmake msgfmt
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-xaudio
 CONFIGURE_ARGS+=	--with-id3=system
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index d2552457d52..21073fe3697 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/26 03:53:56 markd Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:30:03 wiz Exp $
 #
 
 DISTNAME=		kid3-0.8.1
@@ -11,7 +11,7 @@ COMMENT=		KDE ID3 tagger
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 
 CHECK_PORTABILITY_SKIP+=	make_qtonly.sh
 
diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile
index 108f02fa1c2..5acc15776c5 100644
--- a/audio/maplay/Makefile
+++ b/audio/maplay/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2006/05/24 11:47:12 tonio Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:30:03 wiz Exp $
 
-DISTNAME=       maplay1_2
+DISTNAME=	maplay1_2
 PKGNAME=	maplay-1.2
 PKGREVISION=	1
 CATEGORIES=	audio
@@ -12,7 +12,7 @@ COMMENT=	MPEG audio player/decoder for layer I and II MPEG audio streams
 
 WRKSRC=		${WRKDIR}
 
-USE_LANGUAGES+=	c++
+USE_LANGUAGES=	c++
 NOT_FOR_PLATFORM=	Interix-*-*
 
 pre-configure:
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index ae66a434096..7da403fcc26 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2006/12/10 04:12:17 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.19 2007/02/22 19:30:03 wiz Exp $
 
 DISTNAME=		mysql-5.0.27
 CATEGORIES=		databases
@@ -94,7 +94,7 @@ CONFIGURE_ENV+=	ac_cv_func_pthread_setschedparam=no
 CONFIGURE_ENV+=	ac_cv_func_pthread_attr_setschedparam=no
 .endif
 
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 USE_TOOLS+=		autoconf gmake perl:run
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index ed999354e4d..435f668006c 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/12/15 20:02:34 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2007/02/22 19:30:03 wiz Exp $
 
 DISTNAME=	dasher-4.2.2
 CATEGORIES=	editors gnome
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.inference.phy.cam.ac.uk/dasher/
 COMMENT=	Easy typing without using keyboard
 
 USE_DIRS+=		gnome2-1.5
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index 0da1708f648..2ec938ec26d 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/02/02 17:38:36 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:30:03 wiz Exp $
 
 DISTNAME=		abuse_pd
 PKGNAME=		abuse-2.0
@@ -15,7 +15,7 @@ USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		LDFLAGS=${X11_LDFLAGS:Q}
 USE_TOOLS+=		gmake gtar
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 
 NOT_FOR_PLATFORM=	NetBSD-*-arm32
 
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index f60d27eccda..a44a3a122a8 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/07/02 09:47:44 dillo Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:30:03 wiz Exp $
 #
 
 DISTNAME=		scummvm-tools-0.9.0
@@ -11,7 +11,7 @@ HOMEPAGE=		http://scummvm.sourceforge.net/
 COMMENT=		Conversion and compression tools for ScummVM
 
 WRKSRC=		${WRKDIR}/tools-0.9.0
-USE_LANGUAGES+=	c c++
+USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 
 DEPENDS+=	flac-[0-9]*:../../audio/flac
diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile
index 4ebeebc743b..387e901f3d9 100644
--- a/games/starfighter/Makefile
+++ b/games/starfighter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/09/09 02:42:01 obache Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:30:03 wiz Exp $
 #
 
 DISTNAME=	starfighter-1.1-1
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.parallelrealities.co.uk/starfighter.php
 COMMENT=	Old school 2D shoot them up
 
 USE_TOOLS+=	gmake
-USE_LANGUAGES+=	c++
+USE_LANGUAGES=	c++
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-1$//}
 
 MAKE_FILE=	makefile
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 5671a84ca82..97539647f6a 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2007/02/02 21:42:37 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2007/02/22 19:30:03 wiz Exp $
 
 DISTNAME=	wesnoth-1.2.1
 PKGREVISION=	1
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.wesnoth.org/
 COMMENT=	Fantasy turn-based strategy game
 
 USE_TOOLS+=		pkg-config
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 
 UNLIMIT_RESOURCES+=	datasize
diff --git a/geography/postgresql81-postgis/Makefile b/geography/postgresql81-postgis/Makefile
index c05cd205b8c..f3eac697ac1 100644
--- a/geography/postgresql81-postgis/Makefile
+++ b/geography/postgresql81-postgis/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2007/01/12 18:11:49 gdt Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:30:03 wiz Exp $
 
 DISTNAME=		postgis-${VERSION}
 VERSION=		1.2.1
 PKGNAME=		postgresql81-postgis-${VERSION}
-MASTER_SITES=	  	http://postgis.refractions.net/download/
+MASTER_SITES=		http://postgis.refractions.net/download/
 CATEGORIES=		databases geography
 
 MAINTAINER=		gdt@NetBSD.org
@@ -16,7 +16,7 @@ CONFLICTS=		postgis-[0-9]*
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake perl
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 
 CONFIGURE_ARGS+=	--enable-rpath
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/postgresql/contrib
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 1ded520a342..45fe0cc90a8 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/02/15 14:58:19 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:30:03 wiz Exp $
 #
 
 DISTNAME=		aqsis-0.6.4
@@ -15,7 +15,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 
 GCC_REQD+=		2.95.3
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 
 .include "../../devel/libargparse/buildlink3.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 073b11755bd..96b94c846d2 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2006/07/30 20:29:09 abs Exp $
+# $NetBSD: Makefile,v 1.58 2007/02/22 19:30:04 wiz Exp $
 
 DISTNAME=	blender-2.41
 PKGREVISION=	3
@@ -7,7 +7,7 @@ MASTER_SITES=	ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
 		http://download.blender.org/source/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.blender.org/
+HOMEPAGE=	http://www.blender.org/cms/Home.2.0.html
 COMMENT=	Fully integrated 3D graphics creation suite
 
 BUILD_DEPENDS+=		scons>=0.96:../../devel/scons
@@ -15,7 +15,7 @@ BUILD_DEPENDS+=		scons>=0.96:../../devel/scons
 WRKSRC=			${WRKDIR}/blender
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
-USE_LANGUAGES=		c c++ 
+USE_LANGUAGES=		c c++
 
 LDFLAGS+=		-lcrypto
 
diff --git a/graphics/pdiff/Makefile b/graphics/pdiff/Makefile
index 900d259653b..857e82a10d9 100644
--- a/graphics/pdiff/Makefile
+++ b/graphics/pdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/08/06 10:41:00 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:30:04 wiz Exp $
 #
 
 DISTNAME=		pdiff0.9b-src
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 EXTRACT_OPTS+=		-d pdiff
 
 WRKSRC=			${WRKDIR}/pdiff
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 
 BUILD_DEPENDS+=		cmake>=2:../../devel/cmake
 
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index 5c85a12d06c..dfa1a9f3518 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/02/01 16:28:14 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:30:04 wiz Exp $
 
 DISTNAME=	xmorph_20060817
 PKGNAME=	xmorph-20060817
@@ -11,7 +11,7 @@ COMMENT=	X program for image warping and dissolving
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-gtkmorph=no
-USE_LANGUAGES+=	c c++ fortran
+USE_LANGUAGES=	c c++ fortran
 USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index b8bc4d1bc30..8130df8b0a1 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/02/01 16:04:19 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:30:04 wiz Exp $
 #
 
 DISTNAME=	zphoto-1.2
@@ -15,7 +15,7 @@ COMMENT=	Flash-based photo album generator
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake perl
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv:Q}
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index df3092b1a75..ed8174e0062 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.22 2007/02/20 20:46:19 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.23 2007/02/22 19:30:04 wiz Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -9,7 +9,7 @@ PATCHDIR=	${.CURDIR}/../../lang/php5/patches
 BUILD_DEFS+=		USE_INET6
 
 USE_LIBTOOL=		YES
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ENV+=		EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index d55578110ae..80644e6f6d3 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:58 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:30:04 wiz Exp $
 #
 
 DISTNAME=	mailsync_5.2.1.orig
@@ -13,7 +13,7 @@ COMMENT=	Mailsync is a way of synchronizing a collection of mailboxes
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_TOOLS+=	gmake
-USE_LANGUAGES+=	c c++
+USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}/include
diff --git a/math/R-lmm/Makefile b/math/R-lmm/Makefile
index e7728b4b032..f65584813aa 100644
--- a/math/R-lmm/Makefile
+++ b/math/R-lmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/08/22 18:57:01 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:30:04 wiz Exp $
 #
 
 PKGREVISION=		1
@@ -11,7 +11,7 @@ COMMENT=		Improved procedures for linear mixed models with R
 
 R_PKGNAME=		lmm
 R_PKGVER=		0.3-2
-USE_LANGUAGES+=		c fortran
+USE_LANGUAGES=		c fortran
 
 .include "../../math/R/Makefile.extension"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/R-mvtnorm/Makefile b/math/R-mvtnorm/Makefile
index 30149f2b4ee..db7365b1cae 100644
--- a/math/R-mvtnorm/Makefile
+++ b/math/R-mvtnorm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/08/22 18:57:01 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:30:05 wiz Exp $
 #
 
 CATEGORIES=	math
@@ -10,7 +10,7 @@ COMMENT=	Computes the multivariate normal and t distribution
 
 R_PKGNAME=	mvtnorm
 R_PKGVER=	0.7-2
-USE_LANGUAGES+=	c fortran
+USE_LANGUAGES=	c fortran
 
 .include "../../math/R/Makefile.extension"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/R-sgeostat/Makefile b/math/R-sgeostat/Makefile
index c89cf388a1f..91bedc9d863 100644
--- a/math/R-sgeostat/Makefile
+++ b/math/R-sgeostat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/08/22 18:54:11 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:30:05 wiz Exp $
 #
 
 PKGREVISION=		1
@@ -11,7 +11,7 @@ COMMENT=		Object-oriented Framework for Geostatistical Modeling in S+
 
 R_PKGNAME=		sgeostat
 R_PKGVER=		1.0-19
-USE_LANGUAGES+=		c fortran
+USE_LANGUAGES=		c fortran
 
 .include "../../math/R/Makefile.extension"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/R-wle/Makefile b/math/R-wle/Makefile
index c1b2f8e5bf6..632173550e2 100644
--- a/math/R-wle/Makefile
+++ b/math/R-wle/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2006/08/05 22:56:48 markd Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:30:05 wiz Exp $
 #
 
-CATEGORIES=             math
-MASTER_SITES=           ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES=		math
+MASTER_SITES=		${MASTER_SITE_R_CRAN:=contrib/}
 
-MAINTAINER=             mchittur@cs.nmsu.edu
-HOMEPAGE=               ${R_HOMEPAGE_BASE}/wle.html
+MAINTAINER=		mchittur@cs.nmsu.edu
+HOMEPAGE=		${R_HOMEPAGE_BASE}/wle.html
 COMMENT=		Provides approach to robustness via Weighted Likelihood Estimation
 
 R_PKGNAME=		wle
-R_PKGVER=               0.9-2
-USE_LANGUAGES+=		c fortran
+R_PKGVER=		0.9-2
+USE_LANGUAGES=		c fortran
 
 .include "../../math/R/Makefile.extension"
 .include "../../math/blas/buildlink3.mk"
diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common
index 783a596e6ee..f80c056bdb7 100644
--- a/meta-pkgs/boost/Makefile.common
+++ b/meta-pkgs/boost/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2006/11/10 17:41:13 tv Exp $
+# $NetBSD: Makefile.common,v 1.10 2007/02/22 19:30:05 wiz Exp $
 #
 
 BOOST_PACKAGE?=		undefined
@@ -30,7 +30,7 @@ CONFLICTS+=		boost<1.32.0
 DISTINFO_FILE=		${.CURDIR}/../../meta-pkgs/boost/distinfo
 PATCHDIR=		${.CURDIR}/../../meta-pkgs/boost/patches
 
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 GCC_REQD+=		3.2 # if using gcc; ignored otherwise
 
 # We can't do this at post-extract because the extract cookie will get a
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index d1af49ed3ef..cae350032f3 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2006/07/27 18:48:03 jlam Exp $
+# $NetBSD: Makefile,v 1.76 2007/02/22 19:30:05 wiz Exp $
 
 DISTNAME=		openoffice-1.1.5
 PKGREVISION=		1
@@ -7,7 +7,7 @@ MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/1.1.5/}
 DISTFILES=		OOo_1.1.5_src.tar.gz
 DISTFILES+=		gpc231.tar.Z
 DISTFILES+=		ooo_addons_115.tar.bz2
-SITES.gpc231.tar.Z= 	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/
+SITES.gpc231.tar.Z=	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/
 SITES.ooo_addons_115.tar.bz2=http://www.fs.tum.de/~mrauch/OpenOffice/download/\
 			ftp://ftp.NetBSD.org/pub/NetBSD/misc/mrauch/
 DIST_SUBDIR=		${PKGNAME_NOREV}
@@ -23,7 +23,7 @@ BUILD_DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 
 WRKSRC=			${WRKDIR}/OOo_1.1.5/config_office
 GCC_REQD+=		3.0
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -38,8 +38,8 @@ CONFLICTS+=		openoffice-linux-[0-9]*
 ONLY_FOR_PLATFORM=	NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+= 	--enable-mozilla --disable-java
-CONFIGURE_ARGS+= 	--with-lang="AFRIK","ARAB","BASQUE","CHINSIM","CHINTRAD","CZECH","DAN","DTCH","ENUS","ESTONIAN","FINN","FREN","GAL","GREEK","HEBREW","HUNG","ITAL","JAPN","KOREAN","LITHUANIAN","NORBOK","NORNYN","NSOTHO","POL","PORT","PORTBR","RUSS","SLOVAK","SLOVENIAN","SPAN","SWED","TURK","WELSH","ZULU"
+CONFIGURE_ARGS+=	--enable-mozilla --disable-java
+CONFIGURE_ARGS+=	--with-lang="AFRIK","ARAB","BASQUE","CHINSIM","CHINTRAD","CZECH","DAN","DTCH","ENUS","ESTONIAN","FINN","FREN","GAL","GREEK","HEBREW","HUNG","ITAL","JAPN","KOREAN","LITHUANIAN","NORBOK","NORNYN","NSOTHO","POL","PORT","PORTBR","RUSS","SLOVAK","SLOVENIAN","SPAN","SWED","TURK","WELSH","ZULU"
 CONFIGURE_ARGS+=	--with-dict=ALL
 
 TEMP?=			${WRKDIR}
@@ -49,7 +49,7 @@ PLIST_SRC+=		PLIST.common
 PLIST_SUBST+=		OPENOFFICE_DLLSUFFIX=${OPENOFFICE_DLLSUFFIX:Q}
 PLIST_SUBST+=		OPENOFFICE_VERSION=${OPENOFFICE_VERSION:Q}
 .if exists(${PKGDIR}/PLIST.${OPSYS})
-PLIST_SRC+=             ${PKGDIR}/PLIST.${OPSYS}
+PLIST_SRC+=		${PKGDIR}/PLIST.${OPSYS}
 . endif
 MESSAGE_SUBST+=		OPENOFFICE_VERSION=${OPENOFFICE_VERSION}
 
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 702daedffff..510b3d34917 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/02/07 15:18:23 tron Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:30:05 wiz Exp $
 
 DISTNAME=		wireshark-0.99.5
 CATEGORIES=		net
@@ -12,7 +12,7 @@ COMMENT=		Network protocol analyzer
 
 CONFLICTS+=		ethereal-[0-9]*
 
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake perl pkg-config
 
 USE_LIBTOOL=		YES
@@ -20,7 +20,7 @@ SHLIBTOOL_OVERRIDE=	# empty
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-gtk2
-CONFIGURE_ARGS+=        --enable-static=no
+CONFIGURE_ARGS+=	--enable-static=no
 CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	--with-gtk-prefix=${BUILDLINK_PREFIX.gtk2}
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
diff --git a/net/wpa_gui/Makefile b/net/wpa_gui/Makefile
index b9b287da585..1a00384cd84 100644
--- a/net/wpa_gui/Makefile
+++ b/net/wpa_gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/10/25 19:08:37 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:30:05 wiz Exp $
 
 DISTNAME=	wpa_supplicant-0.4.9
 PKGNAME=	${DISTNAME:S/supplicant/gui/}
@@ -9,7 +9,7 @@ MAINTAINER=	rpaulo@NetBSD.org
 HOMEPAGE=	http://hostap.epitest.fi/wpa_supplicant/
 COMMENT=	QT GUI for wpa_supplicant(8)
 
-USE_LANGUAGES+=	c c++
+USE_LANGUAGES=	c c++
 BUILD_TARGET=	wpa_gui
 USE_TOOLS+=	gmake
 
diff --git a/news/pan/Makefile b/news/pan/Makefile
index a17205700b5..e21ce476c2d 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/08/31 12:04:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.50 2007/02/22 19:30:05 wiz Exp $
 #
 
 DISTNAME=		pan-0.14.2
@@ -13,7 +13,7 @@ COMMENT=		Newsreader for GTK2
 
 USE_TOOLS+=		msgfmt perl pkg-config
 USE_DIRS+=		gnome2-1.5
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
diff --git a/security/botan/Makefile b/security/botan/Makefile
index bf8e6018d20..0626ef599a7 100644
--- a/security/botan/Makefile
+++ b/security/botan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/31 00:04:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:30:06 wiz Exp $
 
 DISTNAME=	Botan-1.4.11
 PKGNAME=	botan-1.4.11
@@ -15,7 +15,7 @@ BROKEN_IN=		pkgsrc-2006Q4
 
 USE_TOOLS+=	perl
 
-USE_LANGUAGES+=	c++
+USE_LANGUAGES=	c++
 REPLACE_PERL+=	./configure.pl
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	./configure.pl
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 3ff4c99617b..a28de13fa59 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/01/26 04:34:53 markd Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:30:06 wiz Exp $
 #
 
 DISTNAME=		k3b-1.0rc4
@@ -11,13 +11,13 @@ MAINTAINER=		markd@NetBSD.org
 HOMEPAGE=		http://www.k3b.org/
 COMMENT=		DVD and CD authoring program
 
-DEPENDS+=  		cdrdao-[0-9]*:../../sysutils/cdrdao
-DEPENDS+=  		{cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
+DEPENDS+=		cdrdao-[0-9]*:../../sysutils/cdrdao
+DEPENDS+=		{cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake perl pkg-config
-USE_LANGUAGES=          c c++
-USE_LIBTOOL=            yes
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
 
 ONLY_FOR_PLATFORM=	FreeBSD-*-* Linux-*-* NetBSD-*-* DragonFly-*-*
 
diff --git a/sysutils/rfstool/Makefile b/sysutils/rfstool/Makefile
index 9d5b8215561..a3ae4cfc23a 100644
--- a/sysutils/rfstool/Makefile
+++ b/sysutils/rfstool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/09/09 02:46:08 obache Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:30:06 wiz Exp $
 #
 
 DISTNAME=	rfstool-0.14-source
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/rfstool
 MAKE_FILE=	makefile.gcc3x
-USE_LANGUAGES+=	c++
+USE_LANGUAGES=	c++
 
 INSTALLATION_DIRS=	sbin
 
diff --git a/sysutils/zidrav/Makefile b/sysutils/zidrav/Makefile
index 09b5a80f8c6..33f6a739dec 100644
--- a/sysutils/zidrav/Makefile
+++ b/sysutils/zidrav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/01/07 09:14:13 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:30:06 wiz Exp $
 #
 
 DISTNAME=	zidrav4unix-1.2.0
@@ -10,7 +10,7 @@ MAINTAINER=	tnn@netilium.org
 HOMEPAGE=	http://sourceforge.net/projects/zidrav
 COMMENT=	File corruption detection and repair program
 
-USE_LANGUAGES=  c c++
+USE_LANGUAGES=	c c++
 BUILD_TARGET=	zidrav
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index cb404dc90e3..084fd028be5 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-firefox.common,v 1.39 2006/12/20 11:01:26 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.40 2007/02/22 19:30:06 wiz Exp $
 
 MOZILLA_BIN=		firefox-bin
 MOZ_VER=		1.5.0.9
@@ -26,7 +26,7 @@ MOZILLA_EXTENSIONS=	default
 CONFIGURE_ARGS+=	--enable-extensions=${MOZILLA_EXTENSIONS:Q}
 CONFIGURE_ENV+=	ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no
 
-USE_LANGUAGES+=		c++
+USE_LANGUAGES=		c++
 BUILD_SVG=		# yes
 BUILD_MATHML=		# yes
 
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 37c7c6e2636..0aa16c29ddf 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2007/01/22 14:05:35 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.64 2007/02/22 19:30:06 wiz Exp $
 
 DISTNAME=		opera-${OPERA_PKG_VERSION:S/u/pl/}
 CATEGORIES=		www
@@ -20,8 +20,8 @@ LICENSE=		opera-850-license
 
 #PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-NO_CONFIGURE=           YES
-USE_LANGUAGES=          # empty
+NO_CONFIGURE=		YES
+USE_LANGUAGES=		# empty
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -83,7 +83,7 @@ PLIST_SUBST+=		OPERA_PKG_VERSION=${OPERA_PKG_VERSION:C/u.*//}
 .endif
 
 .if (((${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc)) || (${_OPERA_OPSYS} == FreeBSD))
-NO_BUILD=               YES
+NO_BUILD=		YES
 
 SUBST_CLASSES+=		opera
 SUBST_STAGE.opera=	post-build
diff --git a/www/squidpurge/Makefile b/www/squidpurge/Makefile
index 623b396c209..cd29d48e01a 100644
--- a/www/squidpurge/Makefile
+++ b/www/squidpurge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/05/13 14:12:31 gdt Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:30:06 wiz Exp $
 #
 
 DISTNAME=	purge-${PURGEVERSION}-src
@@ -16,7 +16,7 @@ PURGEVERSION=	20040201
 WRKSRC=		${WRKDIR}/purge
 
 USE_TOOLS+=	gmake
-USE_LANGUAGES+=	c++
+USE_LANGUAGES=	c++
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/purge ${PREFIX}/bin/squidpurge
diff --git a/x11/qt3-qscintilla/Makefile b/x11/qt3-qscintilla/Makefile
index 5576406ebdb..b14446bf62d 100644
--- a/x11/qt3-qscintilla/Makefile
+++ b/x11/qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/05/08 13:06:04 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:30:06 wiz Exp $
 #
 
 DISTNAME=		qscintilla-1.65-gpl-1.6
@@ -18,7 +18,7 @@ BUILD_DEPENDS+=		qt3-tools-3.*:../../x11/qt3-tools
 
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
-USE_LANGUAGES+=		c++
+USE_LANGUAGES=		c++
 
 MAKE_ENV+=	QTPREFIX=${QTDIR:Q}