Received: by mail.netbsd.org (Postfix, from userid 605) id BB79184D84; Fri, 29 Jul 2022 21:16:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F3BD184D40 for ; Fri, 29 Jul 2022 21:16:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id AsqQeoaLIg_6 for ; Fri, 29 Jul 2022 21:16:33 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2A5BC84C71 for ; Fri, 29 Jul 2022 21:16:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2380AFB1A; Fri, 29 Jul 2022 21:16:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1659129393254980" MIME-Version: 1.0 Date: Fri, 29 Jul 2022 21:16:33 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/x11/picom To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20220729211633.2380AFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1659129393254980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Fri Jul 29 21:16:33 UTC 2022 Modified Files: pkgsrc/x11/picom: Makefile PLIST distinfo hacks.mk Added Files: pkgsrc/x11/picom/patches: patch-man_meson.build Log Message: picom: install the sample config To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/picom/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/picom/PLIST pkgsrc/x11/picom/hacks.mk cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/picom/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/x11/picom/patches/patch-man_meson.build Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1659129393254980 Content-Disposition: inline Content-Length: 4146 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/picom/Makefile diff -u pkgsrc/x11/picom/Makefile:1.6 pkgsrc/x11/picom/Makefile:1.7 --- pkgsrc/x11/picom/Makefile:1.6 Mon Apr 12 11:01:56 2021 +++ pkgsrc/x11/picom/Makefile Fri Jul 29 21:16:32 2022 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2021/04/12 11:01:56 nia Exp $ +# $NetBSD: Makefile,v 1.7 2022/07/29 21:16:32 tnn Exp $ DISTNAME= picom-8.2 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=yshui/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -10,22 +11,25 @@ HOMEPAGE= https://github.com/yshui/picom COMMENT= Lightweight compositor for X11 (fork of Compton) LICENSE= mpl-2.0 AND mit -USE_TOOLS+= pkg-config -USE_LANGUAGES= c c++ - CONFLICTS+= compton-[0-9]* SUPERSEDES+= compton-[0-9]* TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc -MESON_ARGS+= -Dwith_docs=true - +USE_TOOLS+= pkg-config +USE_LANGUAGES= c c++ +MESON_ARGS+= -Dwith_docs=true REPLACE_SH+= bin/picom-trans - PYTHON_FOR_BUILD_ONLY= tool +INSTALLATION_DIRS+= share/examples/picom + +SUBST_CLASSES+= mandir +SUBST_STAGE.mandir= pre-configure +SUBST_FILES.mandir= man/meson.build +SUBST_VARS.mandir= PKGMANDIR post-install: - ${MV} ${DESTDIR}${PREFIX}/share/man ${DESTDIR}${PREFIX}/${PKGMANDIR} || ${TRUE} + ${INSTALL_DATA} ${WRKSRC}/picom.sample.conf ${DESTDIR}${PREFIX}/share/examples/picom/picom.sample.conf .include "options.mk" .include "../../devel/meson/build.mk" Index: pkgsrc/x11/picom/PLIST diff -u pkgsrc/x11/picom/PLIST:1.2 pkgsrc/x11/picom/PLIST:1.3 --- pkgsrc/x11/picom/PLIST:1.2 Sat May 2 11:23:04 2020 +++ pkgsrc/x11/picom/PLIST Fri Jul 29 21:16:32 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2020/05/02 11:23:04 tnn Exp $ +@comment $NetBSD: PLIST,v 1.3 2022/07/29 21:16:32 tnn Exp $ bin/compton bin/compton-trans bin/picom @@ -7,5 +7,6 @@ man/man1/picom-trans.1 man/man1/picom.1 share/applications/compton.desktop share/applications/picom.desktop +share/examples/picom/picom.sample.conf share/icons/hicolor/48x48/apps/compton.png share/icons/hicolor/scalable/apps/compton.svg Index: pkgsrc/x11/picom/hacks.mk diff -u pkgsrc/x11/picom/hacks.mk:1.2 pkgsrc/x11/picom/hacks.mk:1.3 --- pkgsrc/x11/picom/hacks.mk:1.2 Tue May 24 09:53:51 2022 +++ pkgsrc/x11/picom/hacks.mk Fri Jul 29 21:16:32 2022 @@ -1,3 +1,5 @@ +# $NetBSD: hacks.mk,v 1.3 2022/07/29 21:16:32 tnn Exp $ + .if !defined(PICOM_HACKS_MK) PICOM_HACKS_MK= defined Index: pkgsrc/x11/picom/distinfo diff -u pkgsrc/x11/picom/distinfo:1.7 pkgsrc/x11/picom/distinfo:1.8 --- pkgsrc/x11/picom/distinfo:1.7 Tue Oct 26 11:34:18 2021 +++ pkgsrc/x11/picom/distinfo Fri Jul 29 21:16:32 2022 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.7 2021/10/26 11:34:18 nia Exp $ +$NetBSD: distinfo,v 1.8 2022/07/29 21:16:32 tnn Exp $ BLAKE2s (picom-8.2.tar.gz) = 7875bdc50acd5a81e0eb2871b3c42ac1962f8d23d3c72428c9735717bd0da2c4 SHA512 (picom-8.2.tar.gz) = bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1 Size (picom-8.2.tar.gz) = 242653 bytes +SHA1 (patch-man_meson.build) = 987bf5451443f0a6d7cd50319052d1f48a0557fe SHA1 (patch-src_c2.c) = ef49d0b02691b495b625423c832c603852045a73 SHA1 (patch-src_config.c) = ffffb13adcf2e6767813fdaade83793d074f4cf5 SHA1 (patch-src_dbus.c) = 191ff5f507b882bac219174a89d887fd6aaf231a Added files: Index: pkgsrc/x11/picom/patches/patch-man_meson.build diff -u /dev/null pkgsrc/x11/picom/patches/patch-man_meson.build:1.1 --- /dev/null Fri Jul 29 21:16:33 2022 +++ pkgsrc/x11/picom/patches/patch-man_meson.build Fri Jul 29 21:16:32 2022 @@ -0,0 +1,14 @@ +$NetBSD: patch-man_meson.build,v 1.1 2022/07/29 21:16:32 tnn Exp $ + +Honour PKGMANDIR. + +--- man/meson.build.orig 2020-10-24 08:44:12.000000000 +0000 ++++ man/meson.build +@@ -7,6 +7,6 @@ if get_option('with_docs') + 'picom-version='+version, + '--format', 'manpage', '@INPUT@', '-D', + meson.current_build_dir()], +- install: true, install_dir: 'share/man/man1/') ++ install: true, install_dir: '@PKGMANDIR@/man1/') + endforeach + endif --_----------=_1659129393254980--