From e7a727e3decaedf6cdf006ab056990a30e058fe7 Mon Sep 17 00:00:00 2001
From: kn <kn@openbsd.org>
Date: Tue, 12 Feb 2019 17:05:03 +0000
Subject: [PATCH] Update to dwm-6.2

Upstream pledge support, various bugfixes and cleanups.

OK jung cwen
---
 x11/dwm/Makefile                   |  5 ++-
 x11/dwm/distinfo                   |  4 +--
 x11/dwm/patches/patch-Makefile     | 25 --------------
 x11/dwm/patches/patch-config_def_h | 54 ++++++++++++++----------------
 x11/dwm/patches/patch-config_mk    | 22 +++++++-----
 x11/dwm/patches/patch-dwm_1        | 17 +++++-----
 x11/dwm/patches/patch-dwm_c        | 14 --------
 7 files changed, 53 insertions(+), 88 deletions(-)
 delete mode 100644 x11/dwm/patches/patch-Makefile
 delete mode 100644 x11/dwm/patches/patch-dwm_c

diff --git a/x11/dwm/Makefile b/x11/dwm/Makefile
index 64519210d85..57dafce1105 100644
--- a/x11/dwm/Makefile
+++ b/x11/dwm/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.31 2019/02/05 20:02:29 kn Exp $
+# $OpenBSD: Makefile,v 1.32 2019/02/12 17:05:03 kn Exp $
 
 COMMENT=		dynamic window manager
 
-V=			6.1
+V=			6.2
 DISTNAME=		dwm-${V}
-REVISION=		3
 
 CATEGORIES=		x11
 
diff --git a/x11/dwm/distinfo b/x11/dwm/distinfo
index 2479a04c5e1..61b70364832 100644
--- a/x11/dwm/distinfo
+++ b/x11/dwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dwm-6.1.tar.gz) = wvbFYWfwrNvj3DfMqcGhkmDAQPLUgA41KaIa18zidf4=
-SIZE (dwm-6.1.tar.gz) = 25887
+SHA256 (dwm-6.2.tar.gz) = l5AuLgB6rqo8bjvtH4F4W4F7dBOUfx2x07YrjaTNEQ4=
+SIZE (dwm-6.2.tar.gz) = 25273
diff --git a/x11/dwm/patches/patch-Makefile b/x11/dwm/patches/patch-Makefile
deleted file mode 100644
index d0a952e9a3e..00000000000
--- a/x11/dwm/patches/patch-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.5 2018/05/22 13:30:57 kn Exp $
-
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -15,8 +15,7 @@ options:
- 	@echo "CC       = ${CC}"
- 
- .c.o:
--	@echo CC $<
--	@${CC} -c ${CFLAGS} $<
-+	${CC} -c ${CFLAGS} $<
- 
- ${OBJ}: config.h config.mk
- 
-@@ -25,8 +24,7 @@ config.h:
- 	@cp config.def.h $@
- 
- dwm: ${OBJ}
--	@echo CC -o $@
--	@${CC} -o $@ ${OBJ} ${LDFLAGS}
-+	${CC} -o $@ ${OBJ} ${LDFLAGS}
- 
- clean:
- 	@echo cleaning
diff --git a/x11/dwm/patches/patch-config_def_h b/x11/dwm/patches/patch-config_def_h
index eb5de71b6d8..fa8d3181010 100644
--- a/x11/dwm/patches/patch-config_def_h
+++ b/x11/dwm/patches/patch-config_def_h
@@ -1,31 +1,29 @@
-$OpenBSD: patch-config_def_h,v 1.13 2019/02/05 20:02:29 kn Exp $
---- config.def.h.orig	Sun Nov  8 23:39:37 2015
-+++ config.def.h	Wed Nov 11 09:50:09 2015
-@@ -2,15 +2,15 @@
- 
- /* appearance */
- static const char *fonts[] = {
--	"monospace:size=10"
-+	"terminus:size=8"
- };
--static const char dmenufont[]       = "monospace:size=10";
--static const char normbordercolor[] = "#444444";
--static const char normbgcolor[]     = "#222222";
--static const char normfgcolor[]     = "#bbbbbb";
--static const char selbordercolor[]  = "#005577";
--static const char selbgcolor[]      = "#005577";
--static const char selfgcolor[]      = "#eeeeee";
-+static const char dmenufont[]       = "terminus:size=8";
-+static const char normbordercolor[] = "#404040";
-+static const char normbgcolor[]     = "#202020";
-+static const char normfgcolor[]     = "#c0c0c0";
-+static const char selbordercolor[]  = "#8888ff";
-+static const char selbgcolor[]      = "#404040";
-+static const char selfgcolor[]      = "#f0f0f0";
- static const unsigned int borderpx  = 1;        /* border pixel of windows */
+$OpenBSD: patch-config_def_h,v 1.14 2019/02/12 17:05:03 kn Exp $
+Index: config.def.h
+--- config.def.h.orig
++++ config.def.h
+@@ -5,13 +5,13 @@ static const unsigned int borderpx  = 1;        /* bor
  static const unsigned int snap      = 32;       /* snap pixel */
  static const int showbar            = 1;        /* 0 means no bar */
-@@ -27,6 +27,9 @@ static const Rule rules[] = {
+ static const int topbar             = 1;        /* 0 means bottom bar */
+-static const char *fonts[]          = { "monospace:size=10" };
+-static const char dmenufont[]       = "monospace:size=10";
+-static const char col_gray1[]       = "#222222";
+-static const char col_gray2[]       = "#444444";
+-static const char col_gray3[]       = "#bbbbbb";
+-static const char col_gray4[]       = "#eeeeee";
+-static const char col_cyan[]        = "#005577";
++static const char *fonts[]          = { "terminus:size=8" };
++static const char dmenufont[]       = "terminus:size=8";
++static const char col_gray1[]       = "#202020";
++static const char col_gray2[]       = "#404040";
++static const char col_gray3[]       = "#c0c0c0";
++static const char col_gray4[]       = "#f0f0f0";
++static const char col_cyan[]        = "#404040";
+ static const char *colors[][3]      = {
+ 	/*               fg         bg         border   */
+ 	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+@@ -29,6 +29,9 @@ static const Rule rules[] = {
  	/* class      instance    title       tags mask     isfloating   monitor */
  	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
  	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
@@ -35,10 +33,10 @@ $OpenBSD: patch-config_def_h,v 1.13 2019/02/05 20:02:29 kn Exp $
  };
  
  /* layout(s) */
-@@ -55,7 +57,7 @@ static const Layout layouts[] = {
+@@ -57,7 +60,7 @@ static const Layout layouts[] = {
  /* commands */
  static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
- static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 -static const char *termcmd[]  = { "st", NULL };
 +static const char *termcmd[]  = { "xterm", NULL };
  
diff --git a/x11/dwm/patches/patch-config_mk b/x11/dwm/patches/patch-config_mk
index f473c75d501..14afafc53b9 100644
--- a/x11/dwm/patches/patch-config_mk
+++ b/x11/dwm/patches/patch-config_mk
@@ -1,18 +1,24 @@
-$OpenBSD: patch-config_mk,v 1.12 2018/06/03 16:57:12 kn Exp $
+$OpenBSD: patch-config_mk,v 1.13 2019/02/12 17:05:03 kn Exp $
 Index: config.mk
 --- config.mk.orig
 +++ config.mk
-@@ -25,10 +25,10 @@ INCS = -I${X11INC} -I${FREETYPEINC}
- LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+@@ -18,7 +18,7 @@ XINERAMAFLAGS = -DXINERAMA
+ FREETYPELIBS = -lfontconfig -lXft
+ FREETYPEINC = /usr/include/freetype2
+ # OpenBSD (uncomment)
+-#FREETYPEINC = ${X11INC}/freetype2
++FREETYPEINC = ${X11INC}/freetype2
  
+ # includes and libs
+ INCS = -I${X11INC} -I${FREETYPEINC}
+@@ -27,8 +27,8 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIB
  # flags
--CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-+CPPFLAGS += -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
  #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
 -CFLAGS   = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
--LDFLAGS  = -s ${LIBS}
-+CFLAGS   += -std=c99 -pedantic -Wall -Wno-deprecated-declarations ${INCS} ${CPPFLAGS}
-+LDFLAGS  += ${LIBS}
+-LDFLAGS  = ${LIBS}
++CFLAGS  += -std=c99 -pedantic -Wall -Wno-deprecated-declarations ${INCS} ${CPPFLAGS}
++LDFLAGS += ${LIBS}
  
  # Solaris
  #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff --git a/x11/dwm/patches/patch-dwm_1 b/x11/dwm/patches/patch-dwm_1
index 08f7d3c4a2a..5a0b947d266 100644
--- a/x11/dwm/patches/patch-dwm_1
+++ b/x11/dwm/patches/patch-dwm_1
@@ -1,21 +1,22 @@
-$OpenBSD: patch-dwm_1,v 1.2 2016/10/24 22:46:54 czarkoff Exp $
---- dwm.1.orig	Wed Nov 11 09:50:32 2015
-+++ dwm.1	Wed Nov 11 09:51:25 2015
-@@ -57,7 +57,7 @@ click on a tag label adds/removes that tag to/from the
+$OpenBSD: patch-dwm_1,v 1.3 2019/02/12 17:05:03 kn Exp $
+Index: dwm.1
+--- dwm.1.orig
++++ dwm.1
+@@ -58,7 +58,7 @@ click on a tag label adds/removes that tag to/from the
  .TP
  .B Mod1\-Shift\-Return
  Start
 -.BR st(1).
 +.BR xterm (1).
  .TP
- .B Mod1\-,
- Focus previous screen, if any.
-@@ -151,7 +151,7 @@ dwm is customized by creating a custom config.h and (r
+ .B Mod1\-p
+ Spawn
+@@ -157,7 +157,7 @@ dwm is customized by creating a custom config.h and (r
  code. This keeps it fast, secure and simple.
  .SH SEE ALSO
  .BR dmenu (1),
 -.BR st (1)
 +.BR xterm (1)
- .SH BUGS
+ .SH ISSUES
  Java applications which use the XToolkit/XAWT backend may draw grey windows
  only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early
diff --git a/x11/dwm/patches/patch-dwm_c b/x11/dwm/patches/patch-dwm_c
deleted file mode 100644
index a5820406a5c..00000000000
--- a/x11/dwm/patches/patch-dwm_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-dwm_c,v 1.2 2018/06/03 17:00:14 kn Exp $
-
-Index: dwm.c
---- dwm.c.orig
-+++ dwm.c
-@@ -2133,6 +2133,8 @@ main(int argc, char *argv[])
- 		die("dwm: cannot open display\n");
- 	checkotherwm();
- 	setup();
-+	if (pledge("stdio rpath proc exec", NULL) == -1)
-+		die("pledge\n");
- 	scan();
- 	run();
- 	cleanup();