hello 

here is a diff that update x11/dmenu to 4.5.

following changelog:

* Detects monitor based on input focus, not just pointer location. 
* Token matching instead of just substrings. 
* XIM composition support. 
* Paste from clipboard with C-S-y. 
* stest(1) replaces lsx(1). 
* M-[Gghjkl] restored for vi-like navigation. 
* And a couple of bug fixes.

works for me, i am running it daily +spectrwm
looking for comments,tests and OKs,
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/dmenu/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile    20 Sep 2011 20:34:52 -0000      1.17
+++ Makefile    3 Apr 2012 18:07:52 -0000
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.17 2011/09/20 20:34:52 gsoares Exp $
 
 COMMENT=               dynamic menu for X11
-DISTNAME=              dmenu-4.4.1
+DISTNAME=              dmenu-4.5
 
 CATEGORIES=            x11
 HOMEPAGE=              http://tools.suckless.org/dmenu
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/dmenu/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo    20 Sep 2011 20:34:52 -0000      1.12
+++ distinfo    3 Apr 2012 18:07:52 -0000
@@ -1,5 +1,5 @@
-MD5 (dmenu-4.4.1.tar.gz) = 0YqqmsMmX5LsNKDfDLbr1A==
-RMD160 (dmenu-4.4.1.tar.gz) = ShVIbq8Z/d6T52PsNAAB5edKwqQ=
-SHA1 (dmenu-4.4.1.tar.gz) = Qvi7S4v3KEDMND8LPzGXWiI1Dlo=
-SHA256 (dmenu-4.4.1.tar.gz) = bWQWRathDZjYR7mmRQC+fMDnW/9TQlNJBpNq+m3bRVA=
-SIZE (dmenu-4.4.1.tar.gz) = 9318
+MD5 (dmenu-4.5.tar.gz) = nEYWntcDcy7FLtlGwn2EtA==
+RMD160 (dmenu-4.5.tar.gz) = t3GoTg6aj7spMXwH+nf5K2Tc3C8=
+SHA1 (dmenu-4.5.tar.gz) = cMGhO5ULewyxvDXjDG6GGng1mVM=
+SHA256 (dmenu-4.5.tar.gz) = CCzWmNghJcoLOYkAb7hKxGdcKlWFv1u4rw6gnPuVqFA=
+SIZE (dmenu-4.5.tar.gz) = 11543
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/dmenu/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile
--- patches/patch-Makefile      18 Aug 2011 14:13:28 -0000      1.1
+++ patches/patch-Makefile      3 Apr 2012 18:07:52 -0000
@@ -1,9 +1,6 @@
 $OpenBSD: patch-Makefile,v 1.1 2011/08/18 14:13:28 gsoares Exp $
-
-dmenu: lsx conflicts with comms/lrzsz
-
---- Makefile.orig      Tue Jul 19 17:31:28 2011
-+++ Makefile   Tue Jul 26 14:51:15 2011
+--- Makefile.orig      Tue Apr  3 12:17:59 2012
++++ Makefile   Tue Apr  3 12:19:29 2012
 @@ -16,17 +16,17 @@ options:
  
  .c.o:
@@ -11,39 +8,17 @@ dmenu: lsx conflicts with comms/lrzsz
 -      @${CC} -c $< ${CFLAGS}
 +      ${CC} -c $< ${CFLAGS}
  
- ${OBJ}: config.mk
+ ${OBJ}: config.mk draw.h
  
  dmenu: dmenu.o draw.o
        @echo CC -o $@
 -      @${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
 +      ${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
  
- lsx: lsx.o
+ stest: stest.o
        @echo CC -o $@
--      @${CC} -o $@ lsx.o ${LDFLAGS}
-+      ${CC} -o $@ lsx.o ${LDFLAGS}
+-      @${CC} -o $@ stest.o ${LDFLAGS}
++      ${CC} -o $@ stest.o ${LDFLAGS}
  
  clean:
        @echo cleaning
-@@ -43,16 +43,17 @@ dist: clean
- install: all
-       @echo installing executables to ${DESTDIR}${PREFIX}/bin
-       @mkdir -p ${DESTDIR}${PREFIX}/bin
--      @cp -f dmenu dmenu_run lsx ${DESTDIR}${PREFIX}/bin
-+      @cp -f dmenu dmenu_run ${DESTDIR}${PREFIX}/bin
-+      @cp -f lsx ${DESTDIR}${PREFIX}/bin/dmenu_lsx
-       @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
-       @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
--      @chmod 755 ${DESTDIR}${PREFIX}/bin/lsx
-+      @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_lsx
-       @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
-       @mkdir -p ${DESTDIR}${MANPREFIX}/man1
-       @sed "s/VERSION/${VERSION}/g" < dmenu.1 > 
${DESTDIR}${MANPREFIX}/man1/dmenu.1
--      @sed "s/VERSION/${VERSION}/g" < lsx.1 > 
${DESTDIR}${MANPREFIX}/man1/lsx.1
-+      @sed "s/VERSION/${VERSION}/g" < lsx.1 > 
${DESTDIR}${MANPREFIX}/man1/dmenu_lsx.1
-       @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
--      @chmod 644 ${DESTDIR}${MANPREFIX}/man1/lsx.1
-+      @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu_lsx.1
- 
- uninstall:
-       @echo removing executables from ${DESTDIR}${PREFIX}/bin
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/x11/dmenu/patches/patch-config_mk,v
retrieving revision 1.9
diff -u -p -r1.9 patch-config_mk
--- patches/patch-config_mk     20 Sep 2011 20:34:52 -0000      1.9
+++ patches/patch-config_mk     3 Apr 2012 18:07:52 -0000
@@ -1,8 +1,8 @@
 $OpenBSD: patch-config_mk,v 1.9 2011/09/20 20:34:52 gsoares Exp $
---- config.mk.orig     Mon Sep 19 06:48:13 2011
-+++ config.mk  Tue Sep 20 11:00:07 2011
+--- config.mk.orig     Sun Jan  8 10:18:43 2012
++++ config.mk  Tue Apr  3 12:08:37 2012
 @@ -2,11 +2,11 @@
- VERSION = 4.4.1
+ VERSION = 4.5
  
  # paths
 -PREFIX = /usr/local
@@ -17,14 +17,15 @@ $OpenBSD: patch-config_mk,v 1.9 2011/09/
  
  # Xinerama, comment if you don't want it
  XINERAMALIBS  = -lXinerama
-@@ -17,9 +17,9 @@ INCS = -I${X11INC}
+@@ -17,10 +17,10 @@ INCS = -I${X11INC}
  LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
  
  # flags
--CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
--CFLAGS   = -ansi -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
--LDFLAGS  = -s ${LIBS}
+-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}
+-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS  = -s ${LIBS}
 +CFLAGS += ${INCS} ${CPPFLAGS}
 +LDFLAGS += ${LIBS}
  
Index: patches/patch-dmenu_1
===================================================================
RCS file: patches/patch-dmenu_1
diff -N patches/patch-dmenu_1
--- patches/patch-dmenu_1       21 Aug 2011 21:28:25 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-dmenu_1,v 1.1 2011/08/21 21:28:25 kili Exp $
-
-dmenu: lsx conflicts with comms/lrzsz
-
---- dmenu.1.orig       Tue Jul 19 22:31:28 2011
-+++ dmenu.1    Sun Aug 21 19:22:34 2011
-@@ -96,4 +96,4 @@ Exit without selecting an item, returning failure.
- Paste the current X selection into the input field.
- .SH SEE ALSO
- .IR dwm (1),
--.IR lsx (1)
-+.IR dmenu_lsx (1)
Index: patches/patch-dmenu_run
===================================================================
RCS file: patches/patch-dmenu_run
diff -N patches/patch-dmenu_run
--- patches/patch-dmenu_run     20 Sep 2011 20:34:52 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-dmenu_run,v 1.2 2011/09/20 20:34:52 gsoares Exp $
-
-dmenu: lsx conflicts with comms/lrzsz
-
---- dmenu_run.orig     Mon Sep 19 06:48:13 2011
-+++ dmenu_run  Tue Sep 20 11:00:07 2011
-@@ -3,7 +3,7 @@ CACHE=${XDG_CACHE_HOME:-"$HOME/.cache"}/dmenu_run
- (
-       IFS=:
-       if test "`ls -dt $PATH "$CACHE" 2> /dev/null | sed 1q`" != "$CACHE"; 
then
--              mkdir -p "`dirname "$CACHE"`" && lsx $PATH | sort -u > "$CACHE"
-+              mkdir -p "`dirname "$CACHE"`" && dmenu_lsx $PATH | sort -u > 
"$CACHE"
-       fi
- )
- cmd=`dmenu "$@" < "$CACHE"` && exec sh -c "$cmd"
Index: patches/patch-lsx_1
===================================================================
RCS file: patches/patch-lsx_1
diff -N patches/patch-lsx_1
--- patches/patch-lsx_1 21 Aug 2011 21:28:25 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-lsx_1,v 1.1 2011/08/21 21:28:25 kili Exp $
-
-dmenu: lsx conflicts with comms/lrzsz
-
---- lsx.1.orig Tue Jul 19 22:31:28 2011
-+++ lsx.1      Sun Aug 21 19:29:03 2011
-@@ -1,11 +1,11 @@
--.TH LSX 1 dmenu\-VERSION
-+.TH DMENU_LSX 1 dmenu\-VERSION
- .SH NAME
--lsx \- list executables
-+dmenu_lsx \- list executables
- .SH SYNOPSIS
--.B lsx
-+.B dmenu_lsx
- .RI [ directory ...]
- .SH DESCRIPTION
--.B lsx
-+.B dmenu_lsx
- lists the executables in each
- .IR directory .
- If none are given the current working directory is used.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/dmenu/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   18 Aug 2011 14:13:28 -0000      1.5
+++ pkg/PLIST   3 Apr 2012 18:07:52 -0000
@@ -1,6 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.5 2011/08/18 14:13:28 gsoares Exp $
 @bin bin/dmenu
-@bin bin/dmenu_lsx
 bin/dmenu_run
+@bin bin/stest
 @man man/man1/dmenu.1
-@man man/man1/dmenu_lsx.1
+@man man/man1/stest.1

Reply via email to