svn commit: r403654 - in head/x11/dmenu: . files
Jan Beich
jbeich at FreeBSD.org
Sun Dec 13 06:03:53 UTC 2015
Author: jbeich
Date: Sun Dec 13 06:03:51 2015
New Revision: 403654
URL: https://svnweb.freebsd.org/changeset/ports/403654
Log:
x11/dmenu: update to 4.6
- Explicitly track direct fontconfig dependency
- Define LICENSE_FILE as MIT has many styles
https://fedoraproject.org/wiki/Licensing:MIT
Changes: http://lists.suckless.org/dev/1511/27503.html
PR: 205236
Reported by: Jakub Lach, Randy Westlund
Pointy hat to: jbeich (timeout-happy)
Approved by: r403178 regression
Modified:
head/x11/dmenu/Makefile (contents, props changed)
head/x11/dmenu/distinfo (contents, props changed)
head/x11/dmenu/files/patch-Makefile (contents, props changed)
head/x11/dmenu/files/patch-config.mk (contents, props changed)
Modified: head/x11/dmenu/Makefile
==============================================================================
--- head/x11/dmenu/Makefile Sun Dec 13 06:03:10 2015 (r403653)
+++ head/x11/dmenu/Makefile Sun Dec 13 06:03:51 2015 (r403654)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= dmenu
-PORTVERSION= 4.5
-PORTREVISION= 1
+PORTVERSION= 4.6
CATEGORIES= x11
MASTER_SITES= http://dl.suckless.org/tools/ \
http://schot.a-eskwadraat.nl/files/
@@ -16,18 +15,19 @@ MAINTAINER= schot at a-eskwadraat.nl
COMMENT= X11 menu application designed for the dwm window manager
LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
-OPTIONS_DEFINE= XINERAMA XFT
+LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+
+OPTIONS_DEFINE= XINERAMA
OPTIONS_DEFAULT= XINERAMA
-USE_XORG= x11
+USE_XORG= x11 xft
-PLIST_FILES= bin/dmenu bin/dmenu_run bin/stest \
+PLIST_FILES= bin/dmenu bin/dmenu_path bin/dmenu_run bin/stest \
man/man1/dmenu.1.gz man/man1/stest.1.gz
XINERAMA_USE= XORG=xinerama
-XFT_USE= XORG=xft
-XFT_PATCHFILES= ${PORTNAME}-${PORTVERSION}-xft.diff
post-patch:
@${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} \
Modified: head/x11/dmenu/distinfo
==============================================================================
--- head/x11/dmenu/distinfo Sun Dec 13 06:03:10 2015 (r403653)
+++ head/x11/dmenu/distinfo Sun Dec 13 06:03:51 2015 (r403654)
@@ -1,4 +1,2 @@
-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
+SHA256 (dmenu-4.6.tar.gz) = 4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3
+SIZE (dmenu-4.6.tar.gz) = 15057
Modified: head/x11/dmenu/files/patch-Makefile
==============================================================================
--- head/x11/dmenu/files/patch-Makefile Sun Dec 13 06:03:10 2015 (r403653)
+++ head/x11/dmenu/files/patch-Makefile Sun Dec 13 06:03:51 2015 (r403654)
@@ -1,7 +1,7 @@
---- 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
+--- Makefile.orig 2015-11-08 22:42:21 UTC
++++ Makefile
+@@ -54,12 +54,12 @@ install: all
+ @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
@chmod 755 ${DESTDIR}${PREFIX}/bin/stest
- @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
@@ -19,7 +19,8 @@
uninstall:
@echo removing executables from ${DESTDIR}${PREFIX}/bin
- @rm -f ${DESTDIR}${PREFIX}/bin/dmenu
+@@ -67,8 +67,8 @@ uninstall:
+ @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_path
@rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
@rm -f ${DESTDIR}${PREFIX}/bin/stest
- @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
Modified: head/x11/dmenu/files/patch-config.mk
==============================================================================
--- head/x11/dmenu/files/patch-config.mk Sun Dec 13 06:03:10 2015 (r403653)
+++ head/x11/dmenu/files/patch-config.mk Sun Dec 13 06:03:51 2015 (r403654)
@@ -1,7 +1,7 @@
---- config.mk.orig 2012-01-08 13:18:43.000000000 +0100
-+++ config.mk 2012-02-13 16:57:04.000000000 +0100
+--- config.mk.orig 2015-11-08 22:42:21 UTC
++++ config.mk
@@ -2,11 +2,11 @@
- VERSION = 4.5
+ VERSION = 4.6
# paths
-PREFIX = /usr/local
@@ -16,15 +16,14 @@
# Xinerama, comment if you don't want it
XINERAMALIBS = -lXinerama
-@@ -17,10 +17,10 @@
- LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
+@@ -23,9 +23,9 @@ INCS = -I${X11INC} -I${FREETYPEINC}
+ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
# flags
--CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-+CPPFLAGS+= -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
- #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
+-CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
++CPPFLAGS+= -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+CFLAGS += -std=c99 ${INCS} ${CPPFLAGS}
+LDFLAGS += ${LIBS}
More information about the svn-ports-head
mailing list