From 883aa01ab9d51adf583b612d3665b992d3d4832b Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sun, 26 Apr 2009 13:23:31 +0000
Subject: [PATCH] update to 5.5; Jim Razmus (maintainer)

---
 x11/dwm/Makefile                   |  4 ++--
 x11/dwm/distinfo                   | 10 +++++-----
 x11/dwm/patches/patch-config_def_h | 10 +++++-----
 x11/dwm/patches/patch-config_mk    | 14 ++++++--------
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/x11/dwm/Makefile b/x11/dwm/Makefile
index 523071bd59a..707e9d229f8 100644
--- a/x11/dwm/Makefile
+++ b/x11/dwm/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2009/02/09 00:11:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2009/04/26 13:23:31 sthen Exp $
 
 COMMENT=		dynamic window manager
 
-DISTNAME=		dwm-5.4.1
+DISTNAME=		dwm-5.5
 
 CATEGORIES=		x11
 
diff --git a/x11/dwm/distinfo b/x11/dwm/distinfo
index 2b256bc70a1..bc8b0c817e4 100644
--- a/x11/dwm/distinfo
+++ b/x11/dwm/distinfo
@@ -1,5 +1,5 @@
-MD5 (dwm-5.4.1.tar.gz) = m51yInQDF+A/2qcYMi/h7A==
-RMD160 (dwm-5.4.1.tar.gz) = PSzBo642X757N+tsomys6w9Fr3g=
-SHA1 (dwm-5.4.1.tar.gz) = AyiwDs/dWNwW6JF1m9ah3UXxZ4w=
-SHA256 (dwm-5.4.1.tar.gz) = iDwmhwZKVQkEp3/CKbuVcTor+bnrXimXJmz0Y2EL0UI=
-SIZE (dwm-5.4.1.tar.gz) = 17970
+MD5 (dwm-5.5.tar.gz) = NS2VLoOasOLfCwlZolCwmA==
+RMD160 (dwm-5.5.tar.gz) = BF3sykDeoGS4m0jobNLL4A9Uau8=
+SHA1 (dwm-5.5.tar.gz) = rXVhBrG9OnQpEnJG9XfyhCs6T9Y=
+SHA256 (dwm-5.5.tar.gz) = 7la0PzoSwpKuTfKQJBKuWhazRYE7kiBzLjxIZpNxuMg=
+SIZE (dwm-5.5.tar.gz) = 17959
diff --git a/x11/dwm/patches/patch-config_def_h b/x11/dwm/patches/patch-config_def_h
index 4e46c9b99aa..0bc8d2b158f 100644
--- a/x11/dwm/patches/patch-config_def_h
+++ b/x11/dwm/patches/patch-config_def_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-config_def_h,v 1.5 2009/02/09 00:11:23 sthen Exp $
---- config.def.h.orig	Sun Feb  8 09:46:55 2009
-+++ config.def.h	Sun Feb  8 14:44:57 2009
+$OpenBSD: patch-config_def_h,v 1.6 2009/04/26 13:23:31 sthen Exp $
+--- config.def.h.orig	Mon Apr 20 15:49:55 2009
++++ config.def.h	Mon Apr 20 15:53:36 2009
 @@ -1,13 +1,13 @@
  /* See LICENSE file for copyright and license details. */
  
@@ -22,7 +22,7 @@ $OpenBSD: patch-config_def_h,v 1.5 2009/02/09 00:11:23 sthen Exp $
  static unsigned int borderpx        = 1;        /* border pixel of windows */
  static unsigned int snap            = 32;       /* snap pixel */
  static Bool showbar                 = True;     /* False means no bar */
-@@ -23,6 +23,8 @@ static Rule rules[] = {
+@@ -21,6 +21,8 @@ static Rule rules[] = {
  	/* class      instance    title       tags mask     isfloating */
  	{ "Gimp",     NULL,       NULL,       0,            True },
  	{ "Firefox",  NULL,       NULL,       1 << 8,       True },
@@ -31,7 +31,7 @@ $OpenBSD: patch-config_def_h,v 1.5 2009/02/09 00:11:23 sthen Exp $
  };
  
  /* layout(s) */
-@@ -49,7 +51,7 @@ static Layout layouts[] = {
+@@ -47,7 +49,7 @@ static Layout layouts[] = {
  
  /* commands */
  static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
diff --git a/x11/dwm/patches/patch-config_mk b/x11/dwm/patches/patch-config_mk
index e3bd1461088..e0ce7980760 100644
--- a/x11/dwm/patches/patch-config_mk
+++ b/x11/dwm/patches/patch-config_mk
@@ -1,7 +1,7 @@
-$OpenBSD: patch-config_mk,v 1.4 2009/02/09 00:11:23 sthen Exp $
---- config.mk.orig	Sun Feb  8 09:46:55 2009
-+++ config.mk	Sun Feb  8 14:44:57 2009
-@@ -4,28 +4,28 @@ VERSION = 5.4
+$OpenBSD: patch-config_mk,v 1.5 2009/04/26 13:23:31 sthen Exp $
+--- config.mk.orig	Mon Apr 20 15:36:56 2009
++++ config.mk	Mon Apr 20 15:40:20 2009
+@@ -4,28 +4,28 @@ VERSION = 5.5
  # Customize below to fit your system
  
  # paths
@@ -16,10 +16,8 @@ $OpenBSD: patch-config_mk,v 1.4 2009/02/09 00:11:23 sthen Exp $
 +X11LIB = ${X11BASE}/lib
  
  # Xinerama, un-comment if you want it
--#XINERAMALIBS = -L${X11LIB} -lXinerama
--#XINERAMAFLAGS = -DXINERAMA
-+XINERAMALIBS = -L${X11LIB} -lXinerama
-+XINERAMAFLAGS = -DXINERAMA
+ XINERAMALIBS = -L${X11LIB} -lXinerama
+ XINERAMAFLAGS = -DXINERAMA
  
  # includes and libs
 -INCS = -I. -I/usr/include -I${X11INC}