diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/dmenu/Makefile | 18 | ||||
| -rw-r--r-- | x11/dmenu/distinfo | 6 | ||||
| -rw-r--r-- | x11/dmenu/files/patch-Makefile | 20 | ||||
| -rw-r--r-- | x11/dmenu/files/patch-config.mk | 17 |
4 files changed, 37 insertions, 24 deletions
diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile index a475dce30f5d..30c021294a33 100644 --- a/x11/dmenu/Makefile +++ b/x11/dmenu/Makefile @@ -6,23 +6,28 @@ # PORTNAME= dmenu -PORTVERSION= 4.4.1 +PORTVERSION= 4.5 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 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -OPTIONS= XINERAMA "Enable Xinerama support" On +OPTIONS= XINERAMA "Enable Xinerama support" On \ + XFT "Enable Xft support" Off USE_XORG= x11 -MAN1= dmenu.1 lsx.1 -PLIST_FILES= bin/dmenu bin/dmenu_run bin/lsx +MAN1= dmenu.1 stest.1 +PLIST_FILES= bin/dmenu bin/dmenu_run bin/stest .include <bsd.port.options.mk> @@ -30,6 +35,11 @@ PLIST_FILES= bin/dmenu bin/dmenu_run bin/lsx USE_XORG+= xinerama .endif +.if defined(WITH_XFT) +USE_XORG+= xft +PATCHFILES+= ${PORTNAME}-${PORTVERSION}-xft.diff +.endif + post-patch: @${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} \ -e "s,%%PREFIX%%,${PREFIX},g" \ diff --git a/x11/dmenu/distinfo b/x11/dmenu/distinfo index f8b997fc808f..80cf9a3d9aaf 100644 --- a/x11/dmenu/distinfo +++ b/x11/dmenu/distinfo @@ -1,2 +1,4 @@ -SHA256 (dmenu-4.4.1.tar.gz) = 6d641645ab610d98d847b9a64500be7cc0e75bff5342534906936afa6ddb4550 -SIZE (dmenu-4.4.1.tar.gz) = 9318 +SHA256 (dmenu-4.5.tar.gz) = 082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850 +SIZE (dmenu-4.5.tar.gz) = 11543 +SHA256 (dmenu-4.5-xft.diff) = efb4095d65e5e86f9dde97294732174409c24f319bdd4824cc22fa1404972b4f +SIZE (dmenu-4.5-xft.diff) = 12884 diff --git a/x11/dmenu/files/patch-Makefile b/x11/dmenu/files/patch-Makefile index e71299b1a6f4..e9da6406b73f 100644 --- a/x11/dmenu/files/patch-Makefile +++ b/x11/dmenu/files/patch-Makefile @@ -1,32 +1,32 @@ ---- Makefile.orig 2011-07-19 22:31:28.000000000 +0200 -+++ Makefile 2011-09-01 13:48:57.000000000 +0200 +--- Makefile.orig 2012-01-08 13:18:43.000000000 +0100 ++++ Makefile 2012-02-13 16:54:54.000000000 +0100 @@ -47,20 +47,20 @@ @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run - @chmod 755 ${DESTDIR}${PREFIX}/bin/lsx + @chmod 755 ${DESTDIR}${PREFIX}/bin/stest - @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" < stest.1 > ${DESTDIR}${MANPREFIX}/man1/stest.1 - @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1 -- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/lsx.1 +- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/stest.1 + @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man/man1 + @mkdir -p ${DESTDIR}${MANPREFIX}/man/man1 + @sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man/man1/dmenu.1 -+ @sed "s/VERSION/${VERSION}/g" < lsx.1 > ${DESTDIR}${MANPREFIX}/man/man1/lsx.1 ++ @sed "s/VERSION/${VERSION}/g" < stest.1 > ${DESTDIR}${MANPREFIX}/man/man1/stest.1 + @chmod 644 ${DESTDIR}${MANPREFIX}/man/man1/dmenu.1 -+ @chmod 644 ${DESTDIR}${MANPREFIX}/man/man1/lsx.1 ++ @chmod 644 ${DESTDIR}${MANPREFIX}/man/man1/stest.1 uninstall: @echo removing executables from ${DESTDIR}${PREFIX}/bin @rm -f ${DESTDIR}${PREFIX}/bin/dmenu @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run - @rm -f ${DESTDIR}${PREFIX}/bin/lsx + @rm -f ${DESTDIR}${PREFIX}/bin/stest - @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1 - @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1 -- @rm -f ${DESTDIR}${MANPREFIX}/man1/lsx.1 +- @rm -f ${DESTDIR}${MANPREFIX}/man1/stest.1 + @echo removing manual page from ${DESTDIR}${MANPREFIX}/man/man1 + @rm -f ${DESTDIR}${MANPREFIX}/man/man1/dmenu.1 -+ @rm -f ${DESTDIR}${MANPREFIX}/man/man1/lsx.1 ++ @rm -f ${DESTDIR}${MANPREFIX}/man/man1/stest.1 .PHONY: all options clean dist install uninstall diff --git a/x11/dmenu/files/patch-config.mk b/x11/dmenu/files/patch-config.mk index 49cc1dd2fea4..efbf0f56ed99 100644 --- a/x11/dmenu/files/patch-config.mk +++ b/x11/dmenu/files/patch-config.mk @@ -1,7 +1,7 @@ ---- config.mk.orig 2011-05-18 18:02:16.000000000 +0200 -+++ config.mk 2011-05-20 22:58:36.000000000 +0200 +--- config.mk.orig 2012-01-08 13:18:43.000000000 +0100 ++++ config.mk 2012-02-13 16:57:04.000000000 +0100 @@ -2,11 +2,11 @@ - VERSION = 4.3.1 + VERSION = 4.5 # paths -PREFIX = /usr/local @@ -16,15 +16,16 @@ # Xinerama, comment if you don't want it XINERAMALIBS = -lXinerama -@@ -17,9 +17,9 @@ +@@ -17,10 +17,10 @@ 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+= -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -+CFLAGS += -ansi ${INCS} ${CPPFLAGS} + #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} +-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} +-LDFLAGS = -s ${LIBS} ++CFLAGS += -std=c99 ${INCS} ${CPPFLAGS} +LDFLAGS += ${LIBS} # compiler and linker |