wm/wmutils-core: update to 1.6

Bumping four versions, see upstream for changes,
too many to list here.

4 files changed, 25 insertions, 28 deletions

diff --git a/wm/wmutils-core/DESCR b/wm/wmutils-core/DESCR
index c3640d16cca..0df38b8cf4f 100644
--- a/wm/wmutils-core/DESCR
+++ b/wm/wmutils-core/DESCR
@@ -4,19 +4,3 @@ of a window manager into separate pieces.
 
 Using these tools, you can build your own window manager
 as a shell script. Think of wmutils as coreutils for X11.
-
-Here is the list of the core utilities composing wmutils:
-
-chwb: change window's border
-chwso: change window's stacking order
-ignw: ignore/unignore window
-killw: kill windows
-lsw: list windows
-mapw: map/unmap windows
-pfw: print focused window
-wattr: show window's attributes
-wmp: move the mouse pointer
-wmv: move a window
-wrs: resize a window
-wtf: focus a window
-wtp: teleport a window
diff --git a/wm/wmutils-core/Makefile b/wm/wmutils-core/Makefile
index cc27c73b1b0..355bef7af2a 100644
--- a/wm/wmutils-core/Makefile
+++ b/wm/wmutils-core/Makefile
@@ -1,20 +1,29 @@
-# $NetBSD: Makefile,v 1.2 2017/09/06 10:40:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/02/11 09:47:34 pin Exp $
 
-DISTNAME=	wmutils-core-1.2
+DISTNAME=	wmutils-core-1.6
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_GITHUB:=wmutils/}
 GITHUB_PROJECT=	core
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-#HOMEPAGE=	http://wmutils.io/
+HOMEPAGE=	https://github.com/wmutils/core/
 COMMENT=	Window Manipulation Utilities
 LICENSE=	isc
 
-MAKE_FLAGS+=		PREFIX=${PREFIX}
-LDFLAGS+=		${LINKER_RPATH_FLAG}${X11BASE}/lib
-LDFLAGS+=		-lxcb
-BUILD_MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
+MAKE_FLAGS+=	PREFIX=${PREFIX}
+
+SUBST_CLASSES+=		configmk
+SUBST_MESSAGE.configmk=	Adjust comfig.mk
+SUBST_STAGE.configmk=	pre-configure
+SUBST_FILES.configmk+=	config.mk
+SUBST_SED.configmk+=	-e 's,/usr,${PREFIX},g'
+SUBST_SED.configmk+=	-e 's,/usr/X11R6,${X11BASE},g'
+SUBST_SED.configmk+=	-e 's,^CFLAGS *= ,CFLAGS += ,'
+SUBST_SED.configmk+=	-e 's,^LDFLAGS *= ,LDFLAGS += ,'
+SUBST_SED.configmk+=	-e 's/cc/${CC:Q}/'
 
 .include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
+.include "../../x11/xcb-util-cursor/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmutils-core/PLIST b/wm/wmutils-core/PLIST
index 2f363464a1b..a64323d0da0 100644
--- a/wm/wmutils-core/PLIST
+++ b/wm/wmutils-core/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2016/06/11 23:07:14 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/02/11 09:47:34 pin Exp $
+bin/atomx
 bin/chwb
 bin/chwso
 bin/ignw
@@ -6,12 +7,14 @@ bin/killw
 bin/lsw
 bin/mapw
 bin/pfw
+bin/slw
 bin/wattr
 bin/wmp
 bin/wmv
 bin/wrs
 bin/wtf
 bin/wtp
+man/man1/atomx.1
 man/man1/chwb.1
 man/man1/chwso.1
 man/man1/ignw.1
@@ -19,6 +22,7 @@ man/man1/killw.1
 man/man1/lsw.1
 man/man1/mapw.1
 man/man1/pfw.1
+man/man1/slw.1
 man/man1/wattr.1
 man/man1/wmp.1
 man/man1/wmutils.1
diff --git a/wm/wmutils-core/distinfo b/wm/wmutils-core/distinfo
index c5457a1164a..6dbfb68c4c8 100644
--- a/wm/wmutils-core/distinfo
+++ b/wm/wmutils-core/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:25:21 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/02/11 09:47:34 pin Exp $
 
-BLAKE2s (wmutils-core-1.2.tar.gz) = 4ce80490191df6ff0446e1b23e999ddd5642f8a4884901b88a378e27b7a2209b
-SHA512 (wmutils-core-1.2.tar.gz) = 78c6828b8b54290a6ddfe655e2015580ef7aee0a3d45e63f42874cecab85836c9ed1cdf6398d158611250fffcf0ea6567980464daa1c00ed744d0f10f728059b
-Size (wmutils-core-1.2.tar.gz) = 9475 bytes
+BLAKE2s (wmutils-core-1.6.tar.gz) = d99f8394f40d4d13d5c4856055e3c050ec6107c18ba75c6bdee2da56a4ace2b3
+SHA512 (wmutils-core-1.6.tar.gz) = 001bb0c80f454c5947237e7157d347ef42b4022e3b35524137044f06e15b286a3d438e5d0f6a8cd1536cc1841aec04ca38028a0be5c936d6b6eef517b4de2bad
+Size (wmutils-core-1.6.tar.gz) = 12026 bytes