On Tue, Apr 08, 2008 at 12:15:23PM -0400, Mike Erdely wrote: > How about the diff below? It honors our CFLAGS and drops the $V > variable (as you don't use the version more than once now).
As jasper@ pointed out to me, the dwm diff does not require the updated dmenu diff: Index: Makefile =================================================================== RCS file: /cvs/ports/x11/dwm/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile 25 Nov 2007 12:07:06 -0000 1.6 +++ Makefile 8 Apr 2008 16:31:28 -0000 @@ -2,8 +2,7 @@ COMMENT= dynamic window manager -V= 4.7 -DISTNAME= dwm-$V +DISTNAME= dwm-4.9 CATEGORIES= x11 @@ -21,14 +20,10 @@ 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} +FAKE_FLAGS= DESTDIR="" USE_X11= Yes Index: distinfo =================================================================== RCS file: /cvs/ports/x11/dwm/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 25 Nov 2007 12:07:06 -0000 1.6 +++ distinfo 8 Apr 2008 15:50:42 -0000 @@ -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 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/x11/dwm/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-Makefile --- patches/patch-Makefile 27 Oct 2007 12:41:48 -0000 1.2 +++ patches/patch-Makefile 8 Apr 2008 15:50:42 -0000 @@ -1,21 +1,22 @@ -$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 -@@ -15,8 +15,7 @@ options: - @echo "CC = ${CC}" +$OpenBSD$ +--- Makefile.orig Fri Apr 4 16:03:22 2008 ++++ Makefile Fri Apr 4 16:04:30 2008 +@@ -16,9 +16,9 @@ options: .c.o: -- @echo CC $< + @echo CC $< - @${CC} -c ${CFLAGS} $< + ${CC} -c ${CFLAGS} $< - ${OBJ}: config.h config.mk +-${OBJ}: config.h config.mk ++#${OBJ}: config.h config.mk -@@ -25,8 +24,7 @@ config.h: - @cp config.def.h $@ + config.h: + @echo creating $@ from config.def.h +@@ -26,7 +26,7 @@ config.h: dwm: ${OBJ} -- @echo CC -o $@ + @echo CC -o $@ - @${CC} -o $@ ${OBJ} ${LDFLAGS} + ${CC} -o $@ ${OBJ} ${LDFLAGS} Index: patches/patch-config_h =================================================================== RCS file: /cvs/ports/x11/dwm/patches/patch-config_h,v retrieving revision 1.3 diff -u -p -r1.3 patch-config_h --- patches/patch-config_h 25 Nov 2007 12:07:06 -0000 1.3 +++ patches/patch-config_h 8 Apr 2008 15:50:42 -0000 @@ -1,15 +1,18 @@ ---- 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 */ +$OpenBSD$ +--- config.h.orig Sat Apr 5 09:30:54 2008 ++++ config.h Sat Apr 5 09:35:44 2008 +@@ -2,19 +2,20 @@ + + /* appearance */ #define BORDERPX 1 - #define FONT "-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*" +-#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" @@ -18,13 +21,20 @@ +#define SELFGCOLOR "#f0f0f0" /* tagging */ - const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "www" }; -@@ -39,7 +39,7 @@ Key keys[] = { + const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; + + Rule rules[] = { + /* class instance title tags ref isfloating */ ++ { "Firefox", NULL, NULL, "9", False }, + { "Gimp", NULL, NULL, NULL, True }, + }; + +@@ -46,7 +47,7 @@ Key keys[] = { + /* modifier key function argument */ { 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 }, + "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 }, Index: patches/patch-config_mk =================================================================== RCS file: patches/patch-config_mk diff -N patches/patch-config_mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-config_mk 8 Apr 2008 15:54:45 -0000 @@ -0,0 +1,31 @@ +$OpenBSD$ +--- config.mk.orig Fri Apr 4 16:06:40 2008 ++++ config.mk Fri Apr 4 16:09:10 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} +
