Change wxGTK to use gtk2 by default. Provide the WXGTK_USE_GTK1 variable

which, if set to YES, will revert the package to use gtk1.  Bump PKGREVISION.
Closes PR pkg/21509.

3 files changed, 39 insertions, 18 deletions

diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index d7378630785..0116301b7e6 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2004/01/03 18:50:00 reed Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/07 21:45:18 jmmv Exp $
 #
 
 DISTNAME=		wxGTK-2.4.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wxwindows/}
 EXTRACT_SUFX=		.tar.bz2
@@ -16,7 +16,6 @@ USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-gtk
 CONFIGURE_ARGS+=	--with-libjpeg=sys
 CONFIGURE_ARGS+=	--with-zlib=sys
 CONFIGURE_ARGS+=	--with-libpng=sys
@@ -26,14 +25,26 @@ CPPFLAGS+=		-Dunix=1	# src/common/unzip.c needs this
 
 DOCDIR=			${PREFIX}/share/doc/wx/gtk
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=	--with-gtk
+PLIST_SUBST+=		GTKVER=
+.include "../../x11/gtk/buildlink2.mk"
+.else
+CONFIGURE_ARGS+=	--enable-gtk2
+PLIST_SUBST+=		GTKVER=2
+.include "../../x11/gtk2/buildlink2.mk"
+.endif
+
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE
 
+.include "../../devel/zlib/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
 
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxGTK/PLIST b/x11/wxGTK/PLIST
index 5ae8427b87d..bb46f9b6125 100644
--- a/x11/wxGTK/PLIST
+++ b/x11/wxGTK/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2003/09/03 18:22:52 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/01/07 21:45:18 jmmv Exp $
 bin/wx-config
-bin/wxgtk-2.4-config
+bin/wxgtk${GTKVER}-2.4-config
 include/wx/accel.h
 include/wx/app.h
 include/wx/arrimpl.cpp
@@ -91,7 +91,6 @@ include/wx/fs_zip.h
 include/wx/gauge.h
 include/wx/gdicmn.h
 include/wx/gdiobj.h
-include/wx/quantize.h
 include/wx/generic/accel.h
 include/wx/generic/calctrl.h
 include/wx/generic/caret.h
@@ -281,6 +280,7 @@ include/wx/protocol/file.h
 include/wx/protocol/ftp.h
 include/wx/protocol/http.h
 include/wx/protocol/protocol.h
+include/wx/quantize.h
 include/wx/radiobox.h
 include/wx/radiobut.h
 include/wx/regex.h
@@ -364,12 +364,12 @@ include/wx/wxprec.h
 include/wx/xpmdecod.h
 include/wx/zipstrm.h
 include/wx/zstream.h
-lib/libwx_gtk.a
-lib/libwx_gtk.la
-lib/libwx_gtk.so
-lib/libwx_gtk.so.0
-lib/libwx_gtk.so.0.1
-lib/wx/include/gtk-2.4/wx/setup.h
+lib/libwx_gtk${GTKVER}.a
+lib/libwx_gtk${GTKVER}.la
+lib/libwx_gtk${GTKVER}.so
+lib/libwx_gtk${GTKVER}.so.0
+lib/libwx_gtk${GTKVER}.so.0.1
+lib/wx/include/gtk${GTKVER}-2.4/wx/setup.h
 share/aclocal/wxwin.m4
 share/doc/wx/gtk/LICENSE
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/wxstd.mo
@@ -420,8 +420,8 @@ share/wx/2.4/gs_afm/Zapf.afm
 @unexec ${RMDIR} %D/share/wx 2>/dev/null || ${TRUE}
 @dirrm share/doc/wx/gtk
 @dirrm share/doc/wx
-@dirrm lib/wx/include/gtk-2.4/wx
-@dirrm lib/wx/include/gtk-2.4
+@dirrm lib/wx/include/gtk${GTKVER}-2.4/wx
+@dirrm lib/wx/include/gtk${GTKVER}-2.4
 @unexec ${RMDIR} %D/lib/wx/include 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/lib/wx 2>/dev/null || ${TRUE}
 @dirrm include/wx/unix
diff --git a/x11/wxGTK/buildlink2.mk b/x11/wxGTK/buildlink2.mk
index 87efa7dc894..f418773d16d 100644
--- a/x11/wxGTK/buildlink2.mk
+++ b/x11/wxGTK/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/01/03 18:50:00 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/01/07 21:45:18 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use wxGTK.
 #
@@ -9,7 +9,7 @@
 WXGTK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		wxGTK
-BUILDLINK_DEPENDS.wxGTK?=	wxGTK>=2.4.1nb2
+BUILDLINK_DEPENDS.wxGTK?=	wxGTK>=2.4.1nb3
 BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.wxGTK=wxGTK
@@ -20,13 +20,23 @@ BUILDLINK_FILES.wxGTK+=	include/wx/gtk/*
 BUILDLINK_FILES.wxGTK+=	include/wx/html/*
 BUILDLINK_FILES.wxGTK+=	include/wx/protocol/*
 BUILDLINK_FILES.wxGTK+=	include/wx/unix/*
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss])
 BUILDLINK_FILES.wxGTK+=	lib/libwx_gtk.*
 BUILDLINK_FILES.wxGTK+=	lib/wx/include/gtk-2.4/wx/*
+.include "../../x11/gtk/buildlink2.mk"
+.else
+BUILDLINK_FILES.wxGTK+=	lib/libwx_gtk2.*
+BUILDLINK_FILES.wxGTK+=	lib/wx/include/gtk2-2.4/wx/*
+.include "../../x11/gtk2/buildlink2.mk"
+.endif
 
+.include "../../devel/zlib/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	wxGTK-buildlink