kompare: fixed conflict

2015-05-23 10:43:26 +02:00 · 2015-05-23 10:43:26 +02:00 · 5adbbe5fcf
parent 47d9c5523e 80a0628a0f
commit 5adbbe5fcf
326 changed files with 14665 additions and 3560 deletions
--- a/common/environment/configure/autoconf_cache/musl-linux
+++ b/common/environment/configure/autoconf_cache/musl-linux
@ -0,0 +1,5 @@
+# Force detection of musl's gettext
+gt_func_gnugettext_libc=yes
+gt_cv_func_gnugettext1_libc=yes
+gt_cv_func_gnugettext2_libc=yes
+gt_cv_func_gnugettext3_libc=yes
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@ -4,7 +4,9 @@ if [ -n "$build_style" -a "$build_style" != "gnu-configure" ]; then
 	return 0
 fi

-export configure_args="--prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info --mandir=/usr/share/man --localstatedir=/var ${configure_args}"
+export configure_args="--prefix=/usr --sysconfdir=/etc --bindir=/usr/bin
+ --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var ${configure_args}"
+
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

@ -14,22 +16,31 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	export configure_args+=" --libdir=/usr/lib32"
 fi

-# Cross compilation vars
-if [ -z "$CROSS_BUILD" ]; then
-	return 0
-fi
-
-export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
-
 _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache

 # From now on all vars are exported to the environment
 set -a

+# Read autoconf cache variables for native target.
+case "$XBPS_TARGET_MACHINE" in
+	# musl libc
+	*-musl) . ${_AUTOCONFCACHEDIR}/musl-linux
+		;;
+esac
+
+# Cross compilation vars
+if [ -z "$CROSS_BUILD" ]; then
+	set +a
+	return 0
+fi
+
+export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
+
 # Read autoconf cache variables for cross target (taken from OE).
 case "$XBPS_TARGET_MACHINE" in
 	# musl libc
 	*-musl) . ${_AUTOCONFCACHEDIR}/common-linux
+		. ${_AUTOCONFCACHEDIR}/musl-linux
 		;;
 	# gnu libc
 	*)	. ${_AUTOCONFCACHEDIR}/common-linux
--- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
@ -65,7 +65,7 @@ hook() {
 	STRIPCMD=/usr/bin/$STRIP

 	find ${PKGDESTDIR} -type f | while read f; do
-		if [[ $f =~ ^/usr/lib/debug/ ]]; then
+		if [[ $f =~ ^${PKGDESTDIR}/usr/lib/debug/ ]]; then
 			continue
 		fi

--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@ -42,6 +42,7 @@ generic_wrapper3() {

 	cp ${XBPS_CROSS_BASE}/usr/bin/${wrapper} ${XBPS_WRAPPERDIR}
 	sed -e "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" -i ${XBPS_WRAPPERDIR}/${wrapper}
+	sed -e "s,/usr/lib,${XBPS_CROSS_BASE}/usr/lib,g" -i ${XBPS_WRAPPERDIR}/${wrapper}
 	sed -e "s,^libdir=.*,libdir=${XBPS_CROSS_BASE}/usr/lib,g" -i ${XBPS_WRAPPERDIR}/${wrapper}
 	sed -e "s,^prefix=.*,prefix=${XBPS_CROSS_BASE}/usr," -i ${XBPS_WRAPPERDIR}/${wrapper}

@ -120,6 +121,7 @@ hook() {
 	generic_wrapper3 ncurses5-config
 	generic_wrapper3 ncursesw5-config
 	generic_wrapper3 libetpan-config
+	generic_wrapper3 nspr-config
 	python_wrapper python-config 2.7
 	python_wrapper python3.4-config 3.4m
 }
--- a/common/shlibs
+++ b/common/shlibs
@ -764,7 +764,7 @@ libclutter-gtk-1.0.so.0 clutter-gtk-1.1.2_1
 libchamplain-0.12.so.0 libchamplain-0.12.5_2
 libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2
 libgeoclue.so.0 geoclue-0.12.0_1
-libvpx.so.1 libvpx-1.0.0_1
+libvpx.so.2 libvpx-1.4.0_1
 libXevie.so.1 libXevie-1.0.2_1
 libatspi.so.0 at-spi2-core-1.91.91_1
 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
@ -1733,6 +1733,7 @@ libmarco-private.so.0 libmarco-1.8.0_1
 libmate-menu.so.2 mate-menus-1.8.0_1
 libcaja-extension.so.1 libcaja-1.8.1_1
 libmatekbd.so.4 libmatekbd-1.8.0_1
+libmatemixer.so.0 libmatemixer-1.10.0_1
 libmatekbdui.so.4 libmatekbd-1.8.0_1
 libmate-window-settings.so.1 libmate-control-center-1.8.1_1
 libmateweather.so.1 libmateweather-1.8.0_1
@ -2034,3 +2035,12 @@ libplayerctl-1.0.so.0 playerctl-0.4.2_1
 libkomparediff2.so.4 libkomparediff2-4.14.2_1
 libkompareinterface.so.4 kompare-4.14.2_1
 libkomparedialogpages.so.4 kompare-4.14.2_1
+libfdt.so.1 dtc-1.4.1_1
+libokteta1core.so.1 okteta-4.14.2_1
+libkasten2gui.so.2 okteta-4.14.2_1
+libkasten2okteta1controllers.so.1 okteta-4.14.2_1
+libokteta1gui.so.1 okteta-4.14.2_1
+libkasten2core.so.2 okteta-4.14.2_1
+libkasten2controllers.so.2 okteta-4.14.2_1
+libkasten2okteta1gui.so.1 okteta-4.14.2_1
+libkasten2okteta1core.so.1 okteta-4.14.2_1
--- a/common/xbps-src/libexec/build.sh
+++ b/common/xbps-src/libexec/build.sh
@ -75,7 +75,6 @@ done
 # If install went ok generate the binpkgs.
 for subpkg in ${subpackages} ${sourcepkg}; do
    $XBPS_LIBEXECDIR/xbps-src-dopkg.sh $subpkg "$XBPS_REPOSITORY" "$XBPS_CROSS_BUILD" || exit 1
-    sleep 1
 done

 # pkg cleanup
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@ -333,7 +333,8 @@ install_pkg_deps() {
        (
        curpkgdepname=$($XBPS_UHELPER_CMD getpkgname "$i" 2>/dev/null)
        setup_pkg $curpkgdepname
-        exec env XBPS_BINPKG_EXISTS=1 $XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target || exit $?
+        exec env XBPS_DEPENDENCY=1 XBPS_BINPKG_EXISTS=1 \
+            $XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target || exit $?
        ) || exit $?
        host_binpkg_deps+=("$i")
    done
--- a/etc/defaults.conf
+++ b/etc/defaults.conf
@ -18,7 +18,7 @@
 # Enable optional arguments to xbps-install. This is useful when you use
 # static binaries and when you need to specify arguments.
 # NOTE: This is only used with the binary-bootstrap target!
-XBPS_INSTALL_ARGS="--repository=http://repo.voidlinux.eu/current"
+XBPS_INSTALL_ARGS="--repository=http://repo.voidlinux.eu/current --repository=http://musl.voidlinux.net/current"

 # [OPTIONAL]
 # Native Compilation/Preprocessor flags for C and C++. Additional settings
--- a/etc/repos-remote.conf
+++ b/etc/repos-remote.conf
@ -1,3 +1,5 @@
 # Remote repositories
 repository=http://repo.voidlinux.eu/current
 repository=http://repo.voidlinux.eu/current/nonfree
+repository=http://musl.voidlinux.net/current
+repository=http://musl.voidlinux.net/current/nonfree
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@ -1,6 +1,6 @@
 # Template file for 'Thunar'
 pkgname=Thunar
-version=1.6.9
+version=1.6.10
 revision=1
 build_style=gnu-configure
 configure_args="--enable-gio-unix --enable-dbus --enable-gudev
@ -10,9 +10,9 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://thunar.xfce.org"
 license="GPL-2, LGPL-2.1"
 distfiles="http://archive.xfce.org/src/xfce/thunar/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=75f3622cbe6ab6837f38d856faeac75a1191be8a08dc4c98ba35b61e312b94e5
+checksum=7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a

-hostmakedepends="xfce4-dev-tools glib-devel"
+hostmakedepends="xfce4-dev-tools gettext-devel glib-devel"
 makedepends="pcre-devel libglib-devel gvfs-devel
 libgudev-devel libnotify-devel libxfce4ui-devel xfce4-panel-devel
 dbus-glib-devel libexif-devel startup-notification-devel exo-devel"
--- a/srcpkgs/a2ps/template
+++ b/srcpkgs/a2ps/template
@ -1,11 +1,10 @@
 # Template file for 'a2ps'
-
 pkgname="a2ps"
 version="4.14"
-revision=2
+revision=3
 build_style=gnu-configure
 short_desc="Any to PS filter"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-3"
 hostmakedepends="perl gperf"
 makedepends="ghostscript psutils groff cups"
@ -14,28 +13,27 @@ configure_args="--sysconfdir=/etc/a2ps --enable-shared --with-medium=A4"
 LDFLAGS="-lm"
 conf_files="/etc/a2ps/a2ps.cfg /etc/a2ps/a2ps-site.cfg"
 homepage="http://www.gnu.org/software/a2ps/"
-distfiles="http://ftp.gnu.org/gnu/a2ps/a2ps-${version}.tar.gz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum="f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4"

 pre_configure() {
-     sed -i "s/GPERF --version |/& head -n 1 |/" ./configure
-     sed -i "s|/usr/local/share|/usr/share|" ./configure 
+	sed -i "s/GPERF --version |/& head -n 1 |/" ./configure
+	sed -i "s|/usr/local/share|/usr/share|" ./configure
 }

 liba2ps-devel_package() {
-    short_desc+=" - development files"
-    depends="liba2ps>=${version}_${revision}"
-    pkg_install() {
-        vmove usr/include
-        vmove "usr/lib/*.a"
-        vmove "usr/lib/*.so"
-    }
+	short_desc+=" - development files"
+	depends="liba2ps>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
 }

 liba2ps_package() {
-    short_desc+=" - library files"
-    pkg_install() {
-        vmove "usr/lib/*.so.*"
-
-    }
+	short_desc+=" - library files"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
 }
--- a/srcpkgs/acct/template
+++ b/srcpkgs/acct/template
@ -1,13 +1,13 @@
 # Template file for 'acct'
 pkgname=acct
 version=6.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="GNU Accounting Utilities"
 homepage="https://www.gnu.org/software/acct/"
 license="GPL-3"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-distfiles="http://ftp.gnu.org/gnu/acct/acct-$version.tar.gz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=8ed47b2f893b08f0d67720880adbb48b835a826c314fa52fd52af1cee6870101
 nocross=yes

--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=1.9.0.1
+version=1.9.1
 revision=1
 noarch=yes
 build_style=python-module
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://www.ansible.com"
 distfiles="http://releases.ansible.com/ansible/$pkgname-$version.tar.gz"
-checksum=b2193fd9a4061ab624fa67311796419a759de06b4f321d37169b22ba3831331c
+checksum=a6f975d565723765a4d490ff40cede96833a745f38908def4950a0075f1973f5

 post_install() {
 	for f in examples/*; do
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=14.12.3
+version=15.04.1
 revision=1
 build_style=cmake
 hostmakedepends="cmake automoc4"
@ -10,4 +10,4 @@ maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
 license="GPL-2"
 homepage="http://kde.org/applications/utilities/ark"
 distfiles="http://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bd97077dc2319f215ff721d8878ea4c51c6b096f83222b2aa46da66e9e7ccf28
+checksum=9cb20f520f45a8c4c25281db3c058ef4ae1edcdfaeb1b264caff57af8dddfd1c
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@ -1,13 +1,14 @@
 # Template file for 'atril'
 pkgname=atril
-version=1.8.1
-revision=2
+version=1.10.0
+revision=1
 build_style=gnu-configure
 build_options="gir"
 configure_args="--with-gtk=2.0 --disable-schemas-compile --enable-djvu
 --enable-dvi --enable-t1lib --enable-pixbuf --enable-comics --enable-xps
 --disable-static $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config intltool itstool glib-devel"
+hostmakedepends="pkg-config intltool itstool glib-devel
+ $(vopt_if gir gobject-introspection)"
 makedepends="gtk+-devel dbus-glib-devel libnotify-devel libunique1-devel
 libcaja-devel djvulibre-devel libspectre-devel libSM-devel mate-desktop-devel
 poppler-glib-devel zlib-devel libxml2-devel libsecret-devel libgxps-devel
@ -17,8 +18,12 @@ short_desc="Simply a document viewer for MATE"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="http://mate-desktop.org"
-distfiles="http://pub.mate-desktop.org/releases/1.8/${pkgname}-${version}.tar.xz"
-checksum=036b6bdf9f9caa7468c0cfb680360420cf8477007a0a04dc3b5c50b163c0333f
+distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=de74bb8d20290b9aab4f5e6e6c58d4e14a979e4914409cb1803522120d814181
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi

 libatril_package() {
 	short_desc+=" - runtime library"
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@ -1,6 +1,6 @@
 # Template file for 'attic'
 pkgname=attic
-version=0.15
+version=0.16
 revision=1
 wrksrc="Attic-$version"
 build_style=python-module
@ -14,8 +14,8 @@ short_desc="A deduplicating backup program for efficient and secure backups"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 homepage="https://attic-backup.org/"
 license="BSD"
-distfiles="${PYPI_SITE}/A/Attic/Attic-$version.tar.gz"
-checksum=5b240950ac049efe7ec6957ff8dcb8e7e3ac844329f33b5d72d114ddcba2d6f2
+distfiles="https://pypi.python.org/packages/source/A/Attic/Attic-0.16.tar.gz"
+checksum=6650cd28072101c2e05941e77b93a62f91da6179785e4e4b4880916c469bba2c

 pre_build() {
 	if [ "$CROSS_BUILD" ]; then
--- a/srcpkgs/autoconf/template
+++ b/srcpkgs/autoconf/template
@ -1,7 +1,7 @@
 # Template build file for 'autoconf'.
 pkgname=autoconf
 version=2.69
-revision=5
+revision=6
 noarch=yes
 build_style=gnu-configure
 hostmakedepends="perl m4"
@ -10,5 +10,5 @@ short_desc="Generates automatic source code configuration scripts"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2, GPL-3"
 homepage="http://www.gnu.org/software/autoconf"
-distfiles="http://ftp.gnu.org/gnu/autoconf/$pkgname-$version.tar.xz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
 checksum=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684
--- a/srcpkgs/autogen/template
+++ b/srcpkgs/autogen/template
@ -9,7 +9,7 @@ makedepends="guile guile-devel libxml2-devel gc-devel"
 depends="guile perl"
 short_desc="The Automated Program Generator"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL3"
+license="GPL-3"
 homepage="http://autogen.sourceforge.net/"
 distfiles="${GNU_SITE}/${pkgname}/rel${version}/${pkgname}-${version}.tar.gz"
 checksum=3cd9f81a8ae7c6865bb9bbbe16c4307a243a1373d0b315a83571cbba1fff725d
--- a/srcpkgs/automake/template
+++ b/srcpkgs/automake/template
@ -1,7 +1,7 @@
 # Template build file for 'automake'.
 pkgname=automake
 version=1.15
-revision=2
+revision=3
 noarch=yes
 build_style=gnu-configure
 hostmakedepends="perl autoconf"
@ -10,5 +10,5 @@ short_desc="GNU Standards-compliant Makefile generator"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="http://www.gnu.org/software/automake"
-distfiles="http://ftp.gnu.org/gnu/automake/${pkgname}-${version}.tar.xz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
 checksum=9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636
--- a/srcpkgs/baloo-widgets/template
+++ b/srcpkgs/baloo-widgets/template
@ -1,7 +1,7 @@
 # Template file for 'baloo-widgets'
 pkgname=baloo-widgets
-version=4.14.2
-revision=2
+version=4.14.3
+revision=1
 build_style=cmake
 configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF"
 hostmakedepends="cmake automoc4 pkg-config"
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL, LGPL, FDL"
 homepage="https://projects.kde.org/projects/kde/kdelibs/baloo-widgets"
 distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=35accda5f8ae73c04312547ea80e32113d3df96e187438722edf312da4cc9069
+checksum=7b6942b8b38ae2bb2c3c19f638c168c738c0a922a585fc43f22db8b018aabcd3

 baloo-widgets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
--- a/srcpkgs/baloo/template
+++ b/srcpkgs/baloo/template
@ -1,7 +1,7 @@
 # Template file for 'baloo'
 pkgname=baloo
-version=4.14.2
-revision=2
+version=4.14.3
+revision=1
 build_style=cmake
 configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF"
 hostmakedepends="cmake automoc4 pkg-config"
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL, LGPL, FDL"
 homepage="https://projects.kde.org/projects/kde/kdelibs/baloo"
 distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=cf3704949bfe318322010049c38712d06bd042134c3a4eb79c5829b61ec1b535
+checksum=9edcd2bf9fcb4f42959087c954e533bf3345d0971b7402f04c0703c1b2e66a5c

 baloo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
--- a/srcpkgs/base-chroot-musl/template
+++ b/srcpkgs/base-chroot-musl/template
@ -1,6 +1,6 @@
 # Template file for 'base-chroot-musl'
 pkgname=base-chroot-musl
-version=0.15
+version=0.16
 revision=1
 bootstrap=yes
 build_style=meta
@ -16,6 +16,6 @@ only_for_archs="i686-musl x86_64-musl armv6l-musl armv7l-musl aarch64-musl"
 depends="
 base-files kernel-libc-headers musl musl-legacy-compat
 gcc gcc-c++ patch chroot-bash chroot-grep coreutils findutils
- gettext gettext-devel chroot-texinfo sed chroot-gawk diffutils
+ gettext chroot-texinfo sed chroot-gawk diffutils
 make gzip file tar chroot-util-linux chroot-distcc
 chroot-git ccache xbps xz which"
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@ -1,6 +1,6 @@
 # Template file for 'base-chroot'
 pkgname=base-chroot
-version=0.61
+version=0.62
 revision=1
 noarch=yes
 bootstrap=yes
@ -12,6 +12,6 @@ license="Public domain"

 depends="
 base-files kernel-libc-headers glibc-devel glibc-locales binutils gcc
- gcc-c++ patch chroot-bash chroot-grep coreutils gettext gettext-devel
+ gcc-c++ patch chroot-bash chroot-grep coreutils gettext
 chroot-texinfo sed chroot-gawk findutils diffutils make gzip file tar
 chroot-util-linux chroot-distcc chroot-git ccache xbps xz which"
--- a/srcpkgs/base-system/template
+++ b/srcpkgs/base-system/template
@ -1,6 +1,6 @@
 # Template file for 'base-system'
 pkgname=base-system
-version=0.107
+version=0.108
 revision=1
 build_style=meta
 homepage="http://www.voidlinux.eu/"
@ -27,11 +27,3 @@ case "$XBPS_TARGET_MACHINE" in
 esac

 build_options="systemd"
-
-do_install() {
-	# Create /sbin/init symlink to runit-init.
-	if [ -z "$build_option_systemd" ]; then
-		vmkdir usr/sbin
-		ln -s /usr/bin/runit-init ${DESTDIR}/usr/sbin/init
-	fi
-}
--- a/srcpkgs/bash-preexec/template
+++ b/srcpkgs/bash-preexec/template
@ -0,0 +1,16 @@
+# Template file for 'bash-preexec'
+pkgname=bash-preexec
+version=0.2.1
+revision=2
+noarch=yes
+depends="bash"
+short_desc="Preexec and Precmd functions for Bash just like Zsh"
+maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+license="MIT"
+homepage="https://github.com/rcaloras/bash-preexec"
+distfiles="https://github.com/rcaloras/bash-preexec/archive/${version}.tar.gz"
+checksum=017e0f06a5213f9a71a8fe6a368b5737470f9d8bd180a910c49d6ef616894f7b
+
+do_install() {
+	vbin bash-preexec.sh
+}
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@ -1,9 +1,9 @@
 # Template build file for 'bash'.
 pkgname=bash
 _bash_distver=4.3
-_bash_patchlevel=033
+_bash_patchlevel=039
 version=${_bash_distver}.${_bash_patchlevel}
-revision=5
+revision=2
 wrksrc=${pkgname}-${_bash_distver}
 build_pie=yes
 build_style=gnu-configure
@ -16,12 +16,12 @@ short_desc="The GNU Bourne Again Shell"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnu.org/software/bash/bash.html"
 license="GPL-3"
-distfiles="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}.tar.gz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-${_bash_distver}.tar.gz"
 checksum=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4
 CFLAGS="-DSYS_BASHRC='\"/etc/bash/bashrc\"'"

 pre_configure() {
-	local url="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}-patches"
+	local url="${GNU_SITE}/$pkgname/$pkgname-${_bash_distver}-patches"
 	local ver=$(echo ${_bash_distver}|sed "s|\.||g")

 	if [ "${_bash_patchlevel}" -gt 000 ]; then
--- a/srcpkgs/bftpd/files/bftpd/run
+++ b/srcpkgs/bftpd/files/bftpd/run
@ -0,0 +1,2 @@
+#!/bin/sh
+exec bftpd -D 
--- a/srcpkgs/bftpd/template
+++ b/srcpkgs/bftpd/template
@ -0,0 +1,21 @@
+# Template file for 'bftpd'
+pkgname=bftpd
+version=4.4
+revision=3
+wrksrc="$pkgname"
+build_style=gnu-configure
+configure_args="--enable-libz"
+makedepends="zlib-devel"
+short_desc="A simple FTP server"
+maintainer="Norbert Vegh <vegh@norvegh.com>"
+license="GPL-2"
+homepage="http://bftpd.sourceforge.net/"
+checksum=b805ebbdd3de993ca14d733ad9ad007ac342a1646b257d91a53ec87a36c7f741
+distfiles=${SOURCEFORGE_SITE}/bftpd/bftpd-${version}.tar.gz
+
+do_install() {
+	sed -i 's,sbin,bin,g' Makefile
+	make PREFIX=/usr DESTDIR=${DESTDIR} install
+	vsv bftpd
+	vconf bftpd.conf
+}
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@ -1,14 +1,14 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.25
-revision=2
+revision=4
 bootstrap=yes
 short_desc="GNU binary utilities"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnu.org/software/binutils/"
 license="GPL-3"
-distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
-checksum=cccf377168b41a52a76f46df18feb8f7285654b3c1bd69fc8265cb0fc6902f2d
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.bz2"
+checksum=22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923

 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="flex perl"
@ -18,7 +18,7 @@ makedepends+=" zlib-devel"
 pre_configure() {
 	sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 	# Drop bashism!
-	sed -e 's,source,\.,g' -i ld/scripttempl/elf.sc
+	sed -e 's,source,\.,g' -i ld/scripttempl/elf32msp430.sc
 }
 do_configure() {
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
--- a/srcpkgs/bsd-games/patches/stdio.h.diff
+++ b/srcpkgs/bsd-games/patches/stdio.h.diff
@ -1,10 +1,11 @@
 diff -ru a/include/stdio.h b/include/stdio.h
 --- a/include/stdio.h	2000-08-04 10:24:39.000000000 +1000
 +++ b/include/stdio.h	2005-06-18 14:26:35.000000000 +1000
-@@ -34,6 +34,10 @@
+@@ -34,6 +34,11 @@
 #include <bsd-games.h>
 #include_next <stdio.h>
 
+#include <sys/cdefs.h> 
 +__BEGIN_DECLS
 +
 #ifndef HAVE_fgetln
--- a/srcpkgs/bsd-games/template
+++ b/srcpkgs/bsd-games/template
@ -1,7 +1,7 @@
 # Template file for 'bsd-games'.  Based on Arch PKGBUILD by Chris Brannon.
 pkgname=bsd-games
 version=2.17
-revision=1
+revision=2
 patch_args="-Np1"
 build_style=gnu-configure
 make_dirs="
@ -15,7 +15,7 @@ short_desc="A linux port for a collection of BSD command line games"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="BSD"
 homepage="ftp://ftp.ibiblio.org/pub/Linux/games/"
-distfiles="ftp://ftp.ibiblio.org/pub/Linux/games/${pkgname}-${version}.tar.gz"
+distfiles="ftp://ftp.lip6.fr/pub/linux/sunsite/games/${pkgname}-${version}.tar.gz"
 checksum=066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60
 nocross=yes

@ -36,6 +36,11 @@ post_extract() {
 	sed -i  "s/\.I range/\.It range/g" arithmetic/arithmetic.6
 	sed -i "s/game were the/game where the/g" gomoku/gomoku.6
 	sed -i 's|/usr/games|/usr/bin|g' wargames/wargames
+
+	sed -i '1i#include <sys/types.h>' banner/banner.c
+	sed -i 's/getdate/get_date/g' hack/*.[ch]
+	sed -i '1i#include <fcntl.h>' wump/wump.c
+	sed -i 's/-DOTTO//' hunt/Makeconfig
 }

 do_install() {
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@ -1,6 +1,6 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-_distver=4.0
+_distver=4.0.1
 # DO NOT MODIFY DATEVER!
 _datever=20141006
 version=${_datever}.${_distver}
--- a/srcpkgs/caja-extensions-common/template
+++ b/srcpkgs/caja-extensions-common/template
@ -1,18 +1,18 @@
 # Template file for 'caja-extensions-common'
 pkgname=caja-extensions-common
-version=1.8.0
+version=1.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-gtk=2.0"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libcaja-devel mate-desktop-devel dbus-glib-devel gupnp-devel"
 depends="caja"
 short_desc="Common files for Caja extensions"
 maintainer="Alexey Rochev <equeim@gmail.com>"
 license="GPL-2"
 homepage="http://mate-desktop.org"
-distfiles="http://pub.mate-desktop.org/releases/1.8/${pkgname%-*}-${version}.tar.xz"
-checksum=71b4353236b4f13e1984a8497ff80ed63d74141833ba47a32629a5d3505bbc91
+distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname%-*}-${version}.tar.xz"
+checksum=08dd6e5d649fbcdc53a1684e89ab0f4e74a812dd1d7b684201b63f94f649b0ea

 wrksrc="${pkgname%-*}-${version}"

--- a/srcpkgs/caja/template
+++ b/srcpkgs/caja/template
@ -1,6 +1,6 @@
 # Template file for 'caja'
 pkgname=caja
-version=1.8.2
+version=1.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-gtk=2.0 --disable-static --enable-unique
@ -14,8 +14,8 @@ short_desc="The MATE shell and file manager"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2"
 homepage="http://mate-desktop.org"
-distfiles="http://pub.mate-desktop.org/releases/1.8/${pkgname}-${version}.tar.xz"
-checksum=99331a7439c346382c3b82c889fee9aaabca8760e9c7dfb60041c1fbcd2c6ac0
+distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=1165f606a3bceb3cbb3f96c52c8f39bf16b5b39ce9088071ee4dd0eb8fae135b

 build_options="gir"
 if [ -z "$CROSS_BUILD" ]; then
--- a/srcpkgs/chromium-pepper-flash/template
+++ b/srcpkgs/chromium-pepper-flash/template
@ -1,10 +1,10 @@
 # Template file for 'chromium-pepper-flash'
 pkgname=chromium-pepper-flash
 version=17.0.0.188
-_chromeVersion=42.0.2311.152-1
+_chromeVersion=43.0.2357.65-1
 _channel='stable'
 _baseUrl='http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable'
-revision=1
+revision=2
 short_desc="Pepper Flash plugin for Chromium"
 maintainer="Enno Boland <eb@s01.de>"
 homepage="http://www.google.com/chrome"
@ -18,11 +18,11 @@ create_wrksrc=yes
 case "${XBPS_TARGET_MACHINE}" in
 x86_64)
 	_filename=google-chrome-${_channel}_${_chromeVersion}_amd64.deb
-	_chromeChecksum="cc79dad8647e2a6252980d7583c290d4d234b346a4b0631301dca028f20c3e77"
+	_chromeChecksum="766799058ed436de63fa2ee1d896cb20ef7ddf26f6d27acb01c24c8fd837e22c"
 	;;
 i686)
 	_filename=google-chrome-${_channel}_${_chromeVersion}_i386.deb
-	_chromeChecksum="5d45a312e3d337f06d40aec20a82bd23653570e48530c6ea9628807c718e205a"
+	_chromeChecksum="a279a1d53e57c46ad11a7cf77476b5c3a29e6fd1775e0a37b11039ee0347fda7"
 	;;
 esac
 _chromeUrl="${_baseUrl}/${_filename}"
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@ -1,14 +1,14 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
-version=42.0.2311.135
+version=43.0.2357.65
 revision=1
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.chromium.org/"
 license="BSD"
 distfiles="https://commondatastorage.googleapis.com/${pkgname}-browser-official/${pkgname}-${version}.tar.xz"
-checksum=c269d40e653794c219fd3eca2922d881199af5acff5d0a55b3e79f3b6a5a2aa9
+checksum=3f8f87d982b5ee14862e49dcfa44e02009e401cb29f9758e253f9fd952c57eed

 lib32disabled=yes
 nodebug=yes
@ -17,7 +17,7 @@ hostmakedepends="yasm python pkg-config perl gperf bison ninja hwids icu-devel"
 makedepends="libpng-devel gtk+-devel nss-devel pciutils-devel
 libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
 libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
- libXScrnSaver-devel alsa-lib-devel icu-devel snappy-devel
+ libXScrnSaver-devel alsa-lib-devel icu-devel snappy-devel libvpx-devel
 libxml2-devel libxslt-devel pulseaudio-devel nss-devel libexif-devel
 libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel
 libjpeg-turbo-devel libevent-devel json-c-devel re2-devel harfbuzz-devel
@ -29,7 +29,8 @@ case "$XBPS_MACHINE" in
 	x86_64) hostmakedepends+=" ca-certificates gcc-c++-multilib";;
 esac
 case "$XBPS_TARGET_MACHINE" in
-	armv6l*) broken="http://build.voidlinux.eu:8010/builders/armv6l_builder/builds/8050/steps/shell_3/logs/stdio";;
+	armv6l*) broken="http://build.voidlinux.eu/builders/armv6l_builder/builds/8050/steps/shell_3/logs/stdio";;
+	armv7l*) broken="http://build.voidlinux.eu/builders/armv7l_builder/builds/13211/steps/shell_3/logs/stdio";;
 esac

 pre_configure() {
@ -102,6 +103,7 @@ do_configure() {
 		-Duse_system_xdg_utils=1
 		-Duse_system_yasm=1
 		-Duse_system_icu=1
+		-Duse_system_libvpx=1
 		-Duse_cups=1
 		-Dlinux_link_cups=1
 		-Duse_pulseaudio=1
@ -115,9 +117,6 @@ do_configure() {
 		conf+=" -Duse_system_libwebp=1"
 	fi

-	# TODO: re-enable on vp9 libvpx release (http://crbug.com/174287).
-	# conf+=" -Dmedia_use_libvpx=0"
-
 	# Use explicit library dependencies instead of dlopen.
 	conf+="
 		-Dlinux_link_gsettings=1
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@ -1,9 +1,9 @@
 # Template build file for 'chroot-bash'.
 pkgname=chroot-bash
 _bash_distver=4.3
-_bash_patchlevel=033
+_bash_patchlevel=039
 version=${_bash_distver}.${_bash_patchlevel}
-revision=2
+revision=1
 wrksrc="bash-${_bash_distver}"
 build_style=gnu-configure
 configure_args="--without-bash-malloc --without-curses --without-installed-readline --disable-nls"
@ -11,7 +11,7 @@ short_desc="The GNU Bourne Again Shell -- for xbps-src use"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnu.org/software/bash/bash.html"
 license="GPL-3"
-distfiles="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}.tar.gz"
+distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
 checksum=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4

 broken_as_needed=yes
@ -20,7 +20,7 @@ provides="bash-${version}_${revision}"
 conflicts="bash>=0 dash>=0"

 pre_configure() {
-	local url="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}-patches"
+	local url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 	local ver=$(echo ${_bash_distver}|sed "s|\.||g")

 	if [ "${_bash_patchlevel}" -gt 000 ]; then
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@ -1,7 +1,7 @@
 # Template file for 'chroot-gawk'
 pkgname=chroot-gawk
 version=4.0.0
-revision=4
+revision=5
 wrksrc="gawk-${version}"
 build_style=gnu-configure
 configure_args="--disable-nls --without-readline ac_cv_libsigsegv=/bin/false"
@ -9,8 +9,8 @@ short_desc="The GNU awk utility -- for xbps-src use"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://www.gnu.org/directory/GNU/gawk.html"
-distfiles="http://ftp.gnu.org/gnu/gawk/gawk-$version.tar.gz"
-checksum=c3a7cf7d976e05c6a1d8a9b3f14fa55d4304707408ddafb1396212653ea00be5
+distfiles="${GNU_SITE}/gawk/gawk-$version.tar.xz"
+checksum=abbef4dbab9db0f159c71b941fd93fd1dcb995f5e8a23396d1c2390801c46edf

 bootstrap=yes
 provides="awk-0_1"
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@ -1,7 +1,7 @@
 # Build template for 'chroot-grep'.
 pkgname=chroot-grep
 version=2.21
-revision=1
+revision=2
 wrksrc=grep-${version}
 bootstrap=yes
 conflicts="grep>=0"
@ -9,7 +9,7 @@ provides="grep-${version}_${revision}"
 build_style=gnu-configure
 configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep"
 homepage="http://www.gnu.org/software/grep/"
-distfiles="http://ftp.gnu.org/gnu/grep/grep-$version.tar.xz"
+distfiles="${GNU_SITE}/grep/grep-$version.tar.xz"
 short_desc="The GNU grep utility - for use with xbps-src"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
--- a/srcpkgs/chroot-texinfo/template
+++ b/srcpkgs/chroot-texinfo/template
@ -1,7 +1,7 @@
 # Template file for 'chroot-texinfo'
 pkgname=chroot-texinfo
 version=4.13a
-revision=6
+revision=7
 wrksrc="texinfo-4.13"
 bootstrap=yes
 hostmakedepends="ncurses-devel"
@ -12,8 +12,8 @@ short_desc="The GNU Documentation System -- for xbps-src use"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://www.gnu.org/software/texinfo/"
-distfiles="http://ftp.gnu.org/gnu/texinfo/texinfo-$version.tar.gz"
-checksum=1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68
+distfiles="${GNU_SITE}/texinfo/texinfo-$version.tar.lzma"
+checksum=6d28b0ceae866e3536142fc552e7a3bc9f84c8303119c25731b2478eef64c9e5

 do_configure() {
 	cp -f ${XBPS_CROSSPFDIR}/config.sub build-aux
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@ -1,4 +1,4 @@
-# Template file for 'coreutils' 
+# Template file for 'coreutils'
 pkgname=coreutils
 version=8.23
 revision=7
@ -9,7 +9,7 @@ short_desc="The GNU core utilities"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnu.org/software/coreutils"
 license="GPL-3"
-distfiles="http://ftp.gnu.org/gnu/coreutils/${pkgname}-${version}.tar.xz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
 checksum=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d
 build_pie=yes

@ -48,7 +48,7 @@ do_build() {
 	if [ "$CROSS_BUILD" ]; then
 		cp Makefile Makefile.orig
 		sed '/src_make_prime_list/d' Makefile.orig > Makefile
-		depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
+		depbase=$(echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||');\
 			cc -std=gnu99  -I. -I./lib  -Ilib -I./lib -Isrc -I./src  \
 			-fdiagnostics-show-option -funit-at-a-time -g -O2 -MT \
 			src/make-prime-list.o -MD -MP -MF $depbase.Tpo -c -o src/make-prime-list.o \
--- a/srcpkgs/cpio/template
+++ b/srcpkgs/cpio/template
@ -1,7 +1,7 @@
 # Template file for 'cpio'
 pkgname=cpio
 version=2.11
-revision=7
+revision=8
 build_pie=yes
 build_style=gnu-configure
 configure_args="gl_cv_func_stat_file_slash=yes gl_cv_func_malloc_posix=yes
@ -11,8 +11,8 @@ short_desc="GNU copy-in/out (cpio) with remote magnetic tape (rmt) support"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnu.org/software/cpio/"
 license="GPL-3"
-distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
-checksum=601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.bz2"
+checksum=bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd

 post_install() {
 	# Remove rmt that conflicts with the one from tar.
--- a/srcpkgs/cpufrequtils/template
+++ b/srcpkgs/cpufrequtils/template
@ -1,7 +1,7 @@
 # Template file for 'cpufrequtils'
 pkgname=cpufrequtils
 version=008
-revision=8
+revision=9
 short_desc="Userspace tools for the Linux kernel cpufreq subsystem"
 homepage="ftp://ftp.archlinux.org/other/cpufrequtils/"
 license="GPL-2"
@ -12,9 +12,6 @@ checksum=1b9daa591d977679fb09ffb9b4d58afa94b9387f3c0be92ec077080e328130f1
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"

 do_build() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) CFLAGS+=" -lintl";;
-	esac
 	make CC=$CC CFLAGS="$CFLAGS" STRIP=true
 }
 do_install() {
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@ -11,16 +11,16 @@ _CROSS_SYSROOT="/usr/${_triplet}"

 pkgname=cross-${_triplet}
 version=0.19
-revision=1
+revision=2
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 homepage="http://www.voidlinux.eu"
 license="Public Domain"
 distfiles="
- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2
- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
- http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz"
+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2
+ ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
+ ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz"
 checksum="22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
 aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@ -12,16 +12,16 @@ _CROSS_SYSROOT="/usr/${_triplet}"

 pkgname=cross-${_triplet}
 version=0.19
-revision=3
+revision=4
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
 license="Public Domain"
 distfiles="
- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2
- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
- http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz"
+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2
+ ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
+ ${GNU_SITE}/glibc-${_glibc_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz"
 checksum="
 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
@ -157,7 +157,7 @@ _glibc_build() {
 		--with-headers=${_CROSS_SYSROOT}/usr/include \
 		--config-cache --disable-profile --enable-obsolete-rpc \
 		--disable-werror --enable-kernel=2.6.27 ${_fpuflags}
-	
+
 	make ${makejobs}
 	make install_root=${_CROSS_SYSROOT} install

--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@ -12,16 +12,16 @@ _CROSS_SYSROOT="/usr/${_triplet}"

 pkgname=cross-${_triplet}
 version=0.19
-revision=3
+revision=4
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
 license="Public Domain"
 distfiles="
- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2
- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
- http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz"
+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2
+ ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
+ ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz"
 checksum="
 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
@ -157,7 +157,7 @@ _glibc_build() {
 		--with-headers=${_CROSS_SYSROOT}/usr/include \
 		--config-cache --disable-profile --enable-obsolete-rpc \
 		--disable-werror --enable-kernel=2.6.27 ${_fpuflags}
-	
+
 	make ${makejobs}
 	make install_root=${_CROSS_SYSROOT} install

--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@ -11,16 +11,16 @@ _CROSS_SYSROOT="/usr/${_triplet}"

 pkgname=cross-${_triplet}
 version=0.17
-revision=1
+revision=2
 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
 license="Public Domain"
 distfiles="
- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2
- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
- http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz"
+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2
+ ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
+ ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz"
 checksum="
 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
@ -156,7 +156,7 @@ _glibc_build() {
 		--with-headers=${_CROSS_SYSROOT}/usr/include \
 		--config-cache --enable-obsolete-rpc \
 		--enable-kernel=2.6.27 ${_fpuflags}
-	
+
 	make ${makejobs}
 	make install_root=${_CROSS_SYSROOT} install

@ -175,7 +175,7 @@ _gcc_build() {
 	unset LD AS CPP
 	export CC="gcc" CFLAGS="-Os -pipe"

-        # Make this link to target libs.
+	# Make this link to target libs.
 	if [ ! -f .sed_subst_done ]; then
 		sed -e "s, /lib/, ${_CROSS_SYSROOT}/lib/,g;s, /usr/lib/, ${_CROSS_SYSROOT}/usr/lib/,g" \
 			-i ${_CROSS_SYSROOT}/lib/libc.so ${_CROSS_SYSROOT}/lib/libpthread.so
--- a/srcpkgs/cubieboard2-uboot/files/boot.txt
+++ b/srcpkgs/cubieboard2-uboot/files/boot.txt
@ -0,0 +1,19 @@
+part uuid ${devtype} ${devnum}:${bootpart} uuid
+setenv bootargs console=${console} root=PARTUUID=${uuid} rw rootwait
+
+if load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /boot/zImage; then
+  if load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /boot/dtbs/${fdtfile}; then
+    if load ${devtype} ${devnum}:${bootpart} ${ramdisk_addr_r} /boot/initramfs-linux.img; then
+      bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r};
+    else
+      bootz ${kernel_addr_r} - ${fdt_addr_r};
+    fi;
+  fi;
+fi
+
+if load ${devtype} ${devnum}:${bootpart} 0x48000000 /boot/uImage; then
+  if load ${devtype} ${devnum}:${bootpart} 0x43000000 /boot/script.bin; then
+    setenv bootm_boot_mode sec;
+    bootm 0x48000000;
+  fi;
+fi
--- a/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd
+++ b/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd
@ -1,5 +0,0 @@
-setenv machid 0x10bb
-setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p2 rw rootwait loglevel=4 panic=10 ${extra}
-fatload mmc 0 0x43000000 script.bin || ext2load mmc 0 0x43000000 boot/script.bin
-fatload mmc 0 0x48000000 uImage || ext2load mmc 0 0x48000000 uImage boot/uImage
-bootm 0x48000000
--- a/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex
+++ b/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex
@ -1,975 +0,0 @@
-[product]
-version = "100"
-machine = "cubieboard2"
-
-[platform]
-eraseflag = 0
-
-[target]
-boot_clock = 912
-dcdc2_vol = 1400
-dcdc3_vol = 1250
-ldo2_vol = 3000
-ldo3_vol = 2800
-ldo4_vol = 2800
-storage_type = 1
-
-[clock]
-pll3 = 297
-pll4 = 300
-pll6 = 600
-pll7 = 297
-pll8 = 336
-
-[card_boot]
-logical_start = 40960
-sprite_gpio0 =
-
-[card0_boot_para]
-card_ctrl = 0
-card_high_speed = 1
-card_line = 4
-sdc_d1 = port:PF00<2><1><default><default>
-sdc_d0 = port:PF01<2><1><default><default>
-sdc_clk = port:PF02<2><1><default><default>
-sdc_cmd = port:PF03<2><1><default><default>
-sdc_d3 = port:PF04<2><1><default><default>
-sdc_d2 = port:PF05<2><1><default><default>
-
-[card2_boot_para]
-card_ctrl = 2
-card_high_speed = 1
-card_line = 4
-sdc_cmd = port:PC06<3><1><default><default>
-sdc_clk = port:PC07<3><1><default><default>
-sdc_d0 = port:PC08<3><1><default><default>
-sdc_d1 = port:PC09<3><1><default><default>
-sdc_d2 = port:PC10<3><1><default><default>
-sdc_d3 = port:PC11<3><1><default><default>
-
-[twi_para]
-twi_port = 0
-twi_scl = port:PB00<2><default><default><default>
-twi_sda = port:PB01<2><default><default><default>
-
-[uart_para]
-uart_debug_port = 0
-uart_debug_tx = port:PB22<2><1><default><default>
-uart_debug_rx = port:PB23<2><1><default><default>
-
-[uart_force_debug]
-uart_debug_port = 0
-uart_debug_tx = port:PF02<4><1><default><default>
-uart_debug_rx = port:PF04<4><1><default><default>
-
-[jtag_para]
-jtag_enable = 0
-jtag_ms = port:PB14<3><default><default><default>
-jtag_ck = port:PB15<3><default><default><default>
-jtag_do = port:PB16<3><default><default><default>
-jtag_di = port:PB17<3><default><default><default>
-
-[pm_para]
-standby_mode = 0
-
-[dram_para]
-dram_baseaddr = 0x40000000
-dram_clk = 432
-dram_type = 3
-dram_rank_num = 1
-dram_chip_density = 4096
-dram_io_width = 16
-dram_bus_width = 32
-dram_cas = 9
-dram_zq = 0x7f
-dram_odt_en = 0
-dram_size = 1024
-dram_tpr0 = 0x42d899b7
-dram_tpr1 = 0xa090
-dram_tpr2 = 0x22a00
-dram_tpr3 = 0x0
-dram_tpr4 = 0x1
-dram_tpr5 = 0x0
-dram_emr1 = 0x4
-dram_emr2 = 0x10
-dram_emr3 = 0x0
-
-[mali_para]
-mali_used = 1
-mali_clkdiv = 1
-
-[emac_para]
-emac_used = 1
-emac_rxd3 = port:PA00<2><default><default><default>
-emac_rxd2 = port:PA01<2><default><default><default>
-emac_rxd1 = port:PA02<2><default><default><default>
-emac_rxd0 = port:PA03<2><default><default><default>
-emac_txd3 = port:PA04<2><default><default><default>
-emac_txd2 = port:PA05<2><default><default><default>
-emac_txd1 = port:PA06<2><default><default><default>
-emac_txd0 = port:PA07<2><default><default><default>
-emac_rxclk = port:PA08<2><default><default><default>
-emac_rxerr = port:PA09<2><default><default><default>
-emac_rxdV = port:PA10<2><default><default><default>
-emac_mdc = port:PA11<2><default><default><default>
-emac_mdio = port:PA12<2><default><default><default>
-emac_txen = port:PA13<2><default><default><default>
-emac_txclk = port:PA14<2><default><default><default>
-emac_crs = port:PA15<2><default><default><default>
-emac_col = port:PA16<2><default><default><default>
-emac_reset = port:PA17<1><default><default><default>
-
-[twi0_para]
-twi0_used = 1
-twi0_scl = port:PB00<2><default><default><default>
-twi0_sda = port:PB01<2><default><default><default>
-
-[twi1_para]
-twi1_used = 0
-twi1_scl = port:PB18<2><default><default><default>
-twi1_sda = port:PB19<2><default><default><default>
-
-[twi2_para]
-twi2_used = 0
-twi2_scl = port:PB20<2><default><default><default>
-twi2_sda = port:PB21<2><default><default><default>
-
-[uart_para0]
-uart_used = 1
-uart_port = 0
-uart_type = 2
-uart_tx = port:PB22<2><1><default><default>
-uart_rx = port:PB23<2><1><default><default>
-
-[uart_para1]
-uart_used = 0
-uart_port = 1
-uart_type = 8
-uart_tx = port:PA10<4><1><default><default>
-uart_rx = port:PA11<4><1><default><default>
-uart_rts = port:PA12<4><1><default><default>
-uart_cts = port:PA13<4><1><default><default>
-uart_dtr = port:PA14<4><1><default><default>
-uart_dsr = port:PA15<4><1><default><default>
-uart_dcd = port:PA16<4><1><default><default>
-uart_ring = port:PA17<4><1><default><default>
-
-[uart_para2]
-uart_used = 0
-uart_port = 2
-uart_type = 4
-uart_tx = port:PI18<3><1><default><default>
-uart_rx = port:PI19<3><1><default><default>
-uart_rts = port:PI16<3><1><default><default>
-uart_cts = port:PI17<3><1><default><default>
-
-[uart_para3]
-uart_used = 0
-uart_port = 3
-uart_type = 4
-uart_tx = port:PH00<4><1><default><default>
-uart_rx = port:PH01<4><1><default><default>
-uart_rts = port:PH02<4><1><default><default>
-uart_cts = port:PH03<4><1><default><default>
-
-[uart_para4]
-uart_used = 0
-uart_port = 4
-uart_type = 2
-uart_tx = port:PH04<4><1><default><default>
-uart_rx = port:PH05<4><1><default><default>
-
-[uart_para5]
-uart_used = 0
-uart_port = 5
-uart_type = 2
-uart_tx = port:PH06<4><1><default><default>
-uart_rx = port:PH07<4><1><default><default>
-
-[uart_para6]
-uart_used = 0
-uart_port = 6
-uart_type = 2
-uart_tx = port:PA12<4><1><default><default>
-uart_rx = port:PA13<4><1><default><default>
-
-[uart_para7]
-uart_used = 0
-uart_port = 7
-uart_type = 2
-uart_tx = port:PA14<4><1><default><default>
-uart_rx = port:PA15<4><1><default><default>
-
-[spi0_para]
-spi_used = 0
-spi_cs_bitmap = 1
-spi_cs0 = port:PI10<2><default><default><default>
-spi_cs1 = port:PI14<2><default><default><default>
-spi_sclk = port:PI11<2><default><default><default>
-spi_mosi = port:PI12<2><default><default><default>
-spi_miso = port:PI13<2><default><default><default>
-
-[spi1_para]
-spi_used = 0
-spi_cs_bitmap = 1
-spi_cs0 = port:PA00<3><default><default><default>
-spi_cs1 = port:PA04<3><default><default><default>
-spi_sclk = port:PA01<3><default><default><default>
-spi_mosi = port:PA02<3><default><default><default>
-spi_miso = port:PA03<3><default><default><default>
-
-[spi2_para]
-spi_used = 0
-spi_cs_bitmap = 1
-spi_cs0 = port:PC19<3><default><default><default>
-spi_cs1 = port:PB13<2><default><default><default>
-spi_sclk = port:PC20<3><default><default><default>
-spi_mosi = port:PC21<3><default><default><default>
-spi_miso = port:PC22<3><default><default><default>
-
-[spi3_para]
-spi_used = 0
-spi_cs_bitmap = 1
-spi_cs0 = port:PA05<3><default><default><default>
-spi_cs1 = port:PA09<3><default><default><default>
-spi_sclk = port:PA06<3><default><default><default>
-spi_mosi = port:PA07<3><default><default><default>
-spi_miso = port:PA08<3><default><default><default>
-
-[ctp_para]
-ctp_used = 0
-ctp_name = "gt811"
-ctp_twi_id = 2
-ctp_twi_addr = 0x40
-ctp_screen_max_x = 1024
-ctp_screen_max_y = 600
-ctp_revert_x_flag = 0
-ctp_revert_y_flag = 0
-ctp_exchange_x_y_flag = 1
-ctp_firm = 1
-ctp_int_port = port:PH21<6><default><default><default>
-ctp_wakeup = port:PB13<1><default><default><1>
-
-[ctp_list_para]
-ctp_det_used = 0
-ft5x_ts = 0
-gt82x = 0
-gslX680 = 0
-gt9xx_ts = 0
-gt811 = 0
-
-[tkey_para]
-tkey_used = 0
-tkey_twi_id = 2
-tkey_twi_addr = 0x62
-tkey_int = port:PI13<6><default><default><default>
-
-[motor_para]
-motor_used = 0
-motor_shake = port:PB03<1><default><default><1>
-
-[gpio_para]
-gpio_used = 1
-gpio_num = 2
-gpio_pin_1 = port:PH20<1><default><default><1>
-gpio_pin_2 = port:PH21<1><default><default><1>
-
-[nand_para]
-nand_used = 1
-nand_we = port:PC00<2><default><default><default>
-nand_ale = port:PC01<2><default><default><default>
-nand_cle = port:PC02<2><default><default><default>
-nand_ce1 = port:PC03<2><default><default><default>
-nand_ce0 = port:PC04<2><default><default><default>
-nand_nre = port:PC05<2><default><default><default>
-nand_rb0 = port:PC06<2><default><default><default>
-nand_rb1 = port:PC07<2><default><default><default>
-nand_d0 = port:PC08<2><default><default><default>
-nand_d1 = port:PC09<2><default><default><default>
-nand_d2 = port:PC10<2><default><default><default>
-nand_d3 = port:PC11<2><default><default><default>
-nand_d4 = port:PC12<2><default><default><default>
-nand_d5 = port:PC13<2><default><default><default>
-nand_d6 = port:PC14<2><default><default><default>
-nand_d7 = port:PC15<2><default><default><default>
-nand_wp = port:PC16<2><default><default><default>
-nand_ce2 = port:PC17<2><default><default><default>
-nand_ce3 = port:PC18<2><default><default><default>
-nand_ce4 =
-nand_ce5 =
-nand_ce6 =
-nand_ce7 =
-nand_spi = port:PC23<3><default><default><default>
-nand_ndqs = port:PC24<2><default><default><default>
-good_block_ratio = 0
-
-[disp_init]
-disp_init_enable = 1
-disp_mode = 0
-screen0_output_type = 3
-screen0_output_mode = 4
-screen1_output_type = 0
-screen1_output_mode = 4
-fb0_framebuffer_num = 3
-fb0_format = 10
-fb0_pixel_sequence = 0
-fb0_scaler_mode_enable = 0
-fb1_framebuffer_num = 2
-fb1_format = 10
-fb1_pixel_sequence = 0
-fb1_scaler_mode_enable = 0
-lcd0_backlight = 197
-lcd1_backlight = 197
-lcd0_bright = 50
-lcd0_contrast = 50
-lcd0_saturation = 57
-lcd0_hue = 50
-lcd1_bright = 50
-lcd1_contrast = 50
-lcd1_saturation = 57
-lcd1_hue = 50
-
-[lcd0_para]
-lcd_used = 0
-lcd_x = 1024
-lcd_y = 600
-lcd_dclk_freq = 51
-lcd_pwm_not_used = 0
-lcd_pwm_ch = 0
-lcd_pwm_freq = 10000
-lcd_pwm_pol = 1
-lcd_max_bright = 240
-lcd_min_bright = 64
-lcd_if = 0
-lcd_hbp = 158
-lcd_ht = 1344
-lcd_vbp = 25
-lcd_vt = 1270
-lcd_vspw = 3
-lcd_hspw = 20
-lcd_hv_if = 0
-lcd_hv_smode = 0
-lcd_hv_s888_if = 0
-lcd_hv_syuv_if = 0
-lcd_lvds_ch = 0
-lcd_lvds_mode = 0
-lcd_lvds_bitwidth = 0
-lcd_lvds_io_cross = 0
-lcd_cpu_if = 0
-lcd_frm = 1
-lcd_io_cfg0 = 0
-lcd_gamma_correction_en = 0
-lcd_gamma_tbl_0 = 0x0
-lcd_gamma_tbl_1 = 0x10101
-lcd_gamma_tbl_255 = 0xffffff
-lcd_bl_en_used = 0
-lcd_bl_en = port:PH07<1><0><default><1>
-lcd_power_used = 0
-lcd_power = port:PH08<1><0><default><1>
-lcd_pwm_used = 0
-lcd_pwm = port:PB02<2><0><default><default>
-lcdd0 = port:PD00<2><0><default><default>
-lcdd1 = port:PD01<2><0><default><default>
-lcdd2 = port:PD02<2><0><default><default>
-lcdd3 = port:PD03<2><0><default><default>
-lcdd4 = port:PD04<2><0><default><default>
-lcdd5 = port:PD05<2><0><default><default>
-lcdd6 = port:PD06<2><0><default><default>
-lcdd7 = port:PD07<2><0><default><default>
-lcdd8 = port:PD08<2><0><default><default>
-lcdd9 = port:PD09<2><0><default><default>
-lcdd10 = port:PD10<2><0><default><default>
-lcdd11 = port:PD11<2><0><default><default>
-lcdd12 = port:PD12<2><0><default><default>
-lcdd13 = port:PD13<2><0><default><default>
-lcdd14 = port:PD14<2><0><default><default>
-lcdd15 = port:PD15<2><0><default><default>
-lcdd16 = port:PD16<2><0><default><default>
-lcdd17 = port:PD17<2><0><default><default>
-lcdd18 = port:PD18<2><0><default><default>
-lcdd19 = port:PD19<2><0><default><default>
-lcdd20 = port:PD20<2><0><default><default>
-lcdd21 = port:PD21<2><0><default><default>
-lcdd22 = port:PD22<2><0><default><default>
-lcdd23 = port:PD23<2><0><default><default>
-lcdclk = port:PD24<2><0><default><default>
-lcdde = port:PD25<2><0><default><default>
-lcdhsync = port:PD26<2><0><default><default>
-lcdvsync = port:PD27<2><0><default><default>
-
-[lcd1_para]
-lcd_used = 0
-lcd_x = 0
-lcd_y = 0
-lcd_dclk_freq = 0
-lcd_pwm_not_used = 0
-lcd_pwm_ch = 1
-lcd_pwm_freq = 0
-lcd_pwm_pol = 0
-lcd_max_bright = 240
-lcd_min_bright = 64
-lcd_if = 0
-lcd_hbp = 0
-lcd_ht = 0
-lcd_vbp = 0
-lcd_vt = 0
-lcd_vspw = 0
-lcd_hspw = 0
-lcd_hv_if = 0
-lcd_hv_smode = 0
-lcd_hv_s888_if = 0
-lcd_hv_syuv_if = 0
-lcd_lvds_ch = 0
-lcd_lvds_mode = 0
-lcd_lvds_bitwidth = 0
-lcd_lvds_io_cross = 0
-lcd_cpu_if = 0
-lcd_frm = 0
-lcd_io_cfg0 = 0
-lcd_gamma_correction_en = 0
-lcd_gamma_tbl_0 = 0x0
-lcd_gamma_tbl_1 = 0x10101
-lcd_gamma_tbl_255 = 0xffffff
-lcd_bl_en_used = 0
-lcd_bl_en =
-lcd_power_used = 0
-lcd_power =
-lcd_pwm_used = 0
-lcd_pwm = port:PI03<2><0><default><default>
-lcd_gpio_0 =
-lcd_gpio_1 =
-lcd_gpio_2 =
-lcd_gpio_3 =
-lcdd0 = port:PH00<2><0><default><default>
-lcdd1 = port:PH01<2><0><default><default>
-lcdd2 = port:PH02<2><0><default><default>
-lcdd3 = port:PH03<2><0><default><default>
-lcdd4 = port:PH04<2><0><default><default>
-lcdd5 = port:PH05<2><0><default><default>
-lcdd6 = port:PH06<2><0><default><default>
-lcdd7 = port:PH07<2><0><default><default>
-lcdd8 = port:PH08<2><0><default><default>
-lcdd9 = port:PH09<2><0><default><default>
-lcdd10 = port:PH10<2><0><default><default>
-lcdd11 = port:PH11<2><0><default><default>
-lcdd12 = port:PH12<2><0><default><default>
-lcdd13 = port:PH13<2><0><default><default>
-lcdd14 = port:PH14<2><0><default><default>
-lcdd15 = port:PH15<2><0><default><default>
-lcdd16 = port:PH16<2><0><default><default>
-lcdd17 = port:PH17<2><0><default><default>
-lcdd18 = port:PH18<2><0><default><default>
-lcdd19 = port:PH19<2><0><default><default>
-lcdd20 = port:PH20<2><0><default><default>
-lcdd21 = port:PH21<2><0><default><default>
-lcdd22 = port:PH22<2><0><default><default>
-lcdd23 = port:PH23<2><0><default><default>
-lcdclk = port:PH24<2><0><default><default>
-lcdde = port:PH25<2><0><default><default>
-lcdhsync = port:PH26<2><0><default><default>
-lcdvsync = port:PH27<2><0><default><default>
-
-[tv_out_dac_para]
-dac_used = 0
-dac0_src = 4
-dac1_src = 5
-dac2_src = 6
-dac3_src = 0
-
-[hdmi_para]
-hdmi_used = 1
-
-[camera_list_para]
-camera_list_para_used = 0
-ov7670 = 0
-gc0308 = 1
-gt2005 = 1
-hi704 = 0
-sp0838 = 0
-mt9m112 = 0
-mt9m113 = 0
-ov2655 = 0
-hi253 = 0
-gc0307 = 0
-mt9d112 = 0
-ov5640 = 0
-gc2015 = 0
-ov2643 = 0
-gc0329 = 0
-gc0309 = 0
-tvp5150 = 0
-s5k4ec = 0
-ov5650_mv9335 = 0
-siv121d = 0
-gc2035 = 0
-
-[csi0_para]
-csi_used = 0
-csi_dev_qty = 2
-csi_stby_mode = 0
-csi_mname = "gc0308"
-csi_twi_id = 1
-csi_twi_addr = 0x42
-csi_if = 0
-csi_vflip = 0
-csi_hflip = 0
-csi_iovdd = "axp20_pll"
-csi_avdd = ""
-csi_dvdd = ""
-csi_vol_iovdd = 2800
-csi_vol_dvdd =
-csi_vol_avdd =
-csi_flash_pol = 0
-csi_mname_b = "gt2005"
-csi_twi_id_b = 1
-csi_twi_addr_b = 0x78
-csi_if_b = 0
-csi_vflip_b = 0
-csi_hflip_b = 0
-csi_iovdd_b = "axp20_pll"
-csi_avdd_b = ""
-csi_dvdd_b = ""
-csi_vol_iovdd_b = 2800
-csi_vol_avdd_b =
-csi_vol_dvdd_b =
-csi_flash_pol_b = 0
-csi_pck = port:PE00<3><default><default><default>
-csi_ck = port:PE01<3><default><default><default>
-csi_hsync = port:PE02<3><default><default><default>
-csi_vsync = port:PE03<3><default><default><default>
-csi_d0 = port:PE04<3><default><default><default>
-csi_d1 = port:PE05<3><default><default><default>
-csi_d2 = port:PE06<3><default><default><default>
-csi_d3 = port:PE07<3><default><default><default>
-csi_d4 = port:PE08<3><default><default><default>
-csi_d5 = port:PE09<3><default><default><default>
-csi_d6 = port:PE10<3><default><default><default>
-csi_d7 = port:PE11<3><default><default><default>
-csi_reset = port:PH14<1><default><default><0>
-csi_power_en = port:PH17<1><default><default><0>
-csi_stby = port:PH19<1><default><default><0>
-csi_flash =
-csi_af_en =
-csi_reset_b = port:PH14<1><default><default><0>
-csi_power_en_b = port:PH17<1><default><default><0>
-csi_stby_b = port:PH18<1><default><default><0>
-csi_flash_b =
-csi_af_en_b =
-
-[csi1_para]
-csi_used = 0
-csi_dev_qty = 1
-csi_stby_mode = 0
-csi_mname = "gc0308"
-csi_if = 0
-csi_iovdd = "axp20_pll"
-csi_avdd = ""
-csi_dvdd = ""
-csi_vol_iovdd = 2800
-csi_vol_dvdd =
-csi_vol_avdd =
-csi_vflip = 0
-csi_hflip = 0
-csi_flash_pol = 0
-csi_facing = 1
-csi_twi_id = 1
-csi_twi_addr = 0x42
-csi_pck = port:PG00<3><default><default><default>
-csi_ck = port:PG01<3><default><default><default>
-csi_hsync = port:PG02<3><default><default><default>
-csi_vsync = port:PG03<3><default><default><default>
-csi_d0 = port:PG04<3><default><default><default>
-csi_d1 = port:PG05<3><default><default><default>
-csi_d2 = port:PG06<3><default><default><default>
-csi_d3 = port:PG07<3><default><default><default>
-csi_d4 = port:PG08<3><default><default><default>
-csi_d5 = port:PG09<3><default><default><default>
-csi_d6 = port:PG10<3><default><default><default>
-csi_d7 = port:PG11<3><default><default><default>
-csi_reset = port:PH13<1><default><default><0>
-csi_power_en = port:PH16<1><default><default><0>
-csi_stby = port:PH19<1><default><default><0>
-
-[tvout_para]
-tvout_used = 0
-tvout_channel_num = 1
-
-[tvin_para]
-tvin_used = 0
-tvin_channel_num = 4
-
-[sata_para]
-sata_used = 1
-sata_power_en = port:PB08<1><default><default><0>
-
-[mmc0_para]
-sdc_used = 1
-sdc_detmode = 1
-sdc_buswidth = 4
-sdc_clk = port:PF02<2><1><2><default>
-sdc_cmd = port:PF03<2><1><2><default>
-sdc_d0 = port:PF01<2><1><2><default>
-sdc_d1 = port:PF00<2><1><2><default>
-sdc_d2 = port:PF05<2><1><2><default>
-sdc_d3 = port:PF04<2><1><2><default>
-sdc_det = port:PH01<0><1><default><default>
-sdc_use_wp = 0
-sdc_wp =
-sdc_isio = 0
-sdc_regulator = "none"
-
-[mmc1_para]
-sdc_used = 0
-sdc_detmode = 4
-sdc_buswidth = 4
-sdc_clk = port:PG00<2><1><2><default>
-sdc_cmd = port:PG01<2><1><2><default>
-sdc_d0 = port:PG02<2><1><2><default>
-sdc_d1 = port:PG03<2><1><2><default>
-sdc_d2 = port:PG04<2><1><2><default>
-sdc_d3 = port:PG05<2><1><2><default>
-sdc_det =
-sdc_use_wp = 0
-sdc_wp =
-sdc_isio = 0
-sdc_regulator = "none"
-
-[mmc2_para]
-sdc_used = 0
-sdc_detmode = 3
-sdc_buswidth = 4
-sdc_cmd = port:PC06<3><1><2><default>
-sdc_clk = port:PC07<3><1><2><default>
-sdc_d0 = port:PC08<3><1><2><default>
-sdc_d1 = port:PC09<3><1><2><default>
-sdc_d2 = port:PC10<3><1><2><default>
-sdc_d3 = port:PC11<3><1><2><default>
-sdc_det =
-sdc_use_wp = 0
-sdc_wp =
-sdc_isio = 0
-sdc_regulator = "none"
-
-[mmc3_para]
-sdc_used = 0
-sdc_detmode = 4
-sdc_buswidth = 4
-sdc_cmd = port:PI04<2><1><2><default>
-sdc_clk = port:PI05<2><1><2><default>
-sdc_d0 = port:PI06<2><1><2><default>
-sdc_d1 = port:PI07<2><1><2><default>
-sdc_d2 = port:PI08<2><1><2><default>
-sdc_d3 = port:PI09<2><1><2><default>
-sdc_det =
-sdc_use_wp = 0
-sdc_wp =
-sdc_isio = 1
-sdc_regulator = "none"
-
-[ms_para]
-ms_used = 0
-ms_bs = port:PH06<5><default><default><default>
-ms_clk = port:PH07<5><default><default><default>
-ms_d0 = port:PH08<5><default><default><default>
-ms_d1 = port:PH09<5><default><default><default>
-ms_d2 = port:PH10<5><default><default><default>
-ms_d3 = port:PH11<5><default><default><default>
-ms_det =
-
-[smc_para]
-smc_used = 0
-smc_rst = port:PH13<5><default><default><default>
-smc_vppen = port:PH14<5><default><default><default>
-smc_vppp = port:PH15<5><default><default><default>
-smc_det = port:PH16<5><default><default><default>
-smc_vccen = port:PH17<5><default><default><default>
-smc_sck = port:PH18<5><default><default><default>
-smc_sda = port:PH19<5><default><default><default>
-
-[ps2_0_para]
-ps2_used = 0
-ps2_scl = port:PI20<2><1><default><default>
-ps2_sda = port:PI21<2><1><default><default>
-
-[ps2_1_para]
-ps2_used = 0
-ps2_scl = port:PI14<3><1><default><default>
-ps2_sda = port:PI15<3><1><default><default>
-
-[can_para]
-can_used = 0
-can_tx = port:PA16<3><default><default><default>
-can_rx = port:PA17<3><default><default><default>
-
-[keypad_para]
-kp_used = 0
-kp_in_size = 8
-kp_out_size = 8
-kp_in0 = port:PH08<4><1><default><default>
-kp_in1 = port:PH09<4><1><default><default>
-kp_in2 = port:PH10<4><1><default><default>
-kp_in3 = port:PH11<4><1><default><default>
-kp_in4 = port:PH14<4><1><default><default>
-kp_in5 = port:PH15<4><1><default><default>
-kp_in6 = port:PH16<4><1><default><default>
-kp_in7 = port:PH17<4><1><default><default>
-kp_out0 = port:PH18<4><1><default><default>
-kp_out1 = port:PH19<4><1><default><default>
-kp_out2 = port:PH22<4><1><default><default>
-kp_out3 = port:PH23<4><1><default><default>
-kp_out4 = port:PH24<4><1><default><default>
-kp_out5 = port:PH25<4><1><default><default>
-kp_out6 = port:PH26<4><1><default><default>
-kp_out7 = port:PH27<4><1><default><default>
-
-[usbc0]
-usb_used = 1
-usb_port_type = 2
-usb_detect_type = 1
-usb_id_gpio = port:PH04<0><1><default><default>
-usb_det_vbus_gpio = port:PH05<0><0><default><default>
-usb_drv_vbus_gpio = port:PB09<1><0><default><0>
-usb_host_init_state = 0
-
-[usbc1]
-usb_used = 1
-usb_port_type = 1
-usb_detect_type = 0
-usb_id_gpio =
-usb_det_vbus_gpio =
-usb_drv_vbus_gpio = port:PH06<1><0><default><0>
-usb_host_init_state = 1
-
-[usbc2]
-usb_used = 1
-usb_port_type = 1
-usb_detect_type = 0
-usb_id_gpio =
-usb_det_vbus_gpio =
-usb_drv_vbus_gpio = port:PH03<1><0><default><0>
-usb_host_init_state = 1
-
-[usb_feature]
-vendor_id = 6353
-mass_storage_id = 1
-adb_id = 2
-manufacturer_name = "USB Developer"
-product_name = "Android"
-serial_number = "20080411"
-
-[msc_feature]
-vendor_name = "USB 2.0"
-product_name = "USB Flash Driver"
-release = 100
-luns = 3
-
-[gsensor_para]
-gsensor_used = 0
-gsensor_twi_id = 1
-gsensor_int1 =
-gsensor_int2 =
-
-[gsensor_list_para]
-gsensor_det_used = 0
-bma250 = 1
-mma8452 = 1
-mma7660 = 1
-mma865x = 1
-afa750 = 1
-lis3de_acc = 1
-lis3dh_acc = 1
-kxtik = 1
-dmard10 = 0
-dmard06 = 1
-mxc622x = 1
-fxos8700 = 1
-lsm303d = 1
-
-[gps_para]
-gps_used = 0
-gps_spi_id = 2
-gps_spi_cs_num = 0
-gps_lradc = 1
-gps_clk = port:PI00<2><default><default><default>
-gps_sign = port:PI01<2><default><default><default>
-gps_mag = port:PI02<2><default><default><default>
-gps_vcc_en = port:PC22<1><default><default><0>
-gps_osc_en = port:PI14<1><default><default><0>
-gps_rx_en = port:PI15<1><default><default><0>
-
-[wifi_para]
-wifi_used = 0
-wifi_sdc_id = 3
-wifi_usbc_id = 2
-wifi_usbc_type = 1
-wifi_mod_sel = 6
-wifi_power = ""
-rtk_rtl8723as_wl_dis = port:PH09<1><default><default><0>
-rtk_rtl8723as_bt_dis = port:PB05<1><default><default><0>
-rtk_rtl8723as_wl_host_wake = port:PH10<0><default><default><0>
-rtk_rtl8723as_bt_host_wake = port:PI21<0><default><default><0>
-ap6xxx_wl_regon = port:PH09<1><default><default><0>
-ap6xxx_wl_host_wake = port:PH10<0><default><default><0>
-ap6xxx_bt_regon = port:PB05<1><default><default><0>
-ap6xxx_bt_wake = port:PI20<1><default><default><0>
-ap6xxx_bt_host_wake = port:PI21<0><default><default><0>
-
-[3g_para]
-3g_used = 0
-3g_usbc_num = 2
-3g_uart_num = 0
-3g_pwr =
-3g_wakeup =
-3g_int =
-
-[gy_para]
-gy_used = 0
-gy_twi_id = 1
-gy_twi_addr = 0
-gy_int1 = port:PH18<6><1><default><default>
-gy_int2 = port:PH19<6><1><default><default>
-
-[ls_para]
-ls_used = 0
-ls_twi_id = 1
-ls_twi_addr = 0
-ls_int = port:PH20<6><1><default><default>
-
-[compass_para]
-compass_used = 0
-compass_twi_id = 1
-compass_twi_addr = 0
-compass_int = port:PI13<6><1><default><default>
-
-[bt_para]
-bt_used = 0
-bt_uart_id = 2
-bt_wakeup = port:PI20<1><default><default><default>
-bt_gpio = port:PI21<1><default><default><default>
-bt_rst = port:PB05<1><default><default><default>
-
-[i2s_para]
-i2s_used = 0
-i2s_channel = 2
-i2s_mclk = port:PB05<2><1><default><default>
-i2s_bclk = port:PB06<2><1><default><default>
-i2s_lrclk = port:PB07<2><1><default><default>
-i2s_dout0 = port:PB08<2><1><default><default>
-i2s_dout1 =
-i2s_dout2 =
-i2s_dout3 =
-i2s_din = port:PB12<2><1><default><default>
-
-[spdif_para]
-spdif_used = 0
-spdif_mclk =
-spdif_dout = port:PB13<4><1><default><default>
-spdif_din =
-
-[audio_para]
-audio_used = 1
-capture_used = 1
-audio_pa_ctrl = port:PH15<1><default><default><1>
-
-[switch_para]
-switch_used = 0
-
-[leds_para]
-leds_used = 1
-leds_num = 2
-leds_pin_1 = port:PH20<1><default><default><0>
-leds_name_1 = "green:ph20:led1"
-leds_default_1 = 1
-leds_trigger_1 = "mmc0"
-leds_pin_2 = port:PH21<1><default><default><0>
-leds_name_2 = "blue:ph21:led2"
-leds_default_2 = 0
-leds_trigger_2 = "heartbeat"
-
-[ir_para]
-ir_used = 1
-ir_rx = port:PB04<2><default><default><default>
-
-[pmu_para]
-pmu_used = 1
-pmu_twi_addr = 52
-pmu_twi_id = 0
-pmu_irq_id = 32
-pmu_battery_rdc = 120
-pmu_battery_cap = 2100
-pmu_init_chgcur = 300
-pmu_earlysuspend_chgcur = 600
-pmu_suspend_chgcur = 1000
-pmu_resume_chgcur = 300
-pmu_shutdown_chgcur = 1000
-pmu_init_chgvol = 4200
-pmu_init_chgend_rate = 15
-pmu_init_chg_enabled = 1
-pmu_init_adc_freq = 100
-pmu_init_adc_freqc = 100
-pmu_init_chg_pretime = 50
-pmu_init_chg_csttime = 720
-pmu_bat_para1 = 0
-pmu_bat_para2 = 0
-pmu_bat_para3 = 0
-pmu_bat_para4 = 0
-pmu_bat_para5 = 5
-pmu_bat_para6 = 11
-pmu_bat_para7 = 13
-pmu_bat_para8 = 15
-pmu_bat_para9 = 19
-pmu_bat_para10 = 32
-pmu_bat_para11 = 50
-pmu_bat_para12 = 58
-pmu_bat_para13 = 71
-pmu_bat_para14 = 81
-pmu_bat_para15 = 89
-pmu_bat_para16 = 100
-pmu_usbvol_limit = 1
-pmu_usbcur_limit = 0
-pmu_usbvol = 4000
-pmu_usbcur = 0
-pmu_usbvol_pc = 4200
-pmu_usbcur_pc = 0
-pmu_pwroff_vol = 3300
-pmu_pwron_vol = 2900
-pmu_pekoff_time = 6000
-pmu_pekoff_en = 1
-pmu_peklong_time = 1500
-pmu_pekon_time = 1000
-pmu_pwrok_time = 64
-pmu_pwrnoe_time = 2000
-pmu_intotp_en = 1
-pmu_used2 = 0
-pmu_adpdet = port:PH02<0><default><default><default>
-pmu_init_chgcur2 = 400
-pmu_earlysuspend_chgcur2 = 600
-pmu_suspend_chgcur2 = 1200
-pmu_resume_chgcur2 = 400
-pmu_shutdown_chgcur2 = 1200
-pmu_suspendpwroff_vol = 3500
-pmu_batdeten = 1
-
-[recovery_key]
-key_min = 4
-key_max = 40
-
-[dvfs_table]
-max_freq = 912000000
-min_freq = 400000000
-LV_count = 7
-LV1_freq = 1008000000
-LV1_volt = 1450
-LV2_freq = 912000000
-LV2_volt = 1400
-LV3_freq = 864000000
-LV3_volt = 1300
-LV4_freq = 720000000
-LV4_volt = 1200
-LV5_freq = 528000000
-LV5_volt = 1100
-LV6_freq = 312000000
-LV6_volt = 1050
-LV7_freq = 144000000
-LV7_volt = 1050
-
--- a/srcpkgs/cubieboard2-uboot/patches/uuid.patch
+++ b/srcpkgs/cubieboard2-uboot/patches/uuid.patch
@ -0,0 +1,10 @@
+--- include/config_distro_defaults.h
+++ include/config_distro_defaults.h
+@@ -53,4 +53,7 @@
+ #define CONFIG_SUPPORT_RAW_INITRD
+ #define CONFIG_SYS_HUSH_PARSER
+ 
+#define CONFIG_CMD_PART
+#define CONFIG_PARTITION_UUIDS
+
+ #endif	/* _CONFIG_CMD_DISTRO_DEFAULTS_H */
--- a/srcpkgs/cubieboard2-uboot/template
+++ b/srcpkgs/cubieboard2-uboot/template
@ -1,33 +1,56 @@
 # Template file for 'cubieboard2-uboot'
 pkgname=cubieboard2-uboot
-version=v2013.10
-revision=9
-wrksrc="u-boot-sunxi-${version/v/}-sunxi"
-hostmakedepends="sunxi-tools uboot-mkimage"
-short_desc="Cubieboard2 U-Boot files for SD booting"
+version=2015.01
+revision=3
+wrksrc="u-boot-${version}"
+hostmakedepends="bc git sunxi-tools uboot-mkimage"
+short_desc="U-Boot for cubieboard2"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
-homepage="https://github.com/linux-sunxi/u-boot-sunxi"
-distfiles="https://github.com/linux-sunxi/u-boot-sunxi/archive/${version}-sunxi.tar.gz"
-checksum=a2a606939574795598d29f04852b1a40ddfcced96e9535d1d31fad30c68e0326
+homepage="http://www.denx.de/wiki/U-Boot/WebHome"
+distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
+checksum=383051a656ebe11757b17d38a3326387e4a1b0949ca8a9e8ee506bf71dac9fde

-only_for_archs="armv7l"
+only_for_archs="armv7l armv7l-musl"

+do_configure() {
+	git clone https://github.com/linux-sunxi/sunxi-boards
+}
 do_build() {
+	local _boards="Cubieboard2 Cubietruck"
+
 	unset CFLAGS CXXFLAGS LDFLAGS
-  
-	if [ "$CROSS_BUILD" ]; then
-		make CROSS_COMPILE=${XBPS_CROSS_TRIPLET}- Cubieboard2
-	else
-		make Cubieboard2
-	fi
-	mkimage -C none -A arm -T script -d ${FILESDIR}/cubieboard2.bootcmd boot.scr
-	fex2bin ${FILESDIR}/cubieboard2.fex script.bin
+
+	for f in ${_boards}; do
+		mkdir bin_${f}
+		make distclean
+		if [ -n "$CROSS_BUILD" ]; then
+			make CROSS_COMPILE=${XBPS_CROSS_TRIPLET}- ${f}_config
+			make CROSS_COMPILE=${XBPS_CROSS_TRIPLET}- ${makejobs}
+		else
+			make ${f}_config
+			make ${makejobs}
+		fi
+		mv u-boot-sunxi-with-spl.bin bin_${f}
+	done
+
+	mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d ${FILESDIR}/boot.txt boot.scr
+}
+do_install() {
+	vmkdir boot
+	vinstall bin_Cubieboard2/u-boot-sunxi-with-spl.bin 644 boot
+	fex2bin sunxi-boards/sys_config/a20/cubieboard2.fex ${DESTDIR}/boot/script.bin
+	vinstall ${FILESDIR}/boot.txt 644 boot
+	vinstall boot.scr 644 boot
 }

-do_install() {
-	vinstall u-boot-sunxi-with-spl.bin 644 boot
-	vinstall script.bin 644 boot
-	vinstall boot.scr 644 boot
-	vinstall ${FILESDIR}/cubieboard2.bootcmd 644 boot boot.cmd
+cubietruck-uboot_package() {
+	short_desc="${short_desc/cubieboard2/cubietruck}"
+	pkg_install () {
+		vmkdir boot
+		vinstall bin_Cubietruck/u-boot-sunxi-with-spl.bin 644 boot
+		fex2bin sunxi-boards/sys_config/a20/cubietruck.fex ${DESTDIR}/boot/script.bin
+		vinstall ${FILESDIR}/boot.txt 644 boot
+		vinstall boot.scr 644 boot
+	}
 }
--- a/srcpkgs/cubietruck-uboot
+++ b/srcpkgs/cubietruck-uboot
@ -0,0 +1 @@
+cubieboard2-uboot
--- a/srcpkgs/cubietruck-uboot/files/cubietruck.bootcmd
+++ b/srcpkgs/cubietruck-uboot/files/cubietruck.bootcmd
@ -1,9 +0,0 @@
-setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait fb0_framebuffer_num=4 sunxi_fb_mem_reserve=64 hdmi.audio=EDID:0 disp.screen0_output_mode=EDID:1280x720p60 panic=10 consoleblank=0
-# Old method
-fatload mmc 0 0x43000000 script.bin || ext2load mmc 0 0x43000000 boot/script.bin
-fatload mmc 0 0x48000000 uImage || ext2load mmc 0 0x48000000 uImage boot/uImage
-bootm 0x48000000
-# New method (one partition)
-ext4load mmc 0 0x43000000 boot/script.bin
-ext4load mmc 0 0x48000000 boot/zImage
-bootz 0x48000000
--- a/srcpkgs/cubietruck-uboot/files/cubietruck.fex
+++ b/srcpkgs/cubietruck-uboot/files/cubietruck.fex
--- a/srcpkgs/cubietruck-uboot/template
+++ b/srcpkgs/cubietruck-uboot/template
@ -1,35 +0,0 @@
-# Template file for 'cubietruck-uboot'
-pkgname=cubietruck-uboot
-version=2015.04
-revision=1
-wrksrc="u-boot-${version}"
-hostmakedepends="sunxi-tools uboot-mkimage"
-short_desc="Cubietruck U-Boot files for SD booting"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="https://github.com/RobertCNelson/u-boot"
-distfiles="https://codeload.github.com/RobertCNelson/u-boot/tar.gz/v${version}>u-boot-${version}.tar.gz"
-checksum=b7cc9d61eb958ed794918aef72a92f07f41315c164cd9ace5a6ca18e3db4b0e1
-
-only_for_archs="armv7l"
-
-do_build() {
-	unset CFLAGS CXXFLAGS LDFLAGS
-
-	if [ "$CROSS_BUILD" ]; then
-		make CROSS_COMPILE=${XBPS_CROSS_TRIPLET}- Cubietruck_config
-		make CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-
-	else
-		make Cubietruck_config
-		make
-	fi
-	mkimage -C none -A arm -T script -d ${FILESDIR}/cubietruck.bootcmd boot.scr
-	fex2bin ${FILESDIR}/cubietruck.fex script.bin
-}
-
-do_install() {
-	vinstall u-boot-sunxi-with-spl.bin 644 boot
-	vinstall script.bin 644 boot
-	vinstall boot.scr 644 boot
-	vinstall ${FILESDIR}/cubietruck.bootcmd 644 boot boot.cmd
-}
--- a/srcpkgs/ddd/template
+++ b/srcpkgs/ddd/template
@ -1,12 +1,12 @@
 # Template build file for 'ddd'.
 pkgname=ddd
 version=3.3.12
-revision=3
+revision=4
 build_style=gnu-configure
 makedepends="ncurses-devel libXt-devel libXext-devel libXmu-devel lesstif-devel"
 short_desc="Graphical front-end for command-line debuggers"
 maintainer="Enno Boland <eb@s01.de>"
 homepage="http://www.gnu.org/software/ddd"
 license="GPL-2"
-distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=3ad6cd67d7f4b1d6b2d38537261564a0d26aaed077bf25c51efc1474d0e8b65c
--- a/srcpkgs/ddrescue/template
+++ b/srcpkgs/ddrescue/template
@ -1,14 +1,14 @@
 # Template file for 'ddrescue'
 pkgname=ddrescue
 version=1.19
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="lzip"
 short_desc="Data recovery tool"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://www.gnu.org/software/ddrescue/ddrescue.html"
-distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.lz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.lz"
 checksum=ed8d0c9d9aac80a9110e9cb0d0a91a7390d3bf9f816b67a62ca4eb140f4747b8

 do_configure() {
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@ -1,6 +1,6 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
-version=1.0.68
+version=1.0.70
 revision=1
 build_style=fetch
 depends="wget gnupg binutils"
@ -10,7 +10,7 @@ license="custom"
 homepage="http://packages.qa.debian.org/d/debootstrap.html"
 distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb
 ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2014.3_all.deb"
-checksum="0e0b6c7e7580b706c3e235aed8d3aaaef46239a16e26a83ef23c2ae9df7ca85d
+checksum="8218a74e66afb796de53f27277065f8f727ff4b915ed06c37b12ab711a998454
 017a2fba215cd64612891f5aa02546be5c0e30923a66672f889867cc6dd8d3a0"

 do_install() {
--- a/srcpkgs/dejavu-fonts-ttf/template
+++ b/srcpkgs/dejavu-fonts-ttf/template
@ -1,24 +1,21 @@
 # Template file for 'dejavu-fonts-ttf'
 pkgname=dejavu-fonts-ttf
-version=2.34
-revision=2
+version=2.35
+revision=1
+noarch=yes
+depends="font-util"
+font_dirs="/usr/share/fonts/TTF"
 short_desc="DejaVu family of TrueType fonts"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://dejavu-fonts.org/wiki/Main_Page"
 license="MIT, Public domain"
 distfiles="${SOURCEFORGE_SITE}/dejavu/$pkgname-$version.tar.bz2"
-checksum=d0a72c3ae99f5b8d7470daf091ec43f78dc942795aed5c996ab1aa678702eb5d
-
-makedepends="font-util xbps-triggers"
-depends="${makedepends}"
-noarch="yes"
-font_dirs="/usr/share/fonts/TTF"
+checksum=f6d7965586101ff3a8a5c3ec503e082bb6a9604ff53413e10702e5917c194d88

 do_install() {
 	vmkdir usr/share/fonts/TTF
 	install -m644 ttf/*.ttf ${DESTDIR}/usr/share/fonts/TTF
 	vmkdir etc/fonts/conf.avail
 	install -m644 fontconfig/*.conf ${DESTDIR}/etc/fonts/conf.avail
-
-	vinstall LICENSE 644 usr/share/licenses/${pkgname}
+	vlicense LICENSE
 }
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@ -1,7 +1,7 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.4.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
--- a/srcpkgs/dmenu/template
+++ b/srcpkgs/dmenu/template
@ -1,24 +1,65 @@
 # Template file for 'dmenu'
 pkgname=dmenu
 version=4.5
-revision=9
+revision=10
 makedepends="libXinerama-devel $(vopt_if xft 'libXft-devel freetype-devel')"
 short_desc="A generic menu for X"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="MIT"
 homepage="http://tools.suckless.org/dmenu/"
-distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz
-	http://tools.suckless.org/dmenu/patches/dmenu-${version}-xft.diff"
-skip_extraction="${pkgname}-${version}-xft.diff"
-checksum="082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850
-	efb4095d65e5e86f9dde97294732174409c24f319bdd4824cc22fa1404972b4f"
+distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
+checksum="082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850"

-build_options="xft"
+build_options="xft fuzzymatch monarg mouse"
 desc_option_xft="Enable Xft font support"
+desc_option_fuzzymatch="Enable Fuzzymatch support"
+desc_option_monarg="Enable monitor argument support"
+desc_option_mouse="Enable mouse support"
+
+if [ "$build_option_xft" ]; then
+	distfiles+=" http://tools.suckless.org/dmenu/patches/dmenu-${version}-xft.diff"
+	skip_extraction+=" ${pkgname}-${version}-xft.diff"
+	checksum+=" efb4095d65e5e86f9dde97294732174409c24f319bdd4824cc22fa1404972b4f"
+fi
+
+if [ "$build_option_fuzzymatch" ]; then
+	distfiles+=" http://tools.suckless.org/dmenu/patches/${pkgname}-${version}-fuzzymatch.diff"
+	skip_extraction+=" ${pkgname}-${version}-fuzzymatch.diff"
+	checksum+=" f037978583a16b2dab554058b147c2dbdfc758472d2bc9e1f031b2b9c686c0ff"
+fi
+
+if [ "$build_option_monarg" ]; then
+	distfiles+=" http://tools.suckless.org/dmenu/patches/${pkgname}-${version}-monarg.diff"
+	skip_extraction+=" ${pkgname}-${version}-monarg.diff"
+	checksum+=" c30a4acd9202712c019de72f9c2832686e6e25ca0b939757e31c20b9c110008b"
+fi
+
+if [ "$build_option_mouse" ]; then
+	distfiles+=" http://tools.suckless.org/dmenu/patches/${pkgname}-${version}-mouse-support.diff"
+	skip_extraction+=" ${pkgname}-${version}-mouse-support.diff"
+	checksum+=" 8ac73e77abb7c5e60080abe892e2b4232c9370bff39e5548cf9a403cffe692c4"
+fi
+
+## RIght now mouse && xft are incompatible

 pre_build() {
+	local srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}/"
+	if [ "$build_option_fuzzymatch" ]; then
+		msg_normal "Applying fuzzymatch patches"
+		patch -p2 < "$srcdir/${pkgname}-${version}-fuzzymatch.diff"
+		echo '#include "fuzzymatch.c"' >> dmenu.c
+	fi
 	if [ "$build_option_xft" ]; then
-		patch -Np1 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}-xft.diff
+		msg_normal "Applying xft patches"
+		patch -p1 < "$srcdir/${pkgname}-${version}-xft.diff"
+	fi
+	if [ "$build_option_mouse" ]; then
+		msg_normal "Applying mouse patches"
+		patch -p1 < "$srcdir/${pkgname}-${version}-mouse-support.diff"
+	fi
+	if [ "$build_option_monarg" ]; then
+		msg_normal "Applying monarg patches"
+		patch -p1 < "$srcdir/${pkgname}-${version}-monarg.diff"
 	fi
 }

@ -35,5 +76,5 @@ do_build() {

 do_install() {
 	make PREFIX=/usr DESTDIR=${DESTDIR} install
-	vinstall LICENSE 644 usr/share/licenses/${pkgname}
+	vlicense LICENSE
 }
--- a/srcpkgs/dockstar-uboot/template
+++ b/srcpkgs/dockstar-uboot/template
@ -0,0 +1,31 @@
+# Template file for 'kirkwood-uboot'
+pkgname=dockstar-uboot
+version=2014.04.R4
+revision=1
+wrksrc="u-boot-${version##*.}"
+only_for_archs="armv5tel"
+short_desc="(archlinuxarm) u-boot compiled for dockstar"
+maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+license="GPL-3"
+homepage="https://github.com/archlinuxarm/u-boot"
+distfiles="https://github.com/archlinuxarm/u-boot/archive/${version##*.}.tar.gz http://archlinuxarm.org/os/armv5te/boot/dockstar/uboot-dockstar.env"
+checksum="22492ec730f0e91e4f732d8793cea39fb5945386eb46e86f3d8446978361c551 ec6522fdb74a41bc2b6f301729c421c9600be1a479bf7932405b39d2f459ada7"
+skip_extraction="uboot-dockstar.env"
+
+do_configure() {
+	make dockstar_config
+}
+do_build() {
+	unset CFLAGS CXXFLAGS LDFLAGS
+	if [ "$CROSS_BUILD" ]; then
+		make CROSS_COMPILE=${XBPS_CROSS_TRIPLET}- u-boot.kwb
+	else
+		make u-boot.kwb
+	fi
+	dd if=u-boot.kwb of=uboot-dockstar.kwb bs=512k conv=sync
+}
+do_install() {
+	local srcdir="$XBPS_SRCDISTDIR/$pkgname-$version"
+	vinstall uboot-dockstar.kwb 755 boot
+	vinstall ${srcdir}/uboot-dockstar.env 644 boot
+}
--- a/srcpkgs/dos2unix/template
+++ b/srcpkgs/dos2unix/template
@ -1,13 +1,13 @@
 # Template file for 'dos2unix'
 pkgname=dos2unix
-version=7.2.1
+version=7.2.2
 revision=1
 maintainer="Dominik Honnef <dominik@honnef.co>"
 license="2-clause-BSD"
 homepage="http://waterlan.home.xs4all.nl/dos2unix.html"
 short_desc="Text file format converter"
 distfiles="http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=53928aa9abbf49939fc0b84f408a4820d11e77e41d832612c37168f98c6945f3
+checksum=9c23907296267fa4ea66e1ee03eb6f6229cf7b64968318d00a77076ae89c2612

 do_build() {
 	make prefix=${DESTDIR}/usr
--- a/srcpkgs/drbd-utils/update
+++ b/srcpkgs/drbd-utils/update
@ -0,0 +1 @@
+ignore="*rc[0-9]"
--- a/srcpkgs/dtc-devel
+++ b/srcpkgs/dtc-devel
@ -0,0 +1 @@
+dtc
--- a/srcpkgs/dtc/template
+++ b/srcpkgs/dtc/template
@ -0,0 +1,27 @@
+# Template file for 'dtc'
+pkgname=dtc
+version=1.4.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="git flex bison"
+short_desc="Device Tree Compiler"
+maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+license="GPL-2"
+homepage="http://www.devicetree.org/Device_Tree_Compiler"
+CFLAGS="-fPIC"
+
+do_fetch() {
+	local url="git://git.kernel.org/pub/scm/utils/${pkgname}/${pkgname}.git"
+	msg_normal "Fetching source from $url ...\n"
+	git clone --branch v${version} ${url} ${pkgname}-${version}
+}
+
+dtc-devel_package() {
+	depends="dtc>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/libfdt.so"
+	}
+}
--- a/srcpkgs/ed/template
+++ b/srcpkgs/ed/template
@ -1,14 +1,14 @@
 # Template file for 'ed'
 pkgname=ed
 version=1.11
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="lzip"
 short_desc="GNU Line-oriented text editor"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://www.gnu.org/software/ed/ed.html"
-distfiles="http://ftp.gnu.org/gnu/ed/ed-$version.tar.lz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.lz"
 checksum=bd146ede5f225e20946ad94ef6bdf07939313bcc41dde5d2beedcea1a147a134

 do_build() {
--- a/srcpkgs/edbrowse/patches/0001-glob-fixes.patch
+++ b/srcpkgs/edbrowse/patches/0001-glob-fixes.patch
@ -0,0 +1,155 @@
+# We were using glob() to do tilde-expansion on filenames, but it caused
+# a couple problems, one of which is that the package won't build
+# under musl.  Fix submitted by Karl Dahlke post-release, and modified
+# by Chris Brannon so that it would apply against 3.5.4 sources.
+# This goes away with the next release.
+diff --git src/messages.c src/messages.c
+index 755b153..3dc2aac 100644
+--- src/messages.c
+++ src/messages.c
+@@ -412,7 +412,7 @@ static const char *englishMessages[] = {
+ 	"cannot read the contents of %s",
+ 	"cannot access %s",
+ 	"$%s is not defined",
+-	0,
+	"~%s is not defined",
+ 	0,
+ 	0,
+ 	0,
+@@ -1075,7 +1075,7 @@ static const char *frenchMessages[] = {
+ 	"impossible de lire le contenu de %s",
+ 	"impossible d'accéder à %s",
+ 	"$%s n'est pas définie",
+-	0,
+	"~%s n'est pas définie",
+ 	0,
+ 	0,
+ 	0,
+@@ -1738,7 +1738,7 @@ static const char *brazilianPortugueseMessages[] = {
+ 	"impossível ler o conteúdo do %s",
+ 	"impossível acessar %s",
+ 	"$%s não definida",
+-	0,
+	"~%s não definida",
+ 	0,
+ 	0,
+ 	0,
+@@ -2401,7 +2401,7 @@ static const char *polishMessages[] = {
+ 	"nie można wczytać zawartości %s",
+ 	"nie można odczytać %s",
+ 	"$%s nie jest ustawiona",
+-	0,
+	"~%s nie jest ustawiona",
+ 	0,
+ 	0,
+ 	0,
+@@ -3064,7 +3064,7 @@ static const char *germanMessages[] = {
+ 	"kann Inhalt von %s nicht lesen",
+ 	"kann auf %s nicht zugreifen",
+ 	"$%s ungültige",
+-	0,
+	"~%s ungültige",
+ 	0,
+ 	0,
+ 	0,
+diff --git src/messages.h src/messages.h
+index 62652a8..4ae61bc 100644
+--- src/messages.h
+++ src/messages.h
+@@ -412,7 +412,7 @@ enum {
+ 	MSG_NoRead2,
+ 	MSG_NoAccess,
+ 	MSG_NoEnvVar,
+-	MSG_NotUsed415,
+	MSG_NoTilde,
+ 	MSG_NotUsed416,
+ 	MSG_NotUsed417,
+ 	MSG_NotUsed418,
+diff --git src/stringfile.c src/stringfile.c
+index ecc2cfc..195912c 100644
+--- src/stringfile.c
+++ src/stringfile.c
+@@ -15,6 +15,7 @@
+ #include <glob.h>
+ #include <dirent.h>
+ #include <netdb.h>
+#include <pwd.h>
+ 
+ /*********************************************************************
+ Allocate and manage memory.
+@@ -1144,22 +1145,62 @@ bool sortedDirList(const char *dir, struct lineMap **map_p, int *count_p)
+ static bool envExpand(const char *line, const char **expanded)
+ {
+ 	const char *s;
+-	const char *v;
+ 	char *t;
+-	bool inbrace;
+	const char *v;		/* result of getenv call */
+	bool inbrace;		/* ${foo} */
+	struct passwd *pw;
+	const char *udir;	/* user directory */
+ 	int l;
+ 	static char varline[ABSPATH];
+ 	char var1[40];
+ 
+ /* quick check */
+-	if (!strchr(line, '$')) {
+	if (line[0] != '~' && !strchr(line, '$')) {
+ 		*expanded = line;
+ 		return true;
+ 	}
+ 
+ /* ok, need to crunch along */
+ 	t = varline;
+-	for (s = line; *s; ++s) {
+	s = line;
+
+	if (line[0] != '~')
+		goto dollars;
+
+	l = 0;
+	for (s = line + 1; isalnum(*s) || *s == '_'; ++s)
+		++l;
+	if (l >= sizeof(var1) || isdigit(line[1]) || *s && *s != '/') {
+/* invalid syntax, put things back */
+		s = line;
+		goto dollars;
+	}
+
+	udir = 0;
+	strncpy(var1, line + 1, l);
+	var1[l] = 0;
+	if (l) {
+		pw = getpwnam(var1);
+		if (!pw) {
+			setError(MSG_NoTilde, var1);
+			return false;
+		}
+		if (pw->pw_dir && *pw->pw_dir)
+			udir = pw->pw_dir;
+	} else
+		udir = home;
+	if (!udir) {
+		s = line;
+		goto dollars;
+	}
+	l = strlen(udir);
+	if (l >= sizeof(varline))
+		goto longline;
+	strcpy(varline, udir);
+	t = varline + l;
+
+dollars:
+	for (; *s; ++s) {
+ 		if (t - varline == ABSPATH - 1) {
+ longline:
+ 			setError(MSG_ShellLineLong);
+@@ -1235,7 +1276,7 @@ bool envFile(const char *line, const char **expanded)
+ 		return false;
+ 
+ /* expanded the environment variables, if any, now time to glob */
+-	flags = (GLOB_NOSORT | GLOB_TILDE_CHECK);
+	flags = GLOB_NOSORT;
+ 	rc = glob(varline, flags, NULL, &g);
+ 
+ 	if (rc == GLOB_NOMATCH) {
--- a/srcpkgs/edbrowse/template
+++ b/srcpkgs/edbrowse/template
@ -1,15 +1,15 @@
 # Template file for 'edbrowse'
 pkgname=edbrowse
-version=3.5.3
-revision=3
+version=3.5.4
+revision=2
 hostmakedepends="unzip pkg-config"
 makedepends="mozjs24-devel libressl-devel pcre-devel libcurl-devel readline-devel"
 short_desc="Line-oriented text editor and web browser similar to ed(1)"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="GPL-3"
-homepage="http://the-brannons.com/edbrowse/"
-distfiles="http://the-brannons.com/${pkgname}/${pkgname}-${version}.zip"
-checksum=fae06a147a9661fe446e47b1ba68cd680e5eb0b5e71fae1fb6952d8c646835d5
+homepage="http://edbrowse.org/"
+distfiles="http://edbrowse.org/${pkgname}-${version}.zip"
+checksum=9b8ef8c8b83a207f59999e9117b1f1f09ca498ccd08811782dd4d42081679225

 do_build() {
 	make ${makejobs} -C src	JS_CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/mozjs-24"
--- a/srcpkgs/engrampa/template
+++ b/srcpkgs/engrampa/template
@ -1,15 +1,15 @@
 # Template file for 'engrampa'
 pkgname=engrampa
-version=1.8.1
-revision=1
+version=1.10.0
+revision=2
 build_style=gnu-configure
 configure_args="--with-gtk=2.0"
 hostmakedepends="pkg-config intltool itstool glib-devel"
-makedepends="gtk+-devel libcaja-devel libarchive-devel libSM-devel json-glib-devel"
+makedepends="file-devel gtk+-devel libcaja-devel libarchive-devel libSM-devel json-glib-devel"
 depends="desktop-file-utils"
 short_desc="Archive manipulator for MATE"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2"
 homepage="http://mate-desktop.org"
-distfiles="http://pub.mate-desktop.org/releases/1.8/${pkgname}-${version}.tar.xz"
-checksum=f8c541de364352005b2f4a100140197a2190269d3dbffe032e284a98478f1be7
+distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=9afabd6d1a8a786ebefc30c8c2e01e3457e71de52927b1c089d4e483c027d932
--- a/srcpkgs/enscript/template
+++ b/srcpkgs/enscript/template
@ -1,7 +1,7 @@
 # Template file for 'enscript'
 pkgname=enscript
 version=1.6.6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl"
 conf_files="/etc/enscript.cfg"
@ -9,5 +9,5 @@ short_desc="Converts text to Postscript, HTML or RTF with syntax highlighting"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://git.savannah.gnu.org/cgit/enscript.git"
-distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb
--- a/srcpkgs/eom/template
+++ b/srcpkgs/eom/template
@ -1,10 +1,10 @@
 # Template file for 'eom'
 pkgname=eom
-version=1.8.1
-revision=1
+version=1.10.0
+revision=2
 build_style=gnu-configure
-configure_args="--with-gtk=2.0 --disable-python"
-hostmakedepends="pkg-config intltool itstool"
+configure_args="--with-gtk=2.0 --disable-python $(vopt_enable gir introspection)"
+hostmakedepends="pkg-config intltool itstool mate-common $(vopt_if gir gobject-introspection)"
 makedepends="gtk+-devel dbus-glib-devel exempi-devel lcms2-devel libexif-devel
 libjpeg-turbo-devel librsvg-devel mate-desktop-devel startup-notification-devel
 mate-icon-theme"
@ -13,8 +13,11 @@ short_desc="An image viewing and cataloging program for MATE"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2"
 homepage="http://mate-desktop.org"
-distfiles="http://pub.mate-desktop.org/releases/1.8/${pkgname}-${version}.tar.xz"
-checksum=d8c97de2aab548dce910cdfd98a11b671c943e9b195d38b043e482e2323ac6d8
+distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=8f615e93b8ec2172222c3a162bd054b6f2483a9d4507542f1873efda5c575306
+
+# Package build options
+build_options="gir"

 eom-devel_package() {
 	short_desc+=" - development files"
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@ -1,7 +1,7 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
 version=2.6.3
-revision=1
+revision=2
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@ -1,18 +1,18 @@
 # Template file for 'findutils'
 pkgname=findutils
 version=4.4.2
-revision=12
+revision=13
 bootstrap=yes
 build_pie=yes
 build_style=gnu-configure
 configure_args="--localstatedir=/var/lib/locate gl_cv_func_wcwidth_works=yes
-gl_cv_header_working_fcntl_h=yes am_cv_func_working_getline=yes
-gl_cv_func_gettimeofday_clobber=no ac_cv_func_working_mktime=yes"
+ gl_cv_header_working_fcntl_h=yes am_cv_func_working_getline=yes
+ gl_cv_func_gettimeofday_clobber=no ac_cv_func_working_mktime=yes"
 short_desc="The GNU Find Utilities"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://www.gnu.org/software/findutils"
-distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a

 make_dirs="/var/lib/locate 0755 root root"
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@ -1,7 +1,7 @@
 # Template build file for 'firefox'.
 pkgname=firefox
 version=38.0.1
-revision=1
+revision=2
 wrksrc="mozilla-release"
 short_desc="Lightweight gecko-based web browser"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
--- a/srcpkgs/flake8/template
+++ b/srcpkgs/flake8/template
@ -1,6 +1,6 @@
 # Template file for 'flake8'
 pkgname=flake8
-version=2.4.0
+version=2.4.1
 revision=1
 noarch=yes
 build_style=python-module
@ -12,8 +12,12 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="https://gitlab.com/pycqa/flake8"
 license="MIT"
 distfiles="${PYPI_SITE}/f/flake8/flake8-${version}.tar.gz"
-checksum=d26a9d0252da9f831b8277b824961bb10b1f9d79f4752d32e4814b7bcd1e089b
+checksum=2e7ebbe59d8c85e626e36d99f0db2f578394313d3f7ce9dc9f1da57ef6cd7537

+pre_build() {
+	# allow pep8 1.6.2, patched
+	sed -i '/pep8/s|, != 1.6.2||' setup.py
+}
 post_install() {
 	vlicense LICENSE
 }
--- a/srcpkgs/freefont-ttf/template
+++ b/srcpkgs/freefont-ttf/template
@ -1,7 +1,7 @@
 # Template file for 'freefont-ttf'
 pkgname=freefont-ttf
 version=20120503
-revision=5
+revision=6
 noarch=yes
 wrksrc=freefont-${version}
 hostmakedepends="unzip"
@ -11,7 +11,7 @@ short_desc="Free family of scalable outline fonts"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.nongnu.org/freefont/"
 license="GPL-3"
-distfiles="http://ftp.gnu.org/gnu/freefont/${pkgname}-${version}.zip"
+distfiles="${GNU_SITE}/${pkgname%-ttf}/${pkgname}-${version}.zip"
 checksum=7c85baf1bf82a1a1845d1322112bc6ca982221b484e3b3925022e25b5cae89af

 do_install() {
--- a/srcpkgs/fuse/patches/fuse-lock.patch
+++ b/srcpkgs/fuse/patches/fuse-lock.patch
@ -1,20 +0,0 @@
--- lib/fuse_lowlevel.c
-+++ lib/fuse_lowlevel.c
-@@ -24,6 +24,7 @@
- #include <limits.h>
- #include <errno.h>
- #include <assert.h>
-+#include <sys/file.h>
- 
- #ifndef F_LINUX_SPECIFIC_BASE
- #define F_LINUX_SPECIFIC_BASE       1024
--- lib/fuse.c
-+++ lib/fuse.c
-@@ -37,6 +37,7 @@
- #include <sys/uio.h>
- #include <sys/time.h>
- #include <sys/mman.h>
-+#include <sys/file.h>
- 
- #define FUSE_NODE_SLAB 1
- 
--- a/srcpkgs/fuse/patches/fuse-paths.patch
+++ b/srcpkgs/fuse/patches/fuse-paths.patch
@ -1,20 +0,0 @@
--- lib/mount_util.c
-+++ lib/mount_util.c
-@@ -16,6 +16,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <paths.h>
- #ifndef __NetBSD__
- #include <mntent.h>
- #endif
--- util/fusermount.c
-+++ util/fusermount.c
-@@ -20,6 +20,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <pwd.h>
-+#include <paths.h>
- #include <mntent.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
--- a/srcpkgs/fuse/template
+++ b/srcpkgs/fuse/template
@ -1,7 +1,7 @@
 # Template file for 'fuse'
 pkgname=fuse
-version=2.9.3
-revision=4
+version=2.9.4
+revision=1
 build_style=gnu-configure
 configure_args="--enable-lib --enable-util"
 short_desc="Filesystem in Userspace"
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="http://fuse.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c
+checksum=6be9c0bff6af8c677414935f31699ea5a7f8f5f791cfa5205be02ea186b97ce1

 post_install() {
 	# remove obsolete rules file provided by udev.
--- a/srcpkgs/gawk/template
+++ b/srcpkgs/gawk/template
@ -1,7 +1,7 @@
 # Template file for 'gawk'
 pkgname=gawk
-version=4.1.2
-revision=1
+version=4.1.3
+revision=2
 build_pie=yes
 build_style=gnu-configure
 configure_args="--with-readline"
@ -10,8 +10,8 @@ short_desc="The GNU awk utility"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://www.gnu.org/directory/GNU/gawk.html"
-distfiles="http://ftp.gnu.org/gnu/gawk/gawk-${version}.tar.gz"
-checksum=3b4d1a537f91c75832c0adcf507bd3be0660cdd14c5405b54d33e000bdd8a415
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
+checksum=e3cf55e91e31ea2845f8338bedd91e40671fc30e4d82ea147d220e687abda625

 lib32disabled=yes
 provides="awk-0_1"
--- a/srcpkgs/gc/patches/fix-boehm-gc.patch
+++ b/srcpkgs/gc/patches/fix-boehm-gc.patch
@ -0,0 +1,11 @@
+--- os_dep.c
+++ os_dep.c
+@@ -26,7 +26,7 @@
+ #   define __KERNEL__
+ #   include <asm/signal.h>
+ #   undef __KERNEL__
+-# else
+# elif defined(__GLIBC__)
+     /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
+     /* struct sigcontext.  libc6 (glibc2) uses "struct sigcontext" in     */
+     /* prototypes, so we have to include the top-level sigcontext.h to    */
--- a/srcpkgs/gc/template
+++ b/srcpkgs/gc/template
@ -5,6 +5,10 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config libtool"
 makedepends="libatomic_ops-devel"
+case "$XBPS_TARGET_MACHINE" in
+*-musl)
+	CFLAGS='-D_GNU_SOURCE -DNO_GETCONTEXT -DUSE_MMAP'
+esac
 short_desc="A garbage collector for C and C++"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.hboehm.info/gc/"
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@ -1,7 +1,7 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=7.9.1
-revision=1
+revision=2
 patch_args="-Np1"
 build_style=gnu-configure
 configure_args="--disable-werror --disable-nls --with-system-readline
@ -13,7 +13,7 @@ short_desc="The GNU Debugger"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnu.org/software/gdb/"
 license="GPL-3"
-distfiles="http://ftp.gnu.org/gnu/gdb/gdb-$version.tar.xz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
 checksum=cd9c543a411a05b2b647dd38936034b68c2b5d6f10e0d51dc168c166c973ba40

 # Package build options
@ -30,5 +30,5 @@ post_install() {
 	[ -d ${DESTDIR}/usr/lib64 ] && rm -rf ${DESTDIR}/usr/lib64
 	for f in bfd configure standards; do
 		rm -f ${DESTDIR}/usr/share/info/${f}.info*
-	done	
+	done
 }
--- a/srcpkgs/gdbm/template
+++ b/srcpkgs/gdbm/template
@ -1,14 +1,14 @@
 # Template file for 'gdbm'
 pkgname=gdbm
 version=1.11
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libgdbm-compat --disable-rpath"
 short_desc="GNU database routines"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://www.gnu.org.ua/software/gdbm/"
-distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=8d912f44f05d0b15a4a5d96a76f852e905d051bb88022fcdfd98b43be093e3c3

 if [ "$CROSS_BUILD" ]; then
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@ -1,7 +1,7 @@
 # Template file for 'gettext'
 pkgname=gettext
 version=0.19.4
-revision=6
+revision=9
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--disable-java --disable-native-java --disable-csharp
@ -25,6 +25,14 @@ if [ "$CROSS_BUILD" ]; then
 	}
 fi

+post_install() {
+	# Fix conflict with musl.
+	if [ -e ${DESTDIR}/usr/include/libintl.h ]; then
+		vmkdir usr/include/gettext
+		mv ${DESTDIR}/usr/include/libintl.h ${DESTDIR}/usr/include/gettext/libintl.h
+	fi
+}
+
 gettext-devel-examples_package() {
 	noarch=yes
 	short_desc+=" - examples for development"
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@ -1,20 +1,19 @@
 # Template file for 'glances'
 pkgname=glances
-version=2.3
+version=2.4.1
 revision=1
 noarch=yes
 wrksrc="Glances-${version}"
-build_style="python-module"
-pycompile_module="glances"
+build_style=python-module
 hostmakedepends="python-setuptools"
 depends="${hostmakedepends} python-psutil"
-conf_files="/etc/glances/glances.conf"
+pycompile_module="glances"
+short_desc="Cross-platform curses-based monitoring tool"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="https://github.com/nicolargo/glances"
 license="LGPL-3"
-short_desc="Cross-platform curses-based monitoring tool"
 distfiles="${PYPI_SITE}/G/Glances/Glances-${version}.tar.gz"
-checksum=b56bb17505b72862358b2d31b6b9a7c0f9045105454d1de0ffed416ad2883612
+checksum=31e42b4c54fa314d19d5ecc1e724369e26f133ed9c3bff836eec51ee5231eb52

 post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@ -1,7 +1,7 @@
 # Template build file for 'glib'
 pkgname=glib
 version=2.44.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-libelf --disable-fam --with-pcre=system --enable-static"
 hostmakedepends="automake libtool pkg-config perl python libxslt docbook-xsl"
--- a/srcpkgs/gnubg/template
+++ b/srcpkgs/gnubg/template
@ -1,7 +1,7 @@
 # Template file for 'gnubg'
 pkgname=gnubg
 version=1.05.000
-revision=1
+revision=2
 build_style=gnu-configure
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	configure_args="--enable-simd=sse2"
--- a/srcpkgs/gperf/template
+++ b/srcpkgs/gperf/template
@ -1,11 +1,11 @@
 # Template file for 'gperf'
 pkgname=gperf
 version=3.0.4
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Perfect hash function generator"
 homepage="https://www.gnu.org/software/gperf/"
 license="GPL-3"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@ -1,7 +1,7 @@
 # Template build file for 'grep'.
 pkgname=grep
 version=2.21
-revision=2
+revision=3
 build_pie=yes
 build_style=gnu-configure
 makedepends="pcre-devel"
@ -10,5 +10,5 @@ short_desc="The GNU grep utility"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://www.gnu.org/software/grep/"
-distfiles="http://ftp.gnu.org/gnu/grep/$pkgname-$version.tar.xz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
 checksum=5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@ -1,14 +1,14 @@
 # Template file for 'groff'
 pkgname=groff
 version=1.22.3
-revision=2
+revision=3
 hostmakedepends="perl bison"
 makedepends="zlib-devel"
 short_desc="The GNU troff text-formatting system"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="http://www.gnu.org/software/groff/groff.html"
-distfiles="http://ftp.gnu.org/gnu/groff/groff-${version}.tar.gz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5

 if [ "$CROSS_BUILD" ]; then
--- a/srcpkgs/gsl/template
+++ b/srcpkgs/gsl/template
@ -1,9 +1,9 @@
 # Template file for 'gsl'
 pkgname=gsl
 version=1.16
-revision=1
+revision=2
 build_style=gnu-configure
-short_desc="The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers"
+short_desc="A numerical library for C and C++ programmers"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnu.org/software/gsl/gsl.html"
 license="GPL-2"
--- a/srcpkgs/gst-plugins-bad/patches/drop-vpx-compat-defs.patch
+++ b/srcpkgs/gst-plugins-bad/patches/drop-vpx-compat-defs.patch
@ -0,0 +1,26 @@
+--- ext/vp8/gstvp8utils.h	2015-04-21 03:31:33.134952881 +0300
+++ ext/vp8/gstvp8utils.h	2015-04-21 03:32:45.553520671 +0300
+@@ -25,23 +25,6 @@
+ 
+ G_BEGIN_DECLS
+ 
+-/* Some compatibility defines for older libvpx versions */
+-#ifndef VPX_IMG_FMT_I420
+-#define VPX_IMG_FMT_I420 IMG_FMT_I420
+-#endif
+-
+-#ifndef VPX_PLANE_Y
+-#define VPX_PLANE_Y PLANE_Y
+-#endif
+-
+-#ifndef VPX_PLANE_U
+-#define VPX_PLANE_U PLANE_U
+-#endif
+-
+-#ifndef VPX_PLANE_V
+-#define VPX_PLANE_V PLANE_V
+-#endif
+-
+ const char * gst_vpx_error_name (vpx_codec_err_t status);
+ 
+ G_END_DECLS
--- a/srcpkgs/gst-plugins-bad/template
+++ b/srcpkgs/gst-plugins-bad/template
@ -1,11 +1,11 @@
 # Template file for 'gst-plugins-bad'.
 pkgname=gst-plugins-bad
 version=0.10.23
-revision=10
+revision=11
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--enable-experimental --disable-static"
-hostmakedepends="pkg-config intltool glib-devel"
+hostmakedepends="automake libtool pkg-config intltool glib-devel"
 makedepends="libpng-devel alsa-lib-devel celt-devel libressl-devel
 gst-plugins-base-devel libdca-devel orc-devel libmms-devel exempi-devel
 libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
@ -21,6 +21,10 @@ homepage="http://gstreamer.freedesktop.org"
 distfiles="$homepage/src/$pkgname/$pkgname-$version.tar.xz"
 checksum=03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9

+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
+
 gst-plugins-bad-devel_package() {
 	depends="gst-plugins-base-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-good1'.
 pkgname=gst-plugins-good1
 version=1:1.4.5
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version#*:}"
 lib32disabled=yes
 build_style=gnu-configure
--- a/srcpkgs/gv/template
+++ b/srcpkgs/gv/template
@ -1,18 +1,18 @@
 # Template file for 'gv'
 pkgname=gv
 version=3.7.4
-revision=2
+revision=3
 build_style=gnu-configure
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 homepage="http://www.gnu.org/software/gv/"
 license="GPL-2"
 short_desc="Postscript and PDF viewer"
 configure_args=" --with-x --enable-backing-pixmap
 --enable-international --with-default-papersize=a4"
 hostmakedepends="pkg-config xproto"
-makedepends="libX11-devel libXmu-devel libXpm-devel libXext-devel 
+makedepends="libX11-devel libXmu-devel libXpm-devel libXext-devel
 libXt-devel libICE-devel libXaw3d-devel zlib-devel bzip2-devel
 libXinerama-devel ghostscript"
 depends="ghostscript"
-distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum="2162b3b3a95481d3855b3c4e28f974617eef67824523e56e20b56f12fe201a61"
--- a/srcpkgs/gzip/template
+++ b/srcpkgs/gzip/template
@ -1,7 +1,7 @@
 # Template file for 'gzip'
 pkgname=gzip
 version=1.6
-revision=6
+revision=7
 bootstrap=yes
 build_pie=yes
 build_style=gnu-configure
@ -11,8 +11,8 @@ short_desc="GNU compression utility (replacement for compress)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnu.org/software/gzip/"
 license="GPL-3"
-distfiles="http://ftp.gnu.org/gnu/gzip/$pkgname-$version.tar.gz"
-checksum=97eb83b763d9e5ad35f351fe5517e6b71521d7aac7acf3e3cacdb6b1496d8f7e
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
+checksum=37dfed1a485d53212c43b3fa2a7c7952f09bf5cd86e37121c222341ee1b27847

 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@ -1,7 +1,7 @@
 # Template file for 'help2man'
 pkgname=help2man
 version=1.46.6
-revision=1
+revision=2
 lib32disabled=yes
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@ -10,5 +10,5 @@ short_desc="GNU conversion tool to create man files"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://www.gnu.org/software/help2man"
-distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.xz"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
 checksum=615ff5ac38369ddb3707c5fd71672ab122639fd9cf6870de172e0127ed632caf
--- a/Show more
+++ b/Show more