[pkgsrc/trunk]: pkgsrc Switch to x11/wxGTK26{,-contrib}.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a717a405f3e7
branches:  trunk
changeset: 547628:a717a405f3e7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Sep 22 20:21:03 2008 +0000

description:
Switch to x11/wxGTK26{,-contrib}.

diffstat:

 cad/boolean/Makefile                |  4 ++--
 converters/tex2rtf/Makefile         |  4 ++--
 devel/rapidsvn/Makefile             |  4 ++--
 editors/poedit/Makefile             |  4 ++--
 graphics/wxsvg/Makefile             |  4 ++--
 graphics/wxsvg/buildlink3.mk        |  4 ++--
 graphics/zphoto/options.mk          |  4 ++--
 misc/xchm/Makefile                  |  4 ++--
 multimedia/dvdstyler/Makefile       |  4 ++--
 multimedia/mmg/Makefile             |  4 ++--
 multimedia/vlc08/options.mk         |  4 ++--
 net/amule/Makefile                  |  4 ++--
 sysutils/bacula-wx-console/Makefile |  4 ++--
 x11/py-wxWidgets/Makefile           |  6 +++---
 x11/py-wxWidgets/buildlink3.mk      |  4 ++--
 x11/wxhaskell/Makefile              |  4 ++--
 16 files changed, 33 insertions(+), 33 deletions(-)

diffs (268 lines):

diff -r 074dbe60e280 -r a717a405f3e7 cad/boolean/Makefile
--- a/cad/boolean/Makefile      Mon Sep 22 20:19:18 2008 +0000
+++ b/cad/boolean/Makefile      Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
        ${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 -r 074dbe60e280 -r a717a405f3e7 converters/tex2rtf/Makefile
--- a/converters/tex2rtf/Makefile       Mon Sep 22 20:19:18 2008 +0000
+++ b/converters/tex2rtf/Makefile       Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 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 -r 074dbe60e280 -r a717a405f3e7 devel/rapidsvn/Makefile
--- a/devel/rapidsvn/Makefile   Mon Sep 22 20:19:18 2008 +0000
+++ b/devel/rapidsvn/Makefile   Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 # 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 -r 074dbe60e280 -r a717a405f3e7 editors/poedit/Makefile
--- a/editors/poedit/Makefile   Mon Sep 22 20:19:18 2008 +0000
+++ b/editors/poedit/Makefile   Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 
 .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 -r 074dbe60e280 -r a717a405f3e7 graphics/wxsvg/Makefile
--- a/graphics/wxsvg/Makefile   Mon Sep 22 20:19:18 2008 +0000
+++ b/graphics/wxsvg/Makefile   Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 
 .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 -r 074dbe60e280 -r a717a405f3e7 graphics/wxsvg/buildlink3.mk
--- a/graphics/wxsvg/buildlink3.mk      Mon Sep 22 20:19:18 2008 +0000
+++ b/graphics/wxsvg/buildlink3.mk      Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 
 .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 -r 074dbe60e280 -r a717a405f3e7 graphics/zphoto/options.mk
--- a/graphics/zphoto/options.mk        Mon Sep 22 20:19:18 2008 +0000
+++ b/graphics/zphoto/options.mk        Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 
 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 -r 074dbe60e280 -r a717a405f3e7 misc/xchm/Makefile
--- a/misc/xchm/Makefile        Mon Sep 22 20:19:18 2008 +0000
+++ b/misc/xchm/Makefile        Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 USE_PKGLOCALEDIR=      yes
 
 .include "../../devel/chmlib/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK26/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 074dbe60e280 -r a717a405f3e7 multimedia/dvdstyler/Makefile
--- a/multimedia/dvdstyler/Makefile     Mon Sep 22 20:19:18 2008 +0000
+++ b/multimedia/dvdstyler/Makefile     Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 .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 -r 074dbe60e280 -r a717a405f3e7 multimedia/mmg/Makefile
--- a/multimedia/mmg/Makefile   Mon Sep 22 20:19:18 2008 +0000
+++ b/multimedia/mmg/Makefile   Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 .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 -r 074dbe60e280 -r a717a405f3e7 multimedia/vlc08/options.mk
--- a/multimedia/vlc08/options.mk       Mon Sep 22 20:19:18 2008 +0000
+++ b/multimedia/vlc08/options.mk       Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 .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 -r 074dbe60e280 -r a717a405f3e7 net/amule/Makefile
--- a/net/amule/Makefile        Mon Sep 22 20:19:18 2008 +0000
+++ b/net/amule/Makefile        Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 
 .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 -r 074dbe60e280 -r a717a405f3e7 sysutils/bacula-wx-console/Makefile
--- a/sysutils/bacula-wx-console/Makefile       Mon Sep 22 20:19:18 2008 +0000
+++ b/sysutils/bacula-wx-console/Makefile       Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 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 -r 074dbe60e280 -r a717a405f3e7 x11/py-wxWidgets/Makefile
--- a/x11/py-wxWidgets/Makefile Mon Sep 22 20:19:18 2008 +0000
+++ b/x11/py-wxWidgets/Makefile Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
 .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 -r 074dbe60e280 -r a717a405f3e7 x11/py-wxWidgets/buildlink3.mk
--- a/x11/py-wxWidgets/buildlink3.mk    Mon Sep 22 20:19:18 2008 +0000
+++ b/x11/py-wxWidgets/buildlink3.mk    Mon Sep 22 20:21:03 2008 +0000
@@ -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_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 -r 074dbe60e280 -r a717a405f3e7 x11/wxhaskell/Makefile
--- a/x11/wxhaskell/Makefile    Mon Sep 22 20:19:18 2008 +0000
+++ b/x11/wxhaskell/Makefile    Mon Sep 22 20:21:03 2008 +0000
@@ -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 @@
        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"