CVS commit: pkgsrc/x11/vte3

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov 17 12:05:01 UTC 2020

Modified Files:
        pkgsrc/x11/vte3: Makefile PLIST distinfo
Added Files:
        pkgsrc/x11/vte3/patches: patch-src_meson.build

Log Message:
vte3: Do not install files to SYSCONFDIR. Use CONF_FILES.

Should fix the build on systems where SYSCONFDIR exists outside of
PREFIX.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/x11/vte3/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/vte3/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/vte3/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/vte3/patches/patch-src_meson.build

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.33 pkgsrc/x11/vte3/Makefile:1.34
--- pkgsrc/x11/vte3/Makefile:1.33       Sat Nov  7 10:05:11 2020
+++ pkgsrc/x11/vte3/Makefile    Tue Nov 17 12:05:01 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2020/11/07 10:05:11 nia Exp $
+# $NetBSD: Makefile,v 1.34 2020/11/17 12:05:01 nia Exp $
 
 DISTNAME=      vte-0.60.3
 PKGNAME=       ${DISTNAME:S/vte/vte3/}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/vte/0.60/}
 EXTRACT_SUFX=  .tar.xz
@@ -16,7 +16,7 @@ PKGCONFIG_OVERRIDE_STAGE=     post-configure
 PKGCONFIG_OVERRIDE+=           output/meson-private/vte-2.91.pc
 
 GNU_CONFIGURE=         yes
-USE_TOOLS+=            gmake intltool msgfmt pkg-config bash
+USE_TOOLS+=            msgfmt pkg-config bash
 USE_LANGUAGES=         c c++17
 # for c++17
 GCC_REQD+=             7
@@ -25,6 +25,12 @@ GCC_REQD+=           7
 # have libsystemd.
 MESON_ARGS+=           -D_systemd=false
 
+CONF_FILES+=           ${PREFIX}/share/examples/profile.d/vte.sh \
+                       ${PKG_SYSCONFDIR}/profile.d/vte.sh
+
+CONF_FILES+=           ${PREFIX}/share/examples/profile.d/vte.csh \
+                       ${PKG_SYSCONFDIR}/profile.d/vte.csh
+
 .include "options.mk"
 .include "../../devel/meson/build.mk"
 .include "../../converters/fribidi/buildlink3.mk"

Index: pkgsrc/x11/vte3/PLIST
diff -u pkgsrc/x11/vte3/PLIST:1.5 pkgsrc/x11/vte3/PLIST:1.6
--- pkgsrc/x11/vte3/PLIST:1.5   Sat Jun 20 00:10:24 2020
+++ pkgsrc/x11/vte3/PLIST       Tue Nov 17 12:05:01 2020
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2020/06/20 00:10:24 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/11/17 12:05:01 nia Exp $
 bin/vte-2.91
-etc/profile.d/vte.csh
-etc/profile.d/vte.sh
 include/vte-2.91/vte/vte.h
 include/vte-2.91/vte/vtedeprecated.h
 include/vte-2.91/vte/vteenums.h
@@ -18,6 +16,8 @@ lib/libvte-2.91.so.0
 lib/libvte-2.91.so.0.6000.3
 lib/pkgconfig/vte-2.91.pc
 libexec/vte-urlencode-cwd
+share/examples/profile.d/vte.csh
+share/examples/profile.d/vte.sh
 share/gir-1.0/Vte-2.91.gir
 share/locale/am/LC_MESSAGES/vte-2.91.mo
 share/locale/an/LC_MESSAGES/vte-2.91.mo

Index: pkgsrc/x11/vte3/distinfo
diff -u pkgsrc/x11/vte3/distinfo:1.13 pkgsrc/x11/vte3/distinfo:1.14
--- pkgsrc/x11/vte3/distinfo:1.13       Fri Sep 25 08:51:41 2020
+++ pkgsrc/x11/vte3/distinfo    Tue Nov 17 12:05:01 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2020/09/25 08:51:41 jperkin Exp $
+$NetBSD: distinfo,v 1.14 2020/11/17 12:05:01 nia Exp $
 
 SHA1 (vte-0.60.3.tar.xz) = ba1e2f241326a2e146336832c21c41b61e0e55af
 RMD160 (vte-0.60.3.tar.xz) = 2615d28eaaf9293038f305d26e62e049f503064a
@@ -9,6 +9,7 @@ SHA1 (patch-meson.build) = ac82a0168f221
 SHA1 (patch-src_app_app.cc) = ff76c74840342195a4d318418474f69e385f6571
 SHA1 (patch-src_decoder-cat.cc) = 438b934314a440f04ab586022fdb057b6512167b
 SHA1 (patch-src_dumpkeys.c) = 102f24d7404d46b13194f3431d0a864d480e5da7
+SHA1 (patch-src_meson.build) = a8e159688fb36e4cfac40249e279a670c9c6cda8
 SHA1 (patch-src_mev.c) = b38dc42e02a8d5fa1e579349319f0b8c8b31dbce
 SHA1 (patch-src_parser-cat.cc) = 2ee7d7113b4688a631021bcbef13ee6196f534e9
 SHA1 (patch-src_pty.cc) = a9f52d89f356eb0a34de90748a7881d34ae27f12

Added files:

Index: pkgsrc/x11/vte3/patches/patch-src_meson.build
diff -u /dev/null pkgsrc/x11/vte3/patches/patch-src_meson.build:1.1
--- /dev/null   Tue Nov 17 12:05:01 2020
+++ pkgsrc/x11/vte3/patches/patch-src_meson.build       Tue Nov 17 12:05:01 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_meson.build,v 1.1 2020/11/17 12:05:01 nia Exp $
+
+Install config files to examples.
+
+--- src/meson.build.orig       2020-05-13 09:51:07.000000000 +0000
++++ src/meson.build
+@@ -555,7 +555,7 @@ vte_csh = configure_file(
+     'libexecdir': vte_prefix / vte_libexecdir,
+   },
+   install: true,
+-  install_dir: vte_sysconfdir / 'profile.d',
++  install_dir: vte_datadir / 'examples' / 'profile.d',
+ )
+ 
+ vte_sh = configure_file(
+@@ -565,7 +565,7 @@ vte_sh = configure_file(
+     'libexecdir': vte_prefix / vte_libexecdir,
+   },
+   install: true,
+-  install_dir: vte_sysconfdir / 'profile.d',
++  install_dir: vte_datadir / 'examples' / 'profile.d',
+ )
+ 
+ # Systemd integration