CVS commit: pkgsrc/devel/geany

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Feb  6 01:49:32 UTC 2019

Modified Files:
        pkgsrc/devel/geany: Makefile PLIST
Added Files:
        pkgsrc/devel/geany: options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/devel/geany/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/geany/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/geany/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/geany/Makefile
diff -u pkgsrc/devel/geany/Makefile:1.57 pkgsrc/devel/geany/Makefile:1.58
--- pkgsrc/devel/geany/Makefile:1.57    Mon Jan 28 04:10:14 2019
+++ pkgsrc/devel/geany/Makefile Wed Feb  6 01:49:32 2019
@@ -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 @@ CONFIGURE_ARGS+=      CC=sunpro
 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"

Index: pkgsrc/devel/geany/PLIST
diff -u pkgsrc/devel/geany/PLIST:1.14 pkgsrc/devel/geany/PLIST:1.15
--- pkgsrc/devel/geany/PLIST:1.14       Mon Jan 28 04:10:14 2019
+++ pkgsrc/devel/geany/PLIST    Wed Feb  6 01:49:32 2019
@@ -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.xml
 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

Added files:

Index: pkgsrc/devel/geany/options.mk
diff -u /dev/null pkgsrc/devel/geany/options.mk:1.1
--- /dev/null   Wed Feb  6 01:49:32 2019
+++ pkgsrc/devel/geany/options.mk       Wed Feb  6 01:49:32 2019
@@ -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