Date: Sat, 18 Mar 2017 15:42:22 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436420 - in head/x11: . dmenu2 dmenu2/files Message-ID: <201703181542.v2IFgMhH003257@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Mar 18 15:42:22 2017 New Revision: 436420 URL: https://svnweb.freebsd.org/changeset/ports/436420 Log: Add `x11/dmenu2', a fork of classic dmenu with many enhancements and additional options. While original upstream is https://bitbucket.org/melek/dmenu2, prefer more up-to-date GitHub repo which was forked from it (and because of our nice USE_GITHUB support for fetching the distfiles). PR: 209391 Submitted by: Timothy Beyer Added: head/x11/dmenu2/ - copied from r436405, head/x11/dmenu/ head/x11/dmenu2/files/dmenu2_path (contents, props changed) head/x11/dmenu2/files/patch-Makefile (contents, props changed) head/x11/dmenu2/files/patch-dmenu__run (contents, props changed) Deleted: head/x11/dmenu2/files/patch-config.mk Modified: head/x11/Makefile head/x11/dmenu2/Makefile head/x11/dmenu2/distinfo head/x11/dmenu2/pkg-descr Modified: head/x11/Makefile ============================================================================== --- head/x11/Makefile Sat Mar 18 15:40:01 2017 (r436419) +++ head/x11/Makefile Sat Mar 18 15:42:22 2017 (r436420) @@ -45,6 +45,7 @@ SUBDIR += deskpaint SUBDIR += dgs SUBDIR += dmenu + SUBDIR += dmenu2 SUBDIR += dmxproto SUBDIR += docker-tray SUBDIR += dri2proto Modified: head/x11/dmenu2/Makefile ============================================================================== --- head/x11/dmenu/Makefile Sat Mar 18 13:06:53 2017 (r436405) +++ head/x11/dmenu2/Makefile Sat Mar 18 15:42:22 2017 (r436420) @@ -1,39 +1,36 @@ -# Created by: Jeroen Schot <schot@a-eskwadraat.nl> +# Created by: Timothy Beyer <beyert@cs.ucr.edu> # $FreeBSD$ -PORTNAME= dmenu -PORTVERSION= 4.6 +PORTNAME= dmenu2 +PORTVERSION= 0.0.20150210 CATEGORIES= x11 -MASTER_SITES= http://dl.suckless.org/tools/ \ - http://schot.a-eskwadraat.nl/files/ -PATCH_SITES= http://tools.suckless.org/dmenu/patches/ \ - http://schot.a-eskwadraat.nl/files/ -PATCH_DIST_STRIP=-p1 - -MAINTAINER= schot@a-eskwadraat.nl -COMMENT= X11 menu application designed for the dwm window manager +MAINTAINER= beyert@cs.ucr.edu +COMMENT= Fork of dmenu with many enhancements and additional options LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig +LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig -OPTIONS_DEFINE= XINERAMA -OPTIONS_DEFAULT= XINERAMA +USE_GITHUB= yes +GH_ACCOUNT= mrshankly +GH_TAGNAME= a4eb44b -USE_XORG= x11 xft -MAKE_ARGS= CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \ - X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib" +USE_XORG= x11 xft xrender -PLIST_FILES= bin/dmenu bin/dmenu_path bin/dmenu_run bin/stest \ - man/man1/dmenu.1.gz man/man1/stest.1.gz +PLIST_FILES= bin/dmenu2 bin/dmenu2_path bin/dmenu2_run bin/stest2 \ + man/man1/dmenu2.1.gz man/man1/stest2.1.gz + +OPTIONS_DEFINE= XINERAMA +OPTIONS_DEFAULT= XINERAMA XINERAMA_USE= XORG=xinerama -XINERAMA_MAKE_ARGS_OFF= XINERAMAFLAGS= XINERAMALIBS= +XINERAMA_CFLAGS= -DXINERAMA +XINERAMA_LIBS= -lXinerama -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dmenu \ - ${STAGEDIR}${PREFIX}/bin/stest +post-extract: + @${LN} -sf ${FILESDIR}/dmenu2_path ${WRKSRC} .include <bsd.port.mk> Modified: head/x11/dmenu2/distinfo ============================================================================== --- head/x11/dmenu/distinfo Sat Mar 18 13:06:53 2017 (r436405) +++ head/x11/dmenu2/distinfo Sat Mar 18 15:42:22 2017 (r436420) @@ -1,2 +1,3 @@ -SHA256 (dmenu-4.6.tar.gz) = 4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 -SIZE (dmenu-4.6.tar.gz) = 15057 +TIMESTAMP = 1423601564 +SHA256 (mrshankly-dmenu2-0.0.20150210-a4eb44b_GH0.tar.gz) = a7a7bbc425c5331926c193b35c8e423f2f94a4ee23d46dd201c8b6e0b194ac9d +SIZE (mrshankly-dmenu2-0.0.20150210-a4eb44b_GH0.tar.gz) = 15533 Added: head/x11/dmenu2/files/dmenu2_path ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/dmenu2/files/dmenu2_path Sat Mar 18 15:42:22 2017 (r436420) @@ -0,0 +1,15 @@ +#!/bin/sh + +# adapted from dmenu_path in the original dmenu distribution +cachedir=${XDG_CACHE_HOME:-$HOME/.cache} +if [ -d "$cachedir" ]; then + cache=$cachedir/dmenu2_run +else + cache=$HOME/.dmenu2_cache # if no xdg dir, fall back to dotfile in ~ +fi +IFS=: +if stest2 -dqr -n "$cache" $PATH; then + stest2 -flx $PATH | sort -u | tee "$cache" +else + cat "$cache" +fi Added: head/x11/dmenu2/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/dmenu2/files/patch-Makefile Sat Mar 18 15:42:22 2017 (r436420) @@ -0,0 +1,48 @@ +--- Makefile.orig 2015-02-10 20:52:44 UTC ++++ Makefile +@@ -1,14 +1,14 @@ +-VERSION = 0.1 ++VERSION = 0.2 + + CC ?= gcc +-LIBS = -lX11 -lXinerama -lXft -lXrender -lfreetype -lz -lfontconfig +-CFLAGS += -std=c99 -pedantic -Wall -Wextra -I/usr/include/freetype2 +-CFLAGS += -DXINERAMA -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" +-LDFLAGS += ++LIBS += -lX11 -lXft -lXrender -lfreetype -lz -lfontconfig ++CFLAGS += -std=c99 -pedantic -Wall -Wextra -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 ++CFLAGS += -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" ++LDFLAGS += -L$(LOCALBASE)/lib + + PREFIX ?= /usr/local + BINPREFIX = $(PREFIX)/bin +-MANPREFIX = $(PREFIX)/share/man ++MANPREFIX = $(PREFIX)/man + + DM_SRC = dmenu.c draw.c + DM_OBJ = $(DM_SRC:.c=.o) +@@ -16,8 +16,6 @@ DM_OBJ = $(DM_SRC:.c=.o) + ST_SRC = stest.c + ST_OBJ = $(ST_SRC:.c=.o) + +-all: CFLAGS += -Os +-all: LDFLAGS += -s + all: dmenu stest + + debug: CFLAGS += -g -O0 -DDEBUG +@@ -34,9 +32,13 @@ stest: $(ST_OBJ) + + install: + mkdir -p "$(DESTDIR)$(BINPREFIX)" +- cp -p dmenu dmenu_run stest "$(DESTDIR)$(BINPREFIX)" ++ $(BSD_INSTALL_PROGRAM) dmenu "$(DESTDIR)$(BINPREFIX)/dmenu2" ++ $(BSD_INSTALL_PROGRAM) stest "$(DESTDIR)$(BINPREFIX)/stest2" ++ $(BSD_INSTALL_SCRIPT) dmenu_run "$(DESTDIR)$(BINPREFIX)/dmenu2_run" ++ $(BSD_INSTALL_SCRIPT) dmenu2_path "$(DESTDIR)$(BINPREFIX)" + mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1 +- cp -p dmenu.1 stest.1 "$(DESTDIR)$(MANPREFIX)"/man1 ++ $(BSD_INSTALL_MAN) dmenu.1 "$(DESTDIR)$(MANPREFIX)/man1/dmenu2.1" ++ $(BSD_INSTALL_MAN) stest.1 "$(DESTDIR)$(MANPREFIX)/man1/stest2.1" + + uninstall: + rm -f "$(DESTDIR)$(BINPREFIX)"/dmenu Added: head/x11/dmenu2/files/patch-dmenu__run ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/dmenu2/files/patch-dmenu__run Sat Mar 18 15:42:22 2017 (r436420) @@ -0,0 +1,26 @@ +--- dmenu_run.orig 2015-02-10 20:52:44 UTC ++++ dmenu_run +@@ -1,15 +1,16 @@ + #!/bin/sh +-cachedir=${XDG_CACHE_HOME:-"$HOME/.cache"} ++ ++cachedir=${XDG_CACHE_HOME:-$HOME/.cache} + if [ -d "$cachedir" ]; then +- cache=$cachedir/dmenu_run ++ cache=$cachedir/dmenu2_run + else +- cache=$HOME/.dmenu_cache # if no xdg dir, fall back to dotfile in ~ ++ cache=$HOME/.dmenu2_cache # if no xdg dir, fall back to dotfile in ~ + fi + ( + IFS=: +- if stest -dqr -n "$cache" $PATH; then +- stest -flx $PATH | sort -u | tee "$cache" | dmenu "$@" ++ if stest2 -dqr -n "$cache" $PATH; then ++ stest2 -flx $PATH | sort -u | tee "$cache" | dmenu2 "$@" + else +- dmenu "$@" < "$cache" ++ dmenu2 "$@" < "$cache" + fi +-) | ${SHELL:-"/bin/sh"} & ++) | ${SHELL:-/bin/sh} & Modified: head/x11/dmenu2/pkg-descr ============================================================================== --- head/x11/dmenu/pkg-descr Sat Mar 18 13:06:53 2017 (r436405) +++ head/x11/dmenu2/pkg-descr Sat Mar 18 15:42:22 2017 (r436420) @@ -1,9 +1,5 @@ -dmenu is a minimalistic X11 menu. It reads a newline separated list of items -from stdin and shows them as a menu on the top of the screen. When the user -selects one item or types any text and presses Enter, his choice is printed to -stdout. +dmenu2 is the fork of original dmenu -- an efficient dynamic menu for X11, +patched to support features like flexible positioning, fuzzy matching, +follow focus, tab navigation, background dimming, etc. -dmenu was developed as an addition to the dynamic window manager (dwm), but can -be used in any X11-environment. - -WWW: http://tools.suckless.org/dmenu +WWW: https://github.com/mrshankly/dmenu2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703181542.v2IFgMhH003257>