Index: head/x11/dmenu/Makefile
===================================================================
--- head/x11/dmenu/Makefile	(revision 403653)
+++ head/x11/dmenu/Makefile	(revision 403654)
@@ -1,46 +1,46 @@
 # Created by: Jeroen Schot <schot@a-eskwadraat.nl>
 # $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/
 
 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_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} \
 	         -e "s,%%PREFIX%%,${PREFIX},g" \
 	         -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
 	         -e "s,%%MANPREFIX%%,${MANPREFIX},g"
 
 post-patch-XINERAMA-off:
 	@${REINPLACE_CMD} -e 's,$${XINERAMALIBS},,g' \
 	         -e 's,$${XINERAMAFLAGS},,g' ${WRKSRC}/config.mk
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dmenu \
 		${STAGEDIR}${PREFIX}/bin/stest
 
 .include <bsd.port.mk>
Index: head/x11/dmenu/distinfo
===================================================================
--- head/x11/dmenu/distinfo	(revision 403653)
+++ head/x11/dmenu/distinfo	(revision 403654)
@@ -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
Index: head/x11/dmenu/files/patch-Makefile
===================================================================
--- head/x11/dmenu/files/patch-Makefile	(revision 403653)
+++ head/x11/dmenu/files/patch-Makefile	(revision 403654)
@@ -1,32 +1,33 @@
---- 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
 -	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
 -	@sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.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/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" < stest.1 > ${DESTDIR}${MANPREFIX}/man/man1/stest.1
 +	@chmod 644 ${DESTDIR}${MANPREFIX}/man/man1/dmenu.1
 +	@chmod 644 ${DESTDIR}${MANPREFIX}/man/man1/stest.1
  
  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
 -	@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.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/stest.1
  
  .PHONY: all options clean dist install uninstall
Index: head/x11/dmenu/files/patch-config.mk
===================================================================
--- head/x11/dmenu/files/patch-config.mk	(revision 403653)
+++ head/x11/dmenu/files/patch-config.mk	(revision 403654)
@@ -1,33 +1,32 @@
---- 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
 -MANPREFIX = ${PREFIX}/share/man
 +PREFIX = %%PREFIX%%
 +MANPREFIX = %%MANPREFIX%%
  
 -X11INC = /usr/X11R6/include
 -X11LIB = /usr/X11R6/lib
 +X11INC = %%LOCALBASE%%/include
 +X11LIB = %%LOCALBASE%%/lib
  
  # 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}
  
  # compiler and linker
 -CC = cc
 +CC?= cc