compton has switched from gmake to meson. Update Makefile so options actually take effect

5 files changed, 38 insertions, 12 deletions

diff --git a/x11/compton/Makefile b/x11/compton/Makefile
index 7003ff59675..e1bc46d1e3d 100644
--- a/x11/compton/Makefile
+++ b/x11/compton/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2019/10/07 09:28:13 prlw1 Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/21 15:56:53 pho Exp $
 
 DISTNAME=	compton-7.3
+PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_GITHUB:=yshui/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -14,10 +15,11 @@ BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
 
 REPLACE_PYTHON=	bin/compton-convgen.py
 EXTRACT_USING=	bsdtar
-USE_TOOLS+=	gmake pkg-config
-BUILD_TARGET=	compton docs
-MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}/man1
-MAKE_FLAGS+=	COMPTON_VERSION=${PKGVERSION}
+USE_TOOLS+=	pkg-config
+MESON_ARGS+=	-Dbuild_docs=true
+
+# Needs a patch to meson_options.txt and meson.build. Probably not worth it.
+#MAKE_FLAGS+=	COMPTON_VERSION=${PKGVERSION}
 
 # compton uses __auto_type which is only available as of GCC 4.9.
 GCC_REQD+=	4.9
diff --git a/x11/compton/PLIST b/x11/compton/PLIST
index 6448beb6eae..0aaf6d24920 100644
--- a/x11/compton/PLIST
+++ b/x11/compton/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2019/03/01 17:11:23 youri Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/10/21 15:56:53 pho Exp $
 bin/compton
 bin/compton-convgen.py
 bin/compton-trans
+man/man1/compton-trans.1
+man/man1/compton.1
 share/applications/compton.desktop
 share/examples/compton/compton.sample.conf
 share/icons/hicolor/48x48/apps/compton.png
diff --git a/x11/compton/distinfo b/x11/compton/distinfo
index caf31dd980c..e2ef62f95d9 100644
--- a/x11/compton/distinfo
+++ b/x11/compton/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.6 2019/09/17 11:43:29 tnn Exp $
+$NetBSD: distinfo,v 1.7 2019/10/21 15:56:53 pho Exp $
 
 SHA1 (compton-7.3.tar.gz) = c899bb76dd5e2eecce3e99ea5386e07f52448491
 RMD160 (compton-7.3.tar.gz) = c8c0a608e2327f2fda773ee18f1e629150fb1555
 SHA512 (compton-7.3.tar.gz) = 5a8fd294a8f39fd926029e872f0c8c998ccc105cb408b058539659f74446ea94862fb6b8d88b370576c73d8b18d846a12d9c0240348c6b758eec4e8550945aac
 Size (compton-7.3.tar.gz) = 218892 bytes
+SHA1 (patch-man_meson.build) = c00a05f1e5a609fc768a7cb7a29737c690ab4250
 SHA1 (patch-meson.build) = c39a4e0da8b7e6e5d3af38ea005e7915cd5e10ab
 SHA1 (patch-src_compiler.h) = 0b853c6d864a3e5ad78e1b494725aa5b19d331b8
 SHA1 (patch-src_utils.h) = 386a7fea89e12b966b9ac38df428b689ad2b63f3
diff --git a/x11/compton/options.mk b/x11/compton/options.mk
index 6b1585f9db5..d5e34586132 100644
--- a/x11/compton/options.mk
+++ b/x11/compton/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2018/12/01 13:23:51 nia Exp $
+# $NetBSD: options.mk,v 1.2 2019/10/21 15:56:53 pho Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.compton
 PKG_SUPPORTED_OPTIONS=	dbus libdrm opengl pcre
@@ -9,23 +9,23 @@ PKG_SUGGESTED_OPTIONS=	dbus libdrm opengl pcre
 .if !empty(PKG_OPTIONS:Mdbus)
 .include "../../sysutils/dbus/buildlink3.mk"
 .else
-MAKE_FLAGS+=	NO_DBUS=1
+MESON_ARGS+=	-Ddbus=false
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibdrm)
 .include "../../x11/libdrm/buildlink3.mk"
 .else
-MAKE_FLAGS+=	NO_VSYNC_DRM=1
+MESON_ARGS+=	-Dvsync_drm=false
 .endif
 
 .if !empty(PKG_OPTIONS:Mopengl)
 .include "../../graphics/MesaLib/buildlink3.mk"
 .else
-MAKE_FLAGS+=	NO_OPENGL=1
+MESON_ARGS+=	-Dopengl=false
 .endif
 
 .if !empty(PKG_OPTIONS:Mpcre)
 .include "../../devel/pcre/buildlink3.mk"
 .else
-MAKE_FLAGS+=	NO_REGEX_PCRE=1
+MESON_ARGS+=	-Dregex=false
 .endif
diff --git a/x11/compton/patches/patch-man_meson.build b/x11/compton/patches/patch-man_meson.build
new file mode 100644
index 00000000000..d67919acdc8
--- /dev/null
+++ b/x11/compton/patches/patch-man_meson.build
@@ -0,0 +1,21 @@
+$NetBSD: patch-man_meson.build,v 1.1 2019/10/21 15:56:53 pho Exp $
+
+Don't hardcode the man path.
+
+--- man/meson.build.orig	2019-08-18 21:40:33.000000000 +0000
++++ man/meson.build
+@@ -1,12 +1,13 @@
+ mans = ['compton.1', 'compton-trans.1']
+ if get_option('build_docs')
+ 	a2x = find_program('a2x')
++	mandir = get_option('mandir')
+ 	foreach m : mans
+ 		custom_target(m, output: [m], input: [m+'.asciidoc'],
+ 		              command: [a2x, '-a',
+ 		                        'compton-version='+version,
+ 		                        '--format', 'manpage', '@INPUT@', '-D',
+ 		                        meson.current_build_dir()],
+-		              install: true, install_dir: 'share/man/man1/')
++		              install: true, install_dir: mandir+'/man1')
+ 	endforeach
+ endif