wm/frankenwm: update to 1.0.23

Allow custom man location and a few other things

Patches by myself and Maya merged.

4 files changed, 7 insertions, 68 deletions

diff --git a/wm/frankenwm/Makefile b/wm/frankenwm/Makefile
index 37dd3211ad6..012b85a3250 100644
--- a/wm/frankenwm/Makefile
+++ b/wm/frankenwm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/07/28 14:23:37 pin Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/23 08:41:27 pin Exp $
 
-DISTNAME=	FrankenWM-1.0.22
+DISTNAME=	FrankenWM-1.0.23
 PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_GITHUB:=sulami/}
diff --git a/wm/frankenwm/distinfo b/wm/frankenwm/distinfo
index 6885ca4ee88..83b61e4f82b 100644
--- a/wm/frankenwm/distinfo
+++ b/wm/frankenwm/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1 2020/07/23 19:53:51 pin Exp $
+$NetBSD: distinfo,v 1.2 2020/11/23 08:41:27 pin Exp $
 
-SHA1 (FrankenWM-1.0.22.tar.gz) = 4fe6bf6ba9e726696ff92fe40e80d98c1dbf43a3
-RMD160 (FrankenWM-1.0.22.tar.gz) = 8574b5ec4308fde772ba0d8d8c7ab223b075dd44
-SHA512 (FrankenWM-1.0.22.tar.gz) = bea5cbc94b34f3d55c7b9721906b7599fe3e8cfb93ce5f4727fc2f699db716eaa419865d611e4a68e9a63916b2c3a41196653d660b8672149e085d4c51d1cf83
-Size (FrankenWM-1.0.22.tar.gz) = 35588 bytes
-SHA1 (patch-Makefile) = 3ce05d6fe097aa80efbd2447c62dc7ab8bc35f73
-SHA1 (patch-frankenwm.c) = 4af49a8aef3694b5b8beb20a2849617ce5d174ac
+SHA1 (FrankenWM-1.0.23.tar.gz) = b7f606fc018afd0f9061d7db5c31a15328d247cc
+RMD160 (FrankenWM-1.0.23.tar.gz) = d841bb756cdb603de66cdb9290a65c9637b8a69d
+SHA512 (FrankenWM-1.0.23.tar.gz) = d2e00a35e1ba0647962de16b80aeffd2019cd22d319d9e4ab67ae06485bee612df4416ff8220a665fb6ccca8b54b516b8c0c253005b7ccfdd95f285f150ca394
+Size (FrankenWM-1.0.23.tar.gz) = 35497 bytes
diff --git a/wm/frankenwm/patches/patch-Makefile b/wm/frankenwm/patches/patch-Makefile
deleted file mode 100644
index e3c2c502763..00000000000
--- a/wm/frankenwm/patches/patch-Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2020/07/23 19:53:51 pin Exp $
-
-Allow custom man location
-Allow discovery of x11-base
-
---- Makefile.orig	2020-05-21 08:59:23.000000000 +0000
-+++ Makefile
-@@ -2,9 +2,9 @@ WMNAME  = frankenwm
- 
- PREFIX ?= /usr/local
- BINDIR ?= ${PREFIX}/bin
--MANPREFIX = ${PREFIX}/share/man
-+MANPREFIX ?= ${PREFIX}/share/man
- 
--INCS = -I. -I${PREFIX}/include -I/usr/X11R6/include
-+INCS = -I. `pkg-config --cflags xcb xcb-aux xcb-icccm xcb-keysyms xcb-ewmh`
- LIBS = -lc -lX11 `pkg-config --libs xcb xcb-aux xcb-icccm xcb-keysyms xcb-ewmh`
- 
- CFLAGS   += -std=c99 -pedantic -Wall -Wextra ${INCS} ${CPPFLAGS}
diff --git a/wm/frankenwm/patches/patch-frankenwm.c b/wm/frankenwm/patches/patch-frankenwm.c
deleted file mode 100644
index a417650fcfe..00000000000
--- a/wm/frankenwm/patches/patch-frankenwm.c
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-frankenwm.c,v 1.1 2020/07/23 19:53:51 pin Exp $
-
-Move include into a reasonable place.
-Don't re-define things that are already in Xlib.h
-
---- frankenwm.c.orig	2020-05-21 08:59:23.000000000 +0000
-+++ frankenwm.c
-@@ -10,6 +10,7 @@
- #include <signal.h>
- #include <regex.h>
- #include <sys/wait.h>
-+#include <X11/Xlib.h>
- #include <X11/keysym.h>
- #include <xcb/xcb.h>
- #include <xcb/xcb_atom.h>
-@@ -27,16 +28,6 @@
- #  define DEBUGP(x, ...);
- #endif
- 
--/* upstream compatility */
--#define True  true
--#define False false
--#define Mod1Mask     XCB_MOD_MASK_1
--#define Mod4Mask     XCB_MOD_MASK_4
--#define ShiftMask    XCB_MOD_MASK_SHIFT
--#define ControlMask  XCB_MOD_MASK_CONTROL
--#define Button1      XCB_BUTTON_INDEX_1
--#define Button2      XCB_BUTTON_INDEX_2
--#define Button3      XCB_BUTTON_INDEX_3
- #define XCB_MOVE_RESIZE XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT
- #define XCB_MOVE        XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y
- #define XCB_RESIZE      XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT
-@@ -3582,7 +3573,6 @@ void xerror(xcb_generic_event_t *e)
- 
- static void ungrab_focus(void)
- {
--#include <X11/Xlib.h>
-     Display * dpy;
- 
-