Hi, please find below an update for x11/dmenu to 4.6. This release contains a lot fixes and improvements, see announcement [1] for more details.
OK? Thanks, Regards, Joerg [1] http://lists.suckless.org/dev/1511/27503.html Index: Makefile =================================================================== RCS file: /cvs/ports/x11/dmenu/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile 11 Mar 2013 11:46:08 -0000 1.20 +++ Makefile 9 Nov 2015 20:30:51 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.20 2013/03/11 11:46:08 espie Exp $ COMMENT= dynamic menu for X11 -DISTNAME= dmenu-4.5 -REVISION= 0 +DISTNAME= dmenu-4.6 CATEGORIES= x11 HOMEPAGE= http://tools.suckless.org/dmenu @@ -15,6 +14,8 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB= X11 Xinerama c MASTER_SITES= http://dl.suckless.org/tools/ + +RUN_DEPENDS= fonts/terminus-font FAKE_FLAGS= DESTDIR="" Index: distinfo =================================================================== RCS file: /cvs/ports/x11/dmenu/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 18 Jan 2015 03:15:53 -0000 1.14 +++ distinfo 9 Nov 2015 20:30:51 -0000 @@ -1,2 +1,2 @@ -SHA256 (dmenu-4.5.tar.gz) = CCzWmNghJcoLOYkAb7hKxGdcKlWFv1u4rw6gnPuVqFA= -SIZE (dmenu-4.5.tar.gz) = 11543 +SHA256 (dmenu-4.6.tar.gz) = SnokAIpiHDzWVhVa2Rq4E2248NO57Fba/uxRjKvalrM= +SIZE (dmenu-4.6.tar.gz) = 15057 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/x11/dmenu/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-Makefile --- patches/patch-Makefile 1 May 2012 04:40:03 -0000 1.2 +++ patches/patch-Makefile 9 Nov 2015 20:30:51 -0000 @@ -1,19 +1,21 @@ $OpenBSD: patch-Makefile,v 1.2 2012/05/01 04:40:03 gsoares Exp $ ---- Makefile.orig Tue Apr 3 12:17:59 2012 -+++ Makefile Tue Apr 3 12:19:29 2012 -@@ -16,17 +16,17 @@ options: +--- Makefile.orig Sun Nov 8 23:42:21 2015 ++++ Makefile Mon Nov 9 20:31:51 2015 +@@ -16,7 +16,7 @@ options: .c.o: - @echo CC -c $< -- @${CC} -c $< ${CFLAGS} -+ ${CC} -c $< ${CFLAGS} + @echo CC $< +- @${CC} -c ${CFLAGS} $< ++ ${CC} -c ${CFLAGS} $< - ${OBJ}: config.mk draw.h + config.h: + @echo creating $@ from config.def.h +@@ -26,11 +26,11 @@ ${OBJ}: arg.h config.h config.mk drw.h - dmenu: dmenu.o draw.o + dmenu: dmenu.o drw.o util.o @echo CC -o $@ -- @${CC} -o $@ dmenu.o draw.o ${LDFLAGS} -+ ${CC} -o $@ dmenu.o draw.o ${LDFLAGS} +- @${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS} ++ ${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS} stest: stest.o @echo CC -o $@ Index: patches/patch-config_def_h =================================================================== RCS file: patches/patch-config_def_h diff -N patches/patch-config_def_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-config_def_h 9 Nov 2015 20:30:51 -0000 @@ -0,0 +1,22 @@ +$OpenBSD$ +--- config.def.h.orig Sun Nov 8 23:42:21 2015 ++++ config.def.h Mon Nov 9 21:05:22 2015 +@@ -4,13 +4,13 @@ + static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ + /* -fn option overrides fonts[0]; default X11 font or font set */ + static const char *fonts[] = { +- "monospace:size=10" ++ "terminus:size=8" + }; + static const char *prompt = NULL; /* -p option; prompt to the elft of input field */ +-static const char *normbgcolor = "#222222"; /* -nb option; normal background */ +-static const char *normfgcolor = "#bbbbbb"; /* -nf option; normal foreground */ +-static const char *selbgcolor = "#005577"; /* -sb option; selected background */ +-static const char *selfgcolor = "#eeeeee"; /* -sf option; selected foreground */ ++static const char *normbgcolor = "#202020"; /* -nb option; normal background */ ++static const char *normfgcolor = "#c0c0c0"; /* -nf option; normal foreground */ ++static const char *selbgcolor = "#404040"; /* -sb option; selected background */ ++static const char *selfgcolor = "#f0f0f0"; /* -sf option; selected foreground */ + static const char *outbgcolor = "#00ffff"; + static const char *outfgcolor = "#000000"; + /* -l option; if nonzero, dmenu uses vertical list with given number of lines */ Index: patches/patch-config_mk =================================================================== RCS file: /cvs/ports/x11/dmenu/patches/patch-config_mk,v retrieving revision 1.10 diff -u -p -r1.10 patch-config_mk --- patches/patch-config_mk 1 May 2012 04:40:03 -0000 1.10 +++ patches/patch-config_mk 9 Nov 2015 20:30:51 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-config_mk,v 1.10 2012/05/01 04:40:03 gsoares Exp $ ---- config.mk.orig Sun Jan 8 10:18:43 2012 -+++ config.mk Tue Apr 3 12:08:37 2012 +--- config.mk.orig Sun Nov 8 23:42:21 2015 ++++ config.mk Mon Nov 9 20:35:06 2015 @@ -2,11 +2,11 @@ - VERSION = 4.5 + VERSION = 4.6 # paths -PREFIX = /usr/local @@ -17,17 +17,25 @@ $OpenBSD: patch-config_mk,v 1.10 2012/05 # Xinerama, comment if you don't want it XINERAMALIBS = -lXinerama -@@ -17,10 +17,10 @@ INCS = -I${X11INC} - LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} +@@ -14,7 +14,7 @@ XINERAMAFLAGS = -DXINERAMA + + # freetype + FREETYPELIBS = -lfontconfig -lXft +-FREETYPEINC = /usr/include/freetype2 ++#FREETYPEINC = /usr/include/freetype2 + # OpenBSD (uncomment) + FREETYPEINC = ${X11INC}/freetype2 + +@@ -23,9 +23,9 @@ INCS = -I${X11INC} -I${FREETYPEINC} + LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} # flags --CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -+CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} - #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} +-CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -LDFLAGS = -s ${LIBS} -+CFLAGS += ${INCS} ${CPPFLAGS} -+LDFLAGS += ${LIBS} ++CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ++CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} ++LDFLAGS += -s ${LIBS} # compiler and linker -CC = cc Index: patches/patch-dmenu_c =================================================================== RCS file: patches/patch-dmenu_c diff -N patches/patch-dmenu_c --- patches/patch-dmenu_c 5 Nov 2012 13:14:23 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-dmenu_c,v 1.1 2012/11/05 13:14:23 zinke Exp $ ---- dmenu.c.orig Fri Nov 2 13:18:33 2012 -+++ dmenu.c Fri Nov 2 13:19:46 2012 -@@ -45,10 +45,10 @@ static int inputw, promptw; - static size_t cursor = 0; - static const char *font = NULL; - static const char *prompt = NULL; --static const char *normbgcolor = "#222222"; --static const char *normfgcolor = "#bbbbbb"; --static const char *selbgcolor = "#005577"; --static const char *selfgcolor = "#eeeeee"; -+static const char *normbgcolor = "#202020"; -+static const char *normfgcolor = "#c0c0c0"; -+static const char *selbgcolor = "#404040"; -+static const char *selfgcolor = "#f0f0f0"; - static unsigned int lines = 0; - static unsigned long normcol[ColLast]; - static unsigned long selcol[ColLast]; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/dmenu/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- pkg/PLIST 1 May 2012 04:40:03 -0000 1.6 +++ pkg/PLIST 9 Nov 2015 20:30:51 -0000 @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.6 2012/05/01 04:40:03 gsoares Exp $ @bin bin/dmenu +bin/dmenu_path bin/dmenu_run @bin bin/stest @man man/man1/dmenu.1
