CVS commit: pkgsrc/x11/lxterminal

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Apr  8 22:31:47 UTC 2022

Modified Files:
        pkgsrc/x11/lxterminal: Makefile
Added Files:
        pkgsrc/x11/lxterminal: options.mk

Log Message:
lxterminal: add optional GTK3 support

Add the option of using GTK3 as the base X11 toolkit, rather than GTK2.
(No change to default build.)


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/lxterminal/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/lxterminal/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/x11/lxterminal/Makefile
diff -u pkgsrc/x11/lxterminal/Makefile:1.21 pkgsrc/x11/lxterminal/Makefile:1.22
--- pkgsrc/x11/lxterminal/Makefile:1.21 Wed Dec  8 16:07:09 2021
+++ pkgsrc/x11/lxterminal/Makefile      Fri Apr  8 22:31:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/12/08 16:07:09 adam Exp $
+# $NetBSD: Makefile,v 1.22 2022/04/08 22:31:47 gutteridge Exp $
 
 DISTNAME=      lxterminal-0.4.0
 PKGREVISION=   1
@@ -16,8 +16,8 @@ USE_TOOLS+=   gmake intltool pkg-config ms
 
 LDFLAGS.SunOS+=        -lsocket
 
+.include "options.mk"
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/vte/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/x11/lxterminal/options.mk
diff -u /dev/null pkgsrc/x11/lxterminal/options.mk:1.1
--- /dev/null   Fri Apr  8 22:31:47 2022
+++ pkgsrc/x11/lxterminal/options.mk    Fri Apr  8 22:31:47 2022
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2022/04/08 22:31:47 gutteridge Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.lxterminal
+PKG_OPTIONS_REQUIRED_GROUPS+=  toolkit
+PKG_OPTIONS_GROUP.toolkit=     gtk2 gtk3
+PKG_SUGGESTED_OPTIONS=         gtk2
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtk3)
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/vte029/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-gtk3
+.else
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/vte/buildlink3.mk"
+# No CONFIGURE_ARGS needed, it's the default
+.endif