Attached are two diffs that brings dwm to 5.0 and dmenu to 3.7, each
released today.
--
James Turner
BSD Group Consulting
http://www.bsdgroup.org
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 29 Apr 2008 13:49:08 -0000 1.8
+++ Makefile 19 Jun 2008 02:23:21 -0000
@@ -2,8 +2,7 @@
COMMENT= dynamic window manager
-DISTNAME= dwm-4.9
-PKGNAME= ${DISTNAME}p0
+DISTNAME= dwm-5.0
CATEGORIES= x11
@@ -21,7 +20,7 @@ WANTLIB= X11 c
MASTER_SITES= http://www.suckless.org/download/
-RUN_DEPENDS= :dmenu->=3.6:x11/dmenu \
+RUN_DEPENDS= :dmenu->=3.7:x11/dmenu \
::x11/terminus-font
MAKE_ENV= LDFLAGS="${LDFLAGS}"
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 15 Apr 2008 19:44:10 -0000 1.7
+++ distinfo 19 Jun 2008 02:23:21 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (dwm-5.0.tar.gz) = ApfHDuCNMDnmwd3L+cyi/w==
+RMD160 (dwm-5.0.tar.gz) = QVY8BDiXNQGRV94BVHQG/jor2B4=
+SHA1 (dwm-5.0.tar.gz) = tNWM6y1c/YQRAPOb9aK20hy6K90=
+SHA256 (dwm-5.0.tar.gz) = l+WRIF4lvl7o1Z37LSr51FWVcH+euTdj3VW6YN+9cRQ=
+SIZE (dwm-5.0.tar.gz) = 17927
Index: patches/patch-config_def_h
===================================================================
RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-config_def_h
--- patches/patch-config_def_h 29 Apr 2008 13:49:08 -0000 1.2
+++ patches/patch-config_def_h 19 Jun 2008 02:23:21 -0000
@@ -1,42 +1,41 @@
$OpenBSD: patch-config_def_h,v 1.2 2008/04/29 13:49:08 sthen Exp $
---- config.def.h.orig Thu Apr 3 21:57:01 2008
-+++ config.def.h Mon Apr 28 22:18:14 2008
-@@ -2,20 +2,22 @@
+--- config.def.h.orig Wed Jun 18 22:18:17 2008
++++ config.def.h Wed Jun 18 22:19:37 2008
+@@ -1,13 +1,13 @@
+ /* See LICENSE file for copyright and license details. */
/* 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"
+-static const char font[] =
"-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
+-static const char normbordercolor[] = "#cccccc";
+-static const char normbgcolor[] = "#cccccc";
+-static const char normfgcolor[] = "#000000";
+-static const char selbordercolor[] = "#0066ff";
+-static const char selbgcolor[] = "#0066ff";
+-static const char selfgcolor[] = "#ffffff";
++static const char font[] =
"-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*";
++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 uint borderpx = 1; /* border pixel of windows */
+ static uint snap = 32; /* snap pixel */
+ static Bool showbar = True; /* False means no bar */
+@@ -24,6 +24,7 @@ static Rule rules[] = {
+ /* class instance title tags mask isfloating */
+ { "Gimp", NULL, NULL, 0, True },
+ { "Firefox", NULL, NULL, 1 << 8, True },
++ { "Xonix", NULL, NULL, 0, True },
+ };
- /* tagging */
- const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9"
};
+ /* layout(s) */
+@@ -49,7 +50,7 @@ static Layout layouts[] = {
- Rule rules[] = {
- /* class instance title tags ref
isfloating */
-+ { "Firefox", NULL, NULL, tags[8], False },
- { "Gimp", NULL, NULL, NULL, True },
-+ { "Xonix", NULL, NULL, NULL, True },
- };
+ /* commands */
+ static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb",
normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+-static const char *termcmd[] = { "uxterm", NULL };
++static const char *termcmd[] = { "xterm", NULL };
- /* geometries, s{x,y,w,h} and bh are already initualized here */
-@@ -46,7 +48,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 },
+ static Key keys[] = {
+ /* modifier key function argument */
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/x11/dwm/patches/patch-config_mk,v
retrieving revision 1.1
diff -u -p -r1.1 patch-config_mk
--- patches/patch-config_mk 15 Apr 2008 19:44:10 -0000 1.1
+++ patches/patch-config_mk 19 Jun 2008 02:23:21 -0000
@@ -1,7 +1,7 @@
$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
+--- config.mk.orig Wed Jun 18 22:17:03 2008
++++ config.mk Wed Jun 18 22:18:09 2008
+@@ -4,28 +4,28 @@ VERSION = 5.0
# Customize below to fit your system
# paths
@@ -15,21 +15,25 @@ $OpenBSD: patch-config_mk,v 1.1 2008/04/
+X11INC = ${X11BASE}/include
+X11LIB = ${X11BASE}/lib
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS = -L${X11LIB} -lXinerama
+ XINERAMAFLAGS = -DXINERAMA
+
# includes and libs
-INCS = -I. -I/usr/include -I${X11INC}
--LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
+INCS = -I${X11INC}
-+LIBS = -L${X11LIB} -lX11
++LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
# flags
--CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+ CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
-+CFLAGS+= ${INCS} -DVERSION=\"${VERSION}\"
-+LDFLAGS+= ${LIBS}
- #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
- #LDFLAGS = -g ${LIBS}
++CFLAGS = ${INCS} ${CPPFLAGS}
++LDFLAGS = ${LIBS}
-@@ -25,4 +25,4 @@ LDFLAGS = -s ${LIBS}
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
#LDFLAGS = ${LIBS}
# compiler and linker
Index: patches/patch-dwm_c
===================================================================
RCS file: patches/patch-dwm_c
diff -N patches/patch-dwm_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-dwm_c 19 Jun 2008 02:23:21 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- dwm.c.orig Wed Jun 18 22:20:57 2008
++++ dwm.c Wed Jun 18 22:21:04 2008
+@@ -63,9 +63,6 @@ enum { ClkLtSymbol = 64, ClkStatusText, ClkWinTitle,
+ ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
+
+ /* typedefs */
+-typedef unsigned int uint;
+-typedef unsigned long ulong;
+-
+ typedef union {
+ int i;
+ uint ui;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/dwm/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 26 May 2007 20:12:15 -0000 1.1.1.1
+++ pkg/PLIST 19 Jun 2008 02:23:21 -0000
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/05/26 20:12:15 kili Exp $
-bin/dwm
[EMAIL PROTECTED] bin/dwm
@man man/man1/dwm.1
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/dmenu/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 8 Apr 2008 18:04:10 -0000 1.6
+++ Makefile 19 Jun 2008 02:25:35 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.6 2008/04/08 18:04:10 merdely Exp $
COMMENT= dynamic menu for X11
-DISTNAME= dmenu-3.6
+DISTNAME= dmenu-3.7
CATEGORIES= x11
HOMEPAGE= http://www.suckless.org/wiki/tools/xlib
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/dmenu/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 8 Apr 2008 18:04:10 -0000 1.6
+++ distinfo 19 Jun 2008 02:25:35 -0000
@@ -1,5 +1,5 @@
-MD5 (dmenu-3.6.tar.gz) = 452OCnepKaK4C69E09xgGQ==
-RMD160 (dmenu-3.6.tar.gz) = fStmCh1WMzikWX8j5IqbFnHueik=
-SHA1 (dmenu-3.6.tar.gz) = lXDhYDGAdc/mpuln+cc9Gi0JfhU=
-SHA256 (dmenu-3.6.tar.gz) = wBg8Thr6dpzfaiyYzTVL4jZ0QStrSD5xsiub1eTwe7c=
-SIZE (dmenu-3.6.tar.gz) = 8508
+MD5 (dmenu-3.7.tar.gz) = 27bCDhRUxBSok/5DYbhGsg==
+RMD160 (dmenu-3.7.tar.gz) = Lit4rMfAKO8NwNHPjG251C+kgZo=
+SHA1 (dmenu-3.7.tar.gz) = TWQjOrpsBPY+eiO1wQ3HB7gi5BY=
+SHA256 (dmenu-3.7.tar.gz) = YM67rl8fwdvZMMS0PwAMq5sKZFVPppztxt1dj8doqu4=
+SIZE (dmenu-3.7.tar.gz) = 8478
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/x11/dmenu/patches/patch-config_mk,v
retrieving revision 1.4
diff -u -p -r1.4 patch-config_mk
--- patches/patch-config_mk 8 Apr 2008 18:04:10 -0000 1.4
+++ patches/patch-config_mk 19 Jun 2008 02:25:35 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-config_mk,v 1.4 2008/04/08 18:04:10 merdely Exp $
---- config.mk.orig Thu Apr 3 22:56:07 2008
-+++ config.mk Mon Apr 7 23:51:43 2008
-@@ -4,19 +4,19 @@ VERSION = 3.6
+--- config.mk.orig Wed Jun 18 22:10:01 2008
++++ config.mk Wed Jun 18 22:11:39 2008
+@@ -4,28 +4,28 @@ VERSION = 3.7
# Customize below to fit your system
# paths
@@ -15,22 +15,26 @@ $OpenBSD: patch-config_mk,v 1.4 2008/04/
+X11INC = ${X11BASE}/include
+X11LIB = ${X11BASE}/lib
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS = -L${X11LIB} -lXinerama
+ XINERAMAFLAGS = -DXINERAMA
+
# includes and libs
-INCS = -I. -I/usr/include -I${X11INC}
--LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
+INCS = -I${X11INC}
-+LIBS = -L${X11LIB} -lX11
++LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
# flags
--CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+ CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
-+CFLAGS+= ${INCS} -DVERSION=\"${VERSION}\"
++CFLAGS = ${INCS} ${CPPFLAGS}
+LDFLAGS = ${LIBS}
- #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
- #LDFLAGS = -g ${LIBS}
-@@ -26,4 +26,4 @@ LDFLAGS = -s ${LIBS}
- #CFLAGS += -xtarget=ultra
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = ${LIBS}
# compiler and linker
-CC = cc
Index: patches/patch-dmenu_c
===================================================================
RCS file: patches/patch-dmenu_c
diff -N patches/patch-dmenu_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-dmenu_c 19 Jun 2008 02:25:35 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- dmenu.c.orig Wed Jun 18 22:24:26 2008
++++ dmenu.c Wed Jun 18 22:24:33 2008
+@@ -21,8 +21,6 @@
+ enum { ColFG, ColBG, ColLast };
+
+ /* typedefs */
+-typedef unsigned int uint;
+-typedef unsigned long ulong;
+ typedef struct {
+ int x, y, w, h;
+ ulong norm[ColLast];
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/dmenu/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 8 Apr 2008 18:04:10 -0000 1.3
+++ pkg/PLIST 19 Jun 2008 02:25:35 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2008/04/08 18:04:10 merdely Exp $
-bin/dmenu
[EMAIL PROTECTED] bin/dmenu
bin/dmenu_path
bin/dmenu_run
@man man/man1/dmenu.1
