x11-toolkits/wxgtk30: add non-default, webkit-less gtk2 flavor

Until subpackages arrive, specify mutual CONFLICTS_INSTALL as splitting
toolkit-independent libraries and other files proved to be unfeasible.

While here, add explicit dependency on `print/harfbuzz' per stage Q/A.

2 files changed, 71 insertions, 47 deletions

diff --git a/x11-toolkits/wxgtk30/Makefile b/x11-toolkits/wxgtk30/Makefile
index 103cdae87825..1912a6f295de 100644
--- a/x11-toolkits/wxgtk30/Makefile
+++ b/x11-toolkits/wxgtk30/Makefile
@@ -3,7 +3,7 @@ PORTVERSION=	3.0.5.1
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits
-PKGNAMESUFFIX=	30-gtk3
+PKGNAMESUFFIX=	${_SHORT_WX_VER}-${FLAVOR}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit with GTK+ bindings
@@ -14,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/docs/gpl.txt
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
 		libpng.so:graphics/png \
 		libsoup-2.4.so:devel/libsoup \
 		libtiff.so:graphics/tiff
@@ -26,7 +27,7 @@ USES=		compiler:c++11-lib gl gmake gnome iconv jpeg localbase \
 		pkgconfig xorg
 USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		gl glu
-USE_GNOME=	cairo gdkpixbuf2 gtk30
+USE_GNOME=	cairo gdkpixbuf2
 USE_LDCONFIG=	yes
 USE_CXXSTD=	c++11
 GNU_CONFIGURE=	yes
@@ -36,7 +37,6 @@ CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-zlib=sys \
 		--with-expat=sys \
 		--with-opengl \
-		--with-gtk=3 \
 		--without-gnomevfs \
 		--disable-epollloop \
 		--disable-joystick \
@@ -51,8 +51,8 @@ CONFIGURE_ARGS=	--with-libpng=sys \
 CONFIGURE_ENV=	X11BASE="${LOCALBASE}" \
 		ac_cv_header_sys_inotify_h=no
 
-OPTIONS_DEFINE=	GSTREAMER NOTIFY MSPACK NLS WEBKIT
-OPTIONS_DEFAULT=GSTREAMER MSPACK WEBKIT
+OPTIONS_DEFINE=	GSTREAMER NOTIFY MSPACK NLS
+OPTIONS_DEFAULT=GSTREAMER MSPACK
 MSPACK_DESC=	Microsoft archives support
 OPTIONS_SUB=	yes
 
@@ -70,6 +70,27 @@ MSPACK_LIB_DEPENDS=	libmspack.so:archivers/libmspack
 WEBKIT_CONFIGURE_ENABLE=	webview
 WEBKIT_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
+FLAVORS=	gtk3 gtk2
+FLAVOR?=	${FLAVORS:[1]}
+
+.if ${FLAVOR} == gtk3
+USE_GNOME+=	gtk30
+CONFIGURE_ARGS+=	--with-gtk=3
+OPTIONS_DEFINE+=	WEBKIT
+OPTIONS_DEFAULT+=	WEBKIT
+PLIST_SUB+=	GTK2="@comment "
+.else
+USE_GNOME+=	gtk20
+CONFIGURE_ARGS+=	--with-gtk
+PLIST_SUB+=	GTK2="" WEBKIT="@comment "
+.endif
+PLIST_SUB+=	GTKVER=${FLAVOR}
+
+_SHORT_WX_VER=	${PORTVERSION:S/./ /g:[1..2]:ts}
+
+gtk3_CONFLICTS_INSTALL=	${PORTNAME}${_SHORT_WX_VER}-gtk2
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}${_SHORT_WX_VER}-gtk3
+
 .include <bsd.port.pre.mk>
 
 # TLS is broken on armv6/7, PR 229396
diff --git a/x11-toolkits/wxgtk30/pkg-plist b/x11-toolkits/wxgtk30/pkg-plist
index c19bd9a3f287..d8e41a664692 100644
--- a/x11-toolkits/wxgtk30/pkg-plist
+++ b/x11-toolkits/wxgtk30/pkg-plist
@@ -1,5 +1,5 @@
-bin/wxgtk3u-3.0-config
-bin/wxrc-gtk3u-3.0
+bin/wx%%GTKVER%%u-3.0-config
+bin/wxrc-%%GTKVER%%u-3.0
 include/wx-3.0/wx/aboutdlg.h
 include/wx-3.0/wx/accel.h
 include/wx-3.0/wx/access.h
@@ -26,6 +26,7 @@ include/wx-3.0/wx/aui/dockart.h
 include/wx-3.0/wx/aui/floatpane.h
 include/wx-3.0/wx/aui/framemanager.h
 include/wx-3.0/wx/aui/tabart.h
+%%GTK2%%include/wx-3.0/wx/aui/tabartgtk.h
 include/wx-3.0/wx/aui/tabmdi.h
 include/wx-3.0/wx/bannerwindow.h
 include/wx-3.0/wx/base64.h
@@ -177,6 +178,7 @@ include/wx-3.0/wx/generic/dvrenderers.h
 include/wx-3.0/wx/generic/fdrepdlg.h
 include/wx-3.0/wx/generic/filectrlg.h
 include/wx-3.0/wx/generic/filepickerg.h
+%%GTK2%%include/wx-3.0/wx/generic/fontdlgg.h
 include/wx-3.0/wx/generic/fswatcher.h
 include/wx-3.0/wx/generic/grid.h
 include/wx-3.0/wx/generic/gridctrl.h
@@ -265,6 +267,7 @@ 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
+%%GTK2%%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
@@ -716,47 +719,47 @@ lib/libwx_baseu_net-3.0.so.0.5.0
 lib/libwx_baseu_xml-3.0.so
 lib/libwx_baseu_xml-3.0.so.0
 lib/libwx_baseu_xml-3.0.so.0.5.0
-lib/libwx_gtk3u_adv-3.0.so
-lib/libwx_gtk3u_adv-3.0.so.0
-lib/libwx_gtk3u_adv-3.0.so.0.5.0
-lib/libwx_gtk3u_aui-3.0.so
-lib/libwx_gtk3u_aui-3.0.so.0
-lib/libwx_gtk3u_aui-3.0.so.0.5.0
-lib/libwx_gtk3u_core-3.0.so
-lib/libwx_gtk3u_core-3.0.so.0
-lib/libwx_gtk3u_core-3.0.so.0.5.0
-lib/libwx_gtk3u_gl-3.0.so
-lib/libwx_gtk3u_gl-3.0.so.0
-lib/libwx_gtk3u_gl-3.0.so.0.5.0
-lib/libwx_gtk3u_html-3.0.so
-lib/libwx_gtk3u_html-3.0.so.0
-lib/libwx_gtk3u_html-3.0.so.0.5.0
-%%GSTREAMER%%lib/libwx_gtk3u_media-3.0.so
-%%GSTREAMER%%lib/libwx_gtk3u_media-3.0.so.0
-%%GSTREAMER%%lib/libwx_gtk3u_media-3.0.so.0.5.0
-lib/libwx_gtk3u_propgrid-3.0.so
-lib/libwx_gtk3u_propgrid-3.0.so.0
-lib/libwx_gtk3u_propgrid-3.0.so.0.5.0
-lib/libwx_gtk3u_qa-3.0.so
-lib/libwx_gtk3u_qa-3.0.so.0
-lib/libwx_gtk3u_qa-3.0.so.0.5.0
-lib/libwx_gtk3u_ribbon-3.0.so
-lib/libwx_gtk3u_ribbon-3.0.so.0
-lib/libwx_gtk3u_ribbon-3.0.so.0.5.0
-lib/libwx_gtk3u_richtext-3.0.so
-lib/libwx_gtk3u_richtext-3.0.so.0
-lib/libwx_gtk3u_richtext-3.0.so.0.5.0
-lib/libwx_gtk3u_stc-3.0.so
-lib/libwx_gtk3u_stc-3.0.so.0
-lib/libwx_gtk3u_stc-3.0.so.0.5.0
-%%WEBKIT%%lib/libwx_gtk3u_webview-3.0.so
-%%WEBKIT%%lib/libwx_gtk3u_webview-3.0.so.0
-%%WEBKIT%%lib/libwx_gtk3u_webview-3.0.so.0.5.0
-lib/libwx_gtk3u_xrc-3.0.so
-lib/libwx_gtk3u_xrc-3.0.so.0
-lib/libwx_gtk3u_xrc-3.0.so.0.5.0
+lib/libwx_%%GTKVER%%u_adv-3.0.so
+lib/libwx_%%GTKVER%%u_adv-3.0.so.0
+lib/libwx_%%GTKVER%%u_adv-3.0.so.0.5.0
+lib/libwx_%%GTKVER%%u_aui-3.0.so
+lib/libwx_%%GTKVER%%u_aui-3.0.so.0
+lib/libwx_%%GTKVER%%u_aui-3.0.so.0.5.0
+lib/libwx_%%GTKVER%%u_core-3.0.so
+lib/libwx_%%GTKVER%%u_core-3.0.so.0
+lib/libwx_%%GTKVER%%u_core-3.0.so.0.5.0
+lib/libwx_%%GTKVER%%u_gl-3.0.so
+lib/libwx_%%GTKVER%%u_gl-3.0.so.0
+lib/libwx_%%GTKVER%%u_gl-3.0.so.0.5.0
+lib/libwx_%%GTKVER%%u_html-3.0.so
+lib/libwx_%%GTKVER%%u_html-3.0.so.0
+lib/libwx_%%GTKVER%%u_html-3.0.so.0.5.0
+%%GSTREAMER%%lib/libwx_%%GTKVER%%u_media-3.0.so
+%%GSTREAMER%%lib/libwx_%%GTKVER%%u_media-3.0.so.0
+%%GSTREAMER%%lib/libwx_%%GTKVER%%u_media-3.0.so.0.5.0
+lib/libwx_%%GTKVER%%u_propgrid-3.0.so
+lib/libwx_%%GTKVER%%u_propgrid-3.0.so.0
+lib/libwx_%%GTKVER%%u_propgrid-3.0.so.0.5.0
+lib/libwx_%%GTKVER%%u_qa-3.0.so
+lib/libwx_%%GTKVER%%u_qa-3.0.so.0
+lib/libwx_%%GTKVER%%u_qa-3.0.so.0.5.0
+lib/libwx_%%GTKVER%%u_ribbon-3.0.so
+lib/libwx_%%GTKVER%%u_ribbon-3.0.so.0
+lib/libwx_%%GTKVER%%u_ribbon-3.0.so.0.5.0
+lib/libwx_%%GTKVER%%u_richtext-3.0.so
+lib/libwx_%%GTKVER%%u_richtext-3.0.so.0
+lib/libwx_%%GTKVER%%u_richtext-3.0.so.0.5.0
+lib/libwx_%%GTKVER%%u_stc-3.0.so
+lib/libwx_%%GTKVER%%u_stc-3.0.so.0
+lib/libwx_%%GTKVER%%u_stc-3.0.so.0.5.0
+%%WEBKIT%%lib/libwx_%%GTKVER%%u_webview-3.0.so
+%%WEBKIT%%lib/libwx_%%GTKVER%%u_webview-3.0.so.0
+%%WEBKIT%%lib/libwx_%%GTKVER%%u_webview-3.0.so.0.5.0
+lib/libwx_%%GTKVER%%u_xrc-3.0.so
+lib/libwx_%%GTKVER%%u_xrc-3.0.so.0
+lib/libwx_%%GTKVER%%u_xrc-3.0.so.0.5.0
 %%WEBKIT%%lib/wx/3.0/web-extensions/webkit2_extu-3.0.so
-lib/wx/include/gtk3-unicode-3.0/wx/setup.h
+lib/wx/include/%%GTKVER%%-unicode-3.0/wx/setup.h
 share/aclocal/wxwin30.m4
 share/bakefile/presets/wx30.bkl
 share/bakefile/presets/wx30_presets.py