summaryrefslogtreecommitdiff
path: root/x11/dmenu2/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11/dmenu2/files')
-rw-r--r--x11/dmenu2/files/dmenu2_path15
-rw-r--r--x11/dmenu2/files/patch-Makefile48
-rw-r--r--x11/dmenu2/files/patch-dmenu__run26
3 files changed, 0 insertions, 89 deletions
diff --git a/x11/dmenu2/files/dmenu2_path b/x11/dmenu2/files/dmenu2_path
deleted file mode 100644
index b919cc5a4dbb..000000000000
--- a/x11/dmenu2/files/dmenu2_path
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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
diff --git a/x11/dmenu2/files/patch-Makefile b/x11/dmenu2/files/patch-Makefile
deleted file mode 100644
index c7a6bad1a8f2..000000000000
--- a/x11/dmenu2/files/patch-Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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
diff --git a/x11/dmenu2/files/patch-dmenu__run b/x11/dmenu2/files/patch-dmenu__run
deleted file mode 100644
index 836eb1a91cc2..000000000000
--- a/x11/dmenu2/files/patch-dmenu__run
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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} &