s/USE_CXX/USE_GCC_SHLIB/ - there are more shared libraries than just

libstdc++ in gcc3.

when defined, USE_GCC_SHLIB ensures that the correct rpath is passed
to the linker, and a full dependency on the compiler package is
registered.

packages which define USE_GCC_SHLIB should not include
mk/gcc.buildlink2.mk (or gcc{,3}/buildlink2.mk) as it is handled
automatically.

20 files changed, 46 insertions, 53 deletions

diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index f8322388735..8f6803e9b20 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/05/22 13:27:45 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/05/29 23:14:07 grant Exp $
 #
 
 DISTNAME=	centericq-4.9.2
@@ -12,7 +12,7 @@ COMMENT=	Instant Messenger interface (ICQ2000, Yahoo!, and MSN support)
 
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-USE_CXX=		yes
+USE_GCC_SHLIB=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 LIBS=			${LDFLAGS}
@@ -26,7 +26,6 @@ INCOMPAT_CURSES+=	NetBSD-1.6[A-T]-*
 .include "../../devel/glib/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/ncurses/buildlink2.mk"
-.include "../../lang/gcc/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
diff --git a/comms/plp/Makefile b/comms/plp/Makefile
index e879ccc44b1..aa31f0746d7 100644
--- a/comms/plp/Makefile
+++ b/comms/plp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/11/14 23:58:33 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/29 23:14:08 grant Exp $
 
 DISTNAME=	plp_1_8
 PKGNAME=	plp-1.8
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.proudman51.freeserve.co.uk/psion/
 COMMENT=	Tools to talk to the PSION organiser
 
 USE_BUILDLINK2=	# defined
-USE_CXX=	# defined
+USE_GCC_SHLIB=	# defined
 USE_GMAKE=	# defined
 USE_LIBTOOL=	# defined
 
diff --git a/converters/macfork/Makefile b/converters/macfork/Makefile
index c54f6ada72c..9ae1af42f8a 100644
--- a/converters/macfork/Makefile
+++ b/converters/macfork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/11/14 23:42:51 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/29 23:14:08 grant Exp $
 
 DISTNAME=	macfork-1.0
 WRKSRC=		${WRKDIR}/macfork
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.cs.cmu.edu/afs/cs/user/ajw/www/software/
 COMMENT=	Tool for extracting data from Macintosh resource forks
 
 USE_BUILDLINK2=	# defined
-USE_CXX=	# defined
+USE_GCC_SHLIB=	# defined
 USE_GMAKE=	# defined
 
 DOCDIR=		${PREFIX}/share/doc/macfork
diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index c4b2d5f571c..1a379874088 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/29 23:14:08 grant Exp $
 
 DISTNAME=	db-4.0.14
 PKGNAME=	db4-4.0.14
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.sleepycat.com/
 COMMENT=	Sleepycat Software's Berkeley DB version 4
 
 USE_BUILDLINK2=		yes
-USE_CXX=		yes
+USE_GCC_SHLIB=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKDIR}/${DISTNAME}/build_unix/libtool
 GNU_CONFIGURE=		yes
diff --git a/devel/netcdf/Makefile b/devel/netcdf/Makefile
index 8bd0d158416..5d0d546da2c 100644
--- a/devel/netcdf/Makefile
+++ b/devel/netcdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/03/02 08:26:09 jtb Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/29 23:14:08 grant Exp $
 
 DISTNAME=	netcdf-3.5.0
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
@@ -12,7 +12,7 @@ COMMENT=	Library for array-oriented data access
 
 USE_BUILDLINK2=		# defined
 USE_FORTRAN=		# defined
-USE_CXX=		# defined
+USE_GCC_SHLIB=		# defined
 USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
 CPPFLAGS+=		-Df2cFortran -Dunix
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 9e835545cb9..2b39a33141c 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/30 23:33:54 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/29 23:14:09 grant Exp $
 
 DISTNAME=	STLport-4.0
 PKGNAME=	stlport-4.0
@@ -13,7 +13,7 @@ COMMENT=	Complete C++ standard library
 USE_BUILDLINK2=	# defined
 USE_GMAKE=	# defined
 USE_LIBTOOL=	# defined
-USE_CXX=	# defined
+USE_GCC_SHLIB=	# defined
 
 NO_CONFIGURE=	# defined
 BUILD_DIRS=	${WRKSRC}/src
@@ -49,5 +49,4 @@ do-install:
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.css *.html ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} images/* ${HTMLDIR}/images
 
-.include "../../lang/gcc/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index ab4feefdbda..8d5eb1eeb1f 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/01/25 12:04:26 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/05/29 23:14:09 grant Exp $
 #
 
 DISTNAME=		plotutils-2.4.1
@@ -12,7 +12,7 @@ COMMENT=		Programs and library for plotting scientific data
 
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
-USE_CXX=		yes
+USE_GCC_SHLIB=		yes
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-libplotter
diff --git a/lang/gcc/buildlink2.mk b/lang/gcc/buildlink2.mk
index 5021a750473..68d4b1c0dd3 100644
--- a/lang/gcc/buildlink2.mk
+++ b/lang/gcc/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/05/28 13:24:36 grant Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2003/05/29 23:14:12 grant Exp $
 
 .if !defined(GCC2_BUILDLINK2_MK)
 GCC2_BUILDLINK2_MK=	# defined
@@ -12,10 +12,10 @@ GCC_REQD?=			2.95.3
 BUILDLINK_DEPENDS.gcc?=		gcc>=${GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc?=	../../lang/gcc
 
-# Packages that use the C++ compiler and subsequently link against the
-# shared libstdc++ from the package need a full dependency.
+# Packages that link against shared gcc libraries need a full
+# dependency.
 #
-.if defined(USE_CXX)
+.if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc+=	full
 .else
 BUILDLINK_DEPMETHOD.gcc?=	build
@@ -69,7 +69,7 @@ CXX=		${_GCC_PREFIX}bin/g++
 F77=		${_GCC_PREFIX}bin/g77
 PKG_FC=		${F77}
 
-.  if defined(USE_CXX)
+.  if defined(USE_GCC_SHLIB)
 LDFLAGS+=		${BUILDLINK_LDFLAGS.gcc}
 .  endif
 BUILDLINK_WRAPPER_ENV+=	\
diff --git a/lang/gcc3/buildlink2.mk b/lang/gcc3/buildlink2.mk
index 97e3dd037f3..b8dd8572392 100644
--- a/lang/gcc3/buildlink2.mk
+++ b/lang/gcc3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/05/28 13:24:35 grant Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/29 23:14:12 grant Exp $
 
 .if !defined(GCC3_BUILDLINK2_MK)
 GCC3_BUILDLINK2_MK=	# defined
@@ -9,10 +9,10 @@ GCC_REQD?=			3.3
 BUILDLINK_DEPENDS.gcc?=		gcc3>=${GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc?=	../../lang/gcc3
 
-# Packages that use the C++ compiler and subsequently link against the
-# shared libstdc++ from the package need a full dependency.
+# Packages that link against gcc shared libraries need a full
+# dependency.
 #
-.if defined(USE_CXX)
+.if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc+=	full
 .else
 BUILDLINK_DEPMETHOD.gcc?=	build
@@ -57,7 +57,7 @@ CXX=		${_GCC_PREFIX}bin/g++
 F77=		${_GCC_PREFIX}bin/g77
 PKG_FC=		${F77}
 
-.  if defined(USE_CXX)
+.  if defined(USE_GCC_SHLIB)
 LDFLAGS+=		${BUILDLINK_LDFLAGS.gcc}
 .  endif
 BUILDLINK_WRAPPER_ENV+=	\
diff --git a/lang/jikes/Makefile b/lang/jikes/Makefile
index 0ede5428e5b..0e4287b93d2 100644
--- a/lang/jikes/Makefile
+++ b/lang/jikes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/05/23 01:50:30 jschauma Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/29 23:14:09 grant Exp $
 #
 
 DISTNAME=	jikes-1.18
@@ -14,10 +14,9 @@ ONLY_FOR_PLATFORM=	NetBSD-*-* SunOS-*-* Linux-*-*
 
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
-USE_CXX=		yes
+USE_GCC_SHLIB=		yes
 UNLIMIT_RESOURCES=      datasize
 
 USE_GMAKE=	# uses multi-line comments with \ (naughty hack!)
 
-.include "../../lang/gcc/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 9ee696188b4..c219f07442e 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/11/15 00:04:41 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/29 23:14:09 grant Exp $
 
 DISTNAME=	maildrop-1.3.9
 COMMENT=	Courier mail delivery agent with filtering abilities
@@ -9,7 +9,7 @@ USE_PERL5=	build
 DEPENDS+=	courier-maildirmake>=0.37.1:../../mail/courier-maildirmake
 
 USE_BUILDLINK2=	yes
-USE_CXX=	yes
+USE_GCC_SHLIB=	yes
 
 .include "../../mail/courier-auth/Makefile.common"
 
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index bf8637a9e33..5c984ae6b99 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/01/10 07:45:43 cjep Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/29 23:14:10 grant Exp $
 
 DISTNAME=	lyx-${LYX_VERS}
 PKGNAME=	cjk-${DISTNAME}
@@ -27,7 +27,7 @@ USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_PERL5=		yes
 USE_X11=		yes
-USE_CXX=		yes
+USE_GCC_SHLIB=		yes
 GNU_CONFIGURE=		yes
 
 USE_LIBTOOL=		yes
@@ -36,7 +36,6 @@ LIBTOOL_OVERRIDE+=	${WRKSRC}/sigc++/libtool
 
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
-.include "../../lang/gcc/buildlink2.mk"
 .include "../../x11/xforms/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index cee54d3a1f9..3aa2f471abd 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/05/27 08:30:24 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/29 23:14:10 grant Exp $
 
 DISTNAME=		Sablot-0.96
 PKGNAME=		sablotron-0.96
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.gingerall.com/charlie/ga/xml/p_sab.xml
 COMMENT=		XML toolkit implementing XSLT, DOM, and XPath
 
 USE_BUILDLINK2=		YES
-USE_CXX=		YES
+USE_GCC_SHLIB=		YES
 GNU_CONFIGURE=  	YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
@@ -26,5 +26,4 @@ LDFLAGS+=               -lstdc++ -lm
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
 
-.include "../../mk/gcc.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index f5f8ee0ce61..bdf2e5d2386 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/05/17 05:41:11 salo Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/29 23:14:10 grant Exp $
 #
 
 DISTNAME=	fluxbox-0.1.14
@@ -15,12 +15,11 @@ DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
 
 USE_BUILDLINK2=	YES
 USE_X11=	YES
-USE_CXX=	YES
+USE_GCC_SHLIB=	YES
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS=	--enable-kde
 
 .include "../../fonts/Xft2/buildlink2.mk"
-.include "../../lang/gcc/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmx-gnome/Makefile b/wm/wmx-gnome/Makefile
index 32b0134966c..3f1bf84084b 100644
--- a/wm/wmx-gnome/Makefile
+++ b/wm/wmx-gnome/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2002/11/15 00:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/29 23:14:10 grant Exp $
 
 PKGNAME=	wmx-gnome-${WMX_VERS}
 CATEGORIES+=	gnome
 COMMENT=	another X11 window manager based on wm2, with GNOME compliance
 
 USE_BUILDLINK2=	# defined
-USE_CXX=	# defined
+USE_GCC_SHLIB=	# defined
 
 .include "../../wm/wmx/Makefile.common"
 
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index 1164174b21c..bb2f2ba162f 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/05/27 08:30:44 grant Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/29 23:14:11 grant Exp $
 
 DISTNAME=	modxslt-1.1
 PKGNAME=	ap-xslt-1.1
@@ -12,7 +12,7 @@ HOMEPAGE=	http://modxslt.sourceforge.net/
 COMMENT=	Simple, fast XSLT transformations for apache
 
 USE_BUILDLINK2=	YES
-USE_CXX=	YES
+USE_GCC_SHLIB=	YES
 
 APACHE_MODULE_NAME=	mod_xslt.so
 LDFLAGS+=	        -lsablot -liconv -lstdc++ -lm
@@ -21,5 +21,4 @@ LDFLAGS+=	        -lsablot -liconv -lstdc++ -lm
 .include "../../www/libwww/buildlink2.mk"
 
 .include "../../www/apache/module.mk"
-.include "../../mk/gcc.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index aa0aa4d1acf..0cafb8afebc 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2003/05/22 23:41:48 taya Exp $
+# $NetBSD: Makefile,v 1.120 2003/05/29 23:14:11 grant Exp $
 
 MOZILLA=	mozilla
 MOZILLA_BIN=	mozilla-bin
@@ -7,7 +7,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 COMMENT=	Full featured gecko-based browser
 
-USE_CXX=	yes
+USE_GCC_SHLIB=	yes
 BUILD_SVG=	# defined
 BUILD_CALENDAR=	# defined
 
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index dff2f3ed22e..a73a36bf286 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2003/05/11 05:24:29 jmc Exp $
+# $NetBSD: Makefile,v 1.50 2003/05/29 23:14:11 grant Exp $
 
 DISTNAME=	kdelibs-2.2.2
 PKGREVISION=	5
@@ -10,7 +10,7 @@ COMMENT=	Support libraries for the KDE integrated X11 desktop
 CONFLICTS=	arts-[1-9]*
 
 USE_BUILDLINK2=		YES
-USE_CXX=		YES
+USE_GCC_SHLIB=		YES
 USE_OPENSSL_VERSION=	${OPENSSL_VERSION_096}
 
 CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 03fdde7795f..f30af219f48 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/05/22 02:42:40 markd Exp $
+# $NetBSD: Makefile,v 1.29 2003/05/29 23:14:12 grant Exp $
 
 DISTNAME=	kdelibs-3.1.2
 CATEGORIES=	x11
@@ -9,7 +9,7 @@ COMMENT=	Support libraries for the KDE integrated X11 desktop
 CONFLICTS+=	koffice3<=1.1.1
 
 USE_BUILDLINK2=		YES
-USE_CXX=		YES
+USE_GCC_SHLIB=		YES
 USE_OPENSSL_VERSION=	${OPENSSL_VERSION_096}
 
 CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index 832dfee0ccb..2de631b38ed 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/03/09 19:28:19 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/29 23:14:12 grant Exp $
 #
 
 DISTNAME=		xplanet-0.93
@@ -11,7 +11,7 @@ HOMEPAGE=		http://xplanet.sourceforge.net/
 COMMENT=		Rotating rendered map of the Earth in X11 root window
 
 USE_BUILDLINK2=		yes
-USE_CXX=		yes
+USE_GCC_SHLIB=		yes
 USE_X11=		yes
 USE_GMAKE=		yes