Update dwm to 5.8.2. Uses the updated dmenu 4.1 previously posted to
the mailing list.

Tested on i386 running the June 5 snapshot of 4.7-CURRENT. Please test
and comment.

-sl



Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.15
diff -u -p Makefile
--- Makefile    11 Oct 2009 13:30:38 -0000      1.15
+++ Makefile    7 Jun 2010 00:42:56 -0000
@@ -2,7 +2,7 @@

 COMMENT=               dynamic window manager

-DISTNAME=              dwm-5.7.2
+DISTNAME=              dwm-5.8.2

 CATEGORIES=            x11

@@ -20,7 +20,7 @@ WANTLIB=              X11 Xinerama c

 MASTER_SITES=          http://dl.suckless.org/dwm/

-RUN_DEPENDS=           :dmenu->=3.9:x11/dmenu \
+RUN_DEPENDS=           :dmenu->=4.1:x11/dmenu \
                       ::x11/terminus-font

 MAKE_ENV=              LDFLAGS="${LDFLAGS}"
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.14
diff -u -p distinfo
--- distinfo    11 Oct 2009 13:30:38 -0000      1.14
+++ distinfo    7 Jun 2010 00:42:56 -0000
@@ -1,5 +1,5 @@
-MD5 (dwm-5.7.2.tar.gz) = oLinmd3FA03YqBjJvXbzow==
-RMD160 (dwm-5.7.2.tar.gz) = j8bMEMprDGrmn98PYSLgFbhJx6E=
-SHA1 (dwm-5.7.2.tar.gz) = 83SrFQM1ACduq2GsUAKyzQX4y8c=
-SHA256 (dwm-5.7.2.tar.gz) = Mr/+M9XanOxV3n5rIVVo/5lQzCS5Ospy5wl0N6K/zeA=
-SIZE (dwm-5.7.2.tar.gz) = 19989
+MD5 (dwm-5.8.2.tar.gz) = 8LQiv+qoEtZsbdFcPMkqaw==
+RMD160 (dwm-5.8.2.tar.gz) = XNwir3t9Ij75Ndxl6ufI82MLK3Y=
+SHA1 (dwm-5.8.2.tar.gz) = 7k/s7mtASWmIQIjK+6FNU4x3ufk=
+SHA256 (dwm-5.8.2.tar.gz) = xSQ7x5Lj/zuxnwtfpF9vmLQCVK+HV6AQ0WQKTZ04m2Y=
+SIZE (dwm-5.8.2.tar.gz) = 20326
? patch-port
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/dwm/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p patches/patch-Makefile
--- patches/patch-Makefile      16 Jul 2009 15:12:39 -0000      1.4
+++ patches/patch-Makefile      7 Jun 2010 00:42:56 -0000
@@ -1,17 +1,15 @@
-$OpenBSD: patch-Makefile,v 1.4 2009/07/16 15:12:39 jim 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}"
+--- Makefile.orig      Sun Jun  6 19:33:13 2010
++++ Makefile   Sun Jun  6 19:34:55 2010
+@@ -16,7 +16,7 @@

 .c.o:
--     �...@echo CC $<
+       @echo CC $<
 -     �...@${cc} -c ${CFLAGS} $<
 +      ${CC} -c ${CFLAGS} $<

 ${OBJ}: config.h config.mk

-@@ -25,8 +24,7 @@ config.h:
+@@ -25,8 +25,7 @@
      �...@cp config.def.h $@

 dwm: ${OBJ}
@@ -21,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/07/16 15:12:39 jim

 clean:
      �...@echo cleaning
-@@ -42,14 +40,12 @@ dist: clean
+@@ -42,14 +41,12 @@
      �...@rm -rf dwm-${VERSION}

 install: all
Index: patches/patch-config_def_h
===================================================================
RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
retrieving revision 1.7
diff -u -p patches/patch-config_def_h
--- patches/patch-config_def_h  16 Jul 2009 15:12:39 -0000      1.7
+++ patches/patch-config_def_h  7 Jun 2010 00:42:56 -0000
@@ -1,18 +1,15 @@
-$OpenBSD: patch-config_def_h,v 1.7 2009/07/16 15:12:39 jim Exp $
---- config.def.h.orig  Tue Jul 14 14:07:55 2009
-+++ config.def.h       Wed Jul 15 15:54:40 2009
-@@ -1,13 +1,13 @@
- /* See LICENSE file for copyright and license details. */
+--- config.def.h.orig  Sun Jun  6 19:35:33 2010
++++ config.def.h       Sun Jun  6 19:37:02 2010
+@@ -2,12 +2,12 @@

 /* appearance */
--static const char font[]            = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
+ static const char font[]            =
"-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
 -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";
@@ -22,7 +19,7 @@ $OpenBSD: patch-config_def_h,v 1.7 2009/07/16 15:12:39
 static const unsigned int borderpx  = 1;        /* border pixel of windows */
 static const unsigned int snap      = 32;       /* snap pixel */
 static const Bool showbar           = True;     /* False means no bar */
-@@ -20,6 +20,8 @@ static const Rule rules[] = {
+@@ -20,6 +20,8 @@
       /* class      instance    title       tags mask     isfloating
 monitor */
       { "Gimp",     NULL,       NULL,       0,            True,        -1 },
       { "Firefox",  NULL,       NULL,       1 << 8,       False,       -1 },
@@ -31,7 +28,7 @@ $OpenBSD: patch-config_def_h,v 1.7 2009/07/16 15:12:39
 };

 /* layout(s) */
-@@ -46,7 +48,7 @@ static const Layout layouts[] = {
+@@ -46,7 +48,7 @@

 /* commands */
 static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb",
normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor,
NULL };
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/x11/dwm/patches/patch-config_mk,v
retrieving revision 1.6
diff -u -p patches/patch-config_mk
--- patches/patch-config_mk     16 Jul 2009 15:12:39 -0000      1.6
+++ patches/patch-config_mk     7 Jun 2010 00:42:56 -0000
@@ -1,7 +1,6 @@
-$OpenBSD: patch-config_mk,v 1.6 2009/07/16 15:12:39 jim Exp $
---- config.mk.orig     Wed Jul 15 15:39:23 2009
-+++ config.mk  Wed Jul 15 15:59:33 2009
-@@ -4,30 +4,30 @@ VERSION = 5.6
+--- config.mk.orig     Sun Jun  6 19:40:42 2010
++++ config.mk  Sun Jun  6 19:40:24 2010
+@@ -4,25 +4,25 @@
 # Customize below to fit your system

 # paths
@@ -15,7 +14,7 @@ $OpenBSD: patch-config_mk,v 1.6 2009/07/16 15:12:39 ji
 +X11INC = ${X11BASE}/include
 +X11LIB = ${X11BASE}/lib

- # Xinerama, un-comment if you want it
+ # Xinerama
 XINERAMALIBS = -L${X11LIB} -lXinerama
 XINERAMAFLAGS = -DXINERAMA

@@ -27,16 +26,16 @@ $OpenBSD: patch-config_mk,v 1.6 2009/07/16 15:12:39 ji

 # flags
 -CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+-CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
 +CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
- #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 +CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
- #LDFLAGS = -g ${LIBS}
--LDFLAGS = -s ${LIBS}
+ #CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS = -g ${LIBS}
 +LDFLAGS += ${LIBS}
+ #LDFLAGS = -s ${LIBS}

 # Solaris
- #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+@@ -30,4 +30,4 @@
 #LDFLAGS = ${LIBS}

 # compiler and linker

Attachment: dwm-5.8.2.tgz
Description: application/tar-gz

Reply via email to