Switch to x11/wxGTK26{,-contrib}.

16 files changed, 33 insertions, 33 deletions

diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index e918c4ea6f1..cd5a97c6729 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2008/06/21 18:01:18 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2008/09/22 20:21:03 joerg Exp $
 #
 
 DISTNAME=	boolean_6_92
@@ -43,5 +43,5 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/boolean  ${DESTDIR}${PREFIX}/bin/boolean
 	${INSTALL_PROGRAM} ${WRKSRC}/apps/edit/edit  ${DESTDIR}${PREFIX}/bin/edit
 
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/tex2rtf/Makefile b/converters/tex2rtf/Makefile
index fea76c62a48..c37016a7ca1 100644
--- a/converters/tex2rtf/Makefile
+++ b/converters/tex2rtf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/03/03 05:51:08 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2008/09/22 20:21:03 joerg Exp $
 
 DISTNAME=		tex2rtf-2.01-source
 PKGNAME=		tex2rtf-2.01
@@ -24,5 +24,5 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tex2rtf ${DESTDIR}${PREFIX}/bin/tex2rtf
 
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 91ce3325d8b..da21566a01d 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2008/09/06 20:54:32 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2008/09/22 20:21:03 joerg Exp $
 
 DISTNAME=		rapidsvn-0.9.4
 PKGREVISION=		5
@@ -31,5 +31,5 @@ post-install:
 # subversion-base, following the precedent of devel/foo-subversion and
 # www/ap2-subversion.
 .include "../../devel/subversion-base/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index a0c6d5122af..5071d96d68e 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/09/06 20:54:32 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2008/09/22 20:21:03 joerg Exp $
 #
 
 DISTNAME=	poedit-1.3.6
@@ -21,6 +21,6 @@ CONFIGURE_ENV+=		WX_CONFIG_NAME=${BUILDLINK_PREFIX.wxGTK}/bin/wx-config
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index e6c70e7220d..e816bf93766 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/09/22 20:21:03 joerg Exp $
 #
 
 DISTNAME=	wxsvg-1.0b6
@@ -20,5 +20,5 @@ USE_TOOLS+=		gmake pkg-config
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/wxsvg/buildlink3.mk b/graphics/wxsvg/buildlink3.mk
index 5ef5bdf2eaf..b97573bcc3e 100644
--- a/graphics/wxsvg/buildlink3.mk
+++ b/graphics/wxsvg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2007/09/21 13:03:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2008/09/22 20:21:03 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXSVG_BUILDLINK3_MK:=	${WXSVG_BUILDLINK3_MK}+
@@ -19,6 +19,6 @@ BUILDLINK_PKGSRCDIR.wxsvg?=	../../graphics/wxsvg
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/zphoto/options.mk b/graphics/zphoto/options.mk
index 3750f8f2aff..3b6c172eb08 100644
--- a/graphics/zphoto/options.mk
+++ b/graphics/zphoto/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:02 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2008/09/22 20:21:03 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.zphoto
 PKG_SUPPORTED_OPTIONS=	zip wx
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=	--disable-zip
 
 PLIST_VARS+=		wx
 .if !empty(PKG_OPTIONS:Mwx)
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 PLIST.wx=		yes
 .else
 CONFIGURE_ARGS+=	--disable-wx
diff --git a/misc/xchm/Makefile b/misc/xchm/Makefile
index 73d53aef31e..088a4d2360e 100644
--- a/misc/xchm/Makefile
+++ b/misc/xchm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2008/06/20 01:09:27 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2008/09/22 20:21:03 joerg Exp $
 #
 
 DISTNAME=	xchm-1.13
@@ -17,5 +17,5 @@ GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 
 .include "../../devel/chmlib/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 0a312dbbda1..c07db7eb0e7 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/06/12 02:14:38 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2008/09/22 20:21:03 joerg Exp $
 #
 
 DISTNAME=	DVDStyler-1.5.1
@@ -28,5 +28,5 @@ CONFIGURE_ARGS+=	--disable-libgnomeui
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/wxsvg/buildlink3.mk"
 .include "../../multimedia/mjpegtools/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile
index 1443c5a23c8..e970e8dbf7b 100644
--- a/multimedia/mmg/Makefile
+++ b/multimedia/mmg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/03/04 19:32:30 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2008/09/22 20:21:03 joerg Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -44,6 +44,6 @@ do-install:
 .include "../../multimedia/libmatroska/buildlink3.mk"
 .include "../../sysutils/file/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/vlc08/options.mk b/multimedia/vlc08/options.mk
index 0ea11d96783..9b57eb7246e 100644
--- a/multimedia/vlc08/options.mk
+++ b/multimedia/vlc08/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2008/09/08 18:42:21 ahoka Exp $
+# $NetBSD: options.mk,v 1.2 2008/09/22 20:21:04 joerg Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
 PKG_SUPPORTED_OPTIONS=		skins wxwidgets faad arts
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+=	--disable-skins2
 .endif
 
 .if !empty(PKG_OPTIONS:Mwxwidgets)
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-wxwidgets
 PLIST.wxwidgets=	yes
 .else
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 802c073225d..6b58eee2a48 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/06/12 02:14:38 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2008/09/22 20:21:04 joerg Exp $
 
 DISTNAME=	aMule-2.1.3
 PKGNAME=	${DISTNAME:S/aMule/amule/}
@@ -28,6 +28,6 @@ UNLIMIT_RESOURCES+=	datasize
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula-wx-console/Makefile b/sysutils/bacula-wx-console/Makefile
index 61c3278f27c..223c494e581 100644
--- a/sysutils/bacula-wx-console/Makefile
+++ b/sysutils/bacula-wx-console/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/01/04 14:32:53 ghen Exp $
+# $NetBSD: Makefile,v 1.8 2008/09/22 20:21:04 joerg Exp $
 
 PKGNAME=		${DISTNAME:S/-/-wxconsole-/}
 COMMENT=		wxWindows-based console for Bacula - The Network Backup Solution
@@ -17,5 +17,5 @@ BUILD_DIRS+=		src/wx-console
 INSTALLATION_DIRS=	sbin share/examples/bacula
 
 .include "../../sysutils/bacula/Makefile.common"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile
index 3d8f4637de5..3763b80ea93 100644
--- a/x11/py-wxWidgets/Makefile
+++ b/x11/py-wxWidgets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/06/12 02:14:58 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2008/09/22 20:21:04 joerg Exp $
 #
 
 DISTNAME=	wxPython-src-2.6.3.3
@@ -36,6 +36,6 @@ PLIST_SUBST+=            GTKVER=2
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
-.include "../../x11/wxGTK-contrib/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
+.include "../../x11/wxGTK26-contrib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk
index e9379d0d296..f61b6413f38 100644
--- a/x11/py-wxWidgets/buildlink3.mk
+++ b/x11/py-wxWidgets/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2008/09/22 20:21:04 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PY_WXWIDGETS_BUILDLINK3_MK:=	${PY_WXWIDGETS_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+=	${PYPKGPREFIX}-wxWidgets>=2.6.1
 BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0nb4
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?=	../../x11/py-wxWidgets
 
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 
 .endif	# PY_WXWIDGETS_BUILDLINK3_MK
 
diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile
index 0abf32a615f..1ec15bdc3ee 100644
--- a/x11/wxhaskell/Makefile
+++ b/x11/wxhaskell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/09/09 02:46:09 obache Exp $
+# $NetBSD: Makefile,v 1.21 2008/09/22 20:21:04 joerg Exp $
 
 DISTNAME=		wxhaskell-src-0.9.4
 PKGNAME=		${DISTNAME:S/-src//}
@@ -27,5 +27,5 @@ pre-configure:
 	cd ${WRKSRC} && ./configure --prefix=${PREFIX} --with-opengl
 
 .include "../../lang/ghc/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"