diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index 9f7e8f4aabc..316be57b58e 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,11 +1,11 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.4.2
-revision=8
+revision=9
 build_wrksrc=cpp
 homepage="http://www.zeroc.com"
 # XXX: other language bindings
-makedepends="mcpp-devel db-devel expat-devel openssl-devel"
+makedepends="mcpp-devel db-devel>=5.3 expat-devel openssl-devel"
 short_desc="The Internet Communications Engine (Ice)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2, ICE"
@@ -68,6 +68,6 @@ Ice-devel_package() {
 
 Ice_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 7d78aa239ef..35019fe4081 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,13 +1,13 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.3.12
-revision=6
+revision=7
 build_style=gnu-configure
 # XXX: add freetds and unixodbc modules.
 configure_args="--with-pgsql --with-mysql --with-sqlite3 --with-ldap
 --with-berkeley-db --with-gdbm --with-apr=/usr --without-odbc
 --with-expat=/usr --without-oracle"
-makedepends="apr-devel db-devel expat-devel gdbm-devel libldap-devel
+makedepends="apr-devel db-devel>=5.3 expat-devel gdbm-devel libldap-devel
  libmysqlclient-devel postgresql-libs-devel sqlite-devel zlib-devel"
 short_desc="The Apache Portable Runtime Utility Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -30,7 +30,7 @@ post_install() {
 
 apr-util-db_package() {
 	depends="apr-util>=${version}"
-	short_desc="${short_desc} - Berkeley DB module"
+	short_desc+=" - Berkeley DB module"
 	pkg_install() {
 		vmove "usr/lib/apr-util-1/apr_dbm_db*"
 	}
@@ -38,7 +38,7 @@ apr-util-db_package() {
 
 apr-util-devel_package() {
 	depends="apr-devel expat-devel libldap-devel ${sourcepkg}>=${version}"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin
 		vmove usr/include
@@ -49,7 +49,7 @@ apr-util-devel_package() {
 
 apr-util-gdbm_package() {
 	depends="apr-util>=${version}"
-	short_desc="${short_desc} - GDBM module"
+	short_desc+=" - GDBM module"
 	pkg_install() {
 		vmove "usr/lib/apr-util-1/apr_dbm_gdbm*"
 	}
@@ -57,7 +57,7 @@ apr-util-gdbm_package() {
 
 apr-util-ldap_package() {
 	depends="apr-util>=${version}"
-	short_desc="${short_desc} - LDAP support"
+	short_desc+=" - LDAP support"
 	pkg_install() {
 		vmove "usr/lib/apr-util-1/apr_ldap*"
 	}
@@ -65,7 +65,7 @@ apr-util-ldap_package() {
 
 apr-util-mysql_package() {
 	depends="apr-util>=${version}"
-	short_desc="${short_desc} - MySQL module"
+	short_desc+=" - MySQL module"
 	pkg_install() {
 		vmove "usr/lib/apr-util-1/apr_dbd_mysql*"
 	}
@@ -73,7 +73,7 @@ apr-util-mysql_package() {
 
 apr-util-pgsql_package() {
 	depends="apr-util>=${version}"
-	short_desc="${short_desc} - PostgreSQL module"
+	short_desc+=" - PostgreSQL module"
 	pkg_install() {
 		vmove "usr/lib/apr-util-1/apr_dbd_pgsql*"
 	}
@@ -81,7 +81,7 @@ apr-util-pgsql_package() {
 
 apr-util-sqlite_package() {
 	depends="apr-util>=${version}"
-	short_desc="${short_desc} - SQLite module"
+	short_desc+=" - SQLite module"
 	pkg_install() {
 		vmove "usr/lib/apr-util-1/apr_dbd_sqlite*"
 	}
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 81fb9ba9988..ab4ea2f2ce2 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,10 +1,10 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.8.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-linux"
 hostmakedepends="which"
-makedepends="db-devel openssl-devel qt-devel boost-devel automoc4 miniupnpc-devel"
+makedepends="db-devel>=5.3 openssl-devel qt-devel boost-devel automoc4 miniupnpc-devel"
 short_desc="Bitcoin is a peer-to-peer network based digital currency"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -12,11 +12,9 @@ homepage="http://www.bitcoin.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-linux.tar.gz"
 checksum=6d7f023a9df1a436c51de83f7cd751f162be9b4fb1c06da05545f9fba7cb2a98
 
-disable_debug=1
-
 if [ "$CROSS_BUILD" ]; then
 	# XXX -qt subpkg
-	makedepends="db-devel openssl-devel boost-devel miniupnpc-devel"
+	makedepends="db-devel>=5.3 openssl-devel boost-devel miniupnpc-devel"
 fi
 
 do_build() {
@@ -42,18 +40,20 @@ do_install() {
 
 bitcoin_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
 
 if [ -z "$CROSS_BUILD" ]; then
-	bitcoin-qt_package() {
-		depends="desktop-file-utils"
-		short_desc="${short_desc} -- QT GUI"
-		pkg_install() {
-			vinstall src/bitcoin-qt 755 usr/bin
-			vinstall src/contrib/debian/bitcoin-qt.desktop 644 usr/share/applications
-			vinstall src/share/pixmaps/bitcoin80.xpm 644 usr/share/pixmaps
-		}
+
+bitcoin-qt_package() {
+	depends="desktop-file-utils"
+	short_desc="${short_desc} -- QT GUI"
+	pkg_install() {
+		vinstall src/bitcoin-qt 755 usr/bin
+		vinstall src/contrib/debian/bitcoin-qt.desktop 644 usr/share/applications
+		vinstall src/share/pixmaps/bitcoin80.xpm 644 usr/share/pixmaps
 	}
+}
+
 fi # !CROSS_BUILD
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 75d60c1c73d..212d0e88d72 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.25
-revision=2
+revision=3
 short_desc="Cyrus SASL - auth daemon and administration tools"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cyrusimap.web.cmu.edu/"
@@ -24,7 +24,7 @@ long_desc="
 disable_parallel_build=yes
 
 hostmakedepends="groff"
-makedepends="openssl-devel db-devel libldap-devel mit-krb5-devel pam-devel
+makedepends="openssl-devel db-devel>=5.3 libldap-devel mit-krb5-devel pam-devel
  postgresql-libs-devel libmysqlclient-devel>=5.5.27 sqlite-devel"
 
 do_configure() {
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index b93eafd227b..303d435e6f9 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,15 +1,15 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-openldap --disable-uoa
  --with-krb5=/usr --with-nspr-includes=/usr/include/nspr
  --with-nss-includes=/usr/include/nss --enable-vala-bindings"
 hostmakedepends="pkg-config intltool flex gperf gobject-introspection"
-makedepends="sqlite-devel mit-krb5-devel nss-devel libical-devel libsecret-devel
- libsoup-gnome-devel>=2.40 gcr-devel>=3.8.0 libldap-devel libgdata-devel
- vala-devel>=0.20 libgweather-devel>=3.8.0"
+makedepends="db-devel>=5.3 sqlite-devel mit-krb5-devel nss-devel libical-devel
+ libsecret-devel libsoup-gnome-devel>=2.40 gcr-devel>=3.8.0 libldap-devel
+ libgdata-devel vala-devel>=0.20 libgweather-devel>=3.8.0"
 short_desc="Evolution data server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -22,7 +22,7 @@ evolution-data-server-devel_package() {
 		libldap-devel libgdata-devel libsecret-devel
 		gnome-online-accounts-devel>=3.8.0
 		${sourcepkg}-${version}_${revision}"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
@@ -34,6 +34,6 @@ evolution-data-server-devel_package() {
 
 evolution-data-server_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 6cbce466276..532d522af13 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,9 +1,9 @@
 # Template file for 'iproute2'
 pkgname=iproute2
 version=3.9.0
-revision=1
+revision=2
 hostmakedepends="pkg-config perl flex"
-makedepends="libfl-devel db-devel iptables-devel>=1.4.18"
+makedepends="libfl-devel db-devel>=5.3 iptables-devel>=1.4.18"
 short_desc="IP Routing Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.linux-foundation.org/en/Net:Iproute2"
diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template
index 4383975e6e9..6331b3a890e 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -1,13 +1,13 @@
 # Template file for 'libsasl'
 pkgname=libsasl
 version=2.1.25
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-cram --enable-digest --enable-auth-sasldb
  --enable-plain --enable-anon --enable-login --enable-gssapi --enable-ntlm
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-devrandom=/dev/urandom LDFLAGS=-ldb"
-makedepends="openssl-devel db-devel mit-krb5-devel"
+makedepends="openssl-devel db-devel>=5.3 mit-krb5-devel"
 wrksrc="cyrus-sasl-${version}"
 short_desc="Cyrus SASL - runtime shared libraries"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -36,8 +36,8 @@ post_install() {
 }
 
 libsasl-devel_package() {
-	depends="db-devel libsasl>=${version}_${revision}"
-	short_desc="${short_desc} - development files"
+	depends="db-devel>=5.3 libsasl>=${version}_${revision}"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 	}
@@ -45,6 +45,6 @@ libsasl-devel_package() {
 
 libsasl_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 45aba5a5f07..ebb432edbb3 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,10 +1,10 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.6.3c
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}"
 hostmakedepends="which"
-makedepends="db-devel openssl-devel boost-devel automoc4 miniupnpc-devel"
+makedepends="db-devel>=5.3 openssl-devel boost-devel automoc4 miniupnpc-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="pancake <pancake@nopcode.org>"
 license="MIT"
@@ -12,8 +12,6 @@ homepage="http://www.litecoin.org/"
 distfiles="https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz"
 checksum=f566d24a1c05392329fbaabf3d09f8244d2da52de320ede4d8476f1f1f835bac
 
-disable_debug=1
-
 do_build() {
 	make ${makejobs} -f makefile.unix -C src CXXFLAGS="$CXXFLAGS" USE_UPNP=1
 }
@@ -28,6 +26,6 @@ do_install() {
 
 litecoin_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index 13d28a486e5..65764879b00 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,8 +1,8 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.12.1
-revision=1
-makedepends="db-devel"
+revision=2
+makedepends="db-devel>=5.3"
 short_desc="mdoc macro compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="ISC"
@@ -45,6 +45,6 @@ mdocml_package() {
 	conflicts="groff>=0 man-db>=0"
 	provides="man-${version} roff-${version} apropos-${version} whatis-${version}"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 240dd37a356..66adc0763c6 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -1,7 +1,7 @@
 # Template file for 'mit-krb5'
 pkgname=mit-krb5
 version=1.11.2
-revision=1
+revision=2
 short_desc="MIT Kerberos 5 implementation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -19,8 +19,7 @@ configure_args="--disable-rpath --with-system-et --without-system-verto
  --with-system-ss --with-system-db --enable-shared --without-tcl"
 
 hostmakedepends="perl flex"
-makedepends="db-devel e2fsprogs-devel openssl-devel"
-
+makedepends="db-devel>=5.3 e2fsprogs-devel openssl-devel"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" e2fsprogs-devel"
@@ -56,7 +55,7 @@ mit-krb5-client_package() {
 }
 
 mit-krb5-devel_package() {
-	depends="db-devel openssl-devel e2fsprogs-devel>=1.4.10_1
+	depends="db-devel>=5.3 openssl-devel e2fsprogs-devel>=1.4.10_1
 		mit-krb5-libs>=${version}"
 	short_desc="MIT Kerberos 5 implementation - development files"
 	pkg_install() {
diff --git a/srcpkgs/nvi/template b/srcpkgs/nvi/template
index 7389f5ad890..af50a5d5243 100644
--- a/srcpkgs/nvi/template
+++ b/srcpkgs/nvi/template
@@ -1,13 +1,13 @@
 # Template file for 'nvi'
 pkgname=nvi
 version=1.81.6
-revision=4
+revision=5
 patch_args="-Np1"
 build_style=gnu-configure
 build_wrksrc=dist
 configure_args="--enable-widechar --enable-threads --disable-static
  vi_cv_path_preserve=/var/tmp vi_cv_sprintf_count=yes"
-makedepends="ncurses-devel db-devel"
+makedepends="ncurses-devel db-devel>=5.3"
 short_desc="The Berkeley Vi Editor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -26,6 +26,6 @@ post_install() {
 
 nvi_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index 8a66cfd5ac9..25ded39ae31 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,13 +1,13 @@
 # Template file for 'pam'
 pkgname=pam
 version=1.1.6
-revision=6
+revision=7
 wrksrc="Linux-PAM-$version"
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --sbindir=/usr/sbin
  --docdir=/usr/share/doc/pam --disable-nis"
 hostmakedepends="flex"
-makedepends="cracklib-devel db-devel"
+makedepends="cracklib-devel db-devel>=5.3"
 short_desc="A flexible mechanism for authenticating users"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/libs/pam/"
@@ -38,7 +38,7 @@ post_install() {
 
 pam-devel_package() {
 	depends="pam-libs>=${version}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/share/man/man3
@@ -47,7 +47,7 @@ pam-devel_package() {
 }
 
 pam-libs_package() {
-	short_desc="${short_desc} -- runtime libraries"
+	short_desc+=" - runtime libraries"
 	replaces="pam<1.1.6_3"
 	pkg_install() {
 		vmove "usr/lib/*.so*"
@@ -73,7 +73,6 @@ pam_package() {
 		/etc/security/time.conf"
 	depends="cracklib"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index 5dd4f61d931..c0c246a4051 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,9 +1,9 @@
 # Template build file for 'perl'.
 pkgname=perl
 version=5.16.3
-revision=2
+revision=3
 hostmakedepends="which less"
-makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
+makedepends="zlib-devel bzip2-devel gdbm-devel db-devel>=5.3"
 short_desc="Practical Extraction and Report Language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.perl.org"
@@ -274,6 +274,6 @@ perl-version-0.99_1
 	done
 
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ed59b30af12..3bcb3d81528 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=2.10.0
-revision=1
+revision=2
 short_desc="High-performance mail transport agent"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="IBM Public License 1.0, BSD-alike"
@@ -10,7 +10,7 @@ distfiles="ftp://ftp.porcupine.org/mirrors/postfix-release/official/$pkgname-$ve
 checksum=4a42a6029af418cbd4a8668b4f8c7e1ea9975cbe9756df760649c0a941bfeb7b
 
 hostmakedepends="perl"
-makedepends="openssl-devel db-devel pcre-devel>=8.30 libsasl-devel
+makedepends="openssl-devel db-devel>=5.3 pcre-devel>=8.30 libsasl-devel
  libldap-devel libmysqlclient-devel>=5.5.27 postgresql-libs-devel sqlite-devel"
 
 do_build() {
@@ -91,7 +91,6 @@ postfix_package() {
 		/var/spool/postfix/saved	0750	postfix	root
 		/var/spool/postfix/trace	0750	postfix	root"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 8ec8c1cfcbd..06ded9b7b22 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -1,7 +1,7 @@
 # Template build file for 'python'.
 pkgname=python
 version=2.7.3
-revision=3
+revision=4
 wrksrc="Python-${version}"
 short_desc="Interpreted, interactive, object-oriented programming language"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,7 +13,7 @@ checksum=61d36be58e9e9c733c49d7b76858d5c08e2c63a84f2066b29d35d3521057c985
 pycompile_dirs="usr/lib/python2.7"
 
 makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
- expat-devel db-devel sqlite-devel bzip2-devel zlib-devel"
+ expat-devel db-devel>=5.3 sqlite-devel bzip2-devel zlib-devel"
 
 # Force posix semaphores by default; sem_open requires /dev/shm and
 # it's not mounted in chroot.
@@ -74,16 +74,15 @@ post_install() {
 
 python_package() {
         pkg_install() {
-                vmove usr
+                vmove all
         }
 }
 
 python-devel_package() {
 	depends="libffi-devel zlib-devel readline-devel bzip2-devel gdbm-devel                                   
-		openssl-devel expat-devel db-devel ncurses-devel sqlite-devel                                           
+		openssl-devel expat-devel db-devel>=5.3 ncurses-devel sqlite-devel                                           
 		python>=${version}"
         short_desc="Python development files"
-
         pkg_install() {
                 vmove "usr/bin/python*-config"
                 vmove usr/lib/pkgconfig
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 7324af72d74..abd41ba9e41 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -1,7 +1,7 @@
 # Template file for 'subversion'
 pkgname=subversion
 version=1.7.9
-revision=1
+revision=2
 short_desc="Enterprise-class centralized version control for the masses"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Apache-2.0, BSD"
@@ -10,8 +10,8 @@ distfiles="http://apache.rediris.es/subversion/subversion-${version}.tar.bz2"
 checksum=f8454c585f99afed764232a5048d9b8bfd0a25a9ab8e339ea69fe1204c453ef4
 
 # XXX enable kwallet when kdelibs is available.
-makedepends="pkg-config perl>=5.16 python-devel swig apr-util-devel
- libldap-devel db-devel gdbm-devel expat-devel apr-devel libuuid-devel
+makedepends="pkg-config db-devel>=5.3 perl>=5.16 python-devel swig apr-util-devel
+ libldap-devel gdbm-devel expat-devel apr-devel libuuid-devel
  sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel
  neon-devel apache-devel ca-certificates"
 
@@ -55,7 +55,7 @@ do_install() {
 }
 
 libsvn_package() {
-	short_desc="${short_desc} - shared libraries"
+	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/libsvn_ra*"
 		vmove "usr/lib/libsvn_fs*"
@@ -69,7 +69,7 @@ libsvn_package() {
 }
 
 subversion-apache_package() {
-	short_desc="${short_desc} - apache httpd modules"
+	short_desc+=" - apache httpd modules"
 	pkg_install() {
 		vmove usr/libexec
 	}
@@ -77,7 +77,7 @@ subversion-apache_package() {
 
 subversion-devel_package() {
 	depends="libsvn>=$version"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 	}
@@ -93,7 +93,7 @@ subversion-gnome-keyring-auth_package() {
 subversion-python_package() {
 	depends="python"
 	pycompile_module="libsvn svn"
-	short_desc="${short_desc} - python bindings"
+	short_desc+=" - python bindings"
 	pkg_install() {
 		vmove "usr/lib/libsvn_swig_py*"
 		vmove "usr/lib/python*"
@@ -102,7 +102,7 @@ subversion-python_package() {
 
 subversion-perl_package() {
 	depends="perl>=5.16"
-	short_desc="${short_desc} - perl bindings"
+	short_desc+=" - perl bindings"
 	pkg_install() {
 		vmove "usr/lib/libsvn_swig_perl*"
 		vmove usr/lib/perl5
@@ -113,6 +113,6 @@ subversion-perl_package() {
 subversion_package() {
 	depends="ca-certificates"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }