On Mon, Nov 09, 2015 at 04:07:56PM -0500, Ted Unangst wrote: > Joerg Jung wrote: > > Hi, > > > > please find below an update for x11/dwm to 6.1. This release contains > > various fixes and improvements, see announcement [1] for more details. > > > > OK? > > so now that we finally changed the default xterm back to uxterm, they changed > it to st. needs another man page patch. :)
You are right. Updated diff including man page patch below. Index: Makefile =================================================================== RCS file: /cvs/ports/x11/dwm/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- Makefile 25 Oct 2015 14:23:07 -0000 1.26 +++ Makefile 9 Nov 2015 21:30:56 -0000 @@ -2,8 +2,7 @@ COMMENT= dynamic window manager -DISTNAME= dwm-6.0 -REVISION= 1 +DISTNAME= dwm-6.1 CATEGORIES= x11 @@ -18,7 +17,7 @@ WANTLIB= X11 Xinerama c MASTER_SITES= http://dl.suckless.org/dwm/ -RUN_DEPENDS= x11/dmenu>=4.4 \ +RUN_DEPENDS= x11/dmenu>=4.6 \ fonts/terminus-font MAKE_ENV= LDFLAGS="${LDFLAGS}" Index: distinfo =================================================================== RCS file: /cvs/ports/x11/dwm/distinfo,v retrieving revision 1.18 diff -u -p -r1.18 distinfo --- distinfo 18 Jan 2015 03:15:53 -0000 1.18 +++ distinfo 9 Nov 2015 21:30:56 -0000 @@ -1,2 +1,2 @@ -SHA256 (dwm-6.0.tar.gz) = srlIPeaSWe7qVoRImbsjhRWNPnmkLYKxDBQgmfyO61Y= -SIZE (dwm-6.0.tar.gz) = 20810 +SHA256 (dwm-6.1.tar.gz) = wvbFYWfwrNvj3DfMqcGhkmDAQPLUgA41KaIa18zidf4= +SIZE (dwm-6.1.tar.gz) = 25887 Index: patches/patch-config_def_h =================================================================== RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v retrieving revision 1.10 diff -u -p -r1.10 patch-config_def_h --- patches/patch-config_def_h 25 Oct 2015 14:23:07 -0000 1.10 +++ patches/patch-config_def_h 9 Nov 2015 21:30:56 -0000 @@ -1,18 +1,21 @@ $OpenBSD: patch-config_def_h,v 1.10 2015/10/25 14:23:07 jung Exp $ ---- config.def.h.orig Mon Dec 19 16:02:46 2011 -+++ config.def.h Thu Oct 8 20:58:14 2015 -@@ -1,13 +1,13 @@ - /* See LICENSE file for copyright and license details. */ +--- config.def.h.orig Sun Nov 8 23:39:37 2015 ++++ config.def.h Mon Nov 9 21:23:42 2015 +@@ -2,15 +2,15 @@ /* appearance */ --static const char font[] = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*"; + static const char *fonts[] = { +- "monospace:size=10" ++ "terminus:size=8" + }; +-static const char dmenufont[] = "monospace:size=10"; -static const char normbordercolor[] = "#444444"; -static const char normbgcolor[] = "#222222"; -static const char normfgcolor[] = "#bbbbbb"; -static const char selbordercolor[] = "#005577"; -static const char selbgcolor[] = "#005577"; -static const char selfgcolor[] = "#eeeeee"; -+static const char font[] = "-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*"; ++static const char dmenufont[] = "terminus:size=8"; +static const char normbordercolor[] = "#404040"; +static const char normbgcolor[] = "#202020"; +static const char normfgcolor[] = "#c0c0c0"; @@ -21,13 +24,22 @@ $OpenBSD: patch-config_def_h,v 1.10 2015 +static const char selfgcolor[] = "#f0f0f0"; 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[] = { + static const int showbar = 1; /* 0 means no bar */ +@@ -27,6 +27,8 @@ static const Rule rules[] = { /* class instance title tags mask isfloating monitor */ - { "Gimp", NULL, NULL, 0, True, -1 }, - { "Firefox", NULL, NULL, 1 << 8, False, -1 }, -+ { "Xonix", NULL, NULL, 0, True, -1 }, -+ { NULL, NULL, "glxgears", 0, True, -1 }, + { "Gimp", NULL, NULL, 0, 1, -1 }, + { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, ++ { "Xonix", NULL, NULL, 0, 1, -1 }, ++ { NULL, NULL, "glxgears", 0, 1, -1 }, }; /* layout(s) */ +@@ -55,7 +57,7 @@ static const Layout layouts[] = { + /* commands */ + static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ + static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; +-static const char *termcmd[] = { "st", NULL }; ++static const char *termcmd[] = { "uxterm", 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.9 diff -u -p -r1.9 patch-config_mk --- patches/patch-config_mk 9 Jul 2012 16:33:40 -0000 1.9 +++ patches/patch-config_mk 9 Nov 2015 21:30:56 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-config_mk,v 1.9 2012/07/09 16:33:40 zinke Exp $ ---- config.mk.orig Mon Dec 19 16:02:46 2011 -+++ config.mk Sat Jul 7 22:28:18 2012 -@@ -4,30 +4,30 @@ VERSION = 6.0 +--- config.mk.orig Sun Nov 8 23:39:37 2015 ++++ config.mk Mon Nov 9 21:14:22 2015 +@@ -4,11 +4,11 @@ VERSION = 6.1 # Customize below to fit your system # paths @@ -15,25 +15,28 @@ $OpenBSD: patch-config_mk,v 1.9 2012/07/ +X11INC = ${X11BASE}/include +X11LIB = ${X11BASE}/lib - # Xinerama - XINERAMALIBS = -L${X11LIB} -lXinerama - XINERAMAFLAGS = -DXINERAMA - - # includes and libs --INCS = -I. -I/usr/include -I${X11INC} --LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} -+INCS = -I${X11INC} -+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} + # Xinerama, comment if you don't want it + XINERAMALIBS = -lXinerama +@@ -16,7 +16,7 @@ XINERAMAFLAGS = -DXINERAMA + + # freetype + FREETYPELIBS = -lfontconfig -lXft +-FREETYPEINC = /usr/include/freetype2 ++#FREETYPEINC = /usr/include/freetype2 + # OpenBSD (uncomment) + FREETYPEINC = ${X11INC}/freetype2 + +@@ -25,14 +25,14 @@ INCS = -I${X11INC} -I${FREETYPEINC} + LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} # flags --CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -+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 -Os ${INCS} ${CPPFLAGS} - #LDFLAGS = -g ${LIBS} --LDFLAGS = -s ${LIBS} -+LDFLAGS += ${LIBS} +-CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ++CPPFLAGS += -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} + #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} +-CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} +-LDFLAGS = -s ${LIBS} ++CFLAGS += -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ++LDFLAGS += -s ${LIBS} # Solaris #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" Index: patches/patch-dwm_1 =================================================================== RCS file: patches/patch-dwm_1 diff -N patches/patch-dwm_1 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-dwm_1 9 Nov 2015 21:30:56 -0000 @@ -0,0 +1,21 @@ +$OpenBSD$ +--- dwm.1.orig Mon Nov 9 22:25:40 2015 ++++ dwm.1 Mon Nov 9 22:26:32 2015 +@@ -57,7 +57,7 @@ click on a tag label adds/removes that tag to/from the + .TP + .B Mod1\-Shift\-Return + Start +-.BR st(1). ++.BR uxterm(1). + .TP + .B Mod1\-, + Focus previous screen, if any. +@@ -151,7 +151,7 @@ dwm is customized by creating a custom config.h and (r + code. This keeps it fast, secure and simple. + .SH SEE ALSO + .BR dmenu (1), +-.BR st (1) ++.BR uxterm (1) + .SH BUGS + Java applications which use the XToolkit/XAWT backend may draw grey windows + only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early
