picom: install the sample config

5 files changed, 32 insertions, 10 deletions

diff --git a/x11/picom/Makefile b/x11/picom/Makefile
index 9e7422a57ce..d1cd170e980 100644
--- a/x11/picom/Makefile
+++ b/x11/picom/Makefile
@@ -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"
diff --git a/x11/picom/PLIST b/x11/picom/PLIST
index 5b8e6d699b8..efb3a8d1100 100644
--- a/x11/picom/PLIST
+++ b/x11/picom/PLIST
@@ -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
diff --git a/x11/picom/distinfo b/x11/picom/distinfo
index d1e7c3fc894..a5a823ff119 100644
--- a/x11/picom/distinfo
+++ b/x11/picom/distinfo
@@ -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
diff --git a/x11/picom/hacks.mk b/x11/picom/hacks.mk
index b513d2f5d3f..ad35552f839 100644
--- a/x11/picom/hacks.mk
+++ b/x11/picom/hacks.mk
@@ -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
 
diff --git a/x11/picom/patches/patch-man_meson.build b/x11/picom/patches/patch-man_meson.build
new file mode 100644
index 00000000000..c475f182e81
--- /dev/null
+++ b/x11/picom/patches/patch-man_meson.build
@@ -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