diff --git a/common/shlibs b/common/shlibs
index 26d5881c05e..de929c712a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -872,9 +872,9 @@ libopenal.so.1 libopenal-1.13_1
 libalut.so.0 freealut-1.1.0_1
 liblilv-0.so.0 liblilv-0.14.4_1
 libsuil-0.so.0 suil-0.6.4_1
-libprotoc.so.8 protobuf-2.5.0_1
-libprotobuf.so.8 protobuf-2.5.0_1
-libprotobuf-lite.so.8 protobuf-lite-2.5.0_1
+libprotoc.so.9 protobuf-2.6.1_1
+libprotobuf.so.9 protobuf-2.6.1_1
+libprotobuf-lite.so.9 protobuf-lite-2.6.1_1
 libmcpp.so.0 libmcpp-2.7.2_1
 libGlacier2.so.35 libIce-3.5.0_1
 libIce.so.35 libIce-3.5.0_1
@@ -940,8 +940,8 @@ libsystemd-daemon.so.0 systemd-libs-43_1
 libsystemd-id128.so.0 systemd-libs-43_1
 libsystemd-journal.so.0 systemd-libs-43_1
 libsystemd-login.so.0 systemd-libs-43_1
-libplist.so.1 libplist-1.4_1
-libplist++.so.1 libplist++-1.4_1
+libplist.so.3 libplist-1.12_1
+libplist++.so.3 libplist++-1.12_1
 libnsbmp.so.0 libnsbmp-0.0.3_1
 libnsgif.so.0 libnsgif-0.0.3_1
 libparserutils.so.0 libparserutils-0.1.1_1
@@ -1821,4 +1821,6 @@ libfm-qt5.so.1 libfm-qt5-0.8.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
 libnpth.so.0 npth-1.1_1
 libglfw.so.3 glfw-3.0.4_1
+libusbmuxd.so.4 libusbmuxd-1.0.10_1
+libimobiledevice.so.5 libimobiledevice-1.1.7_1
 libstfl.so.0 stfl-0.23_1
diff --git a/srcpkgs/bitchx-git/template b/srcpkgs/bitchx-git/template
deleted file mode 100644
index 85e30e3a0af..00000000000
--- a/srcpkgs/bitchx-git/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'bitchx-git'
-pkgname=bitchx-git
-version=20140919
-revision=2
-build_style=gnu-configure
-configure_args="--with-ssl --enable-ipv6 --with-plugins"
-hostmakedepends="git"
-makedepends="libressl-devel ncurses-devel"
-short_desc="A simple IRC client (Internet Relay Chat)"
-maintainer="Ypnose <linuxienATlegtuxDOTorg>"
-license="GPL2"
-homepage="https://github.com/BitchX/BitchX"
-provides="bitchx-${version}_${revision}"
-replaces="bitchx>=0"
-
-do_fetch() {
-	local url="git://github.com/BitchX/BitchX"
-	msg_normal "Fetching source from $url ...\n"
-	git clone ${url} ${pkgname}-${version}
-}
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
new file mode 100644
index 00000000000..6c39e560152
--- /dev/null
+++ b/srcpkgs/bitchx/template
@@ -0,0 +1,13 @@
+# Template file for 'bitchx'
+pkgname=bitchx
+version=1.2.1
+revision=1
+build_style=gnu-configure
+configure_args="--with-ssl --with-ipv6 --with-plugins"
+makedepends="libressl-devel ncurses-devel"
+short_desc="A simple IRC client (Internet Relay Chat)"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="3-clause-BSD"
+homepage="http://bitchx.com"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 596b24e2ee0..436f2dd28d1 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.9.3
-revision=1
+revision=2
 create_wrksrc=yes
 hostmakedepends="which pkg-config"
 makedepends="db-devel protobuf-devel libressl-devel boost-devel>=1.54 miniupnpc-devel>=1.9"
diff --git a/srcpkgs/chromium-pepper-flash/template b/srcpkgs/chromium-pepper-flash/template
index c0eac256ef2..adbe2bc4547 100644
--- a/srcpkgs/chromium-pepper-flash/template
+++ b/srcpkgs/chromium-pepper-flash/template
@@ -4,13 +4,13 @@ version=15.0.0.223
 _chromeVersion=38.0.2125.122-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"
 license="chrome"
 lib32disabled=yes
-nonfree=yes
+repository="nonfree"
 only_for_archs="i686 x86_64"
 depends="chromium binutils"
 create_wrksrc=yes
diff --git a/srcpkgs/cln/template b/srcpkgs/cln/template
index 3fbbb8f4f26..d85cdcc3fd7 100644
--- a/srcpkgs/cln/template
+++ b/srcpkgs/cln/template
@@ -1,6 +1,6 @@
 # Template file for 'cln'
 pkgname=cln
-version=1.3.3
+version=1.3.4
 revision=1
 build_style=gnu-configure
 maintainer="Dominik Honnef <dominik@honnef.co>"
@@ -9,7 +9,7 @@ license="GPL"
 homepage="http://www.ginac.de/CLN/"
 short_desc="A library for efficient computations with all kinds of numbers in arbitrary precision"
 distfiles="http://www.ginac.de/CLN/${pkgname}-${version}.tar.bz2"
-checksum=57fc2ee3ecbb30d4037ff32a9a331804ea7dad8b345e70d42d9991ca659b2612
+checksum=2d99d7c433fb60db1e28299298a98354339bdc120d31bb9a862cafc5210ab748
 
 if [[ "$XBPS_TARGET_MACHINE" == arm* ]]; then
 	CPPFLAGS+=" -DNO_ASM"
diff --git a/srcpkgs/dhcpcd/patches/musl.patch b/srcpkgs/dhcpcd/patches/musl.patch
deleted file mode 100644
index 311e80a4bb8..00000000000
--- a/srcpkgs/dhcpcd/patches/musl.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-Patch for musl:
-
-- no sys/queue.h, use compat/queue.h by including config.h
-- do not include sys/cdefs.h, include it only for linux if __GLIBC__ is defined.
-
---- compat/queue.h.orig	2014-11-10 15:54:07.744929227 +0100
-+++ compat/queue.h	2014-11-10 15:54:14.071992172 +0100
-@@ -34,7 +34,6 @@
- #ifndef COMPAT_QUEUE_H
- #define COMPAT_QUEUE_H
- 
--#include <sys/queue.h>
- /*
-  * Tail queue definitions.
-  */
---- ipv6nd.h.orig	2014-11-10 16:06:24.642349623 +0100
-+++ ipv6nd.h	2014-11-10 16:07:35.347079022 +0100
-@@ -28,10 +28,9 @@
- #ifndef IPV6ND_H
- #define IPV6ND_H
- 
--#include <sys/queue.h>
--
- #include <time.h>
- 
-+#include "config.h"
- #include "dhcpcd.h"
- #include "ipv6.h"
- 
---- ipv6.h.orig	2014-11-10 16:08:03.514369511 +0100
-+++ ipv6.h	2014-11-10 16:08:27.211613861 +0100
-@@ -28,7 +28,6 @@
- #ifndef IPV6_H
- #define IPV6_H
- 
--#include <sys/queue.h>
- #include <sys/uio.h>
- 
- #include <netinet/in.h>
-@@ -38,6 +37,7 @@
- #  include <linux/ipv6.h>
- #endif
- 
-+#include "config.h"
- #include "dhcpcd.h"
- 
- #define ALLROUTERS "ff02::2"
---- ipv4.c.orig	2014-11-10 16:08:42.210768503 +0100
-+++ ipv4.c	2014-11-10 16:08:49.946848257 +0100
-@@ -25,7 +25,6 @@
-  * SUCH DAMAGE.
-  */
- 
--#include <sys/queue.h>
- #include <sys/socket.h>
- #include <sys/types.h>
- 
---- if-options.c.orig	2014-11-10 16:09:05.972013455 +0100
-+++ if-options.c	2014-11-10 16:09:11.684072335 +0100
-@@ -29,7 +29,6 @@
- 
- #include <sys/param.h>
- #include <sys/types.h>
--#include <sys/queue.h>
- 
- #include <arpa/inet.h>
- 
---- eloop.c.orig	2014-11-10 16:09:31.579277397 +0100
-+++ eloop.c	2014-11-10 16:09:41.386378472 +0100
-@@ -28,7 +28,6 @@
- /* Needed for ppoll(2) */
- #define _GNU_SOURCE
- 
--#include <sys/queue.h>
- #include <sys/time.h>
- 
- #include <errno.h>
-@@ -38,6 +37,7 @@
- #include <stdlib.h>
- #include <syslog.h>
- 
-+#include "config.h"
- #include "common.h"
- #include "dhcpcd.h"
- #include "eloop.h"
---- dhcpcd.h.orig	2014-11-10 16:10:00.467575110 +0100
-+++ dhcpcd.h	2014-11-10 16:10:09.882672127 +0100
-@@ -28,10 +28,10 @@
- #ifndef DHCPCD_H
- #define DHCPCD_H
- 
--#include <sys/queue.h>
- #include <sys/socket.h>
- #include <net/if.h>
- 
-+#include "config.h"
- #include "defs.h"
- #include "control.h"
- #include "if-options.h"
---- dhcpcd.c.orig	2014-11-10 16:10:26.435842686 +0100
-+++ dhcpcd.c	2014-11-10 16:10:32.467904833 +0100
-@@ -30,7 +30,6 @@ const char dhcpcd_copyright[] = "Copyrig
- #define _WITH_DPRINTF /* Stop FreeBSD bitching */
- 
- #include <sys/file.h>
--#include <sys/queue.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/time.h>
---- auth.h.orig	2014-11-10 16:10:49.572081045 +0100
-+++ auth.h	2014-11-10 16:11:07.123261845 +0100
-@@ -28,7 +28,7 @@
- #ifndef AUTH_H
- #define AUTH_H
- 
--#include <sys/queue.h>
-+#include "config.h"
- 
- #define DHCPCD_AUTH_SEND	(1 << 0)
- #define DHCPCD_AUTH_REQUIRE	(1 << 1)
---- auth.c.orig	2014-11-10 16:11:28.427481277 +0100
-+++ auth.c	2014-11-10 16:11:33.107529478 +0100
-@@ -26,7 +26,6 @@
-  */
- 
- #include <sys/file.h>
--#include <sys/queue.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <inttypes.h>
---- common.c.orig	2014-11-10 16:12:10.283912320 +0100
-+++ common.c	2014-11-10 16:21:45.141810097 +0100
-@@ -31,7 +31,9 @@
- #endif
- 
- #ifndef __sun
-+# if !defined(__linux__) || (defined(__linux__) && defined(__GLIBC__))
- #  include <sys/cdefs.h>
-+# endif
- #endif
- 
- #ifdef __APPLE__
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 05ac09e1159..8a8c0af0293 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
-version=6.6.1
-revision=3
+version=6.6.2
+revision=1
 lib32disabled=yes
 build_options="systemd"
 build_style=configure
@@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="2-clause-BSD"
 homepage="http://roy.marples.name/projects/dhcpcd"
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2"
-checksum=5d6a15fa064a91761601142232f23edb09b570555c3386e6d766759d78b8e1fe
+checksum=879c81febafc95ed9353909b719af765e9925c6cb06226b79da6c0dd176fe89f
 
 pre_install() {
 	# make wpa_supplicant log to syslog rather than stdout
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 0da7c84d002..5b9e686f976 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,7 +1,7 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
 version=2.4.3
-revision=1
+revision=2
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -11,7 +11,7 @@ checksum=ca5c3e3c0e4f9e43b9dceafceb866acb1ea575cb9f2d94e0d959303e4fc4e602
 
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
- libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel
+ libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel gnutls-devel
  libvorbis-devel x264-devel>=20140928 xvidcore-devel jack-devel SDL-devel
  libcdio-devel libvpx-devel librtmp-devel freetype-devel libmodplug-devel
  speex-devel celt-devel harfbuzz-devel libass-devel opus-devel pulseaudio-devel"
@@ -38,7 +38,7 @@ do_configure() {
 			--target-os=linux --arch=${_arch}"
 	fi
 
-	./configure --prefix=/usr --disable-debug --enable-gpl \
+	./configure --prefix=/usr --disable-debug --enable-gpl --enable-gnutls \
 		--enable-libcdio --enable-version3 --enable-runtime-cpudetect \
 		--enable-libmp3lame --enable-libvorbis --enable-libxvid \
 		--enable-libx264 --enable-libvpx --enable-libtheora \
diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 2e939ffdd5d..44292c9de0c 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,23 +1,24 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
-version=9.14
+version=9.15
 revision=1
 short_desc="An interpreter for the PostScript language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.ghostscript.com/"
-license="GPL-3, custom"
+license="AGPL-3, CPL-1.0"
 distfiles="http://downloads.ghostscript.com/public/$pkgname-$version.tar.bz2"
-checksum=1c74c5aac4042d841b9d5314200b8932a62d03c92d25d329e993534d1279cc74
+checksum=e65daf25059e2f3dabd3535df3d936a42ca4933d36473a03095e39adcdd5315c
 
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel dbus-devel libXext-devel libXt-devel libpng-devel>=1.6
+makedepends="
+ zlib-devel dbus-devel libXext-devel libXt-devel libpng-devel>=1.6
  fontconfig-devel jasper-devel tiff-devel lcms2-devel jbig2dec-devel
- cups-devel gsfonts"
+ cups-devel"
 depends="gsfonts"
 
 pre_configure() {
 	# force it to use system libs.
-	rm -rf jpeg libpng jasper expat tiff lcms lcms2 freetype cups/libs jbig2dec
+	rm -rf zlib jpeg{,xr} libpng jasper expat tiff lcms{,2} freetype cups/libs jbig2dec
 	cd ijs
 	autoreconf -fi
 }
@@ -28,13 +29,13 @@ do_configure() {
 		*) configure_args+=" --enable-little-endian";;
 	esac
 
+	cd ${wrksrc}
 	# configure ghostscript
 	./configure ${configure_args} --enable-dynamic --with-ijs \
 		--with-jbig2dec --with-omni --with-x --with-drivers=ALL \
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
-		--with-install-cups --enable-fontconfig --enable-freetype \
-		--without-luratech --without-omni --with-system-libtiff \
-		--disable-compile-inits
+		--enable-fontconfig --enable-freetype --without-luratech \
+		--without-omni --with-system-libtiff --disable-compile-inits
 
 	# configure libijs
 	cd ijs
diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template
index bbfdb9aa67c..675aef06b55 100644
--- a/srcpkgs/girara/template
+++ b/srcpkgs/girara/template
@@ -1,7 +1,7 @@
 # Template file for 'girara'
 pkgname=girara
-version=0.2.2
-revision=2
+version=0.2.3
+revision=1
 build_style=gnu-makefile
 # COLOR=0 to avoid "tput not found" spam in the build output
 make_build_args="COLOR=0"
@@ -13,7 +13,7 @@ license="zlib"
 homepage="http://pwmt.org/projects/girara/"
 short_desc="A library that implements a user interface that focuses on simplicity and minimalism"
 distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.gz"
-checksum=6382dfdf1cc7ddfedf3d1ece5a7f07590c49b4932184ee8dec6d2bd121e66653
+checksum=b07fcce509a27c5917a997eb08cc5c8da20e9013f59ae89367ff048f2eae0ede
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index cc5b52b99d4..8cf59708008 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template build file for 'glib'
 pkgname=glib
-version=2.42.0
+version=2.42.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-fam --with-pcre=system --enable-static"
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-$version.tar.xz"
-checksum=94fbc0a7d10633433ff383e540607de649c1b46baaa59dea446a50977a6c4472
+checksum=8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
diff --git a/srcpkgs/gvfs-afc b/srcpkgs/gvfs-afc
new file mode 120000
index 00000000000..fcee85889f6
--- /dev/null
+++ b/srcpkgs/gvfs-afc
@@ -0,0 +1 @@
+gvfs
\ No newline at end of file
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index efb5b7be9e5..4a597207ed8 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,32 +1,35 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=gnu-configure
-configure_args="--disable-hal --disable-afc
- --with-bash-completion-dir=/usr/share/bash-completion/completions"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl"
+configure_args="--disable-hal $(vopt_enable systemd)
+ --with-bash-completion-dir=/usr/share/bash-completion/completions
+ --with-samba-includes=${XBPS_CROSS_BASE}/usr/include
+ --with-samba-libs=${XBPS_CROSS_BASE}/usr/lib
+ --with-archive-includes=${XBPS_CROSS_BASE}/usr/include
+ --with-archive-libs=${XBPS_CROSS_BASE}/usr/lib"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
 makedepends="
- libbluetooth-devel dbus-glib-devel libgudev-devel>=183 libexif-devel libbluray-devel
+ libbluetooth-devel dbus-glib-devel libgudev-devel libexif-devel libbluray-devel
  fuse-devel libarchive-devel>=3.1.2 libcdio-devel libsoup-gnome-devel>=2.44
  libgphoto2-devel libsecret-devel gtk+3-devel samba-devel libmtp-devel
- avahi-glib-libs-devel udisks2-devel libgcrypt-devel
- libobexftp-devel gnome-online-accounts-devel>=3.12"
+ avahi-glib-libs-devel udisks2-devel libgcrypt-devel $(vopt_if systemd systemd-devel)
+ libobexftp-devel libimobiledevice-devel libarchive-devel"
 short_desc="Userspace virtual filesystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=646b1906b1c85876fa07299246855f16836080466dde1826003bbbd4b9415cba
+checksum=8d08c4927b6c20d990498c23280017e7033b31a386f09b4c3ce5bedd20316250
 
 # Package build options
 build_options="systemd"
+subpackages="gvfs-afc gvfs-afp gvfs-cdda gvfs-gphoto2 gvfs-mtp gvfs-obex gvfs-smb"
 
-if [ "$build_option_systemd" ]; then
-	configure_args+=" --enable-systemd"
-	makedepends+=" systemd-devel"
-else
-	configure_args+=" --disable-systemd"
+if [ -z "$CROSS_BUILD" ]; then
+	makedepends+=" gnome-online-accounts-devel>=3.12"
+	subpackages+=" gvfs-goa"
 fi
 
 post_install() {
@@ -39,42 +42,44 @@ gvfs-devel_package() {
 		vmove usr/include
 	}
 }
-
+gvfs-afc_package() {
+	short_desc+=" - Apple mobile device backend"
+	depends="gvfs-${version}_${revision}"
+	pkg_install() {
+		vmove usr/libexec/gvfsd-afc
+		vmove usr/libexec/gvfs-afc-volume-monitor
+		vmove usr/share/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service
+		vmove usr/share/gvfs/remote-volume-monitors/afc.monitor
+	}
+}
 gvfs-afp_package() {
 	short_desc+=" - Apple Filing Protocol (AFP) backend"
 	depends="gvfs>=${version}_${revision}"
-	replaces="gvfs<1.18.3_2"
 	pkg_install() {
 		vmove "usr/libexec/gvfsd-afp*"
 		vmove "usr/share/gvfs/mounts/afp*"
 	}
 }
-
 gvfs-cdda_package() {
 	short_desc+=" - CD-ROM backend"
 	depends="gvfs>=${version}_${revision}"
-	replaces="gvfs<1.18.3_2"
 	pkg_install() {
 		vmove "usr/libexec/gvfsd-cd*"
 		vmove "usr/share/gvfs/mounts/cd*"
 	}
 }
-	
 gvfs-goa_package() {
 	short_desc+=" - Gnome Online Accounts (webservices) backend"
 	depends="gvfs>=${version}_${revision}"
-	replaces="gvfs<1.18.3_2"
 	pkg_install() {
 		vmove usr/libexec/gvfs-goa-volume-monitor
 		vmove usr/share/dbus-1/services/org.gtk.Private.GoaVolumeMonitor.service
 		vmove usr/share/gvfs/remote-volume-monitors/goa.monitor
 	}
 }
-
 gvfs-gphoto2_package() {
 	short_desc+=" - gphoto2 (PTP camera/MTP media player) backend"
 	depends="gvfs>=${version}_${revision}"
-	replaces="gvfs<1.18.3_2"
 	pkg_install() {
 		vmove usr/libexec/gvfs-gphoto2-volume-monitor
 		vmove usr/libexec/gvfsd-gphoto2
@@ -82,11 +87,9 @@ gvfs-gphoto2_package() {
 		vmove usr/share/gvfs/remote-volume-monitors/gphoto2.monitor
 	}
 }
-
 gvfs-mtp_package() {
 	short_desc+=" - MTP backend"
 	depends="gvfs>=${version}_${revision}"
-	replaces="gvfs<1.18.3_2"
 	pkg_install() {
 		vmove usr/libexec/gvfs-mtp-volume-monitor
 		vmove usr/libexec/gvfsd-mtp
@@ -95,7 +98,6 @@ gvfs-mtp_package() {
 		vmove usr/share/gvfs/mounts/mtp.mount
 	}
 }
-
 gvfs-obex_package() {
 	short_desc+=" - OBEX backend"
 	depends="obexftp gvfs>=${version}_${revision}"
@@ -104,11 +106,9 @@ gvfs-obex_package() {
 		vmove "usr/share/gvfs/mounts/obex*"
 	}
 }
-
 gvfs-smb_package() {
 	short_desc+=" - SMB/CIFS (Windows client) backend"
 	depends="gvfs>=${version}_${revision}"
-	replaces="gvfs<1.18.3_2"
 	triggers="gsettings-schemas"
 	pkg_install() {
 		vmove usr/libexec/gvfsd-smb
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7cf8bbb6067..2800a0253cc 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,13 +1,14 @@
 # Template file for 'hugin'
 pkgname=hugin
-version=2013.0.0
-revision=3
+version=2014.0.0
+revision=1
 build_style=cmake
 maintainer="Dominik Honnef <dominik@honnef.co>"
-hostmakedepends="cmake pkg-config"
+hostmakedepends="cmake pkg-config exiftool"
 makedepends="wxWidgets-devel tiff-devel libpng-devel libopenexr-devel>=2.2 exiv2-devel libfreeglut-devel libpano13-devel boost-devel MesaLib-devel lensfun-devel python-devel swig glew-devel libXmu-devel libXi-devel glu-devel"
+depends="exiftool"
 license="GPL-2"
 homepage="http://hugin.sourceforge.net/"
 short_desc="An easy to use panoramic imaging toolchain"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=484e1ed58fa6fe4bae1f423967101549345bcca2653b992afbc0ed9ec0dbebd5
+checksum=f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
new file mode 100644
index 00000000000..a64de0c6232
--- /dev/null
+++ b/srcpkgs/icewm/template
@@ -0,0 +1,14 @@
+# Template file for 'icewm'
+pkgname=icewm
+version=1.3.8
+revision=1
+build_style=gnu-configure
+configure_args="--enable-shaped-decorations --enable-gradients"
+hostmakedepends="pkg-config"
+makedepends="libXrandr-devel libXft-devel libSM-devel libXinerama-devel gdk-pixbuf-devel"
+short_desc="A Window Manager designed for speed, usability, and consistency"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="LGPL-2"
+homepage="http://www.icewm.org/"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18
diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
new file mode 100644
index 00000000000..713dd9aa40c
--- /dev/null
+++ b/srcpkgs/ifuse/template
@@ -0,0 +1,13 @@
+# Template file for 'ifuse'
+pkgname=ifuse
+version=1.1.3
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="fuse-devel libimobiledevice-devel"
+short_desc="A fuse filesystem to access the contents of an iPhone or iPod Touch"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="LGPL-2.1"
+homepage="http://libimobiledevice.org/"
+distfiles="http://www.libimobiledevice.org/downloads/ifuse-${version}.tar.bz2"
+checksum=a788de66fb7720c84a5a775df415f78bbfb7c467a76c732d23292c6986252add
diff --git a/srcpkgs/jupp/template b/srcpkgs/jupp/template
index dc617f22daf..f6f4cda1e77 100644
--- a/srcpkgs/jupp/template
+++ b/srcpkgs/jupp/template
@@ -1,6 +1,6 @@
 # Template file for 'jupp'
 pkgname=jupp
-version=3.1jupp27
+version=3.1jupp28
 revision=1
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-termidx"
@@ -19,7 +19,7 @@ license="GPL-1"
 homepage="https://www.mirbsd.org/jupp.htm"
 update_pkgname="joe"
 distfiles="https://www.mirbsd.org/MirOS/dist/${pkgname}/joe-${version}.tgz"
-checksum=80374fbd69c4b827ba33761c669dfcddab7222755bfb858600528bb8d6b98e6f
+checksum=be4d16cb44f002a3f6f5069471096c53d9c184b7366ef1a055422d2f0006851f
 
 pre_configure() {
 	chmod +x configure
diff --git a/srcpkgs/libimobiledevice-devel b/srcpkgs/libimobiledevice-devel
new file mode 120000
index 00000000000..ffb82700045
--- /dev/null
+++ b/srcpkgs/libimobiledevice-devel
@@ -0,0 +1 @@
+libimobiledevice
\ No newline at end of file
diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
new file mode 100644
index 00000000000..7ca890c258a
--- /dev/null
+++ b/srcpkgs/libimobiledevice/template
@@ -0,0 +1,31 @@
+# Template file for 'libimobiledevice'
+pkgname=libimobiledevice
+version=1.1.7
+revision=2
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config python-devel"
+makedepends="python-devel libglib-devel libressl-devel libusb-devel libplist-devel libusbmuxd-devel"
+short_desc="A library to communicate with Apple devices"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2,LGPL-2.1"
+homepage="http://www.libimobiledevice.org/"
+distfiles="http://www.libimobiledevice.org/downloads/${pkgname}-${version}.tar.bz2"
+checksum=e6afaad739f8deeb5b9c5c99fac7d01c818fa944b18ef3d3ae0456453d2eb2b0
+
+pre_configure() {
+	sed -i 's,-L$(libdir),,g' cython/Makefile.am
+	export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7"
+	export PYTHON_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython2.7"
+	autoreconf -fi
+}
+
+libimobiledevice-devel_package() {
+	short_desc+=" - development files"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
+	}
+}
diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template
index da513912ef5..6d4b73452b7 100644
--- a/srcpkgs/libplist/template
+++ b/srcpkgs/libplist/template
@@ -1,41 +1,44 @@
 # Template file for 'libplist'
 pkgname=libplist
-version=1.8
-revision=5
-build_style=cmake
-configure_args="-DCMAKE_SKIP_RPATH=ON"
-hostmakedepends="cmake swig python-devel Cython"
+version=1.12
+revision=3
+build_style=gnu-configure
+configure_args="--disable-static"
+hostmakedepends="automake libtool pkg-config python-devel Cython"
 makedepends="python-devel libglib-devel libxml2-devel"
 short_desc="Apple Property List library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
 homepage="http://libimobiledevice.org/"
 distfiles="http://www.libimobiledevice.org/downloads/${pkgname}-${version}.tar.bz2"
-checksum=a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec
+checksum=0effdedcb3de128c4930d8c03a3854c74c426c16728b8ab5f0a5b6bdc0b644be
 
-disable_parallel_build=yes
-
-libplist++_package() {
-	short_desc+=" -- C++ runtime library"
-	pkg_install() {
-		vmove "usr/lib/libplist++.so.*"
-	}
+pre_configure() {
+	sed -i 's,-L$(libdir),,g' cython/Makefile.am
+	export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7"
+	export PYTHON_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython2.7"
+	autoreconf -fi
 }
 
+libplist++_package() {
+	short_desc+=" - C++ runtime library"
+	pkg_install() {
+		vmove usr/lib/libplist++.so.*
+	}
+}
 libplist-python_package() {
 	lib32disabled=yes
-	short_desc+=" -- Python bindings"
+	short_desc+=" - Python bindings"
 	pkg_install() {
 		vmove usr/lib/python2.7
 	}
 }
-
 libplist-devel_package() {
-	depends="libplist++>=${version}_${revision} libplist>=${version}_${revision}"
-	short_desc+=" -- development files"
+	depends="libxml2-devel libplist++>=${version}_${revision} libplist>=${version}_${revision}"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
+		vmove usr/lib/*.so
 	}
 }
diff --git a/srcpkgs/libreoffice-bin-i18n/template b/srcpkgs/libreoffice-bin-i18n/template
index 573889a7110..c9acbae2820 100644
--- a/srcpkgs/libreoffice-bin-i18n/template
+++ b/srcpkgs/libreoffice-bin-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'libreoffice-bin-i18n'
 pkgname=libreoffice-bin-i18n
-version=4.2.4
+version=4.3.4
 revision=1
 hostmakedepends="rpmextract"
 short_desc="LibreOffice localization files (binary build)"
-maintainer="Ypnose <linuxienATlegtuxDOTorg>"
+maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL"
 homepage="http://www.documentfoundation.org/"
 _url="http://download.documentfoundation.org/libreoffice/stable/${version}/rpm/x86"
@@ -16,8 +16,8 @@ distfiles="
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_helppack_bn.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_helppack_bo.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_helppack_bs.tar.gz
- ${_url}/LibreOffice_${version}_Linux_x86_rpm_helppack_ca.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_helppack_ca-valencia.tar.gz
+ ${_url}/LibreOffice_${version}_Linux_x86_rpm_helppack_ca.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_helppack_cs.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_helppack_da.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_helppack_de.tar.gz
@@ -113,8 +113,8 @@ distfiles="
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_kk.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_km.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_kn.tar.gz
- ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_kok.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_ko.tar.gz
+ ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_kok.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_ks.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_lb.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_lo.tar.gz
@@ -123,8 +123,8 @@ distfiles="
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_mai.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_mk.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_ml.tar.gz
- ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_mni.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_mn.tar.gz
+ ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_mni.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_mr.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_my.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_nb.tar.gz
@@ -146,8 +146,8 @@ distfiles="
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sa-IN.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sat.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sd.tar.gz
- ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sid.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_si.tar.gz
+ ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sid.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sk.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sl.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sq.tar.gz
@@ -174,196 +174,119 @@ distfiles="
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_zh-TW.tar.gz
  ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_zu.tar.gz"
 
-checksum="
-596cea844d9ba796a5ac0f1131f3b231cd7c862ea6035c3878b7638439e0383e
-4f4cf453b3fc96bc8662be358fc9b92c35022e93b32743d3170ab99b36432865
-0839dad31a0fc480081542360f3c9e3a7ee519dd2fd73bc5041854caf9476dae
-9f18450f206ee140a2650e16b61bbbbbdebdb4ec23440a9952c37a24c28d9d54
-eb545df68036974ede3130e65d869848bc3050fae028b951318daa7d4a4f3d02
-a713ba89e2034cead4e80315575641d4b88948c909e790c30e92c455c6e2136d
-d59cc6c1b4cc1265eba39178314d5226255b8eeed2fa6c35bfb8e1502dd27f8c
-14d238fa66a81cd7b2ccd782e8a189e215993c99e29b0e09703d8d6acb4025be
-0bf707a385ea063dbc0442e3898f5a2a2e4dac543af3baeff4a593caee05961c
-48ff34fc793db7439cd2898afa5200d72fe477c03853a0d69dbfabf71694611a
-a6fe2c939f024cf29fb72aad1ddad7169d8ecf579eb285f4454b05e9922c6288
-833f00c7a273b931e381f9b407532882ec3707524b447a62594b2e51caced238
-d3e1b2f241ad78009caaa195869b2569e178c66270d1bbefa6ad07f995e94de1
-fde9dc985dd25c9026a41d330950e448b889575d6531e7de025bed5f9f4d5fe2
-03662a3c6c3c02f6a32ad744723c6dac84d9fa2d683d028d6eca342488777d92
-5111c26df317f08d772194ce6929b076e4a460f656631ea60514fa59fd92edb7
-9eace3ba5dd19ba31162db02eba1496b4a8864beafa9a4af409dee9bbf83e7b6
-a10cfb4c54db7835425129b7a51773a14c640244ab9cf033fc3e2f5690b2b6cf
-a4a8f73f94117e1a5f418e87085190f38d64a46b23ba3a79a18ac1a3a8d333eb
-b123e56d564ea14686169fac2e9d72dea6bd9448bfafc4be921f225254340164
-93796073561c8068cf76533542abca2dca0f3919739e287f4d34bbf478ca1312
-dc03ef30eb1b44785fbcd7ad0000210bf761952ecfc638e8917bcf910637e408
-2211bb8d7ffbbffe832bcbda93e8b977313d6e6903ed665a8906de49cae4e0ab
-8a2c9f573ee00c9937718fbbe5ec250ada6f3c5f73ec485c0fc7bb14638737f5
-e95b04a54744a2d82bbd4d02d01d5e64aa180623d9f6e561458320f4a24ebb0d
-623f84bb323384f1ac3b7571cc4e5f90cdf65fc774902743404aa7692b23aee9
-fadf780db1306ff395d742e9000b0bb638bd7ddfd72e3c0fbf68f2143443e037
-2629efe4727495b41d628e3e79d8b8bf34345875ce902eb005368c62b8b08f3d
-19c3cdabbbe1b25923ca5bbb40b23a00cf1e86cad8981b415e7fb3321fd9c9ba
-61b4ff19a4d1d79e335b3f40a86dd05499946b2230ed7901ecd8d5f1195c76ed
-b038ccee7d1b66c2ba10d475a2dfa36572a1b4a854ecabdc27c4fc79aa8da663
-462f4489bf67bb20b5d4f1f1aef7135f39b73720b1a05781e030d95f66d118f0
-23d4a37e8db61237126e9e7ff6b8ce609835d9b5ed3ac8639314b9426914592f
-6ec224dd5083dff1e06a799039ac3405228cad55e762a7d0d73af6b2d209e88b
-51e8e4b0d5331b796bad1bc268336ac54401fd113893704ae31aad419f96e6b7
-309e808bd1870c1fdc450fa4b9a46e560720bf2981f02c65a16dbcbf9fe9e0bb
-66ad0703f3f067728dcaa0020df5f7218c237ccc2e4db9c115001243f50d8caa
-bb138b2c86cda5b5c3909c6be2bbfd578e19da4e3a8a8b2852527e60bed98678
-72f063705ab85a558dca0d87861bb53c96d8acecd04edf1050a911135a167076
-a91174b61938c67f7ca212d3bc8612c04f1cadeebd80a2dbb74a5a9b461f03e3
-0b7ba49b1bc4ac6a2a1455d13aa323f1d8527cf5866d5d7017832766ba525c80
-776326a5c3dc638f4bbf760693273f1620e6a5ee23d47a91dedf2ee99af8eda5
-9e22daed4323c7209134d7db7743b842e62a598d58c3aed662f5871db475c791
-ad0c9e073362c63827fb65ff9a2307df78f19889847a9b4ebd6de5be20f47802
-9cc023880ce688d2657854753668e4d3ecf28a557dd43f0ee88f4e6c983adca6
-a648694fbe85b48ab1ebdcff912cbf43e85f82e4eb135731f21a6cee71c32880
-aad50b3f379bd8ca9476748302e750abe9af298f94d802d9159ac920f363edf9
-2d5824c50bcd1b629f84aedc5ec983d88f34c48a8ac21250172313b2a092cdc7
-be844c9ba493c8612328af800a1cc5d6717784a61fcab63cac341f22c8730d89
-196c23fc4d1cf8b1a85f31b4535ed5c49b8ff6755f8f27de05d50d61a65a24ad
-51c6945b828f13a2e5f1f818d4801601e8535193aec166837e01349e607a4fb4
-431036afe7dfa7b03e3edaf9944c68af8911381b7b2efcb2f52a26620174be03
-03c4a1b5e995bee70042362a3eaba397130929c9aa75c0283d54167cbbcffa56
-2a50318efaf2943cf93e98ce1133fa8f832d8046d915b5d7e36adbadc10b4e13
-e935d8ec66774c437fded879bac6942aa28d8a4cf4b78569b5e0833fdc9600b3
-d8cd5c22a51b62e9bc561324fa539249a7055d39f6065117a3ba3a77963bf25a
-687a3122ab17b604a0852def205118870cab91b8d8a32ab613439e7bb955394c
-9b60491578f101202dfeedad2fa529a67350e94275793cf5b62e22107939de05
-412bb94985f40a36f395aad9354a5fa6bd6ea3f580bcb2a3b7a26843f9d91199
-9d0de7ef933ef6508e7aa66319212654813cb93d7b6eb3e0e14db8b84fb810a7
-6b5e655c8d42ce51a54e020cb0da23d34def84d90dd92c8823fac8b0769d0b7c
-838bc76e354433de6d3d32a73573726a6db8ccf58469cac94f671bb8e2ffc2f0
-ea59727f1ff92dcd9a796428b132fe92b37aacc1df6dc186f62cc16bd64a70f2
-4c9ea151048a20c95f2b6678ea6fc204f25f3ae9a49358a53f36b04407bf4e9d
-2db150e507695aa906dd967cd1655b7650941f83950960a635632510065bc445
-b208531a8759b2db648aa6ff37bdd94da24a1fde9453e73271c4b0fc0c7d9b52
-83d8391f4a08da9ec416b3c1a67055beb84338eb768ff9d5c392ef53e41f5dae
-9a23dabfd40183d2e927f2c346a949c47db3021c18c6a0f15ba43b8801c918c9
-41fc122c8be6b278fa79bb86b915de1d00fde132ba23f84c5af527684d59106d
-437555d70b96a2c6d5be2ea3079e8906b07b3d8be58cc962ab1dffc101e8e063
-8a6c77547e626d58eb98b49633ccac86094754923978ff9a8ccceb5bcc9c842b
-4206c687f578e83a7c6112a6f04b98133a1dae31d5528e2bf7d1713fff6267e6
-4b0938cc0da02a4b0f234393337603ab7e9e785d71dc4661a0183fadd8a3f142
-9cb1ddb6f661ab17fab0eb03434108fb17b7ef647f5bae1aa2b05ea1d40bf3de
-29aa257d33c67334369beff9ee3ff1f1feef576fe2934f0b5173e8c4ae603d9a
-42c7cbb51d05aabe1f3c1a46fe8d3020172308276556d1095d2ec9a4bb1b3323
-edda1f70d0125851a5d3003ba3e064fe747534d3596c61f9c4ec53b2d4ca4a8b
-a4c2936451a31944642f521d68a1340c350c5e48ab2908eec2681fd757019a7d
-4e5a7a6efddafd23c5533633f7ef109c42e0e58f7b9fb8837e139e9b35b209ad
-6968ea01f58b593942fda31101ac69befc54055cec1c040313db7f000c8f17c7
-4d35dd992bdfc9fa653d2768a8bdf3b0a6602b132bc921aa48244b8fad9298b4
-f1674c6a1a3d482f816e7ae5050b066707e9fb27fb76d9aa4a4697c9cc551c87
-e2682373ac64cd7ce123eb5a75aae4142651ecb8d07aa048642625ae69ccc9db
-c83f0b10289224b85f7465d828d572a8ee7882fa4ebae0e2021dad313c87b73a
-7258ee9628e795e6bb209ed996161eefbdab78dcf869bfbd7bbaedcde1fe437b
-77d63527390e08b8bea240ac03da05e5c4aa635faa65ea2b34a1ecd5987c75d9
-2b9d8434777332f6b1bf859323fc0407451bf34bd188549accfb30d27a54890e
-414f04b0804c93bfec0f6a1035e02f79a0138d169905514fe434cf96025901b9
-afc21ed0a463eb78241457cf85cfbb6fa52d4151734056a56078dad1ce1ac074
-fceb72f99a1f69cbd13e95baaff20bb1752bb191086695d5796f7a3b3e6974d2
-942e4925af9410f87c2bb341630bbb41d8bf1caec884c6567e36f9a060705913
-805d1ead53eb4ae5ccbdbd59983e630a93fa6b281825c7f112978be71e1361ab
-057ebf749012ece66d15bc220c45612c294068692582807a024c4172369d9e95
-c3fe4489ea6cbf016833d33c31ca62e374be7bfaca3470b1eb50f6c926526197
-23a1ff59bef56261cc180aade8539bfe2ed9e44b0f4369d27f14f51290853b6d
-66eebd011d4a64ccb9ee68f8a671b4182bc6e198d346b1b4ba7da8d8083bd71c
-406f6618e0f0b45eb12b739c680dd23b5446492b853546338fc43122e2b33300
-5b517ccbe6ce999a7a4a0e627ac1e47fe6e90333896349812120b2af995805be
-1354d999ee2ae0f9a55242cc2d2ea0d8f4e486bd7fae10be088e8a9916a9c137
-e7b9d12194e0d3b5621d1aae42b7c91e0ab219cdf8f79f43154638141e21e724
-c8ab1ddfda47e05d150c59799d98da3be0c43f3e9eee0b7fdfe9328647993b9d
-e700e4bbb8226d8f367c2b97a15e935b50b4dfc3cf528f9c0c98ab857bacdcda
-e93fe81554363785406cd7bafff894a0fb77e363a418176f6ddefdb55ef1334a
-a8c2eae303b198c87862f37ad7ddfcedc9fbbcd76b25a1e8b39fcba49aad0608
-73d0440020f066dee09ab56d5f87915adc18b2ef25a00bc1c35e730a18a83bde
-7b57dbe0f7b6e15efc7766d59d29c7b262bb96bad87276a1ecda668632074eed
-5723eada98ee87e40b10a4a47fde44e775cfdc8640ba535e4b1b108f45dfe452
-82b01e94aac887839663212a12e2f87dd1318e62a95acf363ca0f22b7a2f569f
-6ae2a7a2bd910bd7eb4be4335c81c554a7832a83f92b55e05f072b3602858162
-83bea9ba8d192f87ca015ab7dab151790f87477a87e57ed6aae3c51ea7642ec0
-4a39ca4d1667f9cb6cefd847e77e4564340fe78b4dad2d89b5489267882d1dd7
-0758927c372e91b699860b1e1d936be5b9255d5453e3c355f75b082a67dfdd6d
-a6859ca4e766e1a218d62af56edd24ab1dde58b48aa4ea44b1417ff70326db0b
-30b87224e6327d2a3696e7afdbf75b18c88163b6649e61cfb4e57fb6c447842f
-d2ce5908b075c589f4f38b47d3925a5f239018e138eb9cde85f0adb359c2bfbe
-2513fc2f7a5a23a812733a86c6008036f644f459f5ef44474cc42cd25e04cadb
-2a42e088db7fcc8f3496028fe6d2d25e00be4a146ab11bcff9b7313b8258c04f
-cdc06b321a35f4b54bf056cc734eb3b8e9ee3ebaaec1565b53640e56150115ee
-747b7ff049def14bad617ee7b975140ade12d37be242c2bb0bb35552e7f371ff
-3d692b1e79ba80e823eb266fb1460ae6bfe343854dcf266e205e0b21dfe19a58
-087b084bcf87b28e3545adce181a35c6fef36d87d036987e4a39b2f457c32b03
-5b798bf13dda758d3fb28e819d7c59423cd19e7a0d82c32ab094ccce920fbe47
-90367024ad77b6e7f7d906fc00983807b7be2233d6c8a703b6d1ff33393bef79
-d327b40387855405810ea63862068de61698f48889d946793aa70fad74cffce8
-fba296e9d569fa59d17501fc8833abb411cc2657ac349519861ab4c6fee512e1
-f228f58ca53f718359731d84b9a3d867b511269c143d829eaa196a244a4add3a
-194f3c7d3d1ed711a6c87a1207c2f7400231021400c1f933664c7a8638133874
-12011f907125dddd5adcf56d8ffabdb02cd95144c6acc7de52c0256d7a4666b2
-a5dec66cf476b9246f05f7f706fe1014a24f289954fbbc635d99b8274e0dd6a4
-96d087cc005540b1e646db22c6c8a57c238ef99e366b978ba818a6bf6b3ccbab
-88f2b48f4adc9c353066c3d1b0e611302cf5e6336e26be987896e2e7947cc976
-ed6b9ad80006676d241c12a92481673d0241aceb3b060fe64923ff7f7eb4de58
-6c24f9542d42cc841ef43d8504d6f371c1f7f9771dfdd97886eeb5c759101c96
-39435238dc4ee840c6e941af5a4b1dafd8b698f6883180f30b68e4d6961153a2
-112421f5e562b18cc5c134c2b8fff52367cffb2864b3f17d9200affc9b5e7dbb
-c0e547e8ee6a5db062abf48bc95839f18def5c902f79365c6a68a8a989cc367d
-a84fc279bcde9daba2fcc9a6a64eec01d1bec47512a4faf60304f39d64245fbe
-eef7abb9fa20f28ed5b56c6fb93d16511c4ccbc991cc93575df4d0fb549f482c
-48b2cecee9d8b4f72fd7b03245763177070e0693d695f4f1b6e7faf25558c225
-12770476bd1e11a4a36320135a0f4c2bee1419d6764f2205cc6fa00f62635fdf
-b47eef943a7f9458b0133597fab4914c5876a8d5f3002b42e8a0e185a12a79ae
-1e37910a987dfd9450418525b7fe0a2f86a67d25f6b774f271361806be50798a
-3c1d2b12bd4a7413b797045e26044b7850dd8c300ad40d6179641690c101b992
-6255343492b2ea31c0c0e9f6c8517a80b0047f0fe4cbf97fca982267f45299b5
-63898ed65215531bc9cb755a7fbe532cdef2a39b0b46643b457c85c3cf4e4fe8
-e3b742fbb102075c84bcd0a28d53ca6a58acb1ee3914de71574756de598ba720
-b05800dfb67a4bba8bd08ccaffca25fc4d7a0202cac31207485b20cf041ba0fe
-f694bea31e7b3890adcceb99c82c29e679b54d4787bfef2b340b71f1a66e5765
-65dc18d55439ec6af8f669bc70eb05528724fbc4953c56bf6c7df3e83303ea8f
-c6d3468583b9a366df10dd5e566d4c39b68818f022901c596a777c90ed15eba1
-ffeb1013a2a9cfc9c6f97aa1fe6e9f4857aa68019a9c382ecd163f5661632b31
-e850c60c7c4d1ded8c9fea0087bac4e27542bd853c9404e65cce95cca7685bd0
-205cfd14b7730ed53f3b913c13948a1662ebec68dc51cdd8753081290f90e71c
-4c3cb2111812529cfbf6126c7c26f7e01ea25b696769e1a845b6bdf025ba7798
-9274ec04fcfbdd2afe470bff60ec6bc468a29af26a1072215f0010c987c95410
-9d7c70c40e1c7143190e5123c4e61c2a852f7e0018e318853f61c0afddad892d
-ee19e5067af2db5488bf29bf2b52220c46cfb2feb0ca20628e6c29ba1ed03464
-f29d12f59781aea9a39eb4f792ef2997a29968f1c512718d58ebdc0a7e390ebf
-4589ccfabdfd906d5452d043c7333e536353173fa179cce56423b12bda224dd5
-087de17728ee951fce2251ae2f428318be31a38d9e5f31420d7c2f488623f9a9
-603c166b1cff0ea125e9f9a71f20c614019de1f167237336bd6b0387453bfd84
-4cdd6695feb47f302b2520e000766cfd3c58668c9697aea34f43a25324bf5db8
-f1e5e627c3828c9faedfeb9c5aafbb629ff9dc563eb7f39ed8a5e7c9e447cd3c
-21d2ed964e24c3f006b0ac53d28bd4c256fe68d81d2ba417d4ecce0bd4edb08b
-"
-
-noarch=yes
-create_wrksrc=yes
-depends="
- libreoffice-bin-i18n-af libreoffice-bin-i18n-am libreoffice-bin-i18n-ar libreoffice-bin-i18n-as libreoffice-bin-i18n-ast libreoffice-bin-i18n-be
- libreoffice-bin-i18n-bg libreoffice-bin-i18n-bn libreoffice-bin-i18n-bn-IN libreoffice-bin-i18n-bo libreoffice-bin-i18n-br libreoffice-bin-i18n-brx libreoffice-bin-i18n-bs
- libreoffice-bin-i18n-ca libreoffice-bin-i18n-ca-valencia libreoffice-bin-i18n-cs libreoffice-bin-i18n-cy libreoffice-bin-i18n-da libreoffice-bin-i18n-de libreoffice-bin-i18n-dgo
- libreoffice-bin-i18n-dz libreoffice-bin-i18n-el libreoffice-bin-i18n-en-GB libreoffice-bin-i18n-en-US libreoffice-bin-i18n-en-ZA libreoffice-bin-i18n-eo libreoffice-bin-i18n-es
- libreoffice-bin-i18n-et libreoffice-bin-i18n-eu libreoffice-bin-i18n-fa libreoffice-bin-i18n-fi libreoffice-bin-i18n-fr libreoffice-bin-i18n-ga libreoffice-bin-i18n-gd
- libreoffice-bin-i18n-gl libreoffice-bin-i18n-gu libreoffice-bin-i18n-he libreoffice-bin-i18n-hi libreoffice-bin-i18n-hr libreoffice-bin-i18n-hu libreoffice-bin-i18n-id
- libreoffice-bin-i18n-is libreoffice-bin-i18n-it libreoffice-bin-i18n-ja libreoffice-bin-i18n-ka libreoffice-bin-i18n-kk libreoffice-bin-i18n-km libreoffice-bin-i18n-kn
- libreoffice-bin-i18n-ko libreoffice-bin-i18n-kok libreoffice-bin-i18n-ks libreoffice-bin-i18n-ku libreoffice-bin-i18n-lb libreoffice-bin-i18n-lo libreoffice-bin-i18n-lt
- libreoffice-bin-i18n-lv libreoffice-bin-i18n-mai libreoffice-bin-i18n-mk libreoffice-bin-i18n-ml libreoffice-bin-i18n-mn libreoffice-bin-i18n-mni libreoffice-bin-i18n-mr
- libreoffice-bin-i18n-my libreoffice-bin-i18n-nb libreoffice-bin-i18n-ne libreoffice-bin-i18n-nl libreoffice-bin-i18n-nn libreoffice-bin-i18n-nr libreoffice-bin-i18n-nso
- libreoffice-bin-i18n-oc libreoffice-bin-i18n-om libreoffice-bin-i18n-or libreoffice-bin-i18n-pa-IN libreoffice-bin-i18n-pl libreoffice-bin-i18n-pt libreoffice-bin-i18n-pt-BR
- libreoffice-bin-i18n-ro libreoffice-bin-i18n-ru libreoffice-bin-i18n-rw libreoffice-bin-i18n-sa-IN libreoffice-bin-i18n-sat libreoffice-bin-i18n-sd libreoffice-bin-i18n-sh
- libreoffice-bin-i18n-si libreoffice-bin-i18n-sid libreoffice-bin-i18n-sk libreoffice-bin-i18n-sl libreoffice-bin-i18n-sq libreoffice-bin-i18n-sr libreoffice-bin-i18n-ss
- libreoffice-bin-i18n-st libreoffice-bin-i18n-sv libreoffice-bin-i18n-sw-TZ libreoffice-bin-i18n-ta libreoffice-bin-i18n-te libreoffice-bin-i18n-tg libreoffice-bin-i18n-th
- libreoffice-bin-i18n-tn libreoffice-bin-i18n-tr libreoffice-bin-i18n-ts libreoffice-bin-i18n-tt libreoffice-bin-i18n-ug libreoffice-bin-i18n-uk libreoffice-bin-i18n-uz
- libreoffice-bin-i18n-ve libreoffice-bin-i18n-vi libreoffice-bin-i18n-xh libreoffice-bin-i18n-zh-CN libreoffice-bin-i18n-zh-TW libreoffice-bin-i18n-zu"
+_languages=(
+  'af            "Afrikaans"'
+  'am            "Amharic"'
+  'ar            "Arabic"'
+  'as            "Assamese (India)"'
+  'ast           "Asturianu"'
+  'be            "Belarusian"'
+  'bg            "Bulgarian"'
+  'bn            "Bengali"'
+  'bn-IN         "Bengali (India)"'
+  'bo            "Tibetan"'
+  'br            "Breton"'
+  'brx           "Bodo"'
+  'bs            "Bosnian"'
+  'ca            "Catalan"'
+  'ca-valencia   "Catalan (Valencia)"'
+  'cs            "Czech"'
+  'cy            "Welsh"'
+  'da            "Danish"'
+  'de            "German"'
+  'dgo           "Dogri"'
+  'dz            "Dzongkha"'
+  'el            "Greek"'
+  'en-GB         "English (GB)"'
+  'en-ZA         "English (ZA)"'
+  'eo            "Esperanto"'
+  'es            "Spanish"'
+  'et            "Estonian"'
+  'eu            "Basque"'
+  'fa            "Persian"'
+  'fi            "Finnish"'
+  'fr            "French"'
+  'ga            "Irish"'
+  'gd            "Gaelic (Scottish)"'
+  'gl            "Galician"'
+  'gu            "Gujarati"'
+  'he            "Hebrew"'
+  'hi            "Hindi"'
+  'hr            "Croatian"'
+  'hu            "Hungarian"'
+  'id            "Indonesian"'
+  'is            "Icelandic"'
+  'it            "Italian"'
+  'ja            "Japanese"'
+  'ka            "Georgian"'
+  'kk            "Kazakh"'
+  'km            "Khmer (Cambodia)"'
+  'kn            "Kannada"'
+  'ko            "Korean"'
+  'kok           "Konkani"'
+  'ks            "Kashmiri"'
+  'lb            "Luxembourgish"'
+  'lo            "Lao"'
+  'lt            "Lithuanian"'
+  'lv            "Latvian"'
+  'mai           "Maithili"'
+  'mk            "Macedonian"'
+  'ml            "Malayalam"'
+  'mn            "Mongolian"'
+  'mni           "Manipuri"'
+  'mr            "Marathi"'
+  'my            "Burmese"'
+  'nb            "Norwegian Bokmal"'
+  'ne            "Nepali"'
+  'nl            "Dutch"'
+  'nn            "Norwegian Nynorsk"'
+  'nr            "Ndebele (South)"'
+  'nso           "Northern Sotho"'
+  'oc            "Occitan"'
+  'om            "Oromo"'
+  'or            "Oriya"'
+  'pa-IN         "Punjabi (India)"'
+  'pl            "Polish"'
+  'pt            "Portuguese"'
+  'pt-BR         "Portuguese (Brasil)"'
+  'ro            "Romanian"'
+  'ru            "Russian"'
+  'rw            "Kinyarwanda"'
+  'sa-IN         "Sanskrit (India)"'
+  'sat           "Santali"'
+  'sd            "Sindhi"'
+  'si            "Singhalese"'
+  'sid           "Sidama"'
+  'sk            "Slovak"'
+  'sl            "Slovenian"'
+  'sq            "Albanien"'
+  'sr            "Serbian"'
+  'ss            "Swati"'
+  'st            "Southern Sotho"'
+  'sv            "Swedish"'
+  'sw-TZ         "Swahili (Tanzania)"'
+  'ta            "Tamil"'
+  'te            "Telugu"'
+  'tg            "Tajik"'
+  'th            "Thai"'
+  'tn            "Tswana"'
+  'tr            "Turkish"'
+  'ts            "Tsonga"'
+  'tt            "Tatar"'
+  'ug            "Uighur"'
+  'uk            "Ukrainian"'
+  'uz            "Uzbek"'
+  've            "Venda"'
+  'vi            "Vietnamese"'
+  'xh            "Xhosa"'
+  'zh-CN         "Chinese (simplified)"'
+  'zh-TW         "Chinese (traditional)"'
+  'zu            "Zulu"'
+)
 
 do_build() {
 	for i in $distfiles; do
-		_localver="${version}.2"
+		_localver="${version}.1"
 		_tarbname="${i##*/}"
 		_tarbname="${_tarbname%*.tar.gz}"
 		_lang="${_tarbname##*_}"
@@ -382,1089 +305,199 @@ do_build() {
 		fi
 	done
 }
-
 do_install() {
-	# empty
 	:
 }
 
-libreoffice-bin-i18n-af_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Afrikaans language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_af/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-am_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Amharic language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_am/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ar_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Arabic language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ar/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-as_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Assamese (India) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_as/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ast_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Asturianu language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ast/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-be_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Belarusian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_be/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-bg_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Belarusian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_bg/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-bn_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Bengali language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_bn/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-bn-IN_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Bengali (India) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_bn-IN/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-bo_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Tibetan language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_bo/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-br_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Breton language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_br/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-brx_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Bodo language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_brx/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-bs_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Bosnian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_bs/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ca_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Catalan language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ca/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ca-valencia_package () {
-	replaces="libreoffice-bin-i18n-ca-XV>=0"
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Catalan (Valencia) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ca-valencia/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-cs_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Czech language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_cs/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-cy_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Welsh language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_cy/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-da_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Danish language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_da/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-de_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - German language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_de/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-dgo_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Dogri language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_dgo/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-dz_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Dzongkha language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_dz/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-el_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Greek language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_el/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-en-GB_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - English (GB) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_en-GB/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-en-US_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - English (US) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_en-US/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-en-ZA_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - English (ZA) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_en-ZA/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-eo_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Esperanto language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_eo/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-es_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Esperanto language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_es/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-et_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Estonian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_et/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-eu_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Estonian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_eu/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-fa_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Persian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_fa/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-fi_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Finnish language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_fi/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-fr_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - French language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_fr/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ga_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Irish language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ga/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-gd_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Gaelic (Scottish) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_gd/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-gl_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Galician language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_gl/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-gu_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Gujarati language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_gu/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-he_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Hebrew language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_he/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-hi_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Hindi language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_hi/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-hr_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Croatian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_hr/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-hu_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Hungarian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_hu/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-id_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Bahasa Indonesia language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_id/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-is_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Icelandic language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_is/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-it_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Italian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_it/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ja_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Japanese language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ja/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ka_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Georgian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ka/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-kk_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Kazakh language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_kk/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-km_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Khmer (Cambodia) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_km/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-kn_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Kannada language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_kn/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ko_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Korean language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ko/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-kok_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Konkani language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_kok/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ks_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Kashmiri language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ks/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-lb_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Luxembourgish language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_lb/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-lo_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Lao language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_lo/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-lt_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Lithuanian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_lt/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-lv_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Latvian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_lv/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-mai_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Maithili language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_mai/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-mk_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Macedonian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_mk/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ml_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Malayalam language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ml/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-mn_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Mongolian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_mn/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-mni_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Manipuri language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_mni/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-mr_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Marathi language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_mr/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-my_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Burmese language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_my/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-nb_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Norwegian Bokmal language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_nb/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ne_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Nepali language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ne/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-nl_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Dutch language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_nl/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-nn_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Norwegian Nynorsk language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_nn/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-nr_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Ndebele (South) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_nr/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-nso_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Northern Sotho language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_nso/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-oc_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Occitan language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_oc/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-om_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Oromo language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_om/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-or_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Oriya language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_or/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-pa-IN_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Punjabi (India) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_pa-IN/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-pl_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Polish language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_pl/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-pt_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Portuguese language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_pt/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-pt-BR_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Portuguese (Brasil) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_pt-BR/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ro_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Romanian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ro/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ru_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Russian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ru/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-rw_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Kinyarwanda language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_rw/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-sa-IN_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Sanskrit (India) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_sa-IN/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-sat_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Santali language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_sat/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-sd_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Sindhi language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_sd/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-si_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Singhalese language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_si/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-sid_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Sidama language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_sid/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-sk_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Slovak language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_sk/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-sl_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Slovenian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_sl/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-sq_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Albanien language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_sq/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-sr_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Serbian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_sr/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ss_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Swati language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ss/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-st_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Southern language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_st/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-sv_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Swedish language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_sv/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-sw-TZ_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Swahili language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_sw-TZ/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ta_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Tamil language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ta/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-te_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Telugu language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_te/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-tg_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Tajik language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_tg/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-th_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Thai language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_th/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-tn_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Tswana language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_tn/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-tr_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Turkish language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_tr/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ts_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Tsonga language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ts/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-tt_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Tatar language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_tt/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ug_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Uighur language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ug/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-uk_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Ukrainian language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_uk/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-uz_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Uzbek language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_uz/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-ve_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Venda language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_ve/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-vi_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Vietnamese language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_vi/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-xh_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Xhosa language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_xh/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-zh-CN_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Chinese (simplified) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_zh-CN/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-zh-TW_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Chinese (traditional) language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_zh-TW/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
-
-libreoffice-bin-i18n-zu_package () {
-	depends="libreoffice-bin"
-	noarch=yes
-	short_desc+=" - Zulu language pack"
-	pkg_install() {
-		vmkdir opt
-		cp -R ${wrksrc}/p_zu/opt/libreoffice*/ ${PKGDESTDIR}/opt/
-	}
-}
+noarch=yes
+create_wrksrc=yes
+depends="${subpackages}"
+
+for _lang in "${_languages[@]}"; do
+	_locale=${_lang%% *}
+	_pkgname=libreoffice-bin-i18n-${_locale}
+
+	depends+=" ${_pkgname}>=${version}"
+
+	eval "${_pkgname}_package() {
+		_pkgtmpl ${_lang}
+	}"
+done
+
+_pkgtmpl() {
+	_lang="$1"
+	depends="${sourcepkg}>=${version}"
+	short_desc="LibreOffice localization files (binary build) - $2 language pack"
+	noarch=yes
+	pkg_install() {
+		vmkdir opt
+		cp -R ${wrksrc}/p_${_lang}/opt/libreoffice*/ ${PKGDESTDIR}/opt/
+	}
+}
+
+checksum="
+c71f9140433a00641e7f06edca1c293ec4d2e640e2b5ee4e47ade0f1e0824b62
+058ec5a377e98a24fedf146ddfa08b89357d5664fce36b8eb31d422ccf78726b
+96828445a9918349d9e0cf17b17f7d4319704444ee5455a67a1739e4366d4f1e
+4cdf14469d35edd5fe19ab8f3ff4e8a99a456b40a792678d816ef8daa0581d2d
+52376e33549353ac5b0fa54e352b1483d5aa64ee64c66ed0209bb9e2b12a9618
+6b2212cc568ede0611fe50fadf5b358d138e372c6ae32197a1ade4ffebb3b123
+dda36ad5ee9878871c1f9f099d8d2f92c611ce3976979757bce492cd27af09ef
+4854e5c17e592b56574f55d251fc8c07f77112383bf86a62bdf2b52744e0141f
+3c4928de1c6736ddfdd784703419e057cbbb08ce56baec4bfd382b268de9ed8a
+45e83b3c86a2e73ac3751cc4ac23c47420656aa0b323d0918d7ce0d3c582a19b
+fdbcb12c8d56c9d49a98603236ffa03a14f4f9bd450bd609ca909d5339437554
+898d89a4eef64a738b640dcc991fbba17590fdeb94f41e2d800cf504c2c1e4a4
+5cdb1f1ede360bdf958594506ba62e39599ee10255fa8577db7e14d8481e6e9f
+3188c46ceb4618e0d23467532b4037ff105636b60e5265497a91f04224717f89
+783db6cdc1bb91a0617b9fbaea0a3d4b348d217d458816e78a8b03dad9d80565
+cf409d342c089590be5ac22f5dae0f6eeca7ec7b5a2e2c697347621e1293bdc8
+bfe065cb0d3b76ea201e0008bec79286f5e37126b853e037e7b7f6830948e604
+f3435915694dc070b8658d581861fdf0e44b5ab3cf2fc522366a22d0b7470cd2
+aa18692544e94e343b50b0bd6de5ceed7099edea9112fcb245ff48a02577c411
+c561bc406597f485321437957e93bab75dece9ec368e009951b03002a4a33f00
+b8f0897d62c9363f33a176024a63f86fd20ecd535f9026683aa1e1004ff0281f
+fe6b284c92ce1d8b1a5e871f2e144dde217ceb279e7679225bde0871495895f0
+b714d45fe6daf3da1ffc8febf93a80bdbcd15e379e2b0b6625f8d18b59e283c6
+8b02001bb648e56d6eb6a902882a4b089cd653f57539386a2470a2a878a54109
+664403005954f58e835652e9b894dae17106925fe7722ad4898fa803bb339428
+55bf1001cea86cbfc76b2cf38da457ff43661c4d1929ee1845ca8f4897b81d39
+c9864b2c558f4a50972e69d91fafc55bc38b8cbfbafa0791d958b2287fcc484f
+93573a1111b11cdf419b0346c19ecd5dcc0e2a3eeaba9bd2cc0ad45f222a43dc
+fef010e1464fd88e1c5428f7c534036d1bc92165daf1be46b5a8926cb6e4a44c
+b5f33db83bb9a07e2e6e201380c861131793f73ce3794104f2cbc3524a0679da
+d9d29feca07425a78363d62d3c84be630adcc10c2c089e15d7b7a38ef4096843
+8e5915b267f6768375f5df86ccce97d72a4498c610b89713a66834bd18833a5d
+ed9fe1ac506eba62898ada5ec1bf63845638145e3d2eb11a2834306da4421409
+af024a70245793dd7e21e798086369ad59460135250c77d9d629f75bd342da4a
+2911bf85f22deb303a058fcb3df6bd5376ec4ad7d4151310c373a10850cd3fe1
+a7f0020f70d6beefef8d92978416435bdb5a670800a8a27ac0da842f0542ee23
+85fc5dba3f5397374128be599e5dc975ed7a7dfe315156066a4f3fb9ea6a39a9
+e59a521cf2fc2f9a76e82b0c7e336eaf30c58cd3754b4e66ddac084721d8be0a
+659ecae9b67fed63fc79df84b44cd5ae3ca24aecf855b8f11a355cb29f854e2f
+e7d6ce67100af0e8a332e0e4dc8a0656e9b51eeb13f7e68c3bd24807e398e701
+35c5f4cbdec55d91fd1dfaafbe875f5a50b331bc67b953e190b74a39156d68c1
+a2708f9092c49ea07213441cff93f6b29abb95939ec03ab8bb9d2e95e96cec0a
+88a1f12f16eddefea1ce83377e6b0b76e61bdaf6b9753caac87757147e47aca8
+e48f87ccbd137d70d2df97e6da301184ff55ffe91c906704362c797f1e2c8c73
+e03eab0a88307301c092bb14e728d11f57b74abab0d303450c2653782bb528ec
+949c94820e7e2b006f1e59f42d3b304f6c8c5673a132ea1532c06eaa2a491723
+d88840c4659ae0a21015763203bf5887e0572c6f1ed8a68add2fc6e85d029203
+26549d789827f9f8e39ba973a37d0150851ab485dcb067321977926870781b37
+2a1f686e233041c66d22b0a667782c8e03534369b93f2070d94f0e14c2ab4a5a
+6b84b0ae8eb9fb488c2c4207e087bc89662d44a41e057debbb4a374c6f017d95
+36c152e68b50969df443b6acf001f34f1689bcacf86fe15928db9305e33c5526
+677a84eb803684afc31ac62fcb7fed0df932bb8bd4398a37bcd1ea00d8a8b237
+8181492f0a0e2aaeb9a66eeb38ef298448d16569e82863b2992bdb65f3e3cb7e
+689c5388da770ac64f41d7867684fc0b4a92b636f88ffc018bbc05fecceee443
+5cc48f63338b4d50db482d05db3845456b202a19e93a7e7c970ea82b9d95541f
+6c783f9507e8517d83d2d2a6c2e3347c09e7a35a717375c38b280faafb533db7
+9ca1e1c95118861f0c583cdd4521e5ae641025704099ebd8865efb4c5e6dc09d
+633527a9533be568e93618a72229a2334b6d0e98dac30de6943ef4113a29d1fb
+1ac1a7c0805746e461f4c011da3d6d6003bd6aa58157edfd1eb8b27dce046975
+03f71f31bf937476011726bb47b926556f774b25389355b20218b64b541f333b
+579879e2af93baf1a72f266c394dee88ef77fbbcca3bbe60f4b05af46704ffa8
+889439a0aa420ce1723c70698b5edc19df26aa0505d4e3e34ae1a4daa19b0aa2
+fcbf6e58f7a64451f7bcd2596c737ef882e0febc1edc2d4ce5852dc0ee37a499
+8e4787a6463180d013b8446193357643f494db434e341d889a70d2342b613526
+6ff5202fac2c3680cae4dc618b34a1b12a27d1f51ef3260fd73cdebaea787000
+b375753a897c90bafdefa3997be43f3fc0406657daffb814deb3dbf396127ee9
+835d926e29074421a2059a3df1bdfa25ba92eb0717a12d23089edb68135f8d5c
+44f3dc1d8dc716664bf4676db0075f15934a331dc053d6c06bf0801403bb4e89
+3a3c4702598ffba30abcee056adc96f04224fb88a861a29a7876da72d25feee4
+5d5c0710c44fe74eb1d7d5bd4ea9b9d1f7d203cf49569f797fd7c184ca108409
+9d903521766796af29970268a7ab4e72d3c2f90b348392cd20fae8c0159e90ff
+b9524fe47befbc0ceeefabfa6f602094812e97a5b6d205be14051f4b37e83030
+d60628ba98c29c2224eb9c4d548b94a545241f37ae55b72d9565dcad9dac1112
+954cc87635c0127594f6d67db6e1e1aaab6d8a556d2dd760e2ce7846af5a54e8
+88a394ea4687edcac89847c036c513c5fb7fccc08f6e2d16444fc975c6fe84c4
+09e2e9af8e2458fad458a1627252889a60cb39ca9857279a30df84c57153a2be
+2147b86011f4197efdfe890249f2981d341368bd74d98628fd1055fcd6e1208f
+f602af4b429156db8a995c1e7b6d84fc1a8c488862d9650be463c3444b4973cd
+5b20583374bbcabdcbcace1830cf4e61e7651177c37fd8aa765f81b893d75247
+0ed266b9728d4a5b752d50cd9b4c29776ae008f5be1e7b9bb5b0c5d68a655c70
+7bea072172171f114721f14eb114766cc24dce556407f0c365b7ed9dcdfdc635
+b98366519ffde4e9a4d5b6dbf80845ae54abafc0d3db640e14f8b4e48d1355c1
+c9b3c37fa34ce97ea5d7454579bd91c380f21195b7257660fcef9834a81e58e2
+320fb25920e0c7de60324d223adbb3e6949ba7bee2b5dd03eeaa4a81af6e4c01
+029179ea21acbd909f7e9fbad2a0d5b0df9ba295dce56f631cb0cca36d1340e9
+b24fce12b71a2fe479d30811b04084cd657a8258a1a8eab064d6630de3a97c94
+e763e9ef0a54c9ef5fa9ca0daa08a43188efdb2494616f6657bed981c55b815a
+c6dc7f1bc391ea5b8c2857b551c1f3896392677bbb159bd88501a682016bea8a
+8b3a4d3284dc34e05de08c00e73c92d1d4cf19ae48f837ec265649d2a78d7254
+3e909d928b07b11cd9c622ae87d18fedd4468f6cbc9d94e538dac93f603d8e27
+cc179815747610f767873c2804543a6a528925a74b2b279e443ac83a3adba815
+4bd93618c9e1baa852c180b6a59625917966f939309ff15e3bee055b04ddc531
+071518d65a330560fbfa072afb3053c361b18c709111c7cc581f79c4eccc4afb
+5510419165e9997ec5f05da2e3d60159c0514c189042ac04ee0324d9cbf5a50b
+b031cb077f37a85893ec4e86c473ab83bf6a16cd96a863b32c89b096c406eb96
+764119c96e56af3d76abebffaf4e332a5743fdde80c5f2e55b99786af4f16136
+ddbc27a0f63f26acbaf90d2b485ff053186e4cc2e341f7025b22b9e40078cb54
+2abe9b32da7ec622c7c8f1f21551fda5ad7865acb9a6b095fc7483505e311701
+f6fbe607c39748119e47e248d9891d01ee5c439590d8a4957340222b91cbf3af
+adf7be63db683bd05c800cb15caaff9e0ca0e2230b3a0df7d4d49a1268c90947
+dced970bf7e7b22c91be2a360e5a6ef1b7f3575989a9ce459e2ef9b84f083847
+e5bd418627241692e43e8ec21738f54ca34268c01102b5b559cd2aea62179c0e
+d7b32ee482f5a64af57aff94ab6e3bf7f1986b79c01f2d2aaf94fcffe5c87d32
+bc17d72e4f2f5d49eeff06b35466226445ef23b163d123eb60f595f9ee3a717a
+8283b62ab04a83fcf3ffccb84f627a11c6e03fe78a8465487ea63778491c31b6
+55fef62a23a8d9e7da4e96cf98fc9541e848a91b8609b3ce39746608579532ab
+46f2a52663181c0c7664c5a7548e4e4fe785d6d5530d7457089aff9dd2d2000c
+9997e46ccf09e76efa2de035e6923bff7f8c1188a2eb7b095ecec3a9f1140963
+ce49842d80b7d6e3783db2332c5b0bc8978f8f3df2bb82c441ef015fc714896e
+562521fa198ce0511791273957552c2c4ff65229996e578c6e835206b0d83320
+2ce5064f80a4568396d23d662a57db098c9b48b9bcd3efdbe7968a85cef908f0
+3cccaee3821b262c70e589d8414a5172d5015e8e1f515062330a0cd3369772af
+752f4628cbc4abb9256e6bf72ada36900306f574c4d5849c9b01e23d4c540054
+1d46d7164e2f0c865fa308f9bdbcf5c331a1b87ab5a21cc64eb9110af8ec1fa2
+d71d6658eb3dfd250a2822470b649be1afc4b8bb01947d675fefec53784952ad
+52d9c6f479085b8bcbefb660c93822049ea372271753510e0734c43b808f9b0d
+df54c1fde299a3943458ab16fc9516d464e9d14f1b3fe6493b20ee42ddba63db
+d58207d4d271fad93b1adaad285209e949f8a57dcd5c5349a68f82ca068cb5e6
+535f231efb49b2b7ceeb0c20ae1191b9cd71fe172488beb77d338ae9f69ecd4c
+a923a6d4692ea1fef39924f7dff03e829d888c06467f05873b0339b5dccf85a5
+42939167f5ae6441aeb98b91b2c4541a0d0391537d31dcb23d214ff26336cfdb
+1559ca49d2cb3a0a564df9542acbd963f925c3258dbd43a4bd6d9c557005925a
+b39e29c6b077d117938540f6494a48f9e8c86313276418feb8ffae995dc3f47d
+f4977ca6c8df910beecfb437ed150fe600780c9503f6890b6a8e2137b4e65e3c
+ac77e29f22edc897550ab5bcd9599a53719b1140dc1fc1c446128aa878bcf830
+818c73b782b01284a238ded41c0291a2d84023d8adab4dc68bb0408966a16368
+bc076b0f98497f59602cc57f2aba21deb9c291a849ec4fbdab7d639f0b619eeb
+0381a117009640bf09ae83cd313876b1891aff7e93f605d96bbbf57cfc25f0bb
+6e64805ac648ae709ddf302b96f5f6ef732886a9bf90a3ef96460ec8e9fd4528
+1369a17f713ea8eb4b467476c62ea82f15cbdabf1201c39ddd6ce6f39926f2bd
+5e6c9e24de171cf5ead8cfba0c628872892373aee92150d6d2c7e6370def88e0
+86b48ccfef9daa0e6fbc4d85627815c649ef26e9ddeeda556eb31254b7c88314
+c21e1e04fa4a695dc4dda3e7f93ddbc2dfddd2783266e501527e1fe138102fd4
+bf991d6a870932b8dc00fff5cd8e3d901fb1e05fa571ee5e3756c89f9a4f954d
+43a6cff8edfffce5071f6068b83ca3ddf0915f8e4183e887d82dd015982e5479
+3b7032396b0fd91c86508d8839cb4ae1c83a306c0722fa861c41667079e33d69
+6b9949970239627d07e8b5afa21d83190f7f10b4299a381cee7bced713a8b917
+47e1036a92cbf431a90a18e63f1123b0e1ed46670ed349ff8ae210a9c1635cab
+0dee6e61d463b265c73b287db1ff3ef011c2ea5c7a036bd3f03dbe15ea92dc20
+797c61c0d2ea9b67796805c95a9545e17bd3482f34e6db3caf747a4532038025
+8f4618db1bfa10fdd18f5d741fd2273b265031b5bdc36e6cc83a16467591eb36
+ea5dd56fbc74d4ba7db7de84a72afbb5bea0cbbc93d3f37b3f3304f8c29abdf5
+74ba1bd2c7a0ed87f948d5f4b1d88402cd827e2097b504805abb7960f1a500e2
+31e9c2e2f7e7fb3bda0de778e04e97a766cccc5ab88add0567fe36e838568de6
+3d7f9b76c607e5136dfd629d5ef0a235868901c23533064aae92fc237ac92dc5
+c9cfe0e2bd4c54811198d9f0e3023d675183b01ea464c1ec6f4f826e835af87e
+76e2d6dffbe1bfb4b2625f8e29215793a3760621aefd61f2d9634f92dc1c17ff
+82a569c3fade3e175d45537ad4aca63d48aa8fdcc9572525798a26988a63c6af
+f741ff3f592a29953beab7ed003141bd4a97cbfe4c21c7daff89a3112447dbff
+f29b8fe8096d4b7f9a41d167a26a5a65aabe617baab8f9e816e59c929641888e
+4725fa7eb91d55dbbc6198a6a96d58c4d727e45d44b0b6baebfdff60ee0cd41f
+bd334c425fa84b40150be074b3cd8fbbbbf2db19a5c4f1075124f14dcc334434
+e533e9142ee70660f9eb7825022694e777bdb2ad590f75e4e370b3ecc69a2cc2
+34e1614713d4e4413d0ca3b503b10647e981aada233b0653b106694ca376ef58
+8ddb0f948f57711cae2be1d4766fe7803641679ea8f984de21f4dabd32e43237
+e47a9dac6acc5172abac056a08d5586454c981f6641c788eb927984ec2f762b2
+961cb35571ad98f370b3af627715e1e687595f565e3680a2153161fb4a8fb7d1
+31716f30d00e0a05945db0bf57c99ce7221f99169fde1e6a875de6136df3ed6a
+fc203f2dd08ec48be5853f4896223c9fd157ddb398175b2e4080fc9b60a26d73
+aa4cccf59775faa1dbddb92c660ee5500595e932686028b4b85e9b52da42fefc
+cb755da696a3e1364b9269ad4d1ec08b61a43ebff407fb528e52be9c44e62df5
+bd4b024663215c892c42a90c79b178d00044f43412ff1ee42ad71d6f9b1e720f
+0a0376ef0d933749794c971f9660490c3ba278a4d4e935b5e4cfa532e4e7da56
+5a7de5f8febab569fbdc76c70dd0e51227640637cf37bcd57804dc6d3293ad8e
+"
diff --git a/srcpkgs/libreoffice-bin/template b/srcpkgs/libreoffice-bin/template
index dafe10ed10a..9db36b52aaf 100644
--- a/srcpkgs/libreoffice-bin/template
+++ b/srcpkgs/libreoffice-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice-bin'
 pkgname=libreoffice-bin
-version=4.2.4
-revision=2
+version=4.3.4
+revision=1
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.libreoffice.org/"
 license="LGPL-3"
@@ -11,16 +11,17 @@ _disturi="http://download.documentfoundation.org/libreoffice/stable/${version}/d
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_arch=x86-64
 	distfiles="${_disturi}/x86_64/LibreOffice_${version}_Linux_${_arch}_deb.tar.gz"
-	checksum=7a7e056c45309f4949e0a33c54c4e65e40894b7c858d36d2b7820eae0fb3efa8
+	checksum=973ffbc6da65cd41ae58550e18269268c1758fa7c3bdfb8c1d5d086db8190ac0
 elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_arch=x86
 	distfiles="${_disturi}/x86/LibreOffice_${version}_Linux_${_arch}_deb.tar.gz"
-	checksum=c22a7158e40707d7f0ee547a7241b12a3c0f607355dba53774fd6d34204c6910
+	checksum=141ffdd2ab2d178ef301ee369856cac4fb7455221d3fea2b0dd1f3387c634e38
 fi
 only_for_archs="i686 x86_64"
-wrksrc="LibreOffice_${version}.2_Linux_${_arch}_deb"
-makedepends="shared-mime-info desktop-file-utils hicolor-icon-theme"
-depends="${makedepends}"
+wrksrc="LibreOffice_${version}.1_Linux_${_arch}_deb"
+depends="shared-mime-info desktop-file-utils hicolor-icon-theme"
+provides="libreoffice-${version}_${revision}"
+replaces="libreoffice>=0"
 allow_unknown_shlibs=yes
 
 do_install() {
@@ -36,4 +37,5 @@ do_install() {
 	for a in ${programs} ; do
 		ln -fs /opt/libreoffice${version%.*}/program/$a ${DESTDIR}/usr/bin/$a
 	done
+	ln -s libreoffice${version%.*} ${DESTDIR}/usr/bin/libreoffice
 }
diff --git a/srcpkgs/libsensors b/srcpkgs/libsensors
index c5a7c463a24..a21f2dfdd7c 120000
--- a/srcpkgs/libsensors
+++ b/srcpkgs/libsensors
@@ -1 +1 @@
-lm-sensors
\ No newline at end of file
+lm_sensors
\ No newline at end of file
diff --git a/srcpkgs/libsensors-devel b/srcpkgs/libsensors-devel
index c5a7c463a24..a21f2dfdd7c 120000
--- a/srcpkgs/libsensors-devel
+++ b/srcpkgs/libsensors-devel
@@ -1 +1 @@
-lm-sensors
\ No newline at end of file
+lm_sensors
\ No newline at end of file
diff --git a/srcpkgs/libusbmuxd-devel b/srcpkgs/libusbmuxd-devel
new file mode 120000
index 00000000000..617f023fadf
--- /dev/null
+++ b/srcpkgs/libusbmuxd-devel
@@ -0,0 +1 @@
+libusbmuxd
\ No newline at end of file
diff --git a/srcpkgs/libusbmuxd/template b/srcpkgs/libusbmuxd/template
new file mode 100644
index 00000000000..105d7483e30
--- /dev/null
+++ b/srcpkgs/libusbmuxd/template
@@ -0,0 +1,24 @@
+# Template file for 'libusbmuxd'
+pkgname=libusbmuxd
+version=1.0.10
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libusb-devel libplist-devel"
+short_desc="USB Multiplex Daemon library"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2,LGPL-2.1"
+homepage="https://marcan.st/blog/iphonelinux/usbmuxd/"
+distfiles="http://www.libimobiledevice.org/downloads/${pkgname}-${version}.tar.bz2"
+checksum=1aa21391265d2284ac3ccb7cf278126d10d354878589905b35e8102104fec9f2
+
+libusbmuxd-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
+	}
+}
diff --git a/srcpkgs/linux3.17/template b/srcpkgs/linux3.17/template
index 6c1046a7cb9..9fc261f5526 100644
--- a/srcpkgs/linux3.17/template
+++ b/srcpkgs/linux3.17/template
@@ -1,15 +1,15 @@
 # Template file for 'linux3.17'
 #
 pkgname=linux3.17
-version=3.17.2
-revision=2
+version=3.17.3
+revision=1
 wrksrc="linux-${version}"
-maintainer="John Galt <johngaltfirstrun@gmail.com>"
+maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2"
 short_desc="The Linux kernel and modules (${version%.*} series)"
 distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz"
-checksum=f9221dc0878955318ab57b8bb5ea1f26cbbaa39359c91d0f6c8de74d68aea796
+checksum=f1ff54a392db4ad6432d07671f19c7da7cb73cae2bd7ea84369492abc8c172c2
 
 _kernver="${version}_${revision}"
 
diff --git a/srcpkgs/lm-sensors/template b/srcpkgs/lm_sensors/template
similarity index 53%
rename from srcpkgs/lm-sensors/template
rename to srcpkgs/lm_sensors/template
index 6cf2a86782e..3319c974947 100644
--- a/srcpkgs/lm-sensors/template
+++ b/srcpkgs/lm_sensors/template
@@ -1,26 +1,19 @@
 # Template file for 'lm-sensors'
-pkgname=lm-sensors
-version=3.3.4
-revision=3
-wrksrc="lm_sensors-${version}"
-hostmakedepends="which flex perl"
+pkgname=lm_sensors
+replaces="lm-sensors>=0"
+version=3.3.5
+revision=1
+build_style=gnu-makefile
+make_install_args="PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man"
+hostmakedepends="flex perl"
 depends="perl"
 conf_files="/etc/sensors3.conf"
 short_desc="Utilities to read temperature/voltage/fan sensors"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
 homepage="http://www.lm-sensors.org/"
-update_pkgname="lm_sensors"
-distfiles="http://dl.lm-sensors.org/$pkgname/releases/lm_sensors-$version.tar.bz2"
-checksum=b4608610cb5de4b24e3fe1ae357712e8633a8a929bbb42df5eecc4ccee6ba76d
-
-do_build() {
-	make CC="$CC" LD="$LD" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" PREFIX=/usr ${makejobs}
-}
-
-do_install() {
-	make PREFIX=/usr MANDIR=/usr/share/man DESTDIR=${DESTDIR} install
-}
+distfiles="http://dl.lm-sensors.org/lm-sensors/releases/$pkgname-$version.tar.bz2"
+checksum=5dae6a665e1150159a93743c4ff1943a7efe02cd9d3bb12c4805e7d7adcf4fcf
 
 libsensors_package() {
 	short_desc="Library to read temperature/voltage/fan sensors"
@@ -28,10 +21,9 @@ libsensors_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
 libsensors-devel_package() {
 	depends="libsensors>=${version}_${revision}"
-	short_desc="lm-sensors development kit"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 6a866454e3f..2fc246beba5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,9 +1,9 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=1.11.0
-revision=3
-hostmakedepends="scons pkg-config which"
-makedepends="qt-devel portaudio-devel libusb-devel libmad-devel protobuf-devel
+revision=4
+hostmakedepends="scons pkg-config"
+makedepends="qt-devel portaudio-devel libusb-devel libmad-devel protobuf-devel>=2.6
  libid3tag-devel libvorbis-devel libflac-devel glu-devel taglib-devel
  libsndfile-devel portmidi-devel vamp-plugin-sdk-devel faad2-devel
  libmp4v2-devel"
@@ -17,19 +17,21 @@ checksum="00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331"
 _scons_args="qtdir=/usr/include shoutcast=0 faad=1 tuned=0 prefix=/usr"
 
 do_build() {
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		export CFLAGS+=" -msse"
+		export CXXFLAGS+=" -msse"
+	fi
 	sed -i \
 		-e 's/branch_name = .*/branch_name = "mixxx"/' \
 		-e 's/bazaar_revision = .*/bazaar_revision = "'$version'"/' \
 		src/SConscript
 
-	scons ${makejobs} \
-		$_scons_args \
-		install_root=$DESTDIR/usr
+	scons ${makejobs} ${_scons_args}
 }
-
 do_install() {
-	scons ${makejobs} \
-		$_scons_args \
-		install_root=$DESTDIR/usr \
-		install
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		export CFLAGS+=" -msse"
+		export CXXFLAGS+=" -msse"
+	fi
+	scons ${_scons_args} install_root=${DESTDIR}/usr install
 }
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 16e37262886..afa3b87cfc8 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.2.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake pkg-config git"
-makedepends="ncurses-devel protobuf-devel>=2.5.0 libutempter-devel libressl-devel perl-IO-Tty"
+makedepends="ncurses-devel protobuf-devel>=2.6 libutempter-devel libressl-devel perl-IO-Tty"
 depends="perl-IO-Tty"
 short_desc="MObile SHell"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index d629bec6daf..421894c7e58 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,10 +1,10 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.2.8
-revision=1
+revision=2
 hostmakedepends="pkg-config"
 makedepends="
- libcap-devel Ice-devel>=3.5 protobuf-devel>=2.5.0 libXi-devel qt-devel libressl-devel
+ libcap-devel Ice-devel>=3.5 protobuf-devel>=2.6 libXi-devel qt-devel libressl-devel
  speex-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel
  avahi-compat-libs-devel MesaLib-devel opus-devel libogg-devel boost-devel"
 depends="qt-plugin-sqlite desktop-file-utils hicolor-icon-theme"
@@ -23,11 +23,9 @@ do_configure() {
 			no-xevie pulseaudio no-embed-qt-translations no-update-packaged" \
 		DEFINES+="PLUGIN_PATH=/usr/lib/mumble"
 }
-
 do_build() {
 	make release
 }
-
 do_install() {
 	vmkdir usr/bin
 	vmkdir usr/lib/mumble
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 7e7ce36f90e..cae6c66e160 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,6 +1,6 @@
 # Template build file for 'php'
 pkgname=php
-version=5.6.2
+version=5.6.3
 revision=1
 short_desc="An HTML-embedded scripting language"
 license="PHP"
@@ -15,7 +15,7 @@ makedepends="postgresql-libs-devel libldap-devel libvpx-devel sqlite-devel
  readline-devel>=6.3 libmysqlclient-devel"
 conf_files="/etc/php/php.ini"
 distfiles="http://www.php.net/distributions/php-${version}.tar.gz"
-checksum=4bb316831979317caf738bb9e2c590bf3b7951ce60c69b9ca33f26069d9a2f39
+checksum=7ac79fe7ef50c2d5893375f5d8854909337adf1632e42bb08b36b66a0d8016a7
 
 nocross=yes
 lib32disabled=yes
diff --git a/srcpkgs/postgresql-contrib b/srcpkgs/postgresql-contrib
new file mode 120000
index 00000000000..360e6d1a1f4
--- /dev/null
+++ b/srcpkgs/postgresql-contrib
@@ -0,0 +1 @@
+postgresql
\ No newline at end of file
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e11fcc9131d..b68245ff37f 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.3.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_build_target="world"
 configure_args="--with-openssl --with-python
@@ -43,7 +43,13 @@ pre_build() {
 	export SGML_CATALOG_FILES="/usr/share/sgml/openjade/catalog:/usr/share/sgml/iso8879/catalog:/usr/share/sgml/docbook/dsssl/modular/catalog:/usr/share/sgml/docbook/4.2/catalog"
 }
 
+post_build() {
+	make -C contrib ${makejobs}
+}
+
 post_install() {
+	make -C contrib install
+
 	vmkdir usr/share/man
 	cp -r doc/src/sgml/man? ${DESTDIR}/usr/share/man
 	vmkdir usr/share/doc/postgresql
@@ -168,3 +174,11 @@ postgresql-client_package() {
 			${PKGDESTDIR}/usr/share/postgresql
 	}
 }
+
+postgresql-contrib_package() {
+	short_desc="PostgreSQL contributed programs and extensions"
+	pkg_install() {
+		make -C contrib install DESTDIR=${PKGDESTDIR}
+	}
+}
+
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index a977541ad19..eb0402cffa4 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,25 +1,25 @@
 # Template file for 'protobuf'
 pkgname=protobuf
-version=2.5.0
-revision=4
+version=2.6.1
+revision=1
 build_style=gnu-configure
-hostmakedepends="libtool pkg-config"
+hostmakedepends="automake libtool pkg-config"
 makedepends="zlib-devel"
 short_desc="Google's data interchange format"
 maintainer="Juan RP <xtraeme@gmail.com>"
-distfiles="http://${pkgname}.googlecode.com/files/${pkgname}-${version}.tar.bz2"
-homepage="http://code.google.com/p/${pkgname}/"
+distfiles="https://github.com/google/protobuf/releases/download/${version}/protobuf-${version}.tar.bz2"
+homepage="https://developers.google.com/protocol-buffers/"
 license="BSD"
-checksum=13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677
+checksum=ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910
 
 if [ "$CROSS_BUILD" ]; then
 	# needs host protoc
-	hostmakedepends+=" protobuf"
+	hostmakedepends+=" protobuf>=2.6"
 	configure_args+=" --with-protoc=/usr/bin/protoc"
 fi
 
 pre_configure() {
-	libtoolize -f
+	NOCONFIGURE=1 ./autogen.sh
 }
 
 protobuf-devel_package() {
@@ -32,7 +32,6 @@ protobuf-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
 protobuf-lite_package() {
 	short_desc="Google's data interchange format - Lite version"
 	pkg_install() {
diff --git a/srcpkgs/sabnzbd/template b/srcpkgs/sabnzbd/template
index ddc742099f6..9b0f477ca13 100644
--- a/srcpkgs/sabnzbd/template
+++ b/srcpkgs/sabnzbd/template
@@ -1,7 +1,7 @@
 # Template file for 'sabnzbd'
 pkgname=sabnzbd
-version=0.7.18
-revision=3
+version=0.7.19
+revision=1
 wrksrc="SABnzbd-${version}"
 depends="par2cmdline python-cheetah python-configobj python-feedparser python-gntp python-openssl python-yenc unzip"
 maintainer="Dominik Honnef <dominik@honnef.co>"
@@ -12,7 +12,7 @@ homepage="http://sabnzbd.org/"
 update_ignore="*RC*"
 short_desc="SABnzbd is an Open Source Binary Newsreader written in Python"
 distfiles="${SOURCEFORGE_SITE}/sabnzbdplus/SABnzbd-${version}-src.tar.gz"
-checksum=aa05697d901b3e334e92f274b2e8788973059840be656a1545e8f2a4b070b014
+checksum=31ad0ae24db3873011db816e1b100f4429734b2260f4c669b7261d2f85717487
 
 noarch=yes
 pycompile_dirs="/usr/share/sabnzbd"
diff --git a/srcpkgs/sandfox/template b/srcpkgs/sandfox/template
new file mode 100644
index 00000000000..ea378859408
--- /dev/null
+++ b/srcpkgs/sandfox/template
@@ -0,0 +1,17 @@
+# Template file for 'sandfox'
+pkgname=sandfox
+version=1.1.4
+revision=1
+noarch=yes
+depends="bash inotify-tools lsof"
+short_desc="Runs Firefox and other apps in a filesystem sandbox"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-3"
+homepage="http://igurublog.wordpress.com/downloads/script-sandfox/"
+distfiles="https://github.com/IgnorantGuru/sandfox/archive/${version}.tar.gz"
+checksum=20c6818cb36bb97e9ae4b0c370f80df551eeb852f83ed91298a81705bcedeafe
+
+do_install() {
+	vbin sandfox
+	vdoc README
+}
diff --git a/srcpkgs/sbase-git/template b/srcpkgs/sbase-git/template
deleted file mode 100644
index 012b8a6c810..00000000000
--- a/srcpkgs/sbase-git/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'sbase-git'
-pkgname=sbase-git
-version=20140919
-revision=1
-build_style=gnu-makefile
-hostmakedepends="git"
-short_desc="Suckless unix tools"
-maintainer="Ypnose <linuxienATlegtuxDOTorg>"
-license="MIT"
-homepage="http://tools.suckless.org/sbase"
-conflicts="coreutils>=0 base-system-busybox>=0"
-provides="sbase-${version}_${revision}"
-replaces="sbase>=0"
-
-do_fetch() {
-	local url="git://git.suckless.org/sbase"
-	msg_normal "Fetching source from $url ...\n"
-	git clone ${url} ${pkgname}-${version}
-}
-
-pre_build() {
-	LD=$CC
-	sed -i 's|^CPPFLAGS = -D_BSD_SOURCE|CPPFLAGS += -D_DEFAULT_SOURCE|g' config.mk
-	sed -i 's|^CFLAGS   =|CFLAGS +=|g' config.mk
-	sed -i 's|^LDFLAGS  =|LDFLAGS +=|g' config.mk
-}
-
-post_install() {
-	vinstall LICENSE 644 usr/share/licenses/sbase
-	vinstall README 644 usr/share/doc/sbase
-}
diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template
index 22c7c65a5f0..d65e793b6a3 100644
--- a/srcpkgs/shared-mime-info/template
+++ b/srcpkgs/shared-mime-info/template
@@ -3,9 +3,11 @@ disable_parallel_build=1
 
 pkgname=shared-mime-info
 version=1.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-update-mimedb"
+# XXX disable fsync for now, ETOOSLOW!
+# see: https://bugs.freedesktop.org/show_bug.cgi?id=70366
+configure_args="--disable-update-mimedb ac_cv_func_fdatasync=no"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel libxml2-devel"
 short_desc="Core database of common types"
diff --git a/srcpkgs/signify/template b/srcpkgs/signify/template
index cea1c146b4c..a7699001b34 100644
--- a/srcpkgs/signify/template
+++ b/srcpkgs/signify/template
@@ -2,7 +2,7 @@
 pkgname=signify
 _pkgname=signify-portable
 version=20140902
-revision=1
+revision=2
 build_style=gnu-makefile
 short_desc="OpenBSD cryptographic signing and verification tool"
 maintainer="Ypnose <linuxienATlegtuxDOTorg>"
@@ -15,7 +15,7 @@ wrksrc="${_pkgname}-${version}"
 
 pre_build() {
 	sed -i 's|^mandir=${prefix}/man|mandir=${prefix}/share/man|g' Makefile
-	sed -i 's|^CC=gcc|CC=$CC|g' Makefile
+	sed -i "s|^CC=gcc|CC=$CC|g;s|CFLAGS=|CFLAGS=$CFLAGS |g" Makefile
 }
 
 post_install() {
diff --git a/srcpkgs/t-prot/template b/srcpkgs/t-prot/template
index 873ac2f6771..cac3d3ba831 100644
--- a/srcpkgs/t-prot/template
+++ b/srcpkgs/t-prot/template
@@ -1,6 +1,6 @@
 # Template file for 't-prot'
 pkgname=t-prot
-version=3.2
+version=3.3
 revision=1
 maintainer="Dominik Honnef <dominik@honnef.co>"
 license="BSD"
@@ -9,7 +9,7 @@ noarch=yes
 homepage="http://www.escape.de/~tolot/mutt/"
 short_desc="TOFU protection - display filter for RFC822 messages"
 distfiles="http://www.escape.de/~tolot/mutt/t-prot/downloads/${pkgname}-${version}.tar.gz"
-checksum=2dff735b13298105a6c4f7db02dfa79f23eb99071f42b301b2f384f2873bf825
+checksum=01d9b60ee7a1c52fa7acb8a5d3465339e75be2a42daa8e9eb847a23eb8d9f52d
 
 do_install() {
 	vbin t-prot
diff --git a/srcpkgs/ubase-git/template b/srcpkgs/ubase-git/template
deleted file mode 100644
index bb37d0efa4a..00000000000
--- a/srcpkgs/ubase-git/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'ubase-git'
-pkgname=ubase-git
-version=20140920
-revision=1
-build_style=gnu-makefile
-hostmakedepends="git"
-short_desc="Suckless linux base utils"
-maintainer="Ypnose <linuxienATlegtuxDOTorg>"
-license="MIT"
-homepage="http://tools.suckless.org/ubase"
-provides="ubase-${version}_${revision}"
-replaces="ubase>=0"
-
-conflicts="base-system-busybox>=0 coreutils>=0 util-linux>=0"
-
-do_fetch() {
-	local url="git://git.suckless.org/ubase"
-	msg_normal "Fetching source from $url ...\n"
-	git clone ${url} ${pkgname}-${version}
-}
-
-pre_build() {
-	LD=$CC
-	sed -i 's|^CPPFLAGS =|CPPFLAGS +=|g' config.mk
-	sed -i 's|^CFLAGS   =|CFLAGS   +=|g' config.mk
-	sed -i 's|^LDFLAGS  =|LDFLAGS  +=|g' config.mk
-}
-
-post_install() {
-	vinstall LICENSE 644 usr/share/licenses/ubase
-	vinstall README 644 usr/share/doc/ubase
-}
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index 0e6bee7592d..fe20a076ec1 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,13 +1,12 @@
 # Template file for 'upower'
 pkgname=upower
 version=0.99.0
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static --with-backend=linux
---without-idevice --with-systemdutildir=/usr/lib/systemd
---with-systemdsystemunitdir=/usr/lib/systemd/system"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl"
-makedepends="libusb-devel libgudev-devel dbus-glib-devel polkit-devel systemd-devel"
+configure_args="--disable-static --with-backend=linux"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl $(vopt_if gir gobject-introspection)"
+makedepends="libusb-devel libgudev-devel dbus-glib-devel libimobiledevice-devel
+ polkit-devel $(vopt_if systemd systemd-devel)"
 conf_files="/etc/UPower/UPower.conf"
 make_dirs="/var/lib/upower 0755 root root"
 short_desc="Abstraction for enumerating power devices"
@@ -18,19 +17,12 @@ distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
 checksum=5f354b9949108cb21180224ef3dba33b41c9221a79f71a8f76c47f56246a39a1
 
 # Package build options
-build_options="gir"
+build_options="gir systemd"
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	hostmakedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
 libupower-glib2_package() {
 	replaces="upower>=0.99<0.99.0_2"
 	short_desc+=" - runtime library"
@@ -38,7 +30,6 @@ libupower-glib2_package() {
 		vmove usr/lib/*.so.*
 	}
 }
-
 upower-devel_package() {
 	depends="dbus-glib-devel libupower-glib2>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/upower0/template b/srcpkgs/upower0/template
index 3be350a7a9e..0a1fe4e7f55 100644
--- a/srcpkgs/upower0/template
+++ b/srcpkgs/upower0/template
@@ -1,13 +1,13 @@
 # Template file for 'upower0'
 pkgname=upower0
 version=0.9.23
-revision=5
+revision=6
 wrksrc="upower-${version}"
 build_style=gnu-configure
-configure_args="--disable-static --enable-deprecated --with-backend=linux --without-idevice --with-udevrulesdir=/usr/lib/udev/rules.d"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl"
-makedepends="libusb-devel libgudev-devel dbus-glib-devel polkit-devel"
-depends="pm-utils"
+configure_args="--disable-static --enable-deprecated --with-backend=linux --with-udevrulesdir=/usr/lib/udev/rules.d"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl $(vopt_if gir gobject-introspection)"
+makedepends="libusb-devel libgudev-devel dbus-glib-devel polkit-devel libimobiledevice-devel $(vopt_if systemd systemd-devel)"
+depends="$(vopt_if systemd '' pm-utils)"
 conf_files="/etc/UPower/UPower.conf"
 make_dirs="/var/lib/upower 0755 root root"
 short_desc="Abstraction for enumerating power devices"
@@ -21,19 +21,12 @@ provides="upower-${version}_${revision}"
 replaces="upower>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir systemd"
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	hostmakedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
 libupower-glib1_package() {
 	replaces="upower0<0.9.23_4"
 	short_desc+=" - runtime library"
@@ -41,7 +34,6 @@ libupower-glib1_package() {
 		vmove usr/lib/*.so.*
 	}
 }
-
 upower0-devel_package() {
 	provides="upower-devel-${version}_${revision}"
 	replaces="upower-devel>=0"
diff --git a/srcpkgs/usbmuxd/files/usbmuxd/run b/srcpkgs/usbmuxd/files/usbmuxd/run
new file mode 100644
index 00000000000..0a064839de3
--- /dev/null
+++ b/srcpkgs/usbmuxd/files/usbmuxd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec usbmuxd -f -u
diff --git a/srcpkgs/usbmuxd/template b/srcpkgs/usbmuxd/template
new file mode 100644
index 00000000000..6d9d55f8b91
--- /dev/null
+++ b/srcpkgs/usbmuxd/template
@@ -0,0 +1,19 @@
+# Template file for 'usbmuxd'
+pkgname=usbmuxd
+version=1.1.0
+revision=2
+build_style=gnu-configure
+build_options="systemd"
+configure_args="$(vopt_with systemd)"
+hostmakedepends="pkg-config"
+makedepends="libusb-devel libimobiledevice-devel $(vopt_if systemd systemd-devel)"
+short_desc="USB Multiplex Daemon"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2,GPL-3"
+homepage="https://marcan.st/blog/iphonelinux/usbmuxd/"
+distfiles="http://www.libimobiledevice.org/downloads/${pkgname}-${version}.tar.bz2"
+checksum=3e8948b4fe4250ee5c4bd41ccd1b83c09b8a6f5518a7d131a66fd38bd461b42d
+
+post_install() {
+	vsv usbmuxd
+}
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 352952b10fd..ebed9c166c7 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=1.7.30
+version=1.7.31
 revision=1
 build_style=gnu-configure
 short_desc="Run Microsoft Windows applications"
@@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 homepage="http://www.winehq.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=10f7caf0420970772d868ab2ae24578f89b8a04b93604473e7c41bb295e0086c
+checksum=3c6e62cb3bfab8505f8b9cbde0fe81072043875c4e655bd1dedd2a5f613ce490
 
 lib32mode=full
 only_for_archs=i686
diff --git a/srcpkgs/wireshark-gtk b/srcpkgs/wireshark-gtk
new file mode 120000
index 00000000000..bb29b6f1b45
--- /dev/null
+++ b/srcpkgs/wireshark-gtk
@@ -0,0 +1 @@
+wireshark
\ No newline at end of file
diff --git a/srcpkgs/wireshark-qt b/srcpkgs/wireshark-qt
new file mode 120000
index 00000000000..bb29b6f1b45
--- /dev/null
+++ b/srcpkgs/wireshark-qt
@@ -0,0 +1 @@
+wireshark
\ No newline at end of file
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index c3b38597b65..a2fc508eca9 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,34 +1,36 @@
 # Template file for 'wireshark'
 pkgname=wireshark
-version=1.12.1
-revision=1
+version=1.12.2
+revision=2
 build_style=gnu-configure
-configure_args=" --with-ssl \
- --with-pcap \
- --with-libcap \
- --with-zlib \
- --with-lua \
- --with-krb5 \
- --without-portaudio \
- CC_FOR_BUILD=cc"
-hostmakedepends="pkg-config bison flex perl mit-krb5-devel libtool"
-makedepends="libpcap-devel zlib-devel lua-devel mit-krb5-devel gtk+3-devel qt-devel"
-depends="libcap-progs"
-short_desc="A graphical network protocol analyzer for Unix/Linux"
+configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua
+ --with-krb5 --with-gtk3=yes --without-portaudio CC_FOR_BUILD=cc"
+hostmakedepends="pkg-config flex perl python-devel mit-krb5-devel libtool"
+makedepends="libpcap-devel zlib-devel lua-devel mit-krb5-devel gnutls-devel
+ geoip-devel libgcrypt-devel gtk+3-devel"
+depends="libwireshark>=${version}_${revision} libcap-progs"
+replaces="wireshark<1.12.2_1"
+short_desc="A network protocol analyzer"
 maintainer="Enno Boland <eb@s01.de>"
 homepage="http://www.wireshark.org"
 license="GPL-2"
 distfiles="http://www.wireshark.org/download/src/${pkgname}-${version}.tar.bz2"
-checksum=82b26bd416ec15903b27785e35a622687008a743342054e96eaaeaa249be584b
+checksum=30ae16b408a592642ce3a84dd9877d24df7a6dae8da4847486965190039df292
 system_groups="wireshark"
+subpackages="libwireshark libwireshark-devel wireshark-gtk"
+
+if [ -z "$CROSS_BUILD" ]; then
+	makedepends+=" qt-devel"
+	configure_args+=" --with-qt=yes"
+	subpackages+=" wireshark-qt"
+else
+	configure_args+=" --with-qt=no"
+fi
 
 pre_configure() {
 	libtoolize -f
-	sed -i \
-		-e "s/^LIBS = .*/\0 -ldl/" \
-		`find -name Makefile.in`
+	find -type f -name Makefile.in -exec sed -i "s/^LIBS = .*/\0 -ldl/" {} \;
 }
-
 post_install() {
 	local _includeDir=usr/include/wireshark
 	# Icons
@@ -41,9 +43,13 @@ post_install() {
 		vinstall image/WiresharkDoc-${d}.png 644 \
 			usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png
 	 done
-	
+
 	# Desktop Launcher
-	vinstall wireshark.desktop 644 usr/share/applications/wireshark.desktop
+	vinstall wireshark.desktop 644 usr/share/applications
+	if [ -z "$CROSS_BUILD" ]; then
+		sed -i 's/^Name.*=Wireshark/& (Qt)/g;/Exec=/s/wireshark/&-qt/g' wireshark.desktop
+		vinstall wireshark.desktop 644 usr/share/applications wireshark-qt.desktop
+	fi
 
 	# Headers
 	vmkdir $_includeDir
@@ -64,7 +70,6 @@ libwireshark_package() {
 		vmove usr/lib/wireshark
 	}
 }
-
 libwireshark-devel_package() {
 	short_desc+=" - development files"
 	depends="libwireshark>=${version}_${revision}"
@@ -73,3 +78,25 @@ libwireshark-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
+
+wireshark-gtk_package() {
+	replaces="wireshark<1.12.2_1"
+	depends="${sourcepkg}>=${version}_${revision} hicolor-icon-theme desktop-file-utils"
+	short_desc+=" - GTK+ frontend"
+	pkg_install() {
+		vmove usr/bin/wireshark
+		vmove usr/share/icons
+		vmove usr/share/man/man1/wireshark.1
+		vmove usr/share/applications/wireshark.desktop
+	}
+}
+
+wireshark-qt_package() {
+	replaces="wireshark<1.12.2_1"
+	depends="${sourcepkg}>=${version}_${revision} desktop-file-utils"
+	short_desc+=" - Qt frontend"
+	pkg_install() {
+		vmove usr/bin/wireshark-qt
+		vmove usr/share/applications/wireshark-qt.desktop
+	}
+}
diff --git a/srcpkgs/xbmc-rpi/template b/srcpkgs/xbmc-rpi/template
index 74435dff714..25421b3e1f7 100644
--- a/srcpkgs/xbmc-rpi/template
+++ b/srcpkgs/xbmc-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'xbmc-rpi'
 pkgname=xbmc-rpi
 version=13.2
-revision=3
+revision=4
 patch_args="-Np1"
 wrksrc="xbmc-${version}-Gotham"
 short_desc="XBMC Media Center for the Raspberry Pi"
@@ -28,12 +28,12 @@ makedepends="
  libmpeg2-devel wavpack-devel zlib-devel lzo-devel fribidi-devel sqlite-devel freetype-devel
  jasper-devel faac-devel faad2-devel libmodplug-devel libressl-devel libass-devel
  libmad-devel fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel librtmp-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel>=1.12 librtmp-devel
  tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel libxslt-devel
  libcec-devel libmicrohttpd-devel libcdio-devel python-devel libssh-devel rpi-firmware"
 # The following dependencies are dlopen(3)ed.
 depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs libplist libssh"
+ librtmp libnfs libplist>=1.12 libssh"
 depends+=" hicolor-icon-theme desktop-file-utils"
 
 provides="xbmc-${version}_${revision}"
diff --git a/srcpkgs/xbmc/template b/srcpkgs/xbmc/template
index f591269b416..56e7fb38a3f 100644
--- a/srcpkgs/xbmc/template
+++ b/srcpkgs/xbmc/template
@@ -1,7 +1,7 @@
 # Template file for 'xbmc'
 pkgname=xbmc
 version=13.2
-revision=3
+revision=4
 wrksrc="xbmc-${version}-Gotham"
 short_desc="XBMC Media Center"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -26,12 +26,12 @@ makedepends="
  jasper-devel faac-devel SDL_image-devel faad2-devel libmodplug-devel libressl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
- libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel
+ libbluetooth-devel yajl-devel libplist-devel>=1.12 librtmp-devel tinyxml-devel
  taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel
  libcec-devel libxslt-devel gnutls-devel libssh-devel"
 # The following dependencies are dlopen(3)ed.
 depends="libbluray libmad libogg libcurl libflac libmodplug libass libmpeg2
- lame librtmp libnfs libplist libssh"
+ lame librtmp libnfs libplist>=1.12 libssh"
 depends+=" glxinfo hicolor-icon-theme desktop-file-utils"
 
 pre_configure() {
diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index 77203a01c52..a0af1169973 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,6 +1,6 @@
 # Template file for 'xtools'
 pkgname=xtools
-version=0.9.1
+version=0.10
 revision=1
 noarch=yes
 build_style=gnu-makefile
@@ -10,4 +10,4 @@ maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="Public Domain"
 homepage="https://github.com/chneukirchen/xtools"
 distfiles="https://github.com/chneukirchen/xtools/archive/v${version}.tar.gz"
-checksum=85c975096c75a4948d6d763983e6e3d201c00451df6069f9108649cfd1d834c3
+checksum=af0968c272665590d2c70963988db1cc56d1d97d7d43542eac141de3b5d70db8
diff --git a/srcpkgs/zathura-cb/template b/srcpkgs/zathura-cb/template
index ba705d471d9..33dbc78b52a 100644
--- a/srcpkgs/zathura-cb/template
+++ b/srcpkgs/zathura-cb/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-cb'
 pkgname=zathura-cb
-version=0.1.2
-revision=2
+version=0.1.4
+revision=1
 build_style=gnu-makefile
 maintainer="Dominik Honnef <dominik@honnef.co>"
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ license="zlib"
 homepage="http://pwmt.org/projects/zathura-cb/"
 short_desc="Comic book support for zathura"
 distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.gz"
-checksum=72b20e2de452ccb8428fe0007bf12cee06c3422eac8e5e3b2c0ecbc9848850e0
+checksum=f21cb140cce02b3ef8b23eff479a7f66285667ab47cdc099c10cd62eaf239626
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zathura-djvu/template b/srcpkgs/zathura-djvu/template
index 941fa4b4f68..3bac6f69855 100644
--- a/srcpkgs/zathura-djvu/template
+++ b/srcpkgs/zathura-djvu/template
@@ -1,6 +1,6 @@
 # Template file for 'zathura-djvu'
 pkgname=zathura-djvu
-version=0.2.3
+version=0.2.4
 revision=1
 build_style=gnu-makefile
 maintainer="Dominik Honnef <dominik@honnef.co>"
@@ -10,7 +10,7 @@ license="zlib"
 homepage="http://pwmt.org/projects/zathura-djvu/"
 short_desc="DjVu support for zathura"
 distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.gz"
-checksum=c16e82d525012b788fd01c4189df93708fcffffb7dd34ca09db55005d644ed89
+checksum=ac10b8c07fd9f58281225e1a4cb026634cd03bf6b549eaceeea02f99ab5334bc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index 35b5fec9c45..c01eb5fa732 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -1,19 +1,19 @@
 # Template file for 'zathura'
 pkgname=zathura
-version=0.2.9
-revision=2
+version=0.3.2
+revision=1
 build_style=gnu-makefile
 # COLOR=0 to avoid "tput not found" spam in the build output
 make_build_args="COLOR=0"
 make_install_args="COLOR=0"
 maintainer="Dominik Honnef <dominik@honnef.co>"
 hostmakedepends="pkg-config intltool"
-makedepends="girara-devel sqlite-devel file-devel zlib-devel"
+makedepends="girara-devel>=0.2.3 sqlite-devel file-devel zlib-devel"
 license="zlib"
 homepage="http://pwmt.org/projects/zathura/installation/"
 short_desc="A highly customizable and functional document viewer"
 distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.gz"
-checksum=2c071d403ec9348b839567b2897850bf29d9c24c85982b5509a1a429a72ee09f
+checksum=fda6503dc5b21f7c667301798fbd2c978897e68b4555e8c731945cecd9d165e2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index cc17f905379..6fa6312dca2 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.3
-revision=1
+revision=2
 build_style=cmake
-hostmakedepends="cmake protobuf-devel"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel"
+hostmakedepends="cmake protobuf>=2.6"
+makedepends="zlib-devel liblzma-devel protobuf-devel>=2.6 libressl-devel"
 short_desc="A versatile deduplicating backup tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"