wm/shod: update to 0.4.0

[pin <voidpin%protonmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Fri May 7 08:06:01 2021 +0200
Changeset:	d72b903e29e849055834c16828633e23b609a016

Modified Files:
	shod/DESCR
	shod/Makefile
	shod/distinfo
Removed Files:
	shod/patches/patch-config.mk

Log Message:
wm/shod: update to 0.4.0

while here, use SUBST instead of patching.
Waiting for someone to test in order to import into main.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d72b903e29e849055834c16828633e23b609a016

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 shod/DESCR                   | 36 ------------------------------------
 shod/Makefile                | 21 ++++++++++++---------
 shod/distinfo                |  9 ++++-----
 shod/patches/patch-config.mk | 17 -----------------
 4 files changed, 16 insertions(+), 67 deletions(-)

diffs:
diff --git a/shod/DESCR b/shod/DESCR
index 7424c6a319..e416012b03 100644
--- a/shod/DESCR
+++ b/shod/DESCR
@@ -7,39 +7,3 @@ to control shod).
 WARNING: Shod is attempt of mine to write a Wm and better understand how
          X11 works, Shod is only meant for me for educational purposes.
          Shod is an experimental project, and should be used with caution.
-
-WARNING: You must have wmctrl(1) installed in order to control Shod.
-
-Non-features:
-• No maximization (Shod uses maximization hints to implement tiling).
-• No tags/groups (Shod uses desktops rather than dwm-like tags).
-• No viewports (Shod does not support fvwm-like viewports).
-• No keybindings (Use sxhkd(1) for binding keys).
-• No bar/panels (I do not use panels, so I add no support for them).
-
-Features:
-• Shod uses EWMH-based maximization to implement tiled windows; that is,
-  when you maximize a window (seting BOTH '_NET_WM_STATE_MAXIMIZED_HORZ'
-  and '_NET_WM_STATE_MAXIMIZED_VERT') it is tiled rather than maximized
-  (that means that classic maximization isn't possible with shod).
-• Shod uses a columnated window tiling style (the same used by wmii(1)
-  and acme(1)).  In this style, each window occupies a row in a column.
-  In order to change the column of a window, just move it left or right
-  with wmctrl(1); and to swap a window with the one above or below, just
-  move it up or down.
-• Shod places floating windows in unoccupied regions of the monitor.
-  The first floating window is spawned in the center of the monitor.
-• Shod manages desktops just like how GNOME implements “actions”.  If a
-  window is open on an empty desktop, it creates a new empty desktop on
-  that monitor.   When a desktop has no window, this desktop is deleted.
-• Each monitor has its own set of workspaces.  For example, if you have
-  two monitors you will have two desktops being shown at the same time,
-  one on each monitor.  In order to change the selected monitor just
-  click on a window or on the root window of that monitor.  In order to
-  change the monitor of a window just move this window to another
-  monitor or move this window to a workspace bound to another monitor.
-• You can use the .focusbuttons compile-time option (set in config.h) to
-  use either a focus-follow-pointer style or a click-to-focus style.
-  You can even specify which mouse button triggers the click-to-focus
-  style.  The related .raisebuttons option specify which mouse buttons
-  raise a window.
diff --git a/shod/Makefile b/shod/Makefile
index 84af1513f4..1591a80148 100644
--- a/shod/Makefile
+++ b/shod/Makefile
@@ -1,22 +1,25 @@
 # $NetBSD$
 
-DISTNAME=	shod-0.3.2
+DISTNAME=	shod-0.4.0
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_GITHUB:=phillbush/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-MAINTAINER=	pkgsrc-usesr%NetBSD.org@localhost
+MAINTAINER=	pin%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/phillbush/shod/
 COMMENT=	Hybrid (floating and tiling) tabbed window manager
 LICENSE=	mit
 
-SUBST_CLASSES+=		prefix
-SUBST_MESSAGE.prefix=	Fixing paths.
-SUBST_STAGE.prefix=	pre-configure
-SUBST_FILES.prefix+=	config.mk
-SUBST_SED.prefix+=	-e 's,/usr/local,${PREFIX},g'
-SUBST_SED.prefix+=	-e 's,/usr/X11R6,${X11BASE},g'
-SUBST_SED.prefix+=	-e 's,share/man,${PKGMANDIR},g'
+SUBST_CLASSES+=		configmk
+SUBST_MESSAGE.configmk=	Adjust config.mk
+SUBST_STAGE.configmk=	pre-configure
+SUBST_FILES.configmk+=	config.mk
+SUBST_SED.configmk+=	-e 's,/usr/local,${PREFIX},g'
+SUBST_SED.configmk+=	-e 's,/usr/X11R6,${X11BASE},g'
+SUBST_SED.configmk+=	-e 's,share/man,${PKGMANDIR},g'
+SUBST_SED.configmk+=	-e 's,^CFLAGS *= ,CFLAGS += ,'
+SUBST_SED.configmk+=	-e 's,^LDFLAGS *= ,LDFLAGS += ,'
+SUBST_SED.configmk+=	-e 's/cc/${CC:Q}/'
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/shod/distinfo b/shod/distinfo
index 4193a47471..7c03df9f53 100644
--- a/shod/distinfo
+++ b/shod/distinfo
@@ -1,7 +1,6 @@
 $NetBSD$
 
-SHA1 (shod-0.3.2.tar.gz) = e8fb8dd42ac0ce9ad2d584b345555e6972777829
-RMD160 (shod-0.3.2.tar.gz) = e22fd5c495f70d6bcc45e3519c3bd02fe73fa89b
-SHA512 (shod-0.3.2.tar.gz) = 165e9936174f8b4ce820bb5dc04f5bbd1a9f8aa6d6f6a99cc792a210ea2f5566baba8bdbfaa3cfdd5d3061d9f76114f1239f3cdc4e669ee779cb07adece21588
-Size (shod-0.3.2.tar.gz) = 27454 bytes
-SHA1 (patch-config.mk) = 21c97fa4cac8d0fa067a45c16cff881ca912949f
+SHA1 (shod-0.4.0.tar.gz) = 428574595b53e97e2c5bb42a16453b84f4b9c996
+RMD160 (shod-0.4.0.tar.gz) = eb3695aaf61b154a4266d3d94ac2bbac2d26b209
+SHA512 (shod-0.4.0.tar.gz) = 8ad32c9dc50bc7cce15755078fd45bbe28a167c2f9d83a6520a1450471ccc68ae4b178c43d0543e1d4adb41e525c3f3f6b4b655facd2878864f68defffb1cdf1
+Size (shod-0.4.0.tar.gz) = 36404 bytes
diff --git a/shod/patches/patch-config.mk b/shod/patches/patch-config.mk
deleted file mode 100644
index fdfadf23ba..0000000000
--- a/shod/patches/patch-config.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Do not override user flags
-
---- config.mk.orig	2021-03-14 03:14:43.000000000 +0000
-+++ config.mk
-@@ -17,8 +17,8 @@ LIBS = -L${LOCALLIB} -L${X11LIB} -lX11 -
- 
- # flags
- CPPFLAGS =
--CFLAGS = -Wall -Wextra ${INCS} ${CPPFLAGS}
--LDFLAGS = ${LIBS}
-+CFLAGS += -Wall -Wextra ${INCS} ${CPPFLAGS}
-+LDFLAGS += ${LIBS}
- 
- # compiler and linker
- CC = cc