Update to 5.1:

Notable changes since v4:


    Config file search order makes more sense now. Make sure user config files are always preferred over system ones. c11c24b
    Fixed handling of -h. 9d64dec



    Makefile has been removed.
    Shadow calculation is a bit different now. There shouldn't be much actual visual difference, but you would need to increase your shadow radius by about 50% to keep what you have now. (dffde06)
    wintypes options actually overrides the global options now. Previously, setting shadow = false for a wintype when the global shadow option is true has no effect. Now that actually disables shadow for that specific wintype. (f97cf48)
    New config file path: ~/.config/compton/compton.conf (#62)
    compton now relies on libxdg-basedir for finding config files. (94b1bc0)
    Better logging (#67).

4 files changed, 13 insertions, 39 deletions

diff --git a/x11/compton/Makefile b/x11/compton/Makefile
index 4d1a92b0df3..d4d8874f57a 100644
--- a/x11/compton/Makefile
+++ b/x11/compton/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2018/12/13 14:39:24 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2019/03/01 17:11:23 youri Exp $
 
-DISTNAME=	compton-4.0
+DISTNAME=	compton-5.1
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_GITHUB:=yshui/}
-GITHUB_TAG=	v4
+GITHUB_TAG=	v5.1
 
 MAINTAINER=	nia@NetBSD.org
 HOMEPAGE=	https://github.com/yshui/compton
@@ -12,9 +12,9 @@ LICENSE=	mit AND mpl-2.0
 
 BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
 
+REPLACE_PYTHON=	bin/compton-convgen.py
 EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake pkg-config
-NO_CONFIGURE=	yes
 BUILD_TARGET=	compton docs
 MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}/man1
 MAKE_FLAGS+=	COMPTON_VERSION=${PKGVERSION}
@@ -26,6 +26,7 @@ post-install:
 		${DESTDIR}${PREFIX}/share/examples/compton
 
 .include "options.mk"
+.include "../../devel/py-meson/build.mk"
 .include "../../devel/libconfig/buildlink3.mk"
 .include "../../devel/libev/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -33,6 +34,7 @@ post-install:
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libxdg-basedir/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../x11/xcb-util-image/buildlink3.mk"
 .include "../../x11/xcb-util-renderutil/buildlink3.mk"
diff --git a/x11/compton/PLIST b/x11/compton/PLIST
index ccdfa6c34ac..6448beb6eae 100644
--- a/x11/compton/PLIST
+++ b/x11/compton/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2015/09/26 07:25:59 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/03/01 17:11:23 youri 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 a05d9294f72..5c9d7d8fe94 100644
--- a/x11/compton/distinfo
+++ b/x11/compton/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2018/12/01 13:23:51 nia Exp $
+$NetBSD: distinfo,v 1.4 2019/03/01 17:11:23 youri Exp $
 
-SHA1 (compton-4.0.tar.gz) = f94eb9f964f2cc7c547a153c1f7e435bbaa32c8d
-RMD160 (compton-4.0.tar.gz) = f283e11f9d33b79d3c57c7d52e9013d0539b2e01
-SHA512 (compton-4.0.tar.gz) = ba585df25792519b8093a5a91d62ca2d3b02dd9df41d787dc4007cee5c8aef7cd0a3c267b58d21026c97b7859f7c5376384dffb7da728a99ccc4122a2ae43679
-Size (compton-4.0.tar.gz) = 171662 bytes
-SHA1 (patch-Makefile) = 240dcfc712d9697399a747f4c668a6c86fec317d
+SHA1 (compton-5.1.tar.gz) = 323904b6305dbf32c1bb7355d75ba4f8f50e9fd1
+RMD160 (compton-5.1.tar.gz) = b1d05080aaa7db33d3500620c77ea41377ee2816
+SHA512 (compton-5.1.tar.gz) = 61f88019b2b4ef06e5c6a155f913b0b1c0ab7d077be5af14104596cebe0428ba6d0d98399e3c450c494945a1d4727446b2f3631989dc766439112527a9d0a888
+Size (compton-5.1.tar.gz) = 199770 bytes
diff --git a/x11/compton/patches/patch-Makefile b/x11/compton/patches/patch-Makefile
deleted file mode 100644
index 4a631dd0d87..00000000000
--- a/x11/compton/patches/patch-Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2018/12/01 13:23:51 nia Exp $
-
-Fix undefined symbols.
-
-Honour CFLAGS.
-
---- Makefile.orig	2018-11-19 12:26:47.000000000 +0000
-+++ Makefile
-@@ -9,14 +9,14 @@ MANDIR ?= $(PREFIX)/share/man/man1
- APPDIR ?= $(PREFIX)/share/applications
- ICODIR ?= $(PREFIX)/share/icons/hicolor/
- 
--PACKAGES = x11 x11-xcb xcb-renderutil xcb-render xcb-damage xcb-randr xcb-composite xcb-shape xcb-image xcb-xfixes xext pixman-1
-+PACKAGES = x11 x11-xcb xcb-renderutil xcb-render xcb-damage xcb-randr xcb-composite xcb-shape xcb-image xcb-xfixes xext pixman-1 xcb-present
- LIBS = -lm -lrt -lev
- INCS =
- 
--OBJS = compton.o config.o win.o x.o
-+OBJS = compton.o config.o diagnostic.o win.o x.o
- 
- # === Configuration flags ===
--CFG = -std=c11 -D_GNU_SOURCE -Wall -Wextra -Wno-unused-parameter -Wnonnull
-+CFG = $(CFLAGS) -std=c11 -D_GNU_SOURCE -Wall -Wextra -Wno-unused-parameter -Wnonnull
- 
- ifeq "$(CC)" "clang"
-   CFG += -Wconditional-uninitialized