[pkgsrc/trunk]: pkgsrc/devel/geany devel/geany: add optional GTK3 support

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f38d18148252
branches:  trunk
changeset: 329361:f38d18148252
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Wed Feb 06 01:49:32 2019 +0000

description:
devel/geany: add optional GTK3 support

Add the option of using GTK3 as the base X11 toolkit, rather than GTK2.
Bump PKGREVISION to indicate this new option, though the default build
doesn't change.

diffstat:

 devel/geany/Makefile   |   7 ++++---
 devel/geany/PLIST      |   7 +++++--
 devel/geany/options.mk |  20 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diffs (70 lines):

diff -r 6f078f361e22 -r f38d18148252 devel/geany/Makefile
--- a/devel/geany/Makefile      Wed Feb 06 01:43:42 2019 +0000
+++ b/devel/geany/Makefile      Wed Feb 06 01:49:32 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2019/01/28 04:10:14 gutteridge Exp $
+# $NetBSD: Makefile,v 1.58 2019/02/06 01:49:32 gutteridge Exp $
 
 DISTNAME=      geany-1.34.1
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://download.geany.org/
 EXTRACT_SUFX=  .tar.bz2
@@ -32,9 +33,9 @@
 BUILDLINK_TRANSFORM+=  rm:-lstdc++
 .endif
 
+.include "options.mk"
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6f078f361e22 -r f38d18148252 devel/geany/PLIST
--- a/devel/geany/PLIST Wed Feb 06 01:43:42 2019 +0000
+++ b/devel/geany/PLIST Wed Feb 06 01:49:32 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2019/01/28 04:10:14 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.15 2019/02/06 01:49:32 gutteridge Exp $
 bin/geany
 include/geany/app.h
 include/geany/build.h
@@ -152,8 +152,11 @@
 share/geany/filedefs/filetypes.yaml
 share/geany/filedefs/filetypes.zephir
 share/geany/filetype_extensions.conf
+${PLIST.gtk3}share/geany/geany-3.0.css
+${PLIST.gtk3}share/geany/geany-3.20.css
+${PLIST.gtk3}share/geany/geany.css
 share/geany/geany.glade
-share/geany/geany.gtkrc
+${PLIST.gtk2}share/geany/geany.gtkrc
 share/geany/snippets.conf
 share/geany/tags/entities.html.tags
 share/geany/tags/std.pas.tags
diff -r 6f078f361e22 -r f38d18148252 devel/geany/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/geany/options.mk    Wed Feb 06 01:49:32 2019 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2019/02/06 01:49:32 gutteridge Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.geany
+PKG_OPTIONS_REQUIRED_GROUPS+=  toolkit
+PKG_OPTIONS_GROUP.toolkit=     gtk2 gtk3
+PKG_SUGGESTED_OPTIONS=         gtk2
+
+PLIST_VARS+=   gtk2 gtk3
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtk3)
+.include "../../x11/gtk3/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-gtk3
+PLIST.gtk3=            yes
+.else
+.include "../../x11/gtk2/buildlink3.mk"
+# No CONFIGURE_ARGS needed, it's the default
+PLIST.gtk2=            yes
+.endif