diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile index 6fcc5aec6ba..3c06c0bae99 100644 --- a/x11/dmenu/Makefile +++ b/x11/dmenu/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.14 2010/11/22 08:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2011/08/18 14:13:28 gsoares Exp $ COMMENT= dynamic menu for X11 -DISTNAME= dmenu-4.1.1 +DISTNAME= dmenu-4.4 CATEGORIES= x11 HOMEPAGE= http://tools.suckless.org/dmenu @@ -20,7 +20,6 @@ MASTER_SITES= http://dl.suckless.org/tools/ FAKE_FLAGS= DESTDIR="" -USE_GROFF = Yes NO_REGRESS= Yes .include diff --git a/x11/dmenu/distinfo b/x11/dmenu/distinfo index 3c0002ef617..4cf1d90be10 100644 --- a/x11/dmenu/distinfo +++ b/x11/dmenu/distinfo @@ -1,5 +1,5 @@ -MD5 (dmenu-4.1.1.tar.gz) = kxiWoZl0HCO+lF6FGagcHQ== -RMD160 (dmenu-4.1.1.tar.gz) = NoP53GILFrOdxTHklALTe+x48SM= -SHA1 (dmenu-4.1.1.tar.gz) = XUHZy/aJYIY2I9ghliwxysktkvw= -SHA256 (dmenu-4.1.1.tar.gz) = nl93WuYhaVIK61cH9y+KhDVSvs93arvXvLa6Ef1B5go= -SIZE (dmenu-4.1.1.tar.gz) = 9351 +MD5 (dmenu-4.4.tar.gz) = rhkC/Ddxb3OYNv3c5hI+vA== +RMD160 (dmenu-4.4.tar.gz) = eCIMDKmBuQKs05SIm5JsWkYrPOk= +SHA1 (dmenu-4.4.tar.gz) = YbVnXFgpdwsR3B+LBGlXwrYhw9E= +SHA256 (dmenu-4.4.tar.gz) = W93lf7iEa+11MOlFjbkKHVFxj/jk5U71sGJNMqt10AQ= +SIZE (dmenu-4.4.tar.gz) = 9308 diff --git a/x11/dmenu/patches/patch-Makefile b/x11/dmenu/patches/patch-Makefile new file mode 100644 index 00000000000..e1a2b7224e1 --- /dev/null +++ b/x11/dmenu/patches/patch-Makefile @@ -0,0 +1,49 @@ +$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 +@@ -16,17 +16,17 @@ options: + + .c.o: + @echo CC -c $< +- @${CC} -c $< ${CFLAGS} ++ ${CC} -c $< ${CFLAGS} + + ${OBJ}: config.mk + + 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 + @echo CC -o $@ +- @${CC} -o $@ lsx.o ${LDFLAGS} ++ ${CC} -o $@ lsx.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 diff --git a/x11/dmenu/patches/patch-config_mk b/x11/dmenu/patches/patch-config_mk index c785972a310..f4e7a059484 100644 --- a/x11/dmenu/patches/patch-config_mk +++ b/x11/dmenu/patches/patch-config_mk @@ -1,8 +1,8 @@ -$OpenBSD: patch-config_mk,v 1.7 2009/04/29 20:14:43 sthen Exp $ ---- config.mk.orig Mon Apr 27 13:03:41 2009 -+++ config.mk Mon Apr 27 13:06:23 2009 -@@ -4,28 +4,28 @@ VERSION = 4.0 - # Customize below to fit your system +$OpenBSD: patch-config_mk,v 1.8 2011/08/18 14:13:28 gsoares Exp $ +--- config.mk.orig Tue Jul 19 17:31:28 2011 ++++ config.mk Tue Jul 26 10:00:34 2011 +@@ -2,11 +2,11 @@ + VERSION = 4.4 # paths -PREFIX = /usr/local @@ -16,27 +16,18 @@ $OpenBSD: patch-config_mk,v 1.7 2009/04/29 20:14:43 sthen Exp $ +X11LIB = ${X11BASE}/lib # Xinerama, comment if you don't want it - 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} + XINERAMALIBS = -lXinerama +@@ -17,9 +17,9 @@ INCS = -I${X11INC} + LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} # flags -CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} --CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} --LDFLAGS = -s ${LIBS} +-CFLAGS = -ansi -pedantic -Wall -Os ${INCS} ${CPPFLAGS} +-LDFLAGS = -s ${LIBS} +CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +CFLAGS += ${INCS} ${CPPFLAGS} +LDFLAGS += ${LIBS} - # Solaris - #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = ${LIBS} - # compiler and linker -CC = cc -+#CC = cc ++CC ?= cc diff --git a/x11/dmenu/patches/patch-dmenu_run b/x11/dmenu/patches/patch-dmenu_run new file mode 100644 index 00000000000..c5b10810c55 --- /dev/null +++ b/x11/dmenu/patches/patch-dmenu_run @@ -0,0 +1,15 @@ +$OpenBSD: patch-dmenu_run,v 1.1 2011/08/18 14:13:28 gsoares Exp $ + +dmenu: lsx conflicts with comms/lrzsz + +--- dmenu_run.orig Tue Jul 26 10:15:08 2011 ++++ dmenu_run Tue Jul 26 10:15:18 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 $cmd diff --git a/x11/dmenu/pkg/PLIST b/x11/dmenu/pkg/PLIST index 0456f178d16..9007891567c 100644 --- a/x11/dmenu/pkg/PLIST +++ b/x11/dmenu/pkg/PLIST @@ -1,5 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.4 2008/07/02 20:44:46 merdely Exp $ +@comment $OpenBSD: PLIST,v 1.5 2011/08/18 14:13:28 gsoares Exp $ @bin bin/dmenu -bin/dmenu_path +@bin bin/dmenu_lsx bin/dmenu_run @man man/man1/dmenu.1 +@man man/man1/dmenu_lsx.1