Add a gtk2 option (default off), as proposed on tech-pkg@ on Nov 26.

At last opencpn and kicad have anoying display bugs when compiled with gtk3.

4 files changed, 185 insertions, 12 deletions

diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile
index 775521148af..6985cb43132 100644
--- a/x11/wxGTK30/Makefile
+++ b/x11/wxGTK30/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2018/11/14 22:22:51 kleink Exp $
+# $NetBSD: Makefile,v 1.31 2018/12/08 10:47:17 bouyer Exp $
 
 DISTNAME=	wxWidgets-3.0.4
 PKGNAME=	${DISTNAME:S/wxWidgets/wxGTK30/}
@@ -50,17 +50,9 @@ SUBST_SED.fix-paths=		-e 's,/usr/pkg/include,${PREFIX}/include,g'
 SUBST_SED.fix-paths+=		-e 's,@PREFIX@,${PREFIX},g'
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 PLIST_SRC+=		${PLIST_SRC_DFLT}
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--with-osx_cocoa
-CONFIGURE_ARGS+=	--without-macosx-sdk
-CONFIGURE_ARGS+=	--without-macosx-version-min
-CPPFLAGS+=		-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
-.else
-PLIST_SRC+=		PLIST.gtk3
-CONFIGURE_ARGS+=	--with-gtk=3
-.endif
 
 CONFIGURE_ARGS.SunOS+=	--disable-xlocale
 
@@ -102,7 +94,6 @@ post-install:
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .endif
diff --git a/x11/wxGTK30/PLIST.gtk2 b/x11/wxGTK30/PLIST.gtk2
new file mode 100644
index 00000000000..f9fda7f7390
--- /dev/null
+++ b/x11/wxGTK30/PLIST.gtk2
@@ -0,0 +1,147 @@
+@comment $NetBSD: PLIST.gtk2,v 1.5 2018/12/08 10:47:17 bouyer Exp $
+include/wx-3.0/wx/aui/tabartgtk.h
+include/wx-3.0/wx/generic/fontdlgg.h
+include/wx-3.0/wx/generic/icon.h
+include/wx-3.0/wx/generic/imaglist.h
+include/wx-3.0/wx/generic/paletteg.h
+include/wx-3.0/wx/gtk/accel.h
+include/wx-3.0/wx/gtk/animate.h
+include/wx-3.0/wx/gtk/anybutton.h
+include/wx-3.0/wx/gtk/app.h
+include/wx-3.0/wx/gtk/assertdlg_gtk.h
+include/wx-3.0/wx/gtk/bitmap.h
+include/wx-3.0/wx/gtk/bmpbuttn.h
+include/wx-3.0/wx/gtk/bmpcbox.h
+include/wx-3.0/wx/gtk/brush.h
+include/wx-3.0/wx/gtk/button.h
+include/wx-3.0/wx/gtk/calctrl.h
+include/wx-3.0/wx/gtk/checkbox.h
+include/wx-3.0/wx/gtk/checklst.h
+include/wx-3.0/wx/gtk/chkconf.h
+include/wx-3.0/wx/gtk/choice.h
+include/wx-3.0/wx/gtk/clipbrd.h
+include/wx-3.0/wx/gtk/clrpicker.h
+include/wx-3.0/wx/gtk/collpane.h
+include/wx-3.0/wx/gtk/colordlg.h
+include/wx-3.0/wx/gtk/colour.h
+include/wx-3.0/wx/gtk/combobox.h
+include/wx-3.0/wx/gtk/control.h
+include/wx-3.0/wx/gtk/cursor.h
+include/wx-3.0/wx/gtk/dataform.h
+include/wx-3.0/wx/gtk/dataobj.h
+include/wx-3.0/wx/gtk/dataobj2.h
+include/wx-3.0/wx/gtk/dataview.h
+include/wx-3.0/wx/gtk/dialog.h
+include/wx-3.0/wx/gtk/dirdlg.h
+include/wx-3.0/wx/gtk/dnd.h
+include/wx-3.0/wx/gtk/dvrenderer.h
+include/wx-3.0/wx/gtk/dvrenderers.h
+include/wx-3.0/wx/gtk/evtloop.h
+include/wx-3.0/wx/gtk/evtloopsrc.h
+include/wx-3.0/wx/gtk/filectrl.h
+include/wx-3.0/wx/gtk/filedlg.h
+include/wx-3.0/wx/gtk/filehistory.h
+include/wx-3.0/wx/gtk/filepicker.h
+include/wx-3.0/wx/gtk/font.h
+include/wx-3.0/wx/gtk/fontdlg.h
+include/wx-3.0/wx/gtk/fontpicker.h
+include/wx-3.0/wx/gtk/frame.h
+include/wx-3.0/wx/gtk/gauge.h
+include/wx-3.0/wx/gtk/glcanvas.h
+include/wx-3.0/wx/gtk/gnome/gvfs.h
+include/wx-3.0/wx/gtk/hildon/notifmsg.h
+include/wx-3.0/wx/gtk/hyperlink.h
+include/wx-3.0/wx/gtk/infobar.h
+include/wx-3.0/wx/gtk/listbox.h
+include/wx-3.0/wx/gtk/mdi.h
+include/wx-3.0/wx/gtk/menu.h
+include/wx-3.0/wx/gtk/menuitem.h
+include/wx-3.0/wx/gtk/minifram.h
+include/wx-3.0/wx/gtk/msgdlg.h
+include/wx-3.0/wx/gtk/nonownedwnd.h
+include/wx-3.0/wx/gtk/notebook.h
+include/wx-3.0/wx/gtk/notifmsg.h
+include/wx-3.0/wx/gtk/pen.h
+include/wx-3.0/wx/gtk/popupwin.h
+include/wx-3.0/wx/gtk/print.h
+include/wx-3.0/wx/gtk/radiobox.h
+include/wx-3.0/wx/gtk/radiobut.h
+include/wx-3.0/wx/gtk/region.h
+include/wx-3.0/wx/gtk/scrolbar.h
+include/wx-3.0/wx/gtk/scrolwin.h
+include/wx-3.0/wx/gtk/slider.h
+include/wx-3.0/wx/gtk/spinbutt.h
+include/wx-3.0/wx/gtk/spinctrl.h
+include/wx-3.0/wx/gtk/statbmp.h
+include/wx-3.0/wx/gtk/statbox.h
+include/wx-3.0/wx/gtk/statline.h
+include/wx-3.0/wx/gtk/stattext.h
+include/wx-3.0/wx/gtk/taskbar.h
+include/wx-3.0/wx/gtk/textctrl.h
+include/wx-3.0/wx/gtk/textentry.h
+include/wx-3.0/wx/gtk/tglbtn.h
+include/wx-3.0/wx/gtk/toolbar.h
+include/wx-3.0/wx/gtk/tooltip.h
+include/wx-3.0/wx/gtk/toplevel.h
+include/wx-3.0/wx/gtk/webview_webkit.h
+include/wx-3.0/wx/gtk/webviewhistoryitem_webkit.h
+include/wx-3.0/wx/gtk/window.h
+include/wx-3.0/wx/private/pipestream.h
+include/wx-3.0/wx/private/streamtempinput.h
+include/wx-3.0/wx/unix/execute.h
+include/wx-3.0/wx/unix/fontutil.h
+include/wx-3.0/wx/unix/fswatcher_inotify.h
+include/wx-3.0/wx/unix/glx11.h
+include/wx-3.0/wx/unix/joystick.h
+include/wx-3.0/wx/unix/mimetype.h
+include/wx-3.0/wx/unix/private/pipestream.h
+include/wx-3.0/wx/unix/sound.h
+include/wx-3.0/wx/unix/taskbarx11.h
+include/wx-3.0/wx/unix/utilsx11.h
+lib/libwx_baseu-3.0.so
+lib/libwx_baseu-3.0.so.0
+lib/libwx_baseu-3.0.so.0.4.0
+lib/libwx_baseu_net-3.0.so
+lib/libwx_baseu_net-3.0.so.0
+lib/libwx_baseu_net-3.0.so.0.4.0
+lib/libwx_baseu_xml-3.0.so
+lib/libwx_baseu_xml-3.0.so.0
+lib/libwx_baseu_xml-3.0.so.0.4.0
+lib/libwx_gtk2u_adv-3.0.so
+lib/libwx_gtk2u_adv-3.0.so.0
+lib/libwx_gtk2u_adv-3.0.so.0.4.0
+lib/libwx_gtk2u_aui-3.0.so
+lib/libwx_gtk2u_aui-3.0.so.0
+lib/libwx_gtk2u_aui-3.0.so.0.4.0
+lib/libwx_gtk2u_core-3.0.so
+lib/libwx_gtk2u_core-3.0.so.0
+lib/libwx_gtk2u_core-3.0.so.0.4.0
+lib/libwx_gtk2u_gl-3.0.so
+lib/libwx_gtk2u_gl-3.0.so.0
+lib/libwx_gtk2u_gl-3.0.so.0.4.0
+lib/libwx_gtk2u_html-3.0.so
+lib/libwx_gtk2u_html-3.0.so.0
+lib/libwx_gtk2u_html-3.0.so.0.4.0
+lib/libwx_gtk2u_media-3.0.so
+lib/libwx_gtk2u_media-3.0.so.0
+lib/libwx_gtk2u_media-3.0.so.0.4.0
+lib/libwx_gtk2u_propgrid-3.0.so
+lib/libwx_gtk2u_propgrid-3.0.so.0
+lib/libwx_gtk2u_propgrid-3.0.so.0.4.0
+lib/libwx_gtk2u_qa-3.0.so
+lib/libwx_gtk2u_qa-3.0.so.0
+lib/libwx_gtk2u_qa-3.0.so.0.4.0
+lib/libwx_gtk2u_ribbon-3.0.so
+lib/libwx_gtk2u_ribbon-3.0.so.0
+lib/libwx_gtk2u_ribbon-3.0.so.0.4.0
+lib/libwx_gtk2u_richtext-3.0.so
+lib/libwx_gtk2u_richtext-3.0.so.0
+lib/libwx_gtk2u_richtext-3.0.so.0.4.0
+lib/libwx_gtk2u_stc-3.0.so
+lib/libwx_gtk2u_stc-3.0.so.0
+lib/libwx_gtk2u_stc-3.0.so.0.4.0
+lib/libwx_gtk2u_xrc-3.0.so
+lib/libwx_gtk2u_xrc-3.0.so.0
+lib/libwx_gtk2u_xrc-3.0.so.0.4.0
+lib/wx/config/gtk2-unicode-3.0
+lib/wx/include/gtk2-unicode-3.0/wx/setup.h
diff --git a/x11/wxGTK30/buildlink3.mk b/x11/wxGTK30/buildlink3.mk
index dce7a1f8eb7..14f30d30f93 100644
--- a/x11/wxGTK30/buildlink3.mk
+++ b/x11/wxGTK30/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2018/11/14 22:22:51 kleink Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2018/12/08 10:47:17 bouyer Exp $
 
 BUILDLINK_TREE+=	wxGTK30
 
@@ -14,6 +14,10 @@ PREPEND_PATH+=			${PREFIX}/libexec/wx-3.0
 CONFIGURE_ARGS+=		--with-wx-version=3.0
 CONFIGURE_ARGS+=		--with-wx-config=${PREFIX}/libexec/wx-3.0/wx-config
 
+pkgbase := wxGTK30
+.include "../../mk/pkg-build-options.mk"
+
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
@@ -22,7 +26,11 @@ CONFIGURE_ARGS+=		--with-wx-config=${PREFIX}/libexec/wx-3.0/wx-config
 .if ${OPSYS} != "Darwin"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.wxGTK30:Mgtk2)
+.include "../../x11/gtk2/buildlink3.mk"
+.else
 .include "../../x11/gtk3/buildlink3.mk"
+.endif
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .endif
diff --git a/x11/wxGTK30/options.mk b/x11/wxGTK30/options.mk
new file mode 100644
index 00000000000..09b98bb29dd
--- /dev/null
+++ b/x11/wxGTK30/options.mk
@@ -0,0 +1,27 @@
+# $NetBSD: options.mk,v 1.1 2018/12/08 10:47:17 bouyer Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.wxGTK30
+.if ${OPSYS} != "Darwin"
+PKG_OPTIONS_REQUIRED_GROUPS= gtk
+PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
+PKG_SUGGESTED_OPTIONS= gtk3
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+=	--with-osx_cocoa
+CONFIGURE_ARGS+=	--without-macosx-sdk
+CONFIGURE_ARGS+=	--without-macosx-version-min
+CPPFLAGS+=		-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
+.else
+.  if !empty(PKG_OPTIONS:Mgtk2)
+PLIST_SRC+=		PLIST.gtk2
+CONFIGURE_ARGS+=	--with-gtk=2
+.include "../../x11/gtk2/buildlink3.mk"
+. else
+PLIST_SRC+=		PLIST.gtk3
+CONFIGURE_ARGS+=	--with-gtk=3
+.include "../../x11/gtk3/buildlink3.mk"
+. endif
+.endif