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

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

5 files changed, 8 insertions, 11 deletions

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