Replace USE_GCC_SHLIB with "USE_LANGUAGE=c c++" (the latter implies the

former) for applications that are known to require C++.

36 files changed, 57 insertions, 73 deletions

diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index 059410caa82..6f857030026 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: Makefile,v 1.21 2004/11/13 22:04:52 jlam Exp $
 #
 
 DISTNAME=	id3ed-1.10.4
@@ -12,10 +12,10 @@ COMMENT=	Edit id3 description tags in mpeg3 files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_LANGUAGES=		c c++
 USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
-USE_GCC_SHLIB=		YES
 
 USE_GNU_READLINE=	# uses rl_startup_hook
 
diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile
index 7ab35fe46c4..313cc2c9a8f 100644
--- a/benchmarks/bonnie++/Makefile
+++ b/benchmarks/bonnie++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/05/05 00:38:07 danw Exp $
+# $NetBSD: Makefile,v 1.11 2004/11/13 22:04:52 jlam Exp $
 #
 
 DISTNAME=       bonnie++-1.03a
@@ -12,10 +12,10 @@ COMMENT=	Enhanced performance Test of Filesystem I/O
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_LANGUAGES=		c c++
 USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS=		make
-USE_GCC_SHLIB=		YES
 REPLACE_PERL=		bon_csv2txt.in bon_csv2html.in
 
 INSTALLATION_DIRS=	bin man/man1 man/man8 sbin
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index 1f994856554..bef3c63a560 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2004/10/19 23:13:21 hubertf Exp $
+# $NetBSD: Makefile,v 1.42 2004/11/13 22:04:52 jlam Exp $
 #
 
 DISTNAME=	centericq-4.12.0
@@ -13,7 +13,6 @@ COMMENT=	Instant Messenger interface for ICQ2000, Yahoo!, MSN and Jabber
 
 USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GCC_SHLIB=		yes
 USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
 
diff --git a/comms/plp/Makefile b/comms/plp/Makefile
index dc608ec0f70..57132a99281 100644
--- a/comms/plp/Makefile
+++ b/comms/plp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:16 tv Exp $
+# $NetBSD: Makefile,v 1.17 2004/11/13 22:04:52 jlam Exp $
 
 DISTNAME=	plp_1_8
 PKGNAME=	plp-1.8
@@ -10,8 +10,8 @@ MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://www.proudman51.freeserve.co.uk/psion/
 COMMENT=	Tools to talk to the PSION organiser
 
+USE_LANGUAGES=	c c++
 USE_BUILDLINK3=	yes
-USE_GCC_SHLIB=	# defined
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	# defined
 
diff --git a/converters/macfork/Makefile b/converters/macfork/Makefile
index 3d62c1e8ccd..441bb73a29e 100644
--- a/converters/macfork/Makefile
+++ b/converters/macfork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/11/13 21:28:27 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/11/13 22:04:52 jlam Exp $
 
 DISTNAME=	macfork-1.0
 CATEGORIES=	converters
@@ -9,8 +9,8 @@ HOMEPAGE=	http://www.cs.cmu.edu/afs/cs/user/ajw/www/software/
 COMMENT=	Tool for extracting data from Macintosh resource forks
 
 WRKSRC=		${WRKDIR}/macfork
+USE_LANGUAGE=	c c++
 USE_BUILDLINK3=	yes
-USE_GCC_SHLIB=	# defined
 USE_GNU_TOOLS+=	make
 
 DOCDIR=		${PREFIX}/share/doc/macfork
diff --git a/databases/edb/Makefile b/databases/edb/Makefile
index e54ce18ff62..a2846422683 100644
--- a/databases/edb/Makefile
+++ b/databases/edb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:13:18 tv Exp $
+# $NetBSD: Makefile,v 1.14 2004/11/13 22:04:52 jlam Exp $
 #
 
 DISTNAME=		edb-1.0.3
@@ -13,7 +13,7 @@ COMMENT=		Database abstraction layer to Berkeley databases
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_BUILDLINK3=		YES
-USE_GCC_SHLIB=		YES
+USE_LANGUAGE=		c c++
 
 CONFIGURE_ARGS+=	--enable-cxx
 
diff --git a/databases/mysql3-client/Makefile.common b/databases/mysql3-client/Makefile.common
index 45248015624..316b0b00faa 100644
--- a/databases/mysql3-client/Makefile.common
+++ b/databases/mysql3-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/11/13 21:28:28 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/11/13 22:04:52 jlam Exp $
 
 DISTNAME=		mysql-3.23.58
 CATEGORIES=		databases
@@ -10,7 +10,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.mysql.com/
 
 EXTRACT_USING_PAX=	# defined
-USE_GCC_SHLIB=		# defined
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -28,6 +27,7 @@ MYSQL_DATADIR?=		${VARBASE}/mysql
 MYSQL_CHARSET?=		latin1
 MYSQL_EXTRA_CHARSET?=	all
 
+USE_LANGUAGES=		c c++
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		# defined
 USE_GNU_TOOLS+=		make
diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile
index 20fa4da69b0..aa118c4eb33 100644
--- a/devel/cssc/Makefile
+++ b/devel/cssc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/10/18 18:49:39 seb Exp $
+# $NetBSD: Makefile,v 1.16 2004/11/13 22:04:52 jlam Exp $
 #
 
 DISTNAME=	CSSC-1.00
@@ -10,10 +10,10 @@ MAINTAINER=	seb@NetBSD.org
 HOMEPAGE=	http://cssc.sourceforge.net/
 COMMENT=	GNU workalike for the source code control system SCCS
 
+USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--enable-binary
 USE_BUILDLINK3=	YES
-USE_GCC_SHLIB=	YES
 TEST_TARGET=	check
 
 USE_MAKEINFO=		YES
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index 4dba01702ca..a72a063915e 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2004/08/26 18:04:10 reed Exp $
+# $NetBSD: Makefile.common,v 1.20 2004/11/13 22:04:52 jlam Exp $
 #
 
 DISTNAME=		lyx-1.3.4
@@ -21,9 +21,9 @@ FILESDIR=		${.CURDIR}/../../editors/lyx-qt/files
 PATCHDIR=		${.CURDIR}/../../editors/lyx-qt/patches
 PLIST_SRC=		${.CURDIR}/../../editors/lyx-qt/PLIST.common
 
+USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
-USE_GCC_SHLIB=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_PERL5=		YES
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 95bc3fcde50..5104f37f86c 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2004/06/13 08:43:00 grant Exp $
+# $NetBSD: Makefile,v 1.37 2004/11/13 22:04:52 jlam Exp $
 
 DISTNAME=		bochs-2.1.1
 CATEGORIES=		emulators
@@ -10,7 +10,6 @@ COMMENT=		i386 machine emulator capable of running DOS/Windows
 
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
-USE_GCC_SHLIB=		yes
 USE_LANGUAGES=		c c++
 
 ONLY_FOR_COMPILER=	gcc
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index be63d925c12..2703cad705f 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:14:42 tv Exp $
+# $NetBSD: Makefile,v 1.16 2004/11/13 22:04:52 jlam Exp $
 
 DISTNAME=	battleball.21.src
 PKGNAME=	battleball-2.1
@@ -13,7 +13,7 @@ COMMENT=	3d game of soccer, with tanks
 WRKSRC=		${WRKDIR}/battleball-2.1-src
 USE_BUILDLINK3=	YES
 USE_X11=	YES
-USE_GCC_SHLIB=	YES
+USE_LANGUAGES=	c c++
 
 SED_CMDS=	-e '/^INCS/s|$$|${CPPFLAGS}|' -e '/^LIBS/s|$$|${LDFLAGS}|'
 
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index 23988665a3e..dfdd84baecd 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/10/03 00:14:47 tv Exp $
+# $NetBSD: Makefile,v 1.29 2004/11/13 22:04:52 jlam Exp $
 #
 
 DISTNAME=	xarchon-0.60
@@ -15,7 +15,7 @@ USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 USE_X11=	YES
-USE_GCC_SHLIB=	YES
+USE_LANGUAGES=	c c++
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/graphics/plotutils-nox11/Makefile b/graphics/plotutils-nox11/Makefile
index 91f39ba647b..c73f68280af 100644
--- a/graphics/plotutils-nox11/Makefile
+++ b/graphics/plotutils-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:14:56 tv Exp $
+# $NetBSD: Makefile,v 1.11 2004/11/13 22:04:53 jlam Exp $
 #
 
 DISTNAME=		plotutils-2.4.1
@@ -17,7 +17,6 @@ DISTINFO_FILE=		${.CURDIR}/../../graphics/plotutils/distinfo
 PATCHDIR=		${.CURDIR}/../../graphics/plotutils/patches
 
 USE_BUILDLINK3=		yes
-USE_GCC_SHLIB=		yes
 USE_LANGUAGES=		c c++
 
 INFO_FILES=	plotutils.info
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index ae945e63c68..5330b9472ae 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/10/03 00:14:56 tv Exp $
+# $NetBSD: Makefile,v 1.33 2004/11/13 22:04:53 jlam Exp $
 #
 
 DISTNAME=		plotutils-2.4.1
@@ -15,7 +15,6 @@ CONFLICTS+=		plotutils-nox11-[0-9]*
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		YES
-USE_GCC_SHLIB=		YES
 USE_LANGUAGES=		c c++
 USE_X11=		YES
 
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index b7a0ff66481..c92a40ea61e 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/10/03 00:14:57 tv Exp $
+# $NetBSD: Makefile,v 1.24 2004/11/13 22:04:53 jlam Exp $
 
 DISTNAME=	pstoedit_3_31
 PKGNAME=	pstoedit-3.31
@@ -19,7 +19,6 @@ WRKSRC=		${WRKDIR}/pstoedit_3.31/src
 USE_X11=	yes
 USE_LIBTOOL=	yes
 USE_BUILDLINK3=	yes
-USE_GCC_SHLIB=	yes
 USE_LANGUAGES=	c++
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBTOOL="${LIBTOOL}" LIBPLOTTERLA="${X11PREFIX}/lib/libplotter.la"
diff --git a/lang/japhar/Makefile b/lang/japhar/Makefile
index 5e6e9ec7030..4fd77c618db 100644
--- a/lang/japhar/Makefile
+++ b/lang/japhar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:15:01 tv Exp $
+# $NetBSD: Makefile,v 1.14 2004/11/13 22:04:53 jlam Exp $
 #
 
 DISTNAME=		japhar-0.08
@@ -15,7 +15,7 @@ ONLY_FOR_PLATFORM=	SunOS-*-*       # untested on NetBSD
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_GNU_TOOLS+=		make
-USE_GCC_SHLIB=		yes
+USE_LANGUAGES=		c c++
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/lib/libffi/ltconfig
 
 INFO_FILES=	japhar.info
diff --git a/lang/jikes/Makefile b/lang/jikes/Makefile
index 29d05b32e0b..49665dae617 100644
--- a/lang/jikes/Makefile
+++ b/lang/jikes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/10/06 04:33:31 tv Exp $
+# $NetBSD: Makefile,v 1.29 2004/11/13 22:04:53 jlam Exp $
 #
 
 DISTNAME=	jikes-1.22
@@ -14,7 +14,6 @@ COMMENT=	Java source to byte-code compiler
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
-USE_GCC_SHLIB=		yes
 UNLIMIT_RESOURCES=      datasize
 
 # enable "-source 1.5" -- not complete, but does not break normal compiles
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index 6face93b164..046d3f1c58f 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:12:57 tv Exp $
+# $NetBSD: Makefile,v 1.15 2004/11/13 22:04:53 jlam Exp $
 #
 
 DISTNAME=	yacas-1.0.56
@@ -10,9 +10,9 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://yacas.sourceforge.net
 COMMENT=	Yet Another Computer Algebra System
 
+USE_LANGUAGES=	c c++
 USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
-USE_GCC_SHLIB=	YES
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 USE_X11=	YES
diff --git a/misc/bbappconf/Makefile b/misc/bbappconf/Makefile
index 06c5ce96dfc..fa9549d1808 100644
--- a/misc/bbappconf/Makefile
+++ b/misc/bbappconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/04/11 17:22:31 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/13 22:04:53 jlam Exp $
 #
 
 DISTNAME=	bbappconf-0.0.2
@@ -9,9 +9,9 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://bbtools.windsofstorm.net/
 COMMENT=	Configure the behaviour of an application under Blackbox
 
+USE_LANGUAGES=		c c++
 USE_BUILDLINK3=		YES
 USE_X11BASE=		YES
-USE_GCC_SHLIB=		YES
 GNU_CONFIGURE=		YES
 
 post-patch:
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index bbbcc12bbf8..5cdd440d00f 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2004/10/03 00:13:00 tv Exp $
+# $NetBSD: Makefile,v 1.55 2004/11/13 22:04:53 jlam Exp $
 
 DISTNAME=		openoffice-1.1.1
 PKGREVISION=		2
@@ -24,7 +24,7 @@ BUILD_DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 WRKSRC=			${WRKDIR}/oo_1.1.1_src/config_office
 USE_BUILDLINK3=		yes
 GCC_REQD=		3.0
-USE_GCC_SHLIB=		yes
+USE_LANGUAGES+=		c c++
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 47e4ba0f9d7..2f1356c88f3 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2004/10/19 07:03:09 salo Exp $
+# $NetBSD: Makefile,v 1.39 2004/11/13 22:04:53 jlam Exp $
 #
 
 DISTNAME=	nmap-3.75
@@ -13,7 +13,6 @@ COMMENT=	Network/port scanner with OS detection
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=	YES
-USE_GCC_SHLIB=	YES
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 
diff --git a/net/pxe/Makefile b/net/pxe/Makefile
index f945802dc48..cfd9e3fe55a 100644
--- a/net/pxe/Makefile
+++ b/net/pxe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/04/25 07:36:39 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/13 22:04:53 jlam Exp $
 #
 
 DISTNAME=	pxe-1.4
@@ -12,7 +12,7 @@ COMMENT=	Preboot eXecution Environment (PXE) daemon
 GNU_CONFIGURE=	YES
 USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
-USE_GCC_SHLIB=	YES
+USE_LANGUAGES=	c c++
 
 CONFIGURE_ARGS+=	--with-log=/var/log/pxe.log
 CONFIGURE_ARGS+=	--with-config="${PKG_SYSCONFDIR}/pxe.conf"
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 4b071bdfd94..ef3675e7d54 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/10/03 00:18:04 tv Exp $
+# $NetBSD: Makefile,v 1.13 2004/11/13 22:04:53 jlam Exp $
 
 DISTNAME=	lyx-${LYX_VERS}
 PKGNAME=	cjk-${DISTNAME}
@@ -23,11 +23,11 @@ CONFLICTS=	lyx-[0-9]*
 DEPENDS+=	ispell-base-[0-9]*:../../textproc/ispell-base
 DEPENDS+=	teTeX-bin>=1.0.7nb1:../../print/teTeX-bin
 
+USE_LANGUAGES=		c c++
 USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_PERL5=		yes
 USE_X11=		yes
-USE_GCC_SHLIB=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index 73bd9966f73..ae83628b7e2 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:18:07 tv Exp $
+# $NetBSD: Makefile,v 1.11 2004/11/13 22:04:53 jlam Exp $
 
 DISTNAME=	teTeX-src-1.0.7
 PKGNAME=	teTeX-bin-1.0.7
@@ -24,7 +24,6 @@ INSTALL_TARGET=		install strip
 
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
-USE_GCC_SHLIB=		yes
 USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
 USE_X11=		yes
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index a78030e5cb8..f9105d6a9d6 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/10/07 16:36:47 tv Exp $
+# $NetBSD: Makefile,v 1.26 2004/11/13 22:04:53 jlam Exp $
 #
 
 DISTNAME=		aspell-0.50.5
@@ -14,7 +14,6 @@ CONFLICTS=		libpspell-[0-9]*
 
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
-USE_GCC_SHLIB=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 302208dd51b..81056f0a7ed 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/08/02 16:14:24 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2004/11/13 22:04:53 jlam Exp $
 #
 
 DISTNAME=	groff-1.19.1
@@ -13,8 +13,8 @@ COMMENT=	GNU roff text processing suite
 DEPENDS+=	netpbm>=10.0:../../graphics/netpbm
 DEPENDS+=	psutils>=1.17:../../print/psutils
 
+USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
-USE_GCC_SHLIB=		YES
 USE_PERL5=		YES
 USE_BUILDLINK3=		YES
 
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index 9563b4ee903..ecbe970a65b 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/10/03 00:18:22 tv Exp $
+# $NetBSD: Makefile,v 1.20 2004/11/13 22:04:53 jlam Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
@@ -12,8 +12,8 @@ COMMENT=	Small and fast X11R6 window manager
 
 DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
 
+USE_LANGUAGES=	c c++
 USE_BUILDLINK3=	YES
-USE_GCC_SHLIB=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/wm/bsetroot/Makefile b/wm/bsetroot/Makefile
index 1a0043ecbf4..a546c541d7c 100644
--- a/wm/bsetroot/Makefile
+++ b/wm/bsetroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:18:22 tv Exp $
+# $NetBSD: Makefile,v 1.14 2004/11/13 22:04:53 jlam Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
@@ -13,7 +13,6 @@ COMMENT=	Tools to set the root windows background
 
 USE_LANGUAGES=	c c++
 USE_BUILDLINK3=	YES
-USE_GCC_SHLIB=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index dd7a40546e8..af0205a8eab 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/05/01 17:57:54 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/13 22:04:53 jlam Exp $
 
 DISTNAME=	wm2-4
 PKGNAME=	wm2-4.0
@@ -11,9 +11,9 @@ COMMENT=	Minimalist window manager for X
 
 ALL_TARGET=	depend wm2
 
+USE_LANGUAGES=	c c++
 USE_BUILDLINK3=	YES
 USE_X11BASE=	YES
-USE_GCC_SHLIB=	YES
 MAKE_ENV+=	CCC="${CXX}"
 
 do-install:
diff --git a/wm/wmx-gnome/Makefile b/wm/wmx-gnome/Makefile
index cc5e37b6ad8..71b8215fb63 100644
--- a/wm/wmx-gnome/Makefile
+++ b/wm/wmx-gnome/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2004/06/02 15:38:00 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2004/11/13 22:04:53 jlam Exp $
 
 PKGNAME=	wmx-gnome-${WMX_VERS}
 CATEGORIES+=	gnome
 COMMENT=	Another X11 window manager based on wm2, with GNOME compliance
 
-USE_GCC_SHLIB=	# defined
-
 .include "../../wm/wmx/Makefile.common"
 
 CPPFLAGS+=	-DCONFIG_GNOME_COMPLIANCE=True
diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common
index e8e92845119..14a44395c21 100644
--- a/wm/wmx/Makefile.common
+++ b/wm/wmx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2004/06/02 15:43:09 minskim Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/11/13 22:04:53 jlam Exp $
 
 DISTNAME=	wmx-6
 WMX_VERS=	6.0
@@ -13,9 +13,9 @@ CONFLICTS+=	wmx-[0-9]* wmx-gnome-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_LANGUAGES=	c c++
 USE_BUILDLINK3=	yes
 USE_X11BASE=	# defined
-USE_GCC_SHLIB=	# defined
 GNU_CONFIGURE=	# defined
 ALL_TARGET=	depend all
 
diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile
index 602483795da..98468c10812 100644
--- a/www/mozilla-gtk2/Makefile
+++ b/www/mozilla-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/11/12 02:11:22 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/11/13 22:04:54 jlam Exp $
 
 PKGREVISION=	2
 MOZILLA=	mozilla-gtk2
@@ -16,7 +16,6 @@ SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL}
 
 COMMENT=	Full featured gecko-based browser built with GTK2
 
-USE_GCC_SHLIB=	yes
 BUILD_SVG=	# defined
 BUILD_MATHML=	# defined
 BUILD_CALENDAR=	# defined
diff --git a/www/mozilla-stable/Makefile b/www/mozilla-stable/Makefile
index bdbbefb146e..a8c67e2c83f 100644
--- a/www/mozilla-stable/Makefile
+++ b/www/mozilla-stable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/06/05 10:20:55 taya Exp $
+# $NetBSD: Makefile,v 1.18 2004/11/13 22:04:54 jlam Exp $
 
 PKGREVISION=	5
 MOZILLA=	mozilla-stable
@@ -14,7 +14,6 @@ SITES_mozilla-source-1.4.1-libart_lgpl.tar.bz2=	${MASTER_SITE_LOCAL}
 
 COMMENT=	Full featured gecko-based browser (stable branch)
 
-USE_GCC_SHLIB=	yes
 BUILD_SVG=	# defined
 BUILD_MATHML=	# defined
 BUILD_CALENDAR=	# defined
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index eb219c52c16..f91be26cef6 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2004/11/12 02:11:22 wiz Exp $
+# $NetBSD: Makefile,v 1.140 2004/11/13 22:04:53 jlam Exp $
 
 PKGREVISION=	2
 MOZILLA=	mozilla
@@ -12,7 +12,6 @@ SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL}
 
 COMMENT=	Full featured gecko-based browser
 
-USE_GCC_SHLIB=	yes
 BUILD_SVG=	# defined
 BUILD_MATHML=	# defined
 BUILD_CALENDAR=	# defined
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 8eb30f49b14..0a8ac1c4cfd 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2004/10/25 18:06:26 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.47 2004/11/13 22:04:53 jlam Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-source-${MOZ_DIST_VER}
@@ -15,7 +15,6 @@ BUILD_DEPENDS+=	zip>=2.3:../../archivers/zip
 
 WRKSRC=		${WRKDIR}/mozilla
 USE_BUILDLINK3=	yes
-USE_GCC_SHLIB=	yes
 USE_LANGUAGES=	c c++
 USE_PERL5=	build
 USE_GNU_TOOLS+=	make
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index c2b6951a586..7ac70e8d54d 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: Makefile,v 1.67 2004/11/13 22:04:53 jlam Exp $
 
 DISTNAME=	kdelibs-2.2.2
 PKGREVISION=	13
@@ -10,7 +10,7 @@ COMMENT=	Support libraries for the KDE integrated X11 desktop
 CONFLICTS=	arts-[1-9]*
 
 USE_BUILDLINK3=		YES
-USE_GCC_SHLIB=		YES
+USE_LANGUAGES=		c c++
 
 CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
 CONFIGURE_ENV+=		PKG_CONFIG=${WRKDIR}/must-not-exist