Index: x11/spectrwm/Makefile
===================================================================
RCS file: /home/cvs/ports/x11/spectrwm/Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 Makefile
--- x11/spectrwm/Makefile	24 Jan 2021 15:41:37 -0000	1.37
+++ x11/spectrwm/Makefile	19 Dec 2021 11:09:37 -0000
@@ -8,7 +8,7 @@ GH_PROJECT=		spectrwm
 GH_TAGNAME=		SPECTRWM_${V:S/./_/g}
 DISTNAME=		${GH_PROJECT}-${V}
 
-REVISION=		1
+REVISION=		2
 
 SHARED_LIBS=		swmhack 1.0
 
Index: x11/spectrwm/patches/patch-spectrwm_c
===================================================================
RCS file: /home/cvs/ports/x11/spectrwm/patches/patch-spectrwm_c,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 patch-spectrwm_c
--- x11/spectrwm/patches/patch-spectrwm_c	23 Jan 2021 18:34:17 -0000	1.16
+++ x11/spectrwm/patches/patch-spectrwm_c	19 Dec 2021 11:09:10 -0000
@@ -1,6 +1,7 @@
 $OpenBSD: patch-spectrwm_c,v 1.16 2021/01/23 18:34:17 bket Exp $
 
 Needs wpath pledge. Tahen from https://github.com/conformal/spectrwm/pull/425
+Let spectrwm quit when X dies. Taken from https://github.com/conformal/spectrwm/pull/478
 
 Index: spectrwm.c
 --- spectrwm.c.orig
@@ -41,3 +42,13 @@ Index: spectrwm.c
  		err(1, "pledge");
  
  	validate_spawns();
+@@ -13762,6 +13762,9 @@ main(int argc, char *argv[])
+ 			restart(NULL, NULL, NULL);
+ 
+ 		if (!running)
++			goto done;
++
++		if(xcb_connection_has_error(conn))
+ 			goto done;
+ 
+ 		if (stdin_ready) {