Use C++ for linking the shared libraries and bump the API requirement.

This fixes the configure run of audacity and generally improves the
correctness.

6 files changed, 14 insertions, 14 deletions

diff --git a/x11/wxGTK-contrib/Makefile b/x11/wxGTK-contrib/Makefile
index b713c07910b..2b3ae80124a 100644
--- a/x11/wxGTK-contrib/Makefile
+++ b/x11/wxGTK-contrib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2007/01/11 17:27:03 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/16 23:27:48 joerg Exp $
 #
 
 .include "../../x11/wxGTK/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/wxGTK/wxGTK-contrib/}
-PKGREVISION=		1
+PKGREVISION=		2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		GTK-based implementation of the wxWidgets GUI library (contrib libraries)
 
diff --git a/x11/wxGTK-contrib/buildlink3.mk b/x11/wxGTK-contrib/buildlink3.mk
index cee2379a9ba..b8655a1b016 100644
--- a/x11/wxGTK-contrib/buildlink3.mk
+++ b/x11/wxGTK-contrib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/01/16 23:27:48 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WXGTK_CONTRIB_BUILDLINK3_MK:=	${WXGTK_CONTRIB_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	wxGTK-contrib
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK-contrib
 
 .if !empty(WXGTK_CONTRIB_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.wxGTK-contrib+=	wxGTK-contrib>=2.6.0
+BUILDLINK_API_DEPENDS.wxGTK-contrib+=	wxGTK-contrib>=2.6.0nb2
 BUILDLINK_ABI_DEPENDS.wxGTK-contrib?=	wxGTK-contrib>=2.6.3nb1
 BUILDLINK_PKGSRCDIR.wxGTK-contrib?=	../../x11/wxGTK-contrib
 
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index 6673bfee435..e39646f5b6f 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.51 2007/01/02 11:00:24 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2007/01/16 23:27:48 joerg Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		1
+PKGREVISION=		2
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
 
 post-build:
diff --git a/x11/wxGTK/Makefile.common b/x11/wxGTK/Makefile.common
index 6340ec236f6..8071ef2c254 100644
--- a/x11/wxGTK/Makefile.common
+++ b/x11/wxGTK/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2007/01/02 11:00:24 joerg Exp $
+# $NetBSD: Makefile.common,v 1.14 2007/01/16 23:27:48 joerg Exp $
 #
 
 DISTNAME=		wxGTK-2.6.3
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.wxwidgets.org/
 PATCHDIR=		${.CURDIR}/../../x11/wxGTK/patches
 DISTINFO_FILE=		${.CURDIR}/../../x11/wxGTK/distinfo
 
-PATCHFILES=		${DISTNAME}-libtool.diff2.bz2
+PATCHFILES=		${DISTNAME}-libtool.diff3.bz2
 PATCH_SITES=		${MASTER_SITE_LOCAL}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/x11/wxGTK/buildlink3.mk b/x11/wxGTK/buildlink3.mk
index 35e39c7049b..460ca53272e 100644
--- a/x11/wxGTK/buildlink3.mk
+++ b/x11/wxGTK/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/11/10 14:06:31 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2007/01/16 23:27:48 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXGTK_BUILDLINK3_MK:=	${WXGTK_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	wxGTK
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK
 
 .if !empty(WXGTK_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.wxGTK+=	wxGTK>=2.6.0
+BUILDLINK_API_DEPENDS.wxGTK+=	wxGTK>=2.6.0nb2
 BUILDLINK_ABI_DEPENDS.wxGTK+=	wxGTK>=2.6.3nb1
 BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK
 .endif	# WXGTK_BUILDLINK3_MK
diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo
index 4c4cebd46eb..4f0816d2519 100644
--- a/x11/wxGTK/distinfo
+++ b/x11/wxGTK/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.29 2006/11/13 17:11:16 drochner Exp $
+$NetBSD: distinfo,v 1.30 2007/01/16 23:27:48 joerg Exp $
 
+SHA1 (wxGTK-2.6.3-libtool.diff3.bz2) = 657566a9384a4bc160dffd26678b5e0c6a1cb5b2
+RMD160 (wxGTK-2.6.3-libtool.diff3.bz2) = 233af8dd61317ed1771c1862c6cec65f131b6de0
+Size (wxGTK-2.6.3-libtool.diff3.bz2) = 136446 bytes
 SHA1 (wxGTK-2.6.3.tar.bz2) = 7c2dfe27a56aa99b4ea557a436bf84a13a579a9d
 RMD160 (wxGTK-2.6.3.tar.bz2) = d7465860d7c07b42d299d4b4c5d015b25f96a9dd
 Size (wxGTK-2.6.3.tar.bz2) = 7213119 bytes
-SHA1 (wxGTK-2.6.3-libtool.diff2.bz2) = e79d3efcf21859911d87ab9a7c8e3c90d7455d8c
-RMD160 (wxGTK-2.6.3-libtool.diff2.bz2) = 3250c47641c023228e44e6477ecb7aaf68280422
-Size (wxGTK-2.6.3-libtool.diff2.bz2) = 136484 bytes
 SHA1 (patch-aa) = 0ef5ae28b70a3290e37363193248365f4cf03cec
 SHA1 (patch-ab) = 3e9c6bc0df33e466390a4f6483b1c84e2eb9257b