diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index 214378f3203..e4d62e60862 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -168,6 +168,7 @@ MesaLib_package() {
 	depends="mesa-swraster-dri-${version}_${revision}"
 	pkg_install() {
 		vmove etc
-		vmove usr
+		vmove "usr/lib/libdricore*.so*"
+		vmove "usr/lib/libxatracker*.so*"
 	}
 }
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index bb3c37c8cd2..deca4a3e825 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -40,6 +40,8 @@ libcurl-devel_package() {
 curl_package() {
 	depends="ca-certificates"
 	pkg_install() {
-		vmove usr
+		vmove usr/bin/curl
+		vmove usr/share/man/man1/curl.1
+		vmove usr/share/man/man1/mk-ca-bundle.1
 	}
 }
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index 3346b644925..b09fcd2ed76 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -2,6 +2,13 @@
 pkgname=e2fsprogs
 version=1.42.7
 revision=2
+short_desc="Ext2/3/4 Filesystem Utilities"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2, LGPL-2.1"
+homepage="http://e2fsprogs.sourceforge.net/"
+distfiles="$SOURCEFORGE_SITE/e2fsprogs/$pkgname-$version.tar.gz"
+checksum=dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345
+
 build_style=gnu-configure
 configure_args="--enable-htree --enable-elf-shlibs --disable-fsck
  --enable-e2initrd-helper --disable-rpath --with-root-prefix=/usr
@@ -11,12 +18,6 @@ configure_args="--enable-htree --enable-elf-shlibs --disable-fsck
 make_install_args="install-libs"
 hostmakedepends="pkg-config"
 makedepends="libuuid-devel libblkid-devel"
-short_desc="Ext2/3/4 Filesystem Utilities"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="GPL-2, LGPL-2.1"
-homepage="http://e2fsprogs.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/e2fsprogs/$pkgname-$version.tar.gz"
-checksum=dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345
 
 post_install() {
 	# Remove stuff belonging to libblkid or libuuid pkgs.
@@ -39,10 +40,10 @@ e2fsprogs-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		for f in compile_et mk_cmds; do
-			vmove usr/bin/${f}
-			vmove "usr/share/man/man1/${f}*"
-		done
+		vmove usr/bin/compile_et
+		vmove usr/bin/mk_cmds
+		vmove usr/share/man/man1/compile_et.1
+		vmove usr/share/man/man1/mk_cmds.1
 		vmove usr/share/et
 		vmove usr/share/ss
 		vmove usr/share/man/man3
diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template
index ef2ec51d7de..58c5e03fa77 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -10,7 +10,6 @@ license="GPL-2"
 homepage="http://www.gnu.org/software/groff/groff.html"
 distfiles="http://ftp.gnu.org/gnu/groff/groff-${version}.tar.gz"
 checksum=380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076
-subpackages="groff-doc"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" groff"
@@ -58,7 +57,7 @@ groff-doc_package() {
 	short_desc="${short_desc} - documentation"
 	noarch=yes
 	pkg_install() {
-		vmove usr/share/doc usr/share
+		vmove usr/share/doc
 	}
 }
 
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index abc1ac0aea2..5256c6000c2 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -30,6 +30,6 @@ harfbuzz-devel_package() {
 
 harfbuzz_package() {
 	pkg_install() {
-		vmove usr
+		vmove usr/bin
 	}
 }
diff --git a/srcpkgs/lcms/lcms-devel.template b/srcpkgs/lcms/lcms-devel.template
deleted file mode 100644
index 14f79703251..00000000000
--- a/srcpkgs/lcms/lcms-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'lcms-devel'.
-#
-noarch=yes
-depends="libjpeg-turbo-devel tiff-devel lcms>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/lcms/template b/srcpkgs/lcms/template
index 4fca032099e..1284b67e469 100644
--- a/srcpkgs/lcms/template
+++ b/srcpkgs/lcms/template
@@ -1,15 +1,30 @@
 # Template build file for 'lcms'.
 pkgname=lcms
 version=1.19
-revision=7
+revision=8
 wrksrc=${pkgname}-${version%[a-z]*}
-subpackages="lcms-devel"
 build_style=gnu-configure
 configure_args="--disable-static"
-makedepends="pkg-config libjpeg-turbo-devel tiff-devel"
+hostmakedepends="pkg-config"
+makedepends"libjpeg-turbo-devel tiff-devel"
 short_desc="Light Color Management System -- a color management library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.littlecms.com"
 license="BSD"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9
+
+lcms-devel_package() {
+	depends="libjpeg-turbo-devel tiff-devel lcms>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+lcms_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/lcms2/lcms2-devel.template b/srcpkgs/lcms2/lcms2-devel.template
deleted file mode 100644
index 92ae0d6e033..00000000000
--- a/srcpkgs/lcms2/lcms2-devel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'lcms-devel'.
-#
-noarch=yes
-depends="tiff-devel lcms2>=${version}"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/lcms2/lcms2-tools.template b/srcpkgs/lcms2/lcms2-tools.template
deleted file mode 100644
index 45b9dda072a..00000000000
--- a/srcpkgs/lcms2/lcms2-tools.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'lcms2-tools'.
-#
-short_desc="${sourcepkg} - bundled tools"
-long_desc="${long_desc}
-
- This package contains the command line tools."
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/share/man/man1 usr/share/man
-}
diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 04ee48590b4..db720ddae7c 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -1,8 +1,7 @@
 # Template build file for 'lcms2'.
 pkgname=lcms2
 version=2.4
-revision=3
-subpackages="lcms2-devel lcms2-tools"
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="tiff-devel"
@@ -19,3 +18,26 @@ long_desc="
  Color management refers to techniques that ensure consistent color
  as images are transferred from scanners or cameras to monitors and
  printers."
+
+lcms2-devel_package() {
+	depends="tiff-devel lcms2>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+lcms2-tools_package() {
+	short_desc+=" -- bundled tools"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/man/man1
+	}
+}
+
+lcms2_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXcomposite/libXcomposite-devel.template b/srcpkgs/libXcomposite/libXcomposite-devel.template
deleted file mode 100644
index 4e46ba3399e..00000000000
--- a/srcpkgs/libXcomposite/libXcomposite-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'libXcomposite-devel'.
-#
-depends="xproto compositeproto libXfixes-devel libX11-devel
- ${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/libXcomposite/template b/srcpkgs/libXcomposite/template
index 31097a14351..5d382d0a173 100644
--- a/srcpkgs/libXcomposite/template
+++ b/srcpkgs/libXcomposite/template
@@ -2,7 +2,6 @@
 pkgname=libXcomposite
 version=0.4.4
 revision=2
-subpackages="${pkgname}-devel"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xproto fixesproto compositeproto libXfixes-devel"
@@ -12,3 +11,21 @@ homepage="http://xorg.freedesktop.org"
 license="MIT/X11"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
 checksum=ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
+
+libXcomposite-devel_package() {
+	depends="xproto compositeproto libXfixes-devel libX11-devel
+		${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+libXcomposite_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXcursor/libXcursor-devel.template b/srcpkgs/libXcursor/libXcursor-devel.template
deleted file mode 100644
index b39a26bf9b9..00000000000
--- a/srcpkgs/libXcursor/libXcursor-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libXcursor-devel'.
-#
-depends="xproto libXcursor>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/libXcursor/template b/srcpkgs/libXcursor/template
index f6bb148a85a..5ad5c9608ff 100644
--- a/srcpkgs/libXcursor/template
+++ b/srcpkgs/libXcursor/template
@@ -3,7 +3,6 @@ pkgname=libXcursor
 version=1.1.13
 revision=3
 build_style=gnu-configure
-subpackages="$pkgname-devel"
 hostmakedepends="pkg-config"
 makedepends="fixesproto>=5.0_1 libXfixes-devel libXrender-devel"
 short_desc="Client-side cursor loading library for X"
@@ -16,3 +15,20 @@ long_desc="
  This package, libXcursor, provides the client-side cursor loading
  library for X. This cursor management library is a simple library
  designed to help locate and load cursors (from files or memory)."
+
+libXcursor-devel_package() {
+	depends="xproto libXcursor>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libXcursor_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXdamage/libXdamage-devel.template b/srcpkgs/libXdamage/libXdamage-devel.template
deleted file mode 100644
index 0461e57b32f..00000000000
--- a/srcpkgs/libXdamage/libXdamage-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libXdamage-devel'.
-#
-depends="xproto damageproto libX11-devel libXfixes-devel
- ${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/libXdamage/template b/srcpkgs/libXdamage/template
index 38265b48718..4a069929881 100644
--- a/srcpkgs/libXdamage/template
+++ b/srcpkgs/libXdamage/template
@@ -2,7 +2,6 @@
 pkgname=libXdamage
 version=1.1.4
 revision=2
-subpackages="${pkgname}-devel"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xproto damageproto libXfixes-devel"
@@ -12,3 +11,20 @@ distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
 homepage="http://xorg.freedesktop.org/"
 license="MIT/X11"
 checksum=7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
+
+libXdamage-devel_package() {
+	depends="xproto damageproto libX11-devel libXfixes-devel
+		${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+libXdamage_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXext/libXext-devel.template b/srcpkgs/libXext/libXext-devel.template
deleted file mode 100644
index dd989f38f06..00000000000
--- a/srcpkgs/libXext/libXext-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libXext-devel'.
-#
-noarch=yes
-depends="xextproto libX11-devel ${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man/man3 usr/share/man
-}
diff --git a/srcpkgs/libXext/template b/srcpkgs/libXext/template
index 0e0b022017f..f94c8d17121 100644
--- a/srcpkgs/libXext/template
+++ b/srcpkgs/libXext/template
@@ -1,8 +1,7 @@
 # Template build file for 'libXext'.
 pkgname=libXext
 version=1.3.1
-revision=3
-subpackages="$pkgname-devel"
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
@@ -13,3 +12,19 @@ license="MIT"
 homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
+
+libXext-devel_package() {
+	depends="xextproto libX11-devel ${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+	}
+}
+
+libXext_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXfixes/libXfixes-devel.template b/srcpkgs/libXfixes/libXfixes-devel.template
deleted file mode 100644
index c0890584232..00000000000
--- a/srcpkgs/libXfixes/libXfixes-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'libXfixes-devel'.
-#
-depends="xproto fixesproto libX11-devel libXfixes>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-}
diff --git a/srcpkgs/libXfixes/template b/srcpkgs/libXfixes/template
index d51ca8b0801..69dcf9ff050 100644
--- a/srcpkgs/libXfixes/template
+++ b/srcpkgs/libXfixes/template
@@ -3,7 +3,6 @@ pkgname=libXfixes
 version=5.0
 revision=3
 build_style=gnu-configure
-subpackages="$pkgname-devel"
 hostmakedepends="pkg-config"
 makedepends="xproto xextproto fixesproto libX11-devel"
 short_desc="Xfixes library and extension of X RandR from modular X.org"
@@ -17,3 +16,20 @@ long_desc="
  in the core protocol.  The extension is designed to hold various
  vaguely related extension bits that change how the X server and
  clients interact with fundamental parts of the window system."
+
+libXfixes-devel_package() {
+	depends="xproto fixesproto libX11-devel libXfixes>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+libXfixes_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXft/libXft-devel.template b/srcpkgs/libXft/libXft-devel.template
deleted file mode 100644
index 0d6983d2acf..00000000000
--- a/srcpkgs/libXft/libXft-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libXft-devel'.
-#
-depends="xproto libXrender-devel fontconfig-devel freetype-devel libXft>=${version}"
-short_desc="${short_desc} (development files)"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/lib*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 38fa0ce8640..848aa2e3d04 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -3,7 +3,6 @@ pkgname=libXft
 version=2.3.0
 revision=2
 build_style=gnu-configure
-subpackages="$pkgname-devel"
 hostmakedepends="pkg-config"
 makedepends="xproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
@@ -23,3 +22,20 @@ long_desc="
  Xft (2.0) hides most of the underlying system details so that developers
  can confidently use its API to access client-side fonts in any X
  environment."
+
+libXft-devel_package() {
+	depends="xproto libXrender-devel fontconfig-devel freetype-devel libXft>=${version}"
+	short_desc="${short_desc} (development files)"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/lib*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libXft_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXi/libXi-devel.template b/srcpkgs/libXi/libXi-devel.template
deleted file mode 100644
index f973defa094..00000000000
--- a/srcpkgs/libXi/libXi-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libXi-devel'.
-#
-depends="inputproto libX11-devel libXext-devel libXi>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/share usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/libXi/template b/srcpkgs/libXi/template
index 173cefdab3f..89e58ea9a95 100644
--- a/srcpkgs/libXi/template
+++ b/srcpkgs/libXi/template
@@ -2,7 +2,6 @@
 pkgname=libXi
 version=1.6.2
 revision=2
-subpackages="$pkgname-devel"
 build_style=gnu-configure
 hostmakedepends="pkg-config xmlto"
 makedepends="inputproto>=2.2 libXext-devel"
@@ -12,3 +11,20 @@ license="MIT"
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=3250fd34cdd099a15b78abdb87c7e1a9b7a2188ab893f273e90d831dbc604058
+
+libXi-devel_package() {
+	depends="inputproto libX11-devel libXext-devel libXi>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+libXi_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXinerama/libXinerama-devel.template b/srcpkgs/libXinerama/libXinerama-devel.template
deleted file mode 100644
index 9301f4eb0e3..00000000000
--- a/srcpkgs/libXinerama/libXinerama-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libXinerama-devel'.
-#
-depends="xineramaproto libXext-devel libXinerama>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/libXinerama/template b/srcpkgs/libXinerama/template
index fd84b69541a..587c60a07ec 100644
--- a/srcpkgs/libXinerama/template
+++ b/srcpkgs/libXinerama/template
@@ -2,7 +2,6 @@
 pkgname=libXinerama
 version=1.1.2
 revision=2
-subpackages="$pkgname-devel"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xineramaproto libXext-devel"
@@ -12,3 +11,20 @@ license="MIT"
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
+
+libXinerama-devel_package() {
+	depends="xineramaproto libXext-devel libXinerama>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libXinerama_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXrandr/libXrandr-devel.template b/srcpkgs/libXrandr/libXrandr-devel.template
deleted file mode 100644
index 3447539a556..00000000000
--- a/srcpkgs/libXrandr/libXrandr-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'libXrandr-devel'.
-#
-noarch=yes
-depends="libXext-devel libXrender-devel randrproto>=1.4.0
- ${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/libXrandr/template b/srcpkgs/libXrandr/template
index 6e222ee4059..54c1023e088 100644
--- a/srcpkgs/libXrandr/template
+++ b/srcpkgs/libXrandr/template
@@ -1,10 +1,9 @@
 # Template build file for 'libXrandr'.
 pkgname=libXrandr
 version=1.4.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static"
-subpackages="$pkgname-devel"
 hostmakedepends="pkg-config"
 makedepends="randrproto>=1.4.0 libXext-devel libXrender-devel"
 short_desc="X RandR Library from X.org"
@@ -13,3 +12,20 @@ homepage="${XORG_SITE}"
 license="MIT"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
+
+libXrandr-devel_package() {
+	depends="libXext-devel libXrender-devel randrproto>=1.4.0
+		${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libXrandr_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXrender/libXrender-devel.template b/srcpkgs/libXrender/libXrender-devel.template
deleted file mode 100644
index e12cc0efb2c..00000000000
--- a/srcpkgs/libXrender/libXrender-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libXrender-devel'.
-#
-depends="xproto renderproto libXext-devel libXrender>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/libXrender/template b/srcpkgs/libXrender/template
index 50adf9d2a00..9ae57ecf262 100644
--- a/srcpkgs/libXrender/template
+++ b/srcpkgs/libXrender/template
@@ -12,3 +12,19 @@ homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
 subpackages="$pkgname-devel"
+
+libXrender-devel_package() {
+	depends="xproto renderproto libXext-devel libXrender>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+libXrender_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXv/libXv-devel.template b/srcpkgs/libXv/libXv-devel.template
deleted file mode 100644
index 3ebc761f1b5..00000000000
--- a/srcpkgs/libXv/libXv-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libXv-devel'.
-#
-depends="xproto videoproto libX11-devel libXext-devel libXv>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/libXv/template b/srcpkgs/libXv/template
index 8ffef1bf386..26e09a6bd1b 100644
--- a/srcpkgs/libXv/template
+++ b/srcpkgs/libXv/template
@@ -3,7 +3,6 @@ pkgname=libXv
 version=1.0.7
 revision=2
 build_style=gnu-configure
-subpackages="$pkgname-devel"
 hostmakedepends="pkg-config"
 makedepends="videoproto libX11-devel libXext-devel"
 short_desc="Xv Extension library"
@@ -12,3 +11,20 @@ license="MIT"
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
+
+libXv-devel_package() {
+	depends="xproto videoproto libX11-devel libXext-devel libXv>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libXv_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXvMC/libXvMC-devel.template b/srcpkgs/libXvMC/libXvMC-devel.template
deleted file mode 100644
index 48fb9f4f38e..00000000000
--- a/srcpkgs/libXvMC/libXvMC-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libXvMC-devel'.
-#
-depends="libX11-devel libXext-devel libXv-devel libXvMC>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/doc usr/share
-}
diff --git a/srcpkgs/libXvMC/template b/srcpkgs/libXvMC/template
index 1410fe21658..9f4d9c94ec1 100644
--- a/srcpkgs/libXvMC/template
+++ b/srcpkgs/libXvMC/template
@@ -3,7 +3,6 @@ pkgname=libXvMC
 version=1.0.7
 revision=2
 build_style=gnu-configure
-subpackages="$pkgname-devel"
 hostmakedepends="pkg-config"
 makedepends="videoproto libX11-devel libXext-devel libXv-devel"
 short_desc="XVideo Motion Compensation Library"
@@ -16,3 +15,20 @@ long_desc="
  X-Video Motion Compensation (XvMC) provides accelerated video
  playback by offloading video decoding to hardware.  It is an
  extension of the X video extension for the X Window System."
+
+libXvMC-devel_package() {
+	depends="libX11-devel libXext-devel libXv-devel libXvMC>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+	}
+}
+
+libXvMC_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libXxf86vm/libXxf86vm-devel.template b/srcpkgs/libXxf86vm/libXxf86vm-devel.template
deleted file mode 100644
index 22edd05e1e7..00000000000
--- a/srcpkgs/libXxf86vm/libXxf86vm-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'libXxf86vm-devel'.
-#
-noarch=yes
-depends="xf86vidmodeproto libX11-devel libXext-devel ${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/libXxf86vm/template b/srcpkgs/libXxf86vm/template
index 0fa0968beb8..a50d7d22709 100644
--- a/srcpkgs/libXxf86vm/template
+++ b/srcpkgs/libXxf86vm/template
@@ -1,11 +1,11 @@
 # Template build file for 'libXxf86vm'.
 pkgname=libXxf86vm
 version=1.1.2
-revision=2
-subpackages="$pkgname-devel"
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
-makedepends="pkg-config xf86vidmodeproto libX11-devel libXext-devel"
+hostmakedepends="pkg-config"
+makedepends="xf86vidmodeproto libX11-devel libXext-devel"
 short_desc="Library for the XFree86-VidMode X extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -16,3 +16,19 @@ long_desc="
  These functions provide an interface to the server extension
  XFree86-VidModeExtension which allows the video modes to be queried
  and adjusted dynamically and mode switching to be controlled."
+
+libXxf86vm-devel_package() {
+	depends="xf86vidmodeproto libX11-devel libXext-devel ${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libXxf86vm_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libdaemon/libdaemon-devel.template b/srcpkgs/libdaemon/libdaemon-devel.template
deleted file mode 100644
index 7e0b6cf2976..00000000000
--- a/srcpkgs/libdaemon/libdaemon-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'libdaemon-devel'.
-#
-depends="libdaemon-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-noarch=yes
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-}
diff --git a/srcpkgs/libdaemon/template b/srcpkgs/libdaemon/template
index 24704a7d1a2..e2bd3f87bfa 100644
--- a/srcpkgs/libdaemon/template
+++ b/srcpkgs/libdaemon/template
@@ -1,8 +1,7 @@
 # Template file for 'libdaemon'
 pkgname=libdaemon
 version=0.14
-revision=5
-subpackages="$pkgname-devel"
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --disable-lynx"
 short_desc="Lightweight C library that eases the writing of UNIX daemons"
@@ -12,6 +11,22 @@ license="LGPL-2.1"
 distfiles="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$version.tar.gz"
 checksum=fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834
 
-if [ -n "$XBPS_CROSS_TRIPLET" ]; then
-	configure_args="${configure_args} ac_cv_func_setpgrp_void=yes"
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" ac_cv_func_setpgrp_void=yes"
 fi
+
+libdaemon-devel_package() {
+	depends="libdaemon-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libdaemon_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libdrm/libdrm-devel.template b/srcpkgs/libdrm/libdrm-devel.template
deleted file mode 100644
index 53254006c10..00000000000
--- a/srcpkgs/libdrm/libdrm-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libdrm-devel'.
-#
-noarch=yes
-depends="libudev-devel ${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	#vmove usr/share/man/man3 usr/share/man
-}
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 6041e1448ce..2e4effff9dd 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,13 +1,12 @@
 # Template build file for 'libdrm'.
 pkgname=libdrm
 version=2.4.43
-revision=1
+revision=2
 patch_args="-Np1"
 build_style=gnu-configure
 configure_args="--enable-udev"
 hostmakedepends="libtool automake pkg-config"
 makedepends="libudev-devel libpciaccess-devel"
-subpackages="$pkgname-devel"
 short_desc="Userspace interface to kernel DRM services"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://dri.freedesktop.org/"
@@ -18,3 +17,19 @@ checksum=7fb8cd89df06e236a66a1a6a9f6d058271c1b1ec92631e08c66dc9e12abd4975
 pre_configure() {
 	autoreconf -fi
 }
+
+libdrm-devel_package() {
+	depends="libudev-devel ${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		#vmove usr/share/man/man3
+	}
+}
+
+libdrm_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libidn/libidn-devel.template b/srcpkgs/libidn/libidn-devel.template
deleted file mode 100644
index 744cb5d6050..00000000000
--- a/srcpkgs/libidn/libidn-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'libidn-devel'.
-#
-depends="libidn>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man/man3 usr/share/man
-	vmove usr/share/emacs usr/share
-	vmove usr/share/info usr/share
-}
diff --git a/srcpkgs/libidn/template b/srcpkgs/libidn/template
index a28ebcb4547..4e5ec35677e 100644
--- a/srcpkgs/libidn/template
+++ b/srcpkgs/libidn/template
@@ -5,10 +5,27 @@ revision=2
 build_style=gnu-configure
 configure_args="--disable-csharp --disable-java --disable-static --enable-threads=posix"
 hostmakedepends="perl pkg-config"
-subpackages="${pkgname}-devel"
 short_desc="Internationalized string handling library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libidn/"
 license="GPL-3, LGPL-2.1"
 distfiles="http://ftp.gnu.org/gnu/libidn/libidn-${version}.tar.gz"
 checksum=0a2f4c71c80f8f389a99d5a26539a9be4a4ac42cd7f375aa41046660f63cc53c
+
+libidn-devel_package() {
+	depends="libidn>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+		vmove usr/share/emacs
+		vmove usr/share/info
+	}
+}
+
+libidn_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template
deleted file mode 100644
index 26e1df75ef3..00000000000
--- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libjpeg-turbo-devel'.
-#
-depends="glibc-devel libjpeg-turbo>=${version}"
-provides="jpeg-devel-8"
-replaces="jpeg-devel>=0"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-}
diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template
deleted file mode 100644
index 0d789cc6d17..00000000000
--- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libjpeg-turbo-tools'.
-#
-provides="jpeg-tools-8"
-replaces="jpeg-tools>=0"
-short_desc="${short_desc} - bundled tools"
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/share/man usr/share
-}
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 5822b000aa0..732e04fdbd2 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -2,13 +2,10 @@
 pkgname=libjpeg-turbo
 version=1.2.1
 revision=2
-provides="jpeg-8"
-replaces="jpeg>=0"
-subpackages="${pkgname}-devel ${pkgname}-tools"
 build_style=gnu-configure
 configure_args="--disable-static --with-jpeg8"
-if [ "$XBPS_MACHINE" = "i686" -o "$XBPS_MACHINE" = "x86_64" ]; then
-	makedepends="nasm"
+if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	hostmakedepends="nasm"
 fi
 short_desc="Derivative of libjpeg which uses SIMD instructions"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -27,3 +24,31 @@ post_install() {
 	rm -f ${DESTDIR}/usr/lib/libturbojpeg*
 	rm -f ${DESTDIR}/usr/include/turbojpeg.h
 }
+
+libjpeg-turbo-devel_package() {
+	depends="libjpeg-turbo>=${version}"
+	provides="jpeg-devel-8"
+	replaces="jpeg-devel>=0"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}
+
+libjpeg-turbo-tools_package() {
+	provides="jpeg-tools-8"
+	replaces="jpeg-tools>=0"
+	short_desc="${short_desc} - bundled tools"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/man
+	}
+}
+
+libjpeg-turbo_package() {
+	provides="jpeg-8"
+	replaces="jpeg>=0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libogg/libogg-devel.template b/srcpkgs/libogg/libogg-devel.template
deleted file mode 100644
index f3c1b9d0fe0..00000000000
--- a/srcpkgs/libogg/libogg-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'libogg-devel'.
-#
-depends="libogg>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-}
diff --git a/srcpkgs/libogg/template b/srcpkgs/libogg/template
index 0d12bea6fa9..aee8bfd2f6b 100644
--- a/srcpkgs/libogg/template
+++ b/srcpkgs/libogg/template
@@ -2,7 +2,6 @@
 pkgname=libogg
 version=1.3.0
 revision=3
-subpackages="$pkgname-devel"
 build_style=gnu-configure
 short_desc="The Ogg bitstream file format library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -14,3 +13,20 @@ long_desc="
  Libogg is a library for manipulating Ogg bitstream file formats.
  Libogg supports both making Ogg bitstreams and getting packets from
  Ogg bitstreams."
+
+libogg-devel_package() {
+	depends="libogg>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+libogg_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libpciaccess/libpciaccess-devel.template b/srcpkgs/libpciaccess/libpciaccess-devel.template
deleted file mode 100644
index 3ddcb78d1fb..00000000000
--- a/srcpkgs/libpciaccess/libpciaccess-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libpciaccess-devel'.
-#
-depends="${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/libpciaccess/template b/srcpkgs/libpciaccess/template
index 43f1b9a306a..cdf84c3ec42 100644
--- a/srcpkgs/libpciaccess/template
+++ b/srcpkgs/libpciaccess/template
@@ -2,7 +2,6 @@
 pkgname=libpciaccess
 version=0.13.1
 revision=2
-subpackages="$pkgname-devel"
 build_style=gnu-configure
 short_desc="X11 PCI Access library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,3 +12,19 @@ checksum=27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
 long_desc="
  libpciaccess is a library for portable PCI access routines across multiple
  operating systems."
+
+libpciaccess-devel_package() {
+	depends="${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+libpciaccess_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libpng/libpng-devel.template b/srcpkgs/libpng/libpng-devel.template
deleted file mode 100644
index c4bed139df7..00000000000
--- a/srcpkgs/libpng/libpng-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'libpng-devel'.
-#
-noarch=yes
-depends="zlib-devel libpng>=$version"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man/man3 usr/share/man
-}
diff --git a/srcpkgs/libpng/template b/srcpkgs/libpng/template
index d313016cd2c..a7b562d757f 100644
--- a/srcpkgs/libpng/template
+++ b/srcpkgs/libpng/template
@@ -1,12 +1,11 @@
 # Template build file for 'libpng'.
 pkgname=libpng
 version=1.5.14
-revision=1
+revision=2
 patch_args="-Np1"
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="zlib-devel"
-subpackages="$pkgname-devel"
 short_desc="Library for manipulating PNG images"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.libpng.org/pub/png/libpng.html"
@@ -18,3 +17,20 @@ post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.la
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
 }
+
+libpng-devel_package() {
+	depends="zlib-devel libpng>=$version"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+	}
+}
+
+libpng_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libudev/libudev-devel.template b/srcpkgs/libudev/libudev-devel.template
deleted file mode 100644
index ef6281ae000..00000000000
--- a/srcpkgs/libudev/libudev-devel.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'libudev-devel'.
-#
-depends="libudev>=${version}_${revision}"
-short_desc="udev shared library -- development files"
-
-do_install() {
-	vmove usr/include/libudev.h usr/include
-	vmove usr/lib/pkgconfig/libudev.pc usr/lib/pkgconfig
-}
diff --git a/srcpkgs/libudev/systemd-devel.template b/srcpkgs/libudev/systemd-devel.template
deleted file mode 100644
index 702ceda33a3..00000000000
--- a/srcpkgs/libudev/systemd-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'systemd-devel'.
-#
-depends="systemd-libs>=${version}_${revision}"
-short_desc="systemd development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man/man3 usr/share/man
-	rm -rf ${SRCPKGDESTDIR}/usr/share/man
-	vmove usr/share/pkgconfig usr/share
-}
diff --git a/srcpkgs/libudev/systemd-libs.template b/srcpkgs/libudev/systemd-libs.template
deleted file mode 100644
index 343a3cb1ed5..00000000000
--- a/srcpkgs/libudev/systemd-libs.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'systemd-libs'.
-#
-short_desc="systemd runtime libraries"
-replaces="systemd<43_1"
-
-do_install() {
-	vmove "usr/lib/libsystemd*.so*" usr/lib
-}
diff --git a/srcpkgs/libudev/template b/srcpkgs/libudev/template
index 23895926bf4..2614f2cec28 100644
--- a/srcpkgs/libudev/template
+++ b/srcpkgs/libudev/template
@@ -17,7 +17,6 @@ configure_args="--libexecdir=/usr/lib --disable-selinux
  --disable-efi --disable-polkit --with-sysvinit-path= --with-sysvrcnd-path="
 hostmakedepends="pkg-config intltool gperf libxslt docbook-xsl"
 makedepends="dbus-devel libcap-devel liblzma-devel libgcrypt-devel"
-subpackages="libudev-devel systemd-libs systemd-devel"
 short_desc="udev shared library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/systemd"
@@ -26,8 +25,7 @@ distfiles="http://www.freedesktop.org/software/systemd/systemd-${version}.tar.xz
 checksum=d6299f1a0bc2122002d731808d3825c6b566d1ffe899c03ed5ebec7e70c8cc10
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="libtool automake gettext-devel pkg-config intltool
-		gperf libxslt docbook-xsl libgcrypt-devel" 
+	hostmakedepends+=" libtool automake gettext-devel libgcrypt-devel"
 	pre_configure() {
 		autoreconf -fi
 	}
@@ -40,3 +38,37 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/lib/{udev,systemd,sysctl.d,tmpfiles.d}
 	rm -rf ${DESTDIR}/usr/share/{bash*,doc,polkit-1,dbus-1}
 }
+
+libudev-devel_package() {
+	depends="libudev>=${version}_${revision}"
+	short_desc="udev shared library -- development files"
+	pkg_install() {
+		vmove usr/include/libudev.h
+		vmove usr/lib/pkgconfig/libudev.pc
+	}
+}
+
+libudev_package() {
+	pkg_install() {
+		vmove "usr/lib/libudev.so*"
+	}
+}
+
+systemd-devel_package() {
+	depends="systemd-libs>=${version}_${revision}"
+	short_desc="systemd development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+		vmove usr/share/pkgconfig
+	}
+}
+
+systemd-libs_package() {
+	short_desc="systemd runtime libraries"
+	replaces="systemd<43_1"
+	pkg_install() {
+		vmove "usr/lib/libsystemd*.so*"
+	}
+}
diff --git a/srcpkgs/libusb/libusb-devel.template b/srcpkgs/libusb/libusb-devel.template
deleted file mode 100644
index bfb7e8ee51c..00000000000
--- a/srcpkgs/libusb/libusb-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'libusb-devel'.
-#
-depends="glibc-devel libusb>=1.0.9"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index bf826e633da..077677ee41e 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,15 +1,29 @@
 # Template file for 'libusb'
 pkgname=libusb
 version=1.0.9
-homepage="http://libusb.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-revision=1
+revision=2
 short_desc="A library which allows userspace access to USB devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
+homepage="http://libusb.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 checksum=e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b
 long_desc="
  This package provides a way for applications to access USB devices."
 
-subpackages="$pkgname-devel"
+libusb-devel_package() {
+	depends="libusb>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libusb_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libvdpau/libvdpau-devel.template b/srcpkgs/libvdpau/libvdpau-devel.template
deleted file mode 100644
index 8724d588786..00000000000
--- a/srcpkgs/libvdpau/libvdpau-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libvdpau-devel'.
-#
-noarch=yes
-depends="libX11-devel libvdpau>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/libvdpau/template b/srcpkgs/libvdpau/template
index d1329e8a22f..1d0cb4b6c56 100644
--- a/srcpkgs/libvdpau/template
+++ b/srcpkgs/libvdpau/template
@@ -1,10 +1,10 @@
 # Template file for 'libvdpau'
 pkgname=libvdpau
 version=0.6
-revision=1
-subpackages="$pkgname-devel"
+revision=2
 build_style=gnu-configure
-makedepends="pkg-config dri2proto libX11-devel libXext-devel"
+hostmakedepends="pkg-config"
+makedepends="dri2proto libX11-devel libXext-devel"
 short_desc="The Video Decode and Presentation API for UNIX"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cgit.freedesktop.org/~aplattner/libvdpau"
@@ -15,3 +15,18 @@ checksum=9b55beec9d8b01bbf89229b7d075ceee870f4e1830523c11f29a46c07fe72d75
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }
+
+libvdpau-devel_package() {
+	depends="libX11-devel libvdpau>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libvdpau_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/libvorbis/libvorbis-devel.template b/srcpkgs/libvorbis/libvorbis-devel.template
deleted file mode 100644
index a9ab041b7aa..00000000000
--- a/srcpkgs/libvorbis/libvorbis-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'libvorbis-devel'.
-#
-depends="libogg-devel libvorbis>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-}
diff --git a/srcpkgs/libvorbis/template b/srcpkgs/libvorbis/template
index b6e1e40773f..2e8fdb0f49c 100644
--- a/srcpkgs/libvorbis/template
+++ b/srcpkgs/libvorbis/template
@@ -3,7 +3,6 @@ pkgname=libvorbis
 version=1.3.3
 revision=2
 build_style=gnu-configure
-subpackages="$pkgname-devel"
 hostmakedepends="pkg-config"
 makedepends="libogg-devel"
 short_desc="The Vorbis General Audio Compression Codec"
@@ -21,9 +20,26 @@ long_desc="
  that support Ogg Vorbis."
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="automake pkg-config"
+	hostmakedepends+=" libtool automake"
 	pre_configure() {
 		sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac
 		./autogen.sh
 	}
 fi
+
+libvorbis-devel_package() {
+	depends="libogg-devel libvorbis>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+libvorbis_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/llvm/clang-analyzer.template b/srcpkgs/llvm/clang-analyzer.template
deleted file mode 100644
index 46057c870cd..00000000000
--- a/srcpkgs/llvm/clang-analyzer.template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'clang-analyzer'.
-#
-noarch=yes
-pycompile_dirs="usr/lib/clang-analyzer"
-depends="clang>=${version} python"
-short_desc="Low-Level Virtual Machine (LLVM) - A source code analysis framework"
-homepage="http://clang-analyzer.llvm.org/"
-
-do_install() {
-	vmkdir usr/bin
-	vmkdir usr/lib/clang-analyzer
-
-	for f in build view; do
-		cp -r ${wrksrc}/tools/clang/tools/scan-${f} \
-			${DESTDIR}/usr/lib/clang-analyzer
-		cd ${DESTDIR}/usr/bin && \
-			ln -s ../lib/${pkgname}/scan-${f}/scan-${f} \
-			scan-${f}
-	done
-	ln -sf /usr/bin/clang ${DESTDIR}/usr/lib/${pkgname}/scan-build
-}
diff --git a/srcpkgs/llvm/clang.template b/srcpkgs/llvm/clang.template
deleted file mode 100644
index 2c2b62ea4ec..00000000000
--- a/srcpkgs/llvm/clang.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'clang'.
-#
-depends="libstdc++-devel binutils"
-short_desc="Low-Level Virtual Machine (LLVM) -- C language family frontend"
-homepage="http://clang.llvm.org/"
-
-do_install() {
-	vmove usr/include/clang usr/include
-	vmove "usr/bin/*clang*" usr/bin
-	vmove usr/bin/c-index-test usr/bin
-	vmove usr/lib/clang usr/lib
-	vmove usr/lib/llvm/libclang* usr/lib/llvm
-	vmove "usr/share/man/man1/*clang*" usr/share/man/man1
-}
diff --git a/srcpkgs/llvm/llvm-docs.template b/srcpkgs/llvm/llvm-docs.template
deleted file mode 100644
index 0d517cefbea..00000000000
--- a/srcpkgs/llvm/llvm-docs.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'llvm-docs'.
-#
-noarch=yes
-short_desc="${sourcepkg} - documentation files"
-
-do_install() {
-	vmove usr/share/doc usr/share
-}
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index 2b676f87467..86f39061c9f 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -28,8 +28,8 @@ disable_debug=yes
 skip_extraction="compiler-rt-${version}.src.tar.xz"
 
 # XXX Investigate ocaml bindings.
-subpackages="clang-analyzer clang llvm-docs"
-makedepends="groff bsdtar perl python libffi-devel"
+hostmakedepends="groff bsdtar perl python"
+makedepends="libffi-devel"
 
 post_extract() {
 	# Move clang files into the llvm source.
@@ -80,3 +80,51 @@ post_install() {
 		done
 	fi
 }
+
+clang-analyzer_package() {
+	noarch=yes
+	pycompile_dirs="usr/lib/clang-analyzer"
+	depends="clang>=${version} python"
+	short_desc="Low-Level Virtual Machine (LLVM) - A source code analysis framework"
+	homepage="http://clang-analyzer.llvm.org/"
+	pkg_install() {
+		install -d ${PKGDESTDIR}/usr/bin
+		install -d ${PKGDESTDIR}/usr/lib/clang-analyzer
+
+		for f in build view; do
+			cp -r ${wrksrc}/tools/clang/tools/scan-${f} ${PKGDESTDIR}/usr/lib/clang-analyzer
+			cd ${PKGDESTDIR}/usr/bin
+			ln -s ../lib/${pkgname}/scan-${f}/scan-${f} scan-${f}
+		done
+
+		ln -sf /usr/bin/clang ${PKGDESTDIR}/usr/lib/${pkgname}/scan-build
+	}
+}
+
+clang_package() {
+	depends="libstdc++-devel binutils"
+	short_desc="Low-Level Virtual Machine (LLVM) -- C language family frontend"
+	homepage="http://clang.llvm.org/"
+	pkg_install() {
+		vmove usr/include/clang
+		vmove "usr/bin/*clang*"
+		vmove usr/bin/c-index-test
+		vmove usr/lib/clang
+		vmove "usr/lib/llvm/libclang*"
+		vmove "usr/share/man/man1/*clang*"
+	}
+}
+
+llvm-docs_package() {
+	noarch=yes
+	short_desc+="  - documentation files"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
+
+llvm_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mit-krb5/mit-krb5-client.template b/srcpkgs/mit-krb5/mit-krb5-client.template
deleted file mode 100644
index fc0478116d8..00000000000
--- a/srcpkgs/mit-krb5/mit-krb5-client.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'mit-krb5-client'.
-#
-short_desc="${short_desc} - client programs"
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/share/man/man1 usr/share/man
-}
diff --git a/srcpkgs/mit-krb5/mit-krb5-devel.template b/srcpkgs/mit-krb5/mit-krb5-devel.template
deleted file mode 100644
index 0806ea92622..00000000000
--- a/srcpkgs/mit-krb5/mit-krb5-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'mit-krb5-devel'.
-#
-noarch=yes
-depends="db-devel openssl-devel e2fsprogs-devel>=1.4.10_1
- mit-krb5-libs>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/bin/krb5-config usr/bin
-}
diff --git a/srcpkgs/mit-krb5/mit-krb5-libs.template b/srcpkgs/mit-krb5/mit-krb5-libs.template
deleted file mode 100644
index 44bcdbda874..00000000000
--- a/srcpkgs/mit-krb5/mit-krb5-libs.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'mit-krb5-libs'.
-#
-conflicts="heimdal-libs>=0"
-short_desc="${short_desc} - shared libraries"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-	chmod 755 ${DESTDIR}/usr/lib/*.so*
-}
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 92c857de8eb..318fe085acf 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -1,18 +1,7 @@
 # Template file for 'mit-krb5'
 pkgname=mit-krb5
 version=1.11
-revision=2
-noextract=yes
-wrksrc="krb5-${version}"
-build_style=gnu-configure
-configure_script="./src/configure"
-configure_args="--disable-rpath --with-system-et
- --with-system-ss --with-system-db --enable-shared"
-depends="mit-krb5-client-${version}_${revision}"
-hostmakedepends="perl flex"
-makedepends="db-devel e2fsprogs-devel openssl-devel"
-subpackages="${pkgname}-devel ${pkgname}-libs ${pkgname}-client"
-conflicts="heimdal>=0"
+revision=3
 short_desc="MIT Kerberos 5 implementation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -23,8 +12,7 @@ checksum=fe37fb93b398db98a1b23f814673ea2ae4b90138f85e1a4027ef639456a78651
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" e2fsprogs-devel"
 	makedepends+=" libfl-devel"
-	configure_args="${configure_args}
-			ac_cv_func_pthread_once=yes
+	configure_args+=" ac_cv_func_pthread_once=yes
 			ac_cv_func_pthread_rwlock_init=yes
 			acx_pthread_ok=yes
 			ac_cv_func_regcomp=yes
@@ -32,6 +20,15 @@ if [ "$CROSS_BUILD" ]; then
 			krb5_cv_attr_constructor_destructor=yes,yes"
 fi
 
+noextract=yes
+wrksrc="krb5-${version}"
+build_style=gnu-configure
+configure_script="./src/configure"
+configure_args="--disable-rpath --with-system-et
+ --with-system-ss --with-system-db --enable-shared"
+hostmakedepends="perl flex"
+makedepends="db-devel e2fsprogs-devel openssl-devel"
+
 do_extract() {
 	# We have to do this dance because the real distfile is
 	# included in the .tar archive.
@@ -40,3 +37,42 @@ do_extract() {
 	# Fix db plugin.
 	sed -i -e "s|<db.h>|<db_185.h>|" $wrksrc/src/plugins/kdb/db2/*.[ch]
 }
+
+mit-krb5-client_package() {
+	short_desc="${short_desc} - client programs"
+	pkg_install() {
+		for f in uuclient ktutil kswitch gss-client kvno kinit kpasswd \
+			kdestroy sclient kadmin k5srvutil sim_client klist ksu; do
+			vmove usr/bin/${f}
+			if [ -f ${DESTDIR}/usr/share/man/man1/${f}.1 ]; then
+				vmove usr/share/man/man1/${f}.1
+			fi
+		done
+	}
+}
+
+mit-krb5-devel_package() {
+	depends="db-devel openssl-devel e2fsprogs-devel>=1.4.10_1
+		mit-krb5-libs>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/bin/krb5-config
+	}
+}
+
+mit-krb5-libs_package() {
+	conflicts="heimdal-libs>=0"
+	short_desc="${short_desc} - shared libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+mit-krb5_package() {
+	depends="mit-krb5-client-${version}_${revision}"
+	conflicts="heimdal>=0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/neverball/template b/srcpkgs/neverball/template
index 4021ea3cef0..0c3dd35354c 100644
--- a/srcpkgs/neverball/template
+++ b/srcpkgs/neverball/template
@@ -4,7 +4,6 @@ version=1.5.4
 revision=8
 makedepends="libpng-devel>=1.5.10 libjpeg-turbo-devel libvorbis-devel
  SDL_ttf-devel physfs-devel"
-depends="desktop-file-utils"
 short_desc="Puzzle/action game similar to Super Monkey Ball"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.neverball.org"
@@ -43,3 +42,10 @@ do_install() {
 	install -d ${DESTDIR}/usr/share/man/man6
 	install -m644 dist/*.6 ${DESTDIR}/usr/share/man/man6
 }
+
+neverball_package() {
+	depends="desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/pango/pango-devel.template b/srcpkgs/pango/pango-devel.template
deleted file mode 100644
index 6060b3aa21d..00000000000
--- a/srcpkgs/pango/pango-devel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'pango-devel'.
-#
-noarch=yes
-depends="libglib-devel cairo-devel fontconfig-devel freetype-devel libXft-devel
- harfbuzz-devel pango-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/share/gir-*" usr/share
-	vmove usr/share/gtk-doc usr/share
-}
diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 27930fdbb9d..2f6320fd788 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,19 +1,36 @@
 # Template build file for 'pango'.
 pkgname=pango
 version=1.34.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-included-modules=basic-fc"
-# XXX Add missing dependency libthai.
-depends="libharfbuzz>=0.9.9 fontconfig>=2.10.91"
 hostmakedepends="pkg-config"
+# XXX Add missing dependency libthai.
 makedepends="libglib-devel>=2.36 cairo-devel libXft-devel
  harfbuzz-devel>=0.9.9 gobject-introspection"
-subpackages="pango-devel"
-triggers="pango-modules"
 short_desc="Library for layout and rendering of text"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.pango.org/"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/pango/1.34/${pkgname}-${version}.tar.xz"
 checksum=105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27
+
+pango-devel_package() {
+	depends="libglib-devel cairo-devel fontconfig-devel freetype-devel
+		libXft-devel harfbuzz-devel pango-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/share/gir-*"
+		vmove usr/share/gtk-doc
+	}
+}
+
+pango_package() {
+	depends="libharfbuzz>=0.9.9 fontconfig>=2.10.91"
+	triggers="pango-modules"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/pixman/pixman-devel.template b/srcpkgs/pixman/pixman-devel.template
deleted file mode 100644
index f6cc6c40032..00000000000
--- a/srcpkgs/pixman/pixman-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'pixman-devel'.
-#
-depends="pixman-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 7bbb85719f7..003349ae969 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -4,8 +4,7 @@ version=0.28.2
 revision=3
 build_style=gnu-configure
 configure_args="--disable-gtk" # do not require gtk+!
-makedepends="pkg-config perl"
-subpackages="$pkgname-devel"
+hostmakedepends="pkg-config perl"
 short_desc="Library of low-level pixel manipulation routines"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org"
@@ -16,3 +15,19 @@ checksum=583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/$pkgname
 }
+
+pixman-devel_package() {
+	depends="pixman-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+pixman_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/poppler/poppler-cpp-devel.template b/srcpkgs/poppler/poppler-cpp-devel.template
deleted file mode 100644
index 6c8aed4a2e5..00000000000
--- a/srcpkgs/poppler/poppler-cpp-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'poppler-cpp-devel'.
-#
-depends="libstdc++-devel zlib-devel poppler-devel>=0.20.0"
-short_desc="${sourcepkg} C++ bindings (development files)"
-long_desc="${long_desc}
-
- This package contains development files for C++ bindings."
-
-
-do_install() {
-	vmove usr/include/poppler/cpp usr/include/poppler
-	vmove usr/lib/libpoppler-cpp.a usr/lib
-	vmove usr/lib/pkgconfig/poppler-cpp.pc usr/lib/pkgconfig
-}
diff --git a/srcpkgs/poppler/poppler-cpp.template b/srcpkgs/poppler/poppler-cpp.template
deleted file mode 100644
index 2a15d09cc5b..00000000000
--- a/srcpkgs/poppler/poppler-cpp.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'poppler-cpp'.
-#
-short_desc="${short_desc} (C++ bindings)"
-long_desc="${long_desc}
-
- This package contains ${sourcepkg} C++ bindings."
-
-do_install() {
-	vmove "usr/lib/libpoppler-cpp.so*" usr/lib
-}
diff --git a/srcpkgs/poppler/poppler-devel.template b/srcpkgs/poppler/poppler-devel.template
deleted file mode 100644
index ed100c2f797..00000000000
--- a/srcpkgs/poppler/poppler-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'poppler-devel'.
-#
-depends="glib-devel poppler>=0.20.0"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-do_install() {
-	vmove usr/include/poppler usr/include
-	vmove usr/lib/libpoppler.a usr/lib
-	vmove usr/lib/pkgconfig/poppler.pc usr/lib/pkgconfig
-	vmove usr/lib/pkgconfig/poppler-splash.pc usr/lib/pkgconfig
-	vmove usr/share/gtk-doc usr/share
-}
diff --git a/srcpkgs/poppler/poppler-glib-devel.template b/srcpkgs/poppler/poppler-glib-devel.template
deleted file mode 100644
index 6d946e384a2..00000000000
--- a/srcpkgs/poppler/poppler-glib-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'poppler-glib'.
-#
-depends="poppler-devel>=0.20.0 poppler-glib>=0.20.0"
-short_desc="${sourcepkg} GLib bindings (development files)"
-long_desc="${long_desc}
-
- This package contains development files for GTK+/Glib bindings."
-
-
-do_install() {
-	vmove usr/include/poppler/glib usr/include/poppler
-	vmove usr/lib/libpoppler-glib.a usr/lib
-	vmove usr/share/gir-1.0 usr/share
-	vmove usr/lib/pkgconfig/poppler-cairo.pc usr/lib/pkgconfig
-	vmove usr/lib/pkgconfig/poppler-glib.pc usr/lib/pkgconfig
-}
diff --git a/srcpkgs/poppler/poppler-glib.template b/srcpkgs/poppler/poppler-glib.template
deleted file mode 100644
index 4a5748f6ae0..00000000000
--- a/srcpkgs/poppler/poppler-glib.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'poppler-glib'.
-#
-short_desc="${short_desc} (GLib bindings)"
-long_desc="${long_desc}
-
- This package contains ${sourcepkg} GTK/GLib bindings."
-
-do_install() {
-	vmove "usr/lib/libpoppler-glib.so*" usr/lib
-	vmove usr/lib/girepository-1.0 usr/lib
-}
diff --git a/srcpkgs/poppler/poppler-utils.template b/srcpkgs/poppler/poppler-utils.template
deleted file mode 100644
index 4136c78be7e..00000000000
--- a/srcpkgs/poppler/poppler-utils.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'poppler-utils'.
-#
-short_desc="${short_desc} (utilities)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} binary utilities."
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/share/man usr/share
-}
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index e5a8e578889..d64776f5a00 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -1,14 +1,13 @@
 # Template build file for 'poppler'.
 pkgname=poppler
 version=0.22.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
 --enable-libtiff --disable-libopenjpeg --enable-cairo-output
 --enable-xpdf-headers --disable-poppler-qt4 --disable-gtk-test"
-makedepends="pkg-config libpng-devel>=1.5.10 gobject-introspection tiff-devel lcms2-devel libcurl-devel"
-fulldepends="poppler-data"
-subpackages="poppler-glib poppler-glib-devel poppler-utils poppler-cpp poppler-cpp-devel poppler-devel"
+hostmakedepends="pkg-config gobject-introspection poppler-data"
+makedepends="glib-devel tiff-devel lcms2-devel libcurl-devel cairo-devel"
 short_desc="PDF rendering library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -23,3 +22,70 @@ long_desc="
  to centralize the maintenence effort and to reduce duplicated
  effort. And the poppler developers would like to move libpoppler
  forward in a number of areas that doesn't fit within the goals of xpdf."
+
+poppler-cpp-devel_package() {
+	depends="libstdc++-devel zlib-devel poppler-devel>=${version}"
+	short_desc+=" -- C++ bindings (development files)"
+	pkg_install() {
+		vmove usr/include/poppler/cpp
+		vmove usr/lib/libpoppler-cpp.a
+		vmove usr/lib/pkgconfig/poppler-cpp.pc
+	}
+}
+
+poppler-cpp_package() {
+	short_desc+=" -- C++ bindings"
+	pkg_install() {
+		vmove "usr/lib/libpoppler-cpp.so*"
+	}
+}
+
+poppler-devel_package() {
+	depends="glib-devel poppler>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove "usr/include/poppler/*.h"
+		vmove usr/include/poppler/splash
+		vmove usr/include/poppler/fofi
+		vmove usr/include/poppler/goo
+		vmove usr/lib/libpoppler.a
+		vmove usr/lib/pkgconfig/poppler.pc
+		vmove usr/lib/pkgconfig/poppler-splash.pc
+		vmove usr/share/gtk-doc
+	}
+}
+
+poppler-glib-devel_package() {
+	depends="poppler-devel>=${version} poppler-glib>=${version}"
+	short_desc+=" -- GLib bindings (development files)"
+	pkg_install() {
+		vmove usr/include/poppler/glib
+		vmove usr/lib/libpoppler-glib.a
+		vmove usr/share/gir-1.0
+		vmove usr/lib/pkgconfig/poppler-cairo.pc
+		vmove usr/lib/pkgconfig/poppler-glib.pc
+	}
+}
+
+poppler-glib_package() {
+	short_desc+=" -- GLib bindings"
+	pkg_install() {
+		vmove "usr/lib/libpoppler-glib.so*"
+		vmove usr/lib/girepository-1.0
+	}
+}
+
+poppler-utils_package() {
+	short_desc+=" -- utilities"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/man
+	}
+}
+
+poppler_package() {
+	depends="poppler-data"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/talloc/talloc-devel.template b/srcpkgs/talloc/talloc-devel.template
deleted file mode 100644
index e34b6287b6e..00000000000
--- a/srcpkgs/talloc/talloc-devel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'talloc-devel'.
-#
-noarch=yes
-depends="${sourcepkg}>=${version}"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template
index 4493027313c..a88ee661238 100644
--- a/srcpkgs/talloc/template
+++ b/srcpkgs/talloc/template
@@ -1,11 +1,10 @@
 # Template build file for 'talloc'.
 pkgname=talloc
 version=2.0.8
-revision=1
-subpackages="talloc-devel"
+revision=2
 build_style=gnu-configure
 configure_args="--enable-talloc-compat1"
-makedepends="pkg-config python libxslt docbook-xsl"
+hostmakedepends="pkg-config python libxslt docbook-xsl"
 short_desc="Hierarchical pool based memory allocator with destructors"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://talloc.samba.org/"
@@ -15,3 +14,19 @@ checksum=1ec11e635e0318dbbb014db38ff96e8dba3ce5f614eeb7d993b4a5b71c016783
 long_desc="
  This package provides the talloc library: an hierarchical pool based memory
  allocator with destructors."
+
+talloc-devel_package() {
+	depends="${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+	}
+}
+
+talloc_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template
index 606ca1da4c8..51b387fce7c 100644
--- a/srcpkgs/tiff/template
+++ b/srcpkgs/tiff/template
@@ -5,7 +5,6 @@ revision=3
 build_style=gnu-configure
 configure_args="--enable-cxx --without-x"
 makedepends="zlib-devel libjpeg-turbo-devel liblzma-devel"
-subpackages="$pkgname-devel"
 short_desc="Library and tools for reading and writing TIFF data files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -19,3 +18,21 @@ if [ "$CROSS_BUILD" ]; then
 		autoreconf -fi
 	}
 fi
+
+tiff-devel_package() {
+	depends="zlib-devel libjpeg-turbo-devel tiff>=$version"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+	}
+}
+
+tiff_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/tiff/tiff-devel.template b/srcpkgs/tiff/tiff-devel.template
deleted file mode 100644
index 310f62263e2..00000000000
--- a/srcpkgs/tiff/tiff-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'tiff-devel'.
-#
-depends="zlib-devel libjpeg-turbo-devel tiff>=$version"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/share/man/man3 usr/share/man
-	vmove usr/share/doc usr/share
-}
diff --git a/srcpkgs/util-linux/libblkid-devel.template b/srcpkgs/util-linux/libblkid-devel.template
deleted file mode 100644
index 42530185215..00000000000
--- a/srcpkgs/util-linux/libblkid-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libblkid-devel'.
-#
-noarch=yes
-depends="zlib-devel libuuid-devel-${version}_${revision} libblkid-${version}_${revision}"
-short_desc="libblkid development files"
-
-do_install() {
-	vmove usr/include/blkid usr/include
-	vmove usr/lib/pkgconfig/blkid.pc usr/lib/pkgconfig
-	vmove usr/share/man/man3/libblkid.3.gz usr/share/man/man3
-}
diff --git a/srcpkgs/util-linux/libblkid.template b/srcpkgs/util-linux/libblkid.template
deleted file mode 100644
index 5b6a127c4be..00000000000
--- a/srcpkgs/util-linux/libblkid.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libblkid'.
-#
-short_desc="Library to handle device identification"
-
-do_install() {
-	vmove "usr/lib/libblkid.so*" usr/lib
-}
diff --git a/srcpkgs/util-linux/libmount-devel.template b/srcpkgs/util-linux/libmount-devel.template
deleted file mode 100644
index 13d05fd929c..00000000000
--- a/srcpkgs/util-linux/libmount-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libmount-devel'.
-#
-noarch=yes
-depends="libblkid-devel-${version}_${revision} libmount-${version}_${revision}"
-short_desc="mount(8) library development files"
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/*mount* ${DESTDIR}/usr/lib/pkgconfig
-	mv ${SRCPKGDESTDIR}/usr/include/libmount ${DESTDIR}/usr/include
-}
diff --git a/srcpkgs/util-linux/libmount.template b/srcpkgs/util-linux/libmount.template
deleted file mode 100644
index a5b49f5616b..00000000000
--- a/srcpkgs/util-linux/libmount.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libmount'.
-#
-short_desc="A mount(8) library"
-
-do_install() {
-	vmove "usr/lib/libmount.so*" usr/lib
-}
diff --git a/srcpkgs/util-linux/libuuid-devel.template b/srcpkgs/util-linux/libuuid-devel.template
deleted file mode 100644
index d19a35e3ec7..00000000000
--- a/srcpkgs/util-linux/libuuid-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libuuid-devel'.
-#
-noarch=yes
-depends="libuuid-${version}_${revision}"
-short_desc="UUID library development files"
-
-do_install() {
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/include usr
-	vmove usr/share/man/man3 usr/share/man
-}
diff --git a/srcpkgs/util-linux/libuuid.template b/srcpkgs/util-linux/libuuid.template
deleted file mode 100644
index 2d68348f9ec..00000000000
--- a/srcpkgs/util-linux/libuuid.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libuuid'.
-#
-short_desc="UUID library"
-
-do_install() {
-	vmove "usr/lib/libuuid.so*" usr/lib
-}
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index a0055f1a47b..98ec0d25560 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,8 +1,7 @@
 # Template file for 'util-linux'
 pkgname=util-linux
 version=2.22.2
-revision=7
-subpackages="libmount libmount-devel libblkid libblkid-devel libuuid libuuid-devel"
+revision=8
 short_desc="Miscellaneous linux utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
@@ -10,24 +9,8 @@ license="GPL-2"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.22/${pkgname}-${version}.tar.xz"
 checksum=929b517fa39b16a61ec536514e08940a381b92befc629d0348e3097920dd2f12
 
-conflicts="chroot-util-linux>=0 coreutils<8.21_3"
-depends="coreutils shadow>=4.1.5.1_3"
 hostmakedepends="pkg-config"
 makedepends="zlib-devel ncurses-devel pam-devel>=1.1.6_3"
-replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3"
-provides="eject-${version}"
-
-# Create uuidd system account for uuidd.
-system_accounts="uuidd"
-uuidd_homedir="/run/uuidd"
-systemd_services="uuidd.socket on"
-
-conf_files="
-/etc/pam.d/chfn
-/etc/pam.d/chsh
-/etc/pam.d/su
-/etc/pam.d/su-l
-/etc/pam.d/login"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool automake gettext-devel"
@@ -70,3 +53,74 @@ do_install() {
 	# Provide sg(1) symlink.
 	ln -sfr ${DESTDIR}/usr/bin/newgrp ${DESTDIR}/usr/bin/sg
 }
+
+libmount_package() {
+	short_desc="A mount(8) library"
+	pkg_install() {
+		vmove "usr/lib/libmount.so*"
+	}
+}
+
+libmount-devel_package() {
+	depends="libblkid-devel-${version}_${revision} libmount-${version}_${revision}"
+	short_desc="mount(8) library development files"
+	pkg_install() {
+		vmove "usr/lib/pkgconfig/*mount*"
+		vmove usr/include/libmount
+	}
+}
+
+libblkid_package() {
+	short_desc="Library to handle device identification"
+	pkg_install() {
+		vmove "usr/lib/libblkid.so*"
+	}
+}
+
+libblkid-devel_package() {
+	depends="zlib-devel libuuid-devel-${version}_${revision} libblkid-${version}_${revision}"
+	short_desc="libblkid development files"
+	pkg_install() {
+		vmove usr/include/blkid
+		vmove usr/lib/pkgconfig/blkid.pc
+		vmove usr/share/man/man3/libblkid.3
+	}
+}
+
+libuuid_package() {
+	short_desc="UUID library"
+	pkg_install() {
+		vmove "usr/lib/libuuid.so*"
+	}
+}
+
+libuuid-devel_package() {
+	depends="libuuid-${version}_${revision}"
+	short_desc="UUID library development files"
+	pkg_install() {
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/man/man3
+	}
+}
+
+util-linux_package() {
+	# Create uuidd system account for uuidd.
+	system_accounts="uuidd"
+	uuidd_homedir="/run/uuidd"
+	systemd_services="uuidd.socket on"
+	conf_files="
+		/etc/pam.d/chfn
+		/etc/pam.d/chsh
+		/etc/pam.d/su
+		/etc/pam.d/su-l
+		/etc/pam.d/login"
+	conflicts="chroot-util-linux>=0 coreutils<8.21_3"
+	replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3"
+	provides="eject-${version}"
+	depends="coreutils shadow>=4.1.5.1_3"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template
index 14d975932a7..70b4c0d6651 100644
--- a/srcpkgs/wayland/template
+++ b/srcpkgs/wayland/template
@@ -6,10 +6,30 @@ build_style=gnu-configure
 configure_args="--disable-documentation --disable-static"
 hostmakedepends="pkg-config flex"
 makedepends="libffi-devel expat-devel"
-subpackages="${pkgname}-devel"
 short_desc="Wayland protocol compositor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wayland.freedesktop.org/"
 license="MIT"
 distfiles="http://wayland.freedesktop.org/releases/wayland-${version}.tar.xz"
 checksum=f52a012df699eff434b0f49e56000d6978b5f781048402ca8e0232242970fc49
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" libfl-devel"
+fi
+
+wayland-devel_package() {
+	depends="${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/include
+		vmove usr/share
+		vmove usr/lib/pkgconfig
+	}
+}
+
+wayland_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wayland/wayland-devel.template b/srcpkgs/wayland/wayland-devel.template
deleted file mode 100644
index 8ab79150632..00000000000
--- a/srcpkgs/wayland/wayland-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'wayland-devel'.
-#
-depends="${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/include usr
-	vmove usr/share usr
-	vmove usr/lib/pkgconfig usr/lib
-}