Merge branch '3.1' into 3.2

dmenu/.footprint

@@ -1,6 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/dmenu
+-rwxr-xr-x	root/root	usr/bin/dmenu_path
 -rwxr-xr-x	root/root	usr/bin/dmenu_run
 -rwxr-xr-x	root/root	usr/bin/stest
 drwxr-xr-x	root/root	usr/man/

dmenu/.md5sum

@@ -1,2 +1 @@
-d448ec9120718b0aedbdb338f4fa69ba  dmenu-4.5-xft.diff
-9c46169ed703732ec52ed946c27d84b4  dmenu-4.5.tar.gz
+6fedf081133bc0725cb040b3b8ac3fac  dmenu-4.6.tar.gz

dmenu/Pkgfile

@@ -4,17 +4,13 @@
 # Depends on:  xorg-libxinerama xorg-libxft xorg-libxrender freetype fontconfig
 
 name=dmenu
-version=4.5
-release=2
-source=(
-    http://dl.suckless.org/tools/$name-$version.tar.gz
-    http://tools.suckless.org/dmenu/patches/dmenu-4.5-xft.diff
-)
+version=4.6
+release=1
+source=(http://dl.suckless.org/tools/$name-$version.tar.gz)
 
 build () {
     cd "$name-$version"
-    patch -p1 -i../dmenu-4.5-xft.diff
-    make XFTINC=-I/usr/include/freetype2
+    sed -i '19d' config.mk
     make DESTDIR=$PKG \
         PREFIX=/usr \
         MANPREFIX=/usr/man \