Uplift dwm to version 4.5. Adds a patch for config.h to encourage dwm to respect Xresources when starting an xterm. Lastly, folds in my color preferences so I don't have to maintain my own one off in my tree.
Tested on three i386 machines that I use daily. Questions? Concerns? Jim
Index: Makefile =================================================================== RCS file: /openbsd/mirror/ports/x11/dwm/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 29 Jul 2007 17:26:10 -0000 1.3 +++ Makefile 16 Oct 2007 12:37:50 -0000 @@ -2,7 +2,7 @@ COMMENT= dynamic window manager -V= 4.3 +V= 4.5 DISTNAME= dwm-$V CATEGORIES= x11 @@ -21,7 +21,8 @@ MASTER_SITES= http://www.suckless.org/download/ -RUN_DEPENDS= ::x11/dmenu +RUN_DEPENDS= ::x11/dmenu \ + ::x11/terminus-font CFLAGS+= -I. -I${X11BASE}/include -DVERSION=\\\"$V\\\" LDFLAGS+= -L${X11BASE}/lib -lX11 Index: distinfo =================================================================== RCS file: /openbsd/mirror/ports/x11/dwm/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 29 Jul 2007 17:26:10 -0000 1.3 +++ distinfo 16 Oct 2007 12:37:50 -0000 @@ -1,5 +1,5 @@ -MD5 (dwm-4.3.tar.gz) = szwp7Gg5m38+PhRcAQekUg== -RMD160 (dwm-4.3.tar.gz) = VebZtg76AKUYr3Q61bKmnClIamQ= -SHA1 (dwm-4.3.tar.gz) = dBZwj5edD0tUoU8bhZAe/ZDPWXM= -SHA256 (dwm-4.3.tar.gz) = /3kZ2gb7m16ZW2r534eiQEXNdH78PHdLjCh+UOGo56E= -SIZE (dwm-4.3.tar.gz) = 18658 +MD5 (dwm-4.5.tar.gz) = sXj++1XwFbZI11bnD8zMzA== +RMD160 (dwm-4.5.tar.gz) = tSJOu34LnhvfiDZh23HLXs9ALCg= +SHA1 (dwm-4.5.tar.gz) = Do8//aJBzfXGTQmE82+nc5tTNrY= +SHA256 (dwm-4.5.tar.gz) = AO6CKfVt7q/1viWh8nwPoHZp5MyCfA04/0s+QV8CB1I= +SIZE (dwm-4.5.tar.gz) = 17338 Index: patches/patch-config_h =================================================================== RCS file: patches/patch-config_h diff -N patches/patch-config_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-config_h 16 Oct 2007 12:37:50 -0000 @@ -0,0 +1,31 @@ +--- config.h.orig Sat Sep 22 03:11:13 2007 ++++ config.h Fri Oct 12 08:52:40 2007 +@@ -4,12 +4,12 @@ + #define BARPOS BarTop /* BarBot, BarOff */ + #define BORDERPX 1 + #define FONT "-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso10646-*" +-#define NORMBORDERCOLOR "#333" +-#define NORMBGCOLOR "#000" +-#define NORMFGCOLOR "#ccc" +-#define SELBORDERCOLOR "#f00" +-#define SELBGCOLOR "#00f" +-#define SELFGCOLOR "#fff" ++#define NORMBORDERCOLOR "#404040" ++#define NORMBGCOLOR "#202020" ++#define NORMFGCOLOR "#c0c0c0" ++#define SELBORDERCOLOR "#8888ff" ++#define SELBGCOLOR "#404040" ++#define SELFGCOLOR "#f0f0f0" + + /* tagging */ + const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL }; +@@ -39,8 +39,7 @@ + { 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 xterm -bg '"NORMBGCOLOR"' -fg '"NORMFGCOLOR"' -cr '"NORMFGCOLOR"' +sb -fn '"FONT"'" }, \ ++ { MODKEY|ShiftMask, XK_Return, spawn, "exec xterm" }, \ + { MODKEY, XK_space, setlayout, NULL }, \ + { MODKEY, XK_b, togglebar, NULL }, \ + { MODKEY, XK_j, focusnext, NULL }, \
