CVS commit: pkgsrc/x11/vte3

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Nov  7 10:05:12 UTC 2020

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

Log Message:
vte3: Make icu support optional.

According to upstream it's only used for legacy charset support, and
doesn't seem to be enabled in some popular Linux distributions I checked.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/vte3/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/vte3/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/vte3/Makefile
diff -u pkgsrc/x11/vte3/Makefile:1.32 pkgsrc/x11/vte3/Makefile:1.33
--- pkgsrc/x11/vte3/Makefile:1.32       Thu Nov  5 09:09:29 2020
+++ pkgsrc/x11/vte3/Makefile    Sat Nov  7 10:05:11 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2020/11/05 09:09:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.33 2020/11/07 10:05:11 nia Exp $
 
 DISTNAME=      vte-0.60.3
 PKGNAME=       ${DISTNAME:S/vte/vte3/}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/vte/0.60/}
 EXTRACT_SUFX=  .tar.xz
@@ -25,6 +25,7 @@ GCC_REQD+=            7
 # have libsystemd.
 MESON_ARGS+=           -D_systemd=false
 
+.include "options.mk"
 .include "../../devel/meson/build.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -34,7 +35,6 @@ MESON_ARGS+=          -D_systemd=false
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/vala/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"

Added files:

Index: pkgsrc/x11/vte3/options.mk
diff -u /dev/null pkgsrc/x11/vte3/options.mk:1.1
--- /dev/null   Sat Nov  7 10:05:12 2020
+++ pkgsrc/x11/vte3/options.mk  Sat Nov  7 10:05:11 2020
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2020/11/07 10:05:11 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.vte3
+PKG_SUPPORTED_OPTIONS= icu
+
+.include "../../mk/bsd.options.mk"
+
+#
+# Enable legacy charsets support.
+#
+.if !empty(PKG_OPTIONS:Micu)
+.  include "../../textproc/icu/buildlink3.mk"
+MESON_ARGS+=   -Dicu=true
+.else
+MESON_ARGS+=   -Dicu=false
+.endif