Update x11/dmenu to 4.6.

Changes:
Features:
  - Now uses Xft for font rendering by default with fallback-font
support, this also allows anti-aliased fonts and such.
    The font string matching will be different, check out
http://www.freedesktop.org/software/fontconfig/fontconfig-user.html
for the font string syntax, huge thanks to Eric Pruitt and the other
people who worked on the dmenu-xft patch (previously on the wiki).
  - Uses a shared libdraw codebase (also used for dwm right now).
  - Merged wiki patches:
    - monarg: allow to specify monitor number to start on with -m (Martin Kühl).
    - multisel: allow selecting multiple items (ctrl-enter) (Evan Gates).
    - xft: see above.
  - Accepted vi'is exit approach ^[ (Arkaduisz).
  - Add ^G escape keybinding (Karl F).
  - Separate config options to config.h (Alex Sedov).
  - Support keybind C-S-[jm] (Connor Lane Smith).
  - stest: get rid of getopt, use suckless arg.h (Hiltjo).
  - stest: support inverse matching (flag -v) (Martin Kühl).

Notable fixes:
  - Buffer nul termination on tab (Alex Sedov's).
  - Crash (pointer dereference) with ctrl-enter as input (Hiltjo).
  - Ignore prompt if it is empty in addition to NULL (Moritz Wilhelmy).
  - Incorrect ordering of match results (Davide Del Zompo).
  - Input text matching (Quentin Rameau).
  - Paste from clipboard (ctrl+shift+y) (Joshua Lloret).
  - Replace deprecated usleep() with nanosleep() (Quentin Rameau).
  - dmenu_run: Split cache logic to dmenu_path again (Quentin Glidic).
  - multimon: always spawn client on first monitor if specified with
-m 0 (Hiltjo).
  - reset ControlMask for C-j and C-m (Hiltjo).

Build improvements:
  - config.mk: add $FREETYPELIBS and $FREETYPEINC, simpler to override
(ports and *BSDs).
  - config.mk: improve feature test check (k0ga, stateless).
  - config.mk: use -std=c99 by default.

4 files changed, 20 insertions, 15 deletions

diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile
index 904e1ae32d2..ec3541b7421 100644
--- a/x11/dmenu/Makefile
+++ b/x11/dmenu/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2012/10/29 05:06:09 asau Exp $
+# $NetBSD: Makefile,v 1.11 2015/11/11 16:13:12 leot Exp $
 #
 
-DISTNAME=	dmenu-4.5
+DISTNAME=	dmenu-4.6
 CATEGORIES=	x11
 MASTER_SITES=	http://dl.suckless.org/tools/
 
-MAINTAINER=	leot1990@users.sourceforge.net
+MAINTAINER=	leot@NetBSD.org
 HOMEPAGE=	http://tools.suckless.org/dmenu
 COMMENT=	Dynamic menu for X
 LICENSE=	mit
@@ -13,23 +13,28 @@ LICENSE=	mit
 MAKE_JOBS_SAFE=	no
 
 NO_CONFIGURE=	yes
+USE_LANGUAGES=	c99
 
 # Adjust config.mk
 SUBST_CLASSES+=		makefile
-SUBST_STAGE.makefile=	pre-build
+SUBST_STAGE.makefile=	pre-patch
 SUBST_MESSAGE.makefile=	Fixing config.mk
 SUBST_FILES.makefile=	config.mk
 SUBST_SED.makefile+=	-e 's,/usr/local,${PREFIX},g'
 SUBST_SED.makefile+=	-e 's,share/man,${PKGMANDIR},g'
 SUBST_SED.makefile+=	-e 's,/usr/X11R6,${X11BASE},'
-# -D_XOPEN_SOURCE=600 is needed for usleep(3) and S_ISLNK() macro in <sys/stat.h>
-SUBST_SED.makefile+=	-e 's,^CPPFLAGS *= ,CPPFLAGS = -D_XOPEN_SOURCE=600 ,'
 SUBST_SED.makefile+=	-e 's,^CFLAGS *= ,CFLAGS += ,'
 SUBST_SED.makefile+=	-e 's,^LDFLAGS *= ,LDFLAGS += ,'
+SUBST_SED.makefile+=	-e 's/-I$${FREETYPEINC}/$${FREETYPEINC}/'
+SUBST_SED.makefile+=	-e 's,^FREETYPEINC *=.*,FREETYPEINC != freetype-config --cflags,'
 SUBST_SED.makefile+=	-e 's/cc/${CC:Q}/'
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "options.mk"
 
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/dmenu/PLIST b/x11/dmenu/PLIST
index 43b259a38a3..931a1ade457 100644
--- a/x11/dmenu/PLIST
+++ b/x11/dmenu/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2012/05/25 21:00:26 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/11/11 16:13:12 leot Exp $
 bin/dmenu
+bin/dmenu_path
 bin/dmenu_run
 bin/stest
 man/man1/dmenu.1
diff --git a/x11/dmenu/distinfo b/x11/dmenu/distinfo
index 571ae7eaed8..d4564da5233 100644
--- a/x11/dmenu/distinfo
+++ b/x11/dmenu/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 03:28:27 agc Exp $
+$NetBSD: distinfo,v 1.9 2015/11/11 16:13:12 leot Exp $
 
-SHA1 (dmenu-4.5.tar.gz) = 70c1a13b950b7b0cb1bc35e30c6e861a78359953
-RMD160 (dmenu-4.5.tar.gz) = b771a84e0e9a8fbb29317c07fa77f92b64dcdc2f
-SHA512 (dmenu-4.5.tar.gz) = 872dee68c35a93c663eb0a941653eaaa4aa83d8379e05b4dbca089a2c9335036b496de85d8ddf7af1228a5625490a06a89031fb1aac726236b608b952962c248
-Size (dmenu-4.5.tar.gz) = 11543 bytes
+SHA1 (dmenu-4.6.tar.gz) = 16297db470b370a16d532fba3cfd9743758ada80
+RMD160 (dmenu-4.6.tar.gz) = abf5433ea6cd8ef1ff65fa3eacce8a67622be047
+SHA512 (dmenu-4.6.tar.gz) = e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
+Size (dmenu-4.6.tar.gz) = 15057 bytes
diff --git a/x11/dmenu/options.mk b/x11/dmenu/options.mk
index 8532bd1963b..010af4fa619 100644
--- a/x11/dmenu/options.mk
+++ b/x11/dmenu/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2012/01/22 12:59:01 obache Exp $
+# $NetBSD: options.mk,v 1.3 2015/11/11 16:13:12 leot Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dmenu
 PKG_SUPPORTED_OPTIONS=	xinerama
@@ -16,9 +16,8 @@ PKG_SUGGESTED_OPTIONS=	xinerama
 .  include "../../x11/libXinerama/buildlink3.mk"
 .else
 SUBST_CLASSES+=		options
-SUBST_STAGE.options=	pre-build
+SUBST_STAGE.options=	pre-patch
 SUBST_MESSAGE.options=	Toggle the Xinerama support
 SUBST_FILES.options=	config.mk
 SUBST_SED.options+=	-e '/^XINERAMA/d'
-.  include "../../x11/libX11/buildlink3.mk"
 .endif