diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2019-02-06 01:49:32 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2019-02-06 01:49:32 +0000 |
| commit | c3cff9bb8664d8170343d64ae3eeda8c612339ba (patch) | |
| tree | 7b51a333c1310a4299c6335fd8ed81a08450a544 | |
| parent | 1b4693eb607dea000b4c66031f14fcdceaf0e5ab (diff) | |
| download | pkgsrc-c3cff9bb8664d8170343d64ae3eeda8c612339ba.tar.gz | |
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.
| -rw-r--r-- | devel/geany/Makefile | 7 | ||||
| -rw-r--r-- | devel/geany/PLIST | 7 | ||||
| -rw-r--r-- | devel/geany/options.mk | 20 |
3 files changed, 29 insertions, 5 deletions
diff --git a/devel/geany/Makefile b/devel/geany/Makefile index 31abf6172df..9529df19b9f 100644 --- a/devel/geany/Makefile +++ b/devel/geany/Makefile @@ -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" diff --git a/devel/geany/PLIST b/devel/geany/PLIST index ff7df290c64..e40b8053107 100644 --- a/devel/geany/PLIST +++ b/devel/geany/PLIST @@ -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 diff --git a/devel/geany/options.mk b/devel/geany/options.mk new file mode 100644 index 00000000000..9c02ea391e2 --- /dev/null +++ b/devel/geany/options.mk @@ -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 |