Merge branch '2.6' into 2.7

dhcpcd/.md5sum

@@ -1 +1 @@
-dbd0a904954b580cbffb4b09eb1839ef  dhcpcd-5.2.3.tar.bz2
+e235ced9932038b528c2f2cd6973ea1d  dhcpcd-5.2.4.tar.bz2

dhcpcd/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=dhcpcd
-version=5.2.3
+version=5.2.4
 release=1
 source=(http://roy.marples.name/downloads/dhcpcd/$name-$version.tar.bz2)
 

gettext/.footprint

@@ -36,17 +36,17 @@ drwxr-xr-x	root/root	usr/lib/gettext/
 lrwxrwxrwx	root/root	usr/lib/libasprintf.so -> libasprintf.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libasprintf.so.0 -> libasprintf.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libasprintf.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/libgettextlib-0.18.so
+-rwxr-xr-x	root/root	usr/lib/libgettextlib-0.18.1.so
 -rwxr-xr-x	root/root	usr/lib/libgettextlib.la
-lrwxrwxrwx	root/root	usr/lib/libgettextlib.so -> libgettextlib-0.18.so
+lrwxrwxrwx	root/root	usr/lib/libgettextlib.so -> libgettextlib-0.18.1.so
 -rw-r--r--	root/root	usr/lib/libgettextpo.a
 -rwxr-xr-x	root/root	usr/lib/libgettextpo.la
-lrwxrwxrwx	root/root	usr/lib/libgettextpo.so -> libgettextpo.so.0.5.0
-lrwxrwxrwx	root/root	usr/lib/libgettextpo.so.0 -> libgettextpo.so.0.5.0
--rwxr-xr-x	root/root	usr/lib/libgettextpo.so.0.5.0
--rwxr-xr-x	root/root	usr/lib/libgettextsrc-0.18.so
+lrwxrwxrwx	root/root	usr/lib/libgettextpo.so -> libgettextpo.so.0.5.1
+lrwxrwxrwx	root/root	usr/lib/libgettextpo.so.0 -> libgettextpo.so.0.5.1
+-rwxr-xr-x	root/root	usr/lib/libgettextpo.so.0.5.1
+-rwxr-xr-x	root/root	usr/lib/libgettextsrc-0.18.1.so
 -rwxr-xr-x	root/root	usr/lib/libgettextsrc.la
-lrwxrwxrwx	root/root	usr/lib/libgettextsrc.so -> libgettextsrc-0.18.so
+lrwxrwxrwx	root/root	usr/lib/libgettextsrc.so -> libgettextsrc-0.18.1.so
 -rw-r--r--	root/root	usr/lib/preloadable_libintl.so
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/

gettext/.md5sum

@@ -1 +1 @@
-d52a3e061032a1ed13856d42fc86f0fd  gettext-0.18.tar.gz
+2ae04f960d5fa03774636ddef19ebdbf  gettext-0.18.1.tar.gz

gettext/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  ncurses
 
 name=gettext
-version=0.18
+version=0.18.1
 release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
 
@@ -15,7 +15,7 @@ build() {
                 --disable-csharp \
                 --disable-{,native-}java \
                 --disable-nls \
-                --without-{emacs,cvs} \
+                --without-{emacs,git} \
                 --with-included-{glib,libcroco,libxml}
     make
     make -j1 DESTDIR=$PKG install