From 215ed2c6b20dc05d164721b0c6c33d8cc2c6fc81 Mon Sep 17 00:00:00 2001
From: merdely <merdely@openbsd.org>
Date: Tue, 15 Apr 2008 19:44:10 +0000
Subject: [PATCH] Update to 4.9.

ok MAINTAINER (Jim Razmus)
input from Tobias Ulmer and kili@

ok sthen@, jasper@, kili@
---
 x11/dwm/Makefile                   | 17 ++++---------
 x11/dwm/distinfo                   | 10 ++++----
 x11/dwm/patches/patch-Makefile     | 27 +++++++++++++++++---
 x11/dwm/patches/patch-config_def_h | 40 ++++++++++++++++++++++++++++++
 x11/dwm/patches/patch-config_h     | 30 ----------------------
 x11/dwm/patches/patch-config_mk    | 37 +++++++++++++++++++++++++++
 6 files changed, 111 insertions(+), 50 deletions(-)
 create mode 100644 x11/dwm/patches/patch-config_def_h
 delete mode 100644 x11/dwm/patches/patch-config_h
 create mode 100644 x11/dwm/patches/patch-config_mk

diff --git a/x11/dwm/Makefile b/x11/dwm/Makefile
index d427fac4991..56bb4894799 100644
--- a/x11/dwm/Makefile
+++ b/x11/dwm/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2007/11/25 12:07:06 kili Exp $
+# $OpenBSD: Makefile,v 1.7 2008/04/15 19:44:10 merdely Exp $
 
 COMMENT=		dynamic window manager
 
-V=			4.7
-DISTNAME=		dwm-$V
+DISTNAME=		dwm-4.9
 
 CATEGORIES=		x11
 
@@ -21,20 +20,14 @@ WANTLIB=		X11 c
 
 MASTER_SITES=		http://www.suckless.org/download/
 
-RUN_DEPENDS=		::x11/dmenu \
+RUN_DEPENDS=		:dmenu->=3.6:x11/dmenu \
 			::x11/terminus-font
 
-CFLAGS+=		-I. -I${X11BASE}/include -DVERSION=\\\"$V\\\"
-LDFLAGS+=		-L${X11BASE}/lib -lX11
-MAKE_FLAGS=		CC=${CC} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-FAKE_FLAGS=		MANPREFIX=${PREFIX}/man \
-			PREFIX=${PREFIX}
+MAKE_ENV=		LDFLAGS="${LDFLAGS}"
+FAKE_FLAGS=		DESTDIR=""
 
 USE_X11=		Yes
 
 NO_REGRESS=		Yes
 
-pre-patch:
-	@cp ${WRKSRC}/config.def.h ${WRKSRC}/config.h
-
 .include <bsd.port.mk>
diff --git a/x11/dwm/distinfo b/x11/dwm/distinfo
index 345c790c685..8a84e9977b7 100644
--- a/x11/dwm/distinfo
+++ b/x11/dwm/distinfo
@@ -1,5 +1,5 @@
-MD5 (dwm-4.7.tar.gz) = gnsShRSj7bh+II6E/uDrPw==
-RMD160 (dwm-4.7.tar.gz) = KkZM67ykMcC7GZ/Arp/axIEFwiY=
-SHA1 (dwm-4.7.tar.gz) = 23CkLts4PmU5zOT5qO4fy+Watz0=
-SHA256 (dwm-4.7.tar.gz) = N0gZV/wkf2hgullCdI+PibUmv1uLIQQgAdOE6INgxao=
-SIZE (dwm-4.7.tar.gz) = 17693
+MD5 (dwm-4.9.tar.gz) = z3LGpy5sNcEytdtPrz+zWA==
+RMD160 (dwm-4.9.tar.gz) = jNgvEPCsWFLiw6tRd033EKKb2LI=
+SHA1 (dwm-4.9.tar.gz) = yOz5MghPYmoi78AgdkpiquvUjbU=
+SHA256 (dwm-4.9.tar.gz) = P09ZXnhFztzhaWZorfCoreL8inLUwy1T3jWnxdkAeQ0=
+SIZE (dwm-4.9.tar.gz) = 18132
diff --git a/x11/dwm/patches/patch-Makefile b/x11/dwm/patches/patch-Makefile
index 8bd49a29024..7936aa6e707 100644
--- a/x11/dwm/patches/patch-Makefile
+++ b/x11/dwm/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.2 2007/10/27 12:41:48 merdely Exp $
---- Makefile.orig	Thu Oct 25 14:24:37 2007
-+++ Makefile	Thu Oct 25 16:24:41 2007
+$OpenBSD: patch-Makefile,v 1.3 2008/04/15 19:44:10 merdely Exp $
+--- Makefile.orig	Thu Apr  3 22:57:01 2008
++++ Makefile	Wed Apr  9 21:49:02 2008
 @@ -15,8 +15,7 @@ options:
  	@echo "CC       = ${CC}"
  
@@ -21,3 +21,24 @@ $OpenBSD: patch-Makefile,v 1.2 2007/10/27 12:41:48 merdely Exp $
  
  clean:
  	@echo cleaning
+@@ -42,14 +40,12 @@ dist: clean
+ 	@rm -rf dwm-${VERSION}
+ 
+ install: all
+-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f dwm ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
+-	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+-	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+-	@sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
+-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
++	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} dwm ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
++	sed "s/VERSION/${VERSION}/g" < dwm.1 > dwm.1.tmp
++	mv dwm.1.tmp dwm.1
++	${BSD_INSTALL_MAN} dwm.1 ${DESTDIR}${MANPREFIX}/man1
+ 
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
diff --git a/x11/dwm/patches/patch-config_def_h b/x11/dwm/patches/patch-config_def_h
new file mode 100644
index 00000000000..ec22fcb5590
--- /dev/null
+++ b/x11/dwm/patches/patch-config_def_h
@@ -0,0 +1,40 @@
+$OpenBSD: patch-config_def_h,v 1.1 2008/04/15 19:44:10 merdely Exp $
+--- config.def.h.orig	Thu Apr  3 22:57:01 2008
++++ config.def.h	Tue Apr  8 19:02:10 2008
+@@ -2,19 +2,20 @@
+ 
+ /* appearance */
+ #define BORDERPX		1
+-#define FONT			"-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
+-#define NORMBORDERCOLOR		"#cccccc"
+-#define NORMBGCOLOR		"#cccccc"
+-#define NORMFGCOLOR		"#000000"
+-#define SELBORDERCOLOR		"#0066ff"
+-#define SELBGCOLOR		"#0066ff"
+-#define SELFGCOLOR		"#ffffff"
++#define FONT			"-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*"
++#define NORMBORDERCOLOR		"#404040"
++#define NORMBGCOLOR		"#202020"
++#define NORMFGCOLOR		"#c0c0c0"
++#define SELBORDERCOLOR		"#8888ff"
++#define SELBGCOLOR		"#404040"
++#define SELFGCOLOR		"#f0f0f0"
+ 
+ /* tagging */
+ const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+ 
+ Rule rules[] = {
+ 	/* class	instance	title		tags ref	isfloating */
++	{ "Firefox",	NULL,		NULL,		tags[8],	False },
+ 	{ "Gimp",	NULL,		NULL,		NULL,		True },
+ };
+ 
+@@ -46,7 +47,7 @@ Key keys[] = {
+ 	/* modifier			key		function	argument */
+ 	{ MODKEY,			XK_p,		spawn,
+ 		"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
+-	{ MODKEY|ShiftMask,		XK_Return,	spawn,		"exec uxterm" },
++	{ MODKEY|ShiftMask,		XK_Return,	spawn,		"exec xterm" },
+ 	{ MODKEY,			XK_j,		focusnext,	NULL },
+ 	{ MODKEY,			XK_k,		focusprev,	NULL },
+ 	{ MODKEY,			XK_r,		reapply,	NULL },
diff --git a/x11/dwm/patches/patch-config_h b/x11/dwm/patches/patch-config_h
deleted file mode 100644
index b9da60db581..00000000000
--- a/x11/dwm/patches/patch-config_h
+++ /dev/null
@@ -1,30 +0,0 @@
---- config.h.orig	Sat Nov 24 23:23:08 2007
-+++ config.h	Sat Nov 24 23:23:09 2007
-@@ -4,12 +4,12 @@
- #define BARPOS			BarTop /* BarBot, BarOff */
- #define BORDERPX		1
- #define FONT			"-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*"
--#define NORMBORDERCOLOR		"#cccccc"
--#define NORMBGCOLOR		"#cccccc"
--#define NORMFGCOLOR		"#000000"
--#define SELBORDERCOLOR		"#0066ff"
--#define SELBGCOLOR		"#0066ff"
--#define SELFGCOLOR		"#ffffff"
-+#define NORMBORDERCOLOR		"#404040"
-+#define NORMBGCOLOR		"#202020"
-+#define NORMFGCOLOR		"#c0c0c0"
-+#define SELBORDERCOLOR		"#8888ff"
-+#define SELBGCOLOR		"#404040"
-+#define SELFGCOLOR		"#f0f0f0"
- 
- /* tagging */
- const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "www" };
-@@ -39,7 +39,7 @@ Key keys[] = {
- 	{ MODKEY,			XK_p,		spawn,
- 		"exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'"
- 		" -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" },
--	{ MODKEY|ShiftMask,		XK_Return,	spawn, "exec uxterm" },
-+	{ MODKEY|ShiftMask,		XK_Return,	spawn, "exec xterm" },
- 	{ MODKEY,			XK_space,	setlayout,	NULL },
- 	{ MODKEY,			XK_b,		togglebar,	NULL },
- 	{ MODKEY,			XK_j,		focusnext,	NULL },
diff --git a/x11/dwm/patches/patch-config_mk b/x11/dwm/patches/patch-config_mk
new file mode 100644
index 00000000000..726ec9e1644
--- /dev/null
+++ b/x11/dwm/patches/patch-config_mk
@@ -0,0 +1,37 @@
+$OpenBSD: patch-config_mk,v 1.1 2008/04/15 19:44:10 merdely Exp $
+--- config.mk.orig	Thu Apr  3 22:57:01 2008
++++ config.mk	Tue Apr  8 18:59:01 2008
+@@ -4,19 +4,19 @@ VERSION = 4.9
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
+-MANPREFIX = ${PREFIX}/share/man
++#PREFIX = /usr/local
++MANPREFIX = ${PREFIX}/man
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = ${X11BASE}/include
++X11LIB = ${X11BASE}/lib
+ 
+ # includes and libs
+-INCS = -I. -I/usr/include -I${X11INC}
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
++INCS = -I${X11INC}
++LIBS = -L${X11LIB} -lX11
+ 
+ # flags
+-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+-LDFLAGS = -s ${LIBS}
++CFLAGS+= ${INCS} -DVERSION=\"${VERSION}\"
++LDFLAGS+= ${LIBS}
+ #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = -g ${LIBS}
+ 
+@@ -25,4 +25,4 @@ LDFLAGS = -s ${LIBS}
+ #LDFLAGS = ${LIBS}
+ 
+ # compiler and linker
+-CC = cc
++#CC = cc