diff --git a/srcpkgs/faac/faac-devel.template b/srcpkgs/faac/faac-devel.template
deleted file mode 100644
index 5778e900adc..00000000000
--- a/srcpkgs/faac/faac-devel.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'faac-devel'.
-#
-depends="libmp4v2-devel>=2.0.0 faac>=${version}"
-short_desc="${short_desc} -- development files"
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-}
diff --git a/srcpkgs/faac/template b/srcpkgs/faac/template
index cea62a3a1fd..85009761836 100644
--- a/srcpkgs/faac/template
+++ b/srcpkgs/faac/template
@@ -1,8 +1,7 @@
 # Template file for 'faac'
 pkgname=faac
 version=1.28
-revision=6
-subpackages="faac-devel"
+revision=7
 build_style=gnu-configure
 configure_args="--with-mp4v2 --disable-static"
 makedepends="automake libtool libmp4v2-devel>=2.0.0"
@@ -22,3 +21,17 @@ pre_configure() {
 post_install() {
 	vinstall libfaac/kiss_fft/COPYING 644 usr/share/licenses/faac
 }
+
+faac-devel_package() {
+	depends="libmp4v2-devel>=2.0.0 faac>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}
+
+faac_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/faad2/faad2-devel.template b/srcpkgs/faad2/faad2-devel.template
deleted file mode 100644
index d70d6aa533d..00000000000
--- a/srcpkgs/faad2/faad2-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'faad2-devel'.
-#
-depends="glibc-devel faad2>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/faad2/template b/srcpkgs/faad2/template
index 9f92cde7ee3..5e6660fc0d6 100644
--- a/srcpkgs/faad2/template
+++ b/srcpkgs/faad2/template
@@ -1,7 +1,7 @@
 # Template file for 'faad2'
 pkgname=faad2
 version=2.7
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="CFLAGS=-fPIC"
 make_install_args="manmdir=/usr/share/man/man1"
@@ -16,11 +16,24 @@ long_desc="
  decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type
  AAC files."
 
-subpackages="$pkgname-devel"
-
 post_install() {
 	install -D -m644 common/mp4ff/mp4ff_int_types.h \
 		${DESTDIR}/usr/include/mp4ff_int_types.h
 	mv ${DESTDIR}/usr/share/man/man1/faad.man \
 		${DESTDIR}/usr/share/man/man1/faad.1
 }
+
+faad2-devel_package() {
+	depends="faad2>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
+
+faad2_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fakechroot/template b/srcpkgs/fakechroot/template
index 2aeccb4b3d8..5f765d59456 100644
--- a/srcpkgs/fakechroot/template
+++ b/srcpkgs/fakechroot/template
@@ -13,7 +13,13 @@ long_desc="
  This package provides a library which overrides libc functions, so it is
  possible to use root-specific tools without root privileges."
 
-conf_files="
-/etc/${pkgname}/chroot.env
-/etc/${pkgname}/debootstrap.env
-/etc/${pkgname}/rinse.env"
+fakechroot_package() {
+	conf_files="
+		/etc/fakechroot/chroot.env
+		/etc/fakechroot/debootstrap.env
+		/etc/fakechroot/rinse.env"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fakeroot/template b/srcpkgs/fakeroot/template
index 989d17b7559..cd6aa0d2ec3 100644
--- a/srcpkgs/fakeroot/template
+++ b/srcpkgs/fakeroot/template
@@ -2,7 +2,6 @@
 pkgname=fakeroot
 version=1.18.4
 revision=2
-conflicts="chroot-fakeroot>=0"
 build_style=gnu-configure
 configure_args="--disable-static"
 short_desc="Gives a fake root environment"
@@ -21,3 +20,10 @@ post_install() {
 	# Use /bin/sh shebang.
 	sed -i -e "s|^#!/bin/bash$|#!/bin/sh|" ${DESTDIR}/usr/bin/fakeroot
 }
+
+fakeroot_package() {
+	conflicts="chroot-fakeroot>=0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/farstream/farstream-devel.template b/srcpkgs/farstream/farstream-devel.template
deleted file mode 100644
index 4e08e8d8efc..00000000000
--- a/srcpkgs/farstream/farstream-devel.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'farstream-devel'.
-#
-depends="gst-plugins-base1-devel farstream-${version}_${revision}"
-short_desc="${sourcepkg} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-replaces="farsight2-devel>=0"
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/gtk-doc usr/share
-	vmove usr/share/gir-1.0 usr/share
-}
diff --git a/srcpkgs/farstream/template b/srcpkgs/farstream/template
index ea53ed3694e..1ad113f7b8b 100644
--- a/srcpkgs/farstream/template
+++ b/srcpkgs/farstream/template
@@ -1,10 +1,9 @@
 # Template file for 'farstream'
 pkgname=farstream
 version=0.2.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-valgrind --disable-debug --disable-static"
-depends="gst-python pygobject2 pygtk gst-plugins-good1 gst-plugins-bad1"
 makedepends="pkg-config intltool gupnp-igd-devel>=0.2.0 libnice-devel>=0.1.3
  gst-plugins-base1-devel python-devel gst-python-devel pygobject2-devel
 gobject-introspection"
@@ -20,5 +19,22 @@ long_desc="
  that makes it possible to write plugins for different streaming protocols, on
  the other side it offers an API for clients to use those plugins."
 
-replaces="farsight2>=0"
-subpackages="$pkgname-devel"
+farstream-devel_package() {
+	depends="gst-plugins-base1-devel farstream-${version}_${revision}"
+	short_desc+=" - development files"
+	replaces="farsight2-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gtk-doc 
+		vmove usr/share/gir-1.0
+	}
+}
+
+farstream_package() {
+	depends="gst-python pygobject2 pygtk gst-plugins-good1 gst-plugins-bad1"
+	replaces="farsight2>=0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template
index a55e6ffda74..cc117c4447f 100644
--- a/srcpkgs/feh/template
+++ b/srcpkgs/feh/template
@@ -13,3 +13,9 @@ license="MIT"
 homepage="http://feh.finalrewind.org/"
 distfiles="${homepage}/feh-${version}.tar.bz2"
 checksum=4a02d2328c37ae7d7df09c49ccfcbad90458735b132c70937047b3395fb45925
+
+feh_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ffmpeg-0.10x-compat/ffmpeg-0.10x-compat-devel.template b/srcpkgs/ffmpeg-0.10x-compat/ffmpeg-0.10x-compat-devel.template
deleted file mode 100644
index c3c15fdd4bd..00000000000
--- a/srcpkgs/ffmpeg-0.10x-compat/ffmpeg-0.10x-compat-devel.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'ffmpeg-0.10x-compat-devel'.
-#
-depends="${sourcepkg}>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/${sourcepkg}/pkgconfig usr/lib/${sourcepkg}
-}
diff --git a/srcpkgs/ffmpeg-0.10x-compat/template b/srcpkgs/ffmpeg-0.10x-compat/template
index 2aec472fed8..8f413d0f762 100644
--- a/srcpkgs/ffmpeg-0.10x-compat/template
+++ b/srcpkgs/ffmpeg-0.10x-compat/template
@@ -10,7 +10,6 @@ homepage="http://www.ffmpeg.org"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2"
 checksum=8c67c0be9dc568a857d5542247aa4e3c1c6538fa3643b47c9deb7ff004a97626
 
-subpackages="${pkgname}-devel"
 hostmakedepends="which pkg-config perl yasm"
 makedepends="alsa-lib-devel faad2-devel lame-devel libtheora-devel
  libvorbis-devel x264-devel xvidcore-devel libvpx-devel librtmp-devel
@@ -57,3 +56,18 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} install
 }
+
+ffmpeg-0.10x-compat-devel_package() {
+	depends="${sourcepkg}>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/${sourcepkg}/pkgconfig
+	}
+}
+
+ffmpeg-0.10x-compat_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ffmpeg/ffmpeg-devel.template b/srcpkgs/ffmpeg/ffmpeg-devel.template
deleted file mode 100644
index d3a7a7aa547..00000000000
--- a/srcpkgs/ffmpeg/ffmpeg-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'ffmpeg-devel'.
-#
-depends="libavcodec>=${version} libavdevice>=${version} libavformat>=${version}
- libavutil>=${version} libavfilter>=${version} libpostproc>=${version}
- libswscale>=${version} libswresample>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/ffmpeg/examples usr/share/ffmpeg
-}
diff --git a/srcpkgs/ffmpeg/libavcodec.template b/srcpkgs/ffmpeg/libavcodec.template
deleted file mode 100644
index 8a5abe2ae40..00000000000
--- a/srcpkgs/ffmpeg/libavcodec.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libavcodec'.
-#
-short_desc="FFmpeg codec library"
-
-do_install() {
-	vmove "usr/lib/libavcodec.so*" usr/lib
-}
diff --git a/srcpkgs/ffmpeg/libavdevice.template b/srcpkgs/ffmpeg/libavdevice.template
deleted file mode 100644
index 6e6888b90f5..00000000000
--- a/srcpkgs/ffmpeg/libavdevice.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libavdevice'.
-#
-short_desc="FFmpeg device handling library"
-
-do_install() {
-	vmove "usr/lib/libavdevice.so*" usr/lib
-}
diff --git a/srcpkgs/ffmpeg/libavfilter.template b/srcpkgs/ffmpeg/libavfilter.template
deleted file mode 100644
index b572d07da84..00000000000
--- a/srcpkgs/ffmpeg/libavfilter.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libavfilter'.
-#
-short_desc="FFmpeg audio/video filter library"
-
-do_install() {
-	vmove "usr/lib/libavfilter.so*" usr/lib
-}
diff --git a/srcpkgs/ffmpeg/libavformat.template b/srcpkgs/ffmpeg/libavformat.template
deleted file mode 100644
index 7519b2b5d70..00000000000
--- a/srcpkgs/ffmpeg/libavformat.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libavformat'.
-#
-short_desc="FFmpeg file format library"
-
-do_install() {
-	vmove "usr/lib/libavformat.so*" usr/lib
-}
diff --git a/srcpkgs/ffmpeg/libavutil.template b/srcpkgs/ffmpeg/libavutil.template
deleted file mode 100644
index 5d29b062914..00000000000
--- a/srcpkgs/ffmpeg/libavutil.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libavutil'.
-#
-short_desc="FFmpeg utility library"
-
-do_install() {
-	vmove "usr/lib/libavutil.so*" usr/lib
-}
diff --git a/srcpkgs/ffmpeg/libpostproc.template b/srcpkgs/ffmpeg/libpostproc.template
deleted file mode 100644
index ab614a7a689..00000000000
--- a/srcpkgs/ffmpeg/libpostproc.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libpostproc'.
-#
-short_desc="FFmpeg video postprocessing library"
-
-do_install() {
-	vmove "usr/lib/libpostproc.so*" usr/lib
-}
diff --git a/srcpkgs/ffmpeg/libswresample.template b/srcpkgs/ffmpeg/libswresample.template
deleted file mode 100644
index d026389a3a6..00000000000
--- a/srcpkgs/ffmpeg/libswresample.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libswresample'.
-#
-short_desc="FFmpeg video resampling library"
-
-do_install() {
-	vmove "usr/lib/libswresample.so*" usr/lib
-}
diff --git a/srcpkgs/ffmpeg/libswscale.template b/srcpkgs/ffmpeg/libswscale.template
deleted file mode 100644
index 55512f3d149..00000000000
--- a/srcpkgs/ffmpeg/libswscale.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libswscale'.
-#
-short_desc="FFmpeg video scaling library"
-
-do_install() {
-	vmove "usr/lib/libswscale.so*" usr/lib
-}
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 01c3bea2014..bd8b39a8fda 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -9,10 +9,6 @@ homepage="http://www.ffmpeg.org"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2"
 checksum=1f1af23112e2da8403abce605749db9111d45d2e4e28910831e778c6e2cbdcce
 
-subpackages="libavcodec libavdevice libavformat libavutil libavfilter
- libpostproc libswscale libswresample ffmpeg-devel"
-
-#depends="faad2 x264 xvidcore libvdpau"
 makedepends="pkg-config perl yasm zlib-devel alsa-lib-devel libXfixes-devel
  libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel
  libvorbis-devel x264-devel xvidcore-devel jack-devel SDL-devel libcdio-devel
@@ -41,3 +37,79 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} install install-man
 }
+
+libavcodec_package() {
+	short_desc="FFmpeg codec library"
+	pkg_install() {
+		vmove "usr/lib/libavcodec.so*"
+	}
+}
+
+libavdevice_package() {
+	short_desc="FFmpeg device handling library"
+	pkg_install() {
+		vmove "usr/lib/libavdevice.so*"
+	}
+}
+
+libavformat_package() {
+	short_desc="FFmpeg file format library"
+	pkg_install() {
+		vmove "usr/lib/libavformat.so*"
+	}
+}
+
+libavutil_package() {
+	short_desc="FFmpeg utility library"
+	pkg_install() {
+		vmove "usr/lib/libavutil.so*"
+	}
+}
+
+libavfilter_package() {
+	short_desc="FFmpeg audio/video filter library"
+	pkg_install() {
+		vmove "usr/lib/libavfilter.so*"
+	}
+}
+
+libpostproc_package() {
+	short_desc="FFmpeg video postprocessing library"
+	pkg_install() {
+		vmove "usr/lib/libpostproc.so*"
+	}
+}
+
+libswscale_package() {
+	short_desc="FFmpeg video scaling library"
+	pkg_install() {
+		vmove "usr/lib/libswscale.so*"
+	}
+}
+
+libswresample_package() {
+	short_desc="FFmpeg video resampling library"
+	pkg_install() {
+		vmove "usr/lib/libswresample.so*"
+	}
+}
+
+ffmpeg-devel_package() {
+	depends="libavcodec>=${version} libavdevice>=${version} libavformat>=${version}
+		libavutil>=${version} libavfilter>=${version} libpostproc>=${version}
+		libswscale>=${version} libswresample>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/ffmpeg/examples
+	}
+}
+
+ffmpeg_package() {
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/man
+		vmove usr/share/ffmpeg
+	}
+}
diff --git a/srcpkgs/fftw/fftw-devel.template b/srcpkgs/fftw/fftw-devel.template
deleted file mode 100644
index d25f9551763..00000000000
--- a/srcpkgs/fftw/fftw-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'fftw-devel'.
-#
-depends="libfftw>=${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/info usr/share
-}
diff --git a/srcpkgs/fftw/libfftw.template b/srcpkgs/fftw/libfftw.template
deleted file mode 100644
index f695a9043cd..00000000000
--- a/srcpkgs/fftw/libfftw.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libfftw'.
-#
-short_desc="${short_desc} - Runtime library"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/fftw/template b/srcpkgs/fftw/template
index b258b9f0d86..73cbbfd2ea6 100644
--- a/srcpkgs/fftw/template
+++ b/srcpkgs/fftw/template
@@ -15,7 +15,6 @@ long_desc="
  efficiently. FFTW is typically faster than other publically-available FFT
  implementations, and is even competitive with vendor-tuned libraries."
 
-subpackages="libfftw fftw-devel"
 hostmakedepends="automake gcc-fortran"
 
 pre_configure() {
@@ -60,3 +59,27 @@ do_install() {
 		cd ${wrksrc}/build-${f} && make DESTDIR=${DESTDIR} install
 	done
 }
+
+libfftw_package() {
+	short_desc="${short_desc} - Runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+fftw-devel_package() {
+	depends="libfftw>=${version}"
+	short_desc="${short_desc} - Development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share/info
+	}
+}
+
+fftw_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index bf3977e1a39..9eb8dfc6419 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -4,7 +4,6 @@ version=3.8.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --enable-magic --disable-static"
-depends="desktop-file-utils hicolor-icon-theme"
 hostmakedepends="which pkg-config intltool gnome-doc-utils itstool"
 makedepends="nautilus-devel>=3.8 json-glib-devel libnotify-devel libarchive-devel>=3.1.2"
 short_desc="GNOME Front-end to archiving programs like tar and zip"
@@ -13,3 +12,10 @@ homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz"
 checksum=5c800bf969ef07d350a876622462267892194d914042d1dcc080bf3c838db46d
+
+file-roller_package() {
+	depends="desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/file/file-devel.template b/srcpkgs/file/file-devel.template
deleted file mode 100644
index 405ef4edb7b..00000000000
--- a/srcpkgs/file/file-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'file-devel'.
-#
-depends="zlib-devel libmagic>=${version}"
-short_desc="File type identification library -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/share/man/man3 usr/share/man
-}
diff --git a/srcpkgs/file/libmagic.template b/srcpkgs/file/libmagic.template
deleted file mode 100644
index a14837adde2..00000000000
--- a/srcpkgs/file/libmagic.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libmagic'.
-#
-short_desc="File type identification library"
-replaces="file<5.12"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-	vmove usr/share/misc usr/share
-	vmove usr/share/man/man4 usr/share/man
-}
diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index b684a9a8ab8..29d570c02fc 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -2,8 +2,6 @@
 pkgname=file
 version=5.14
 revision=1
-conflicts="chroot-file>=0"
-subpackages="libmagic file-devel"
 build_style=gnu-configure
 configure_args="--enable-static"
 makedepends="zlib-devel"
@@ -13,3 +11,31 @@ homepage="http://www.darwinsys.com/file/"
 license="BSD"
 distfiles="ftp://ftp.astron.com/pub/file/file-${version}.tar.gz"
 checksum=461ba01dd0900a3b7c2dcd901b04903192c07887a9c1928af0be507572c77fe4
+
+libmagic_package() {
+	short_desc="File type identification library"
+	replaces="file<5.12"
+	pkg_install() {
+		vmove "usr/lib/*.so*" usr/lib
+		vmove usr/share/misc usr/share
+		vmove usr/share/man/man4 usr/share/man
+	}
+}
+
+file-devel_package() {
+	depends="zlib-devel libmagic>=${version}"
+	short_desc="File type identification library -- development files"
+	pkg_install() {
+		vmove usr/include usr
+		vmove "usr/lib/*.a" usr/lib
+		vmove usr/share/man/man3 usr/share/man
+	}
+}
+
+file_package() {
+	conflicts="chroot-file>=0"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/man/man1
+	}
+}
diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template
index 15d4ba2ba40..753fcce8f3c 100644
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@@ -13,12 +13,18 @@ homepage="http://www.gnu.org/software/findutils"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 checksum=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a
 
-conflicts="chroot-findutils>=0"
-conf_files="/etc/updatedb.conf"
-
 post_install() {
 	# Install the cron daily job.
 	vinstall ${FILESDIR}/updatedb.cron-daily 744 etc/cron.daily updatedb
 	# Install the updatedb conf file.
 	vinstall ${FILESDIR}/updatedb.conf 640 etc
 }
+
+findutils_package() {
+	conf_files="/etc/updatedb.conf"
+	conflicts="chroot-findutils>=0"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 85feb4627a7..712b953c205 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -12,8 +12,6 @@ checksum=69818444915d3002a0d15583d47bc86fcf5027b53fab2a8a91ae18a7bfa20577
 
 disable_debug=yes
 
-depends="desktop-file-utils hicolor-icon-theme"
-
 hostmakedepends="unzip zip pkg-config perl python yasm"
 makedepends="libjpeg-turbo-devel libpng-devel>=1.5.10
  pixman-devel libIDL-devel nss-devel>=3.13.3 sqlite-devel libXrender-devel
@@ -47,3 +45,10 @@ do_install() {
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
 	ln -sf firefox ${DESTDIR}/usr/lib/firefox/firefox-bin
 }
+
+firefox_package() {
+	depends="desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fixesproto/template b/srcpkgs/fixesproto/template
index 28e4abe4e23..0c7893bf189 100644
--- a/srcpkgs/fixesproto/template
+++ b/srcpkgs/fixesproto/template
@@ -2,16 +2,22 @@
 pkgname=fixesproto
 version=5.0
 revision=2
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-fulldepends="xextproto"
+makedepends="xextproto"
 short_desc="Fixes extension headers from X.org"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce
 long_desc="
  This provides the Fixes extension headers from modular X.org X11
  project."
 
-noarch=yes
+fixesproto_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/flac/libflac-devel.template b/srcpkgs/flac/libflac-devel.template
deleted file mode 100644
index 8ac15940aff..00000000000
--- a/srcpkgs/flac/libflac-devel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'libflac-devel'.
-#
-depends="libstdc++-devel libogg-devel libflac>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
-}
diff --git a/srcpkgs/flac/libflac.template b/srcpkgs/flac/libflac.template
deleted file mode 100644
index 80c122710af..00000000000
--- a/srcpkgs/flac/libflac.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'libflac'.
-#
-short_desc="${short_desc} - shared libraries"
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 9ba1efe4d20..23b59ae35d7 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -2,7 +2,6 @@
 pkgname=flac
 version=1.2.1
 revision=6
-subpackages="libflac libflac-devel"
 build_style=gnu-configure
 configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin"
 if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
@@ -31,5 +30,30 @@ if [ "$CROSS_BUILD" ]; then
 	pre_configure() {
 		./autogen.sh
 	}
-	configure_args="${configure_args} --with-ogg=$XBPS_CROSS_BASE"
+	configure_args+=" --with-ogg=$XBPS_CROSS_BASE"
 fi
+
+libflac_package() {
+	short_desc="${short_desc} - shared libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+libflac-devel_package() {
+	depends="libstdc++-devel libogg-devel libflac>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share/aclocal
+		vmove usr/share/doc
+	}
+}
+
+flac_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/flowcanvas/flowcanvas-devel.template b/srcpkgs/flowcanvas/flowcanvas-devel.template
deleted file mode 100644
index 6f8f5841262..00000000000
--- a/srcpkgs/flowcanvas/flowcanvas-devel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'flowcanvas-devel'.
-#
-noarch=yes
-depends="flowcanvas>=${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/flowcanvas/template b/srcpkgs/flowcanvas/template
index a4eb2c81dc1..06fcd973a41 100644
--- a/srcpkgs/flowcanvas/template
+++ b/srcpkgs/flowcanvas/template
@@ -1,11 +1,10 @@
 # Template file for 'flowcanvas'
 pkgname=flowcanvas
 version=0.7.1
-revision=1
+revision=2
 build_style=waf
-subpackages="$pkgname-devel"
 makedepends="pkg-config python gtkmm2-devel libgnomecanvasmm-devel
-graphviz-devel boost-devel"
+ graphviz-devel boost-devel"
 short_desc="Interactive canvas widget for boxes-and-lines style environments."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -16,3 +15,18 @@ long_desc="
  FlowCanvas is an interactive Gtkmm/Gnomecanvasmm widget for boxes-and-lines
  style environments (e.g. modular synths or interactive finite state automata
  diagrams)."
+
+flowcanvas-devel_package() {
+	depends="flowcanvas>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+flowcanvas_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fltk/fltk-devel.template b/srcpkgs/fltk/fltk-devel.template
deleted file mode 100644
index 607e5d975da..00000000000
--- a/srcpkgs/fltk/fltk-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'fltk-devel'.
-#
-noarch=yes
-depends="fltk-${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/bin/fltk-config usr/bin
-	vmove usr/share/man/man1/fltk-config.1 usr/share/man/man1
-	vmove usr/share/man/man3 usr/share/man
-	vmove usr/share/doc usr/share
-}
diff --git a/srcpkgs/fltk/template b/srcpkgs/fltk/template
index a1ced1656ec..49e6bb794e1 100644
--- a/srcpkgs/fltk/template
+++ b/srcpkgs/fltk/template
@@ -1,12 +1,11 @@
 # Template file for 'fltk'
 pkgname=fltk
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-threads --enable-xft --enable-shared"
 makedepends="libjpeg-turbo-devel libpng-devel>=1.5.10 MesaLib-devel alsa-lib-devel
  freetype-devel libXinerama-devel libXft-devel"
-subpackages="fltk-devel"
 short_desc="Cross-platform C++ GUI toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -18,3 +17,21 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/share/man/cat[13]
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
+
+fltk-devel_package() {
+	depends="fltk-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/bin/fltk-config
+		vmove usr/share/man/man1/fltk-config.1
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+	}
+}
+
+fltk_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fluidsynth/fluidsynth-devel.template b/srcpkgs/fluidsynth/fluidsynth-devel.template
deleted file mode 100644
index 3964326a302..00000000000
--- a/srcpkgs/fluidsynth/fluidsynth-devel.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'fluidsynth-devel'.
-#
-depends="libfluidsynth>=${version}"
-short_desc="${short_desc} - Development files"
-
-do_install() {
-        vmove usr/include usr
-        vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/fluidsynth/libfluidsynth.template b/srcpkgs/fluidsynth/libfluidsynth.template
deleted file mode 100644
index 67699db63b3..00000000000
--- a/srcpkgs/fluidsynth/libfluidsynth.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'libfluidsynth'.
-#
-short_desc="${short_desc} - Runtime library"
-long_desc="${long_desc}
-
- This package contains the fluidsynth runtime lib(s)."
-
-
-
-do_install()
-{
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 6d6f5b144ed..f9266d684ac 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -3,7 +3,6 @@ pkgname=fluidsynth
 version=1.1.6
 revision=3
 build_style=cmake
-subpackages="lib$pkgname $pkgname-devel"
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config cmake"
 makedepends="glib-devel jack-devel pulseaudio-devel readline-devel"
@@ -21,3 +20,25 @@ long_desc="
   Shared library which can be used in other programs
   Built in command line shell
   Playback of MIDI files"
+
+libfluidsynth_package() {
+	short_desc="${short_desc} - Runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+fluidsynth-devel_package() {
+	depends="libfluidsynth>=${version}"
+	short_desc="${short_desc} - Development files"
+	pkg_install() {
+        	vmove usr/include
+        	vmove usr/lib/pkgconfig
+	}
+}
+
+fluidsynth_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fluxbox/template b/srcpkgs/fluxbox/template
index d305212c554..1d8863218fc 100644
--- a/srcpkgs/fluxbox/template
+++ b/srcpkgs/fluxbox/template
@@ -17,3 +17,9 @@ post_install() {
 	vinstall ${FILESDIR}/fluxbox.desktop 644 usr/share/xsessions
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }
+
+fluxbox_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/folks/folks-devel.template b/srcpkgs/folks/folks-devel.template
deleted file mode 100644
index 1c7c7087c1d..00000000000
--- a/srcpkgs/folks/folks-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'folks-devel'.
-#
-depends="telepathy-glib-devel>=0.19.9 libgee08-devel>=0.10 libsocialweb-devel
- evolution-data-server-devel>=3.8.0 folks>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/gir-1.0 usr/share
-	vmove usr/share/vala usr/share
-}
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 58dc50bc614..6a5beb1470f 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -5,7 +5,6 @@ revision=2
 build_style=gnu-configure
 subpackages="$pkgname-devel"
 configure_args="--enable-vala --enable-tracker-backend"
-depends="zeitgeist"
 hostmakedepends="pkg-config intltool which gobject-introspection"
 makedepends="dbus-glib-devel telepathy-glib-devel>=0.19.9 libgee08-devel>=0.10
  libsocialweb-devel evolution-data-server-devel>=3.8.0 tracker-devel>=0.16
@@ -23,3 +22,21 @@ long_desc="
  The initial goal is for GObject/C support, though the Vala bindings should
  basically automatic."
 
+folks-devel_package() {
+	depends="telepathy-glib-devel>=0.19.9 libgee08-devel>=0.10 libsocialweb-devel
+		evolution-data-server-devel>=3.8.0 folks>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+	}
+}
+
+folks_package() {
+	depends="zeitgeist"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-adobe-100dpi/template b/srcpkgs/font-adobe-100dpi/template
index e1a07f4b50a..6653b90f09f 100644
--- a/srcpkgs/font-adobe-100dpi/template
+++ b/srcpkgs/font-adobe-100dpi/template
@@ -1,15 +1,14 @@
 # Template build file for 'font-adobe-100dpi'.
 pkgname=font-adobe-100dpi
 version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
 revision=2
+build_style=gnu-configure
+makedepends="pkg-config bdftopcf font-utils"
 short_desc="Standard 100dpi Adobe PCF fonts"
 homepage="http://xorg.freedesktop.org/"
 license="opensource"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054
 long_desc="
  Theses are the PCF versions of the following Adobe fonts for 100dpi displays:
@@ -21,11 +20,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/100dpi"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-adobe-100dpi_package() {
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/100dpi"
+	depends="font-util"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-adobe-75dpi/template b/srcpkgs/font-adobe-75dpi/template
index 4a8314dcfa0..d183215ae4f 100644
--- a/srcpkgs/font-adobe-75dpi/template
+++ b/srcpkgs/font-adobe-75dpi/template
@@ -1,11 +1,10 @@
 # Template build file for 'font-adobe-75dpi'.
 pkgname=font-adobe-75dpi
 version=1.0.3
+revision=2
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
-revision=2
+makedepends="pkg-config bdftopcf font-utils"
 short_desc="Standard 75pi Adobe PCF fonts"
 homepage="http://xorg.freedesktop.org/"
 license="opensource"
@@ -21,11 +20,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/75dpi"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-adobe-75dpi_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/75dpi"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-adobe-utopia-100dpi/template b/srcpkgs/font-adobe-utopia-100dpi/template
index 7cb99d1a542..a23b7878048 100644
--- a/srcpkgs/font-adobe-utopia-100dpi/template
+++ b/srcpkgs/font-adobe-utopia-100dpi/template
@@ -1,11 +1,10 @@
 # Template build file for 'font-adobe-utopia-100dpi'.
 pkgname=font-adobe-utopia-100dpi
 version=1.0.4
+revision=2
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
-revision=2
+makedepends="pkg-config bdftopcf font-utils"
 short_desc="100dpi Adobe Utopia PCF fonts"
 homepage="http://xorg.freedesktop.org/"
 license="opensource"
@@ -17,11 +16,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/100dpi"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-adobe-utopia-100dpi_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/100dpi"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-adobe-utopia-75dpi/template b/srcpkgs/font-adobe-utopia-75dpi/template
index f872dee5dfd..661d45b8b64 100644
--- a/srcpkgs/font-adobe-utopia-75dpi/template
+++ b/srcpkgs/font-adobe-utopia-75dpi/template
@@ -1,11 +1,10 @@
 # Template build file for 'font-adobe-utopia-75dpi'.
 pkgname=font-adobe-utopia-75dpi
 version=1.0.4
+revision=2
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
-revision=2
+makedepends="pkg-config bdftopcf font-util"
 short_desc="100dpi Adobe Utopia PCF fonts"
 homepage="http://xorg.freedesktop.org/"
 license="opensource"
@@ -17,11 +16,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/75dpi"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-adobe-utopia-75dpi_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/75dpi"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-adobe-utopia-type1/template b/srcpkgs/font-adobe-utopia-type1/template
index c3085398066..8997eb67f2a 100644
--- a/srcpkgs/font-adobe-utopia-type1/template
+++ b/srcpkgs/font-adobe-utopia-type1/template
@@ -1,15 +1,14 @@
 # Template build file for 'font-adobe-utopia-type1'.
 pkgname=font-adobe-utopia-type1
 version=1.0.4
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="Adobe Utopia Type1 fonts"
 homepage="http://xorg.freedesktop.org/"
 license="opensource"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=979435105f897a70f8993fa02c8362160b0513366c2ab896965416f96dbb8077
 long_desc="
  This are the Type1 versions of the following Adobe fonts:
@@ -17,11 +16,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/Type1"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-adobe-utopia-type1_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/Type1"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-alias/template b/srcpkgs/font-alias/template
index dff3abe1f81..c7c47cfdf84 100644
--- a/srcpkgs/font-alias/template
+++ b/srcpkgs/font-alias/template
@@ -1,9 +1,9 @@
 # Template build file for 'font-alias'.
 pkgname=font-alias
 version=1.0.3
+revision=2
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-revision=2
 short_desc="Standard aliases for X11 PCF fonts"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
@@ -15,4 +15,9 @@ long_desc="
  descriptors. The most important alias is fixed, which is needed for
  the X server to run."
 
-noarch=yes
+font-alias_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-bh-100dpi/template b/srcpkgs/font-bh-100dpi/template
index da28baa866c..00f0749a8c8 100644
--- a/srcpkgs/font-bh-100dpi/template
+++ b/srcpkgs/font-bh-100dpi/template
@@ -3,8 +3,7 @@ pkgname=font-bh-100dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="Standard 100dpi Bigelow and Holmes PCF fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -19,11 +18,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/100dpi"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-bh-100dpi_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/100dpi"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-bh-75dpi/template b/srcpkgs/font-bh-75dpi/template
index 000c3c23c06..d9ee4f5b9a1 100644
--- a/srcpkgs/font-bh-75dpi/template
+++ b/srcpkgs/font-bh-75dpi/template
@@ -3,8 +3,7 @@ pkgname=font-bh-75dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="Standard 75dpi Bigelow and Holmes PCF fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -19,11 +18,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/75dpi"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-bh-75dpi_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/75dpi"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-bh-lucidatypewriter-100dpi/template b/srcpkgs/font-bh-lucidatypewriter-100dpi/template
index d83f3cb334d..fd1dcfcdce9 100644
--- a/srcpkgs/font-bh-lucidatypewriter-100dpi/template
+++ b/srcpkgs/font-bh-lucidatypewriter-100dpi/template
@@ -3,8 +3,7 @@ pkgname=font-bh-lucidatypewriter-100dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="100dpi Bigelow and Holmes Lucida Typewriter PCF fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -18,11 +17,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/100dpi"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-bh-lucidatypewriter-100dpi_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/100dpi"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-bh-lucidatypewriter-75dpi/template b/srcpkgs/font-bh-lucidatypewriter-75dpi/template
index 1db2c47e3df..a88e4dbcd1e 100644
--- a/srcpkgs/font-bh-lucidatypewriter-75dpi/template
+++ b/srcpkgs/font-bh-lucidatypewriter-75dpi/template
@@ -3,8 +3,7 @@ pkgname=font-bh-lucidatypewriter-75dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="75dpi Bigelow and Holmes Lucida Typewriter PCF fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -18,11 +17,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/75dpi"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-bh-lucidatypewriter-75dpi_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/75dpi"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-bh-ttf/template b/srcpkgs/font-bh-ttf/template
index bba5a5f38cd..901fbb0e302 100644
--- a/srcpkgs/font-bh-ttf/template
+++ b/srcpkgs/font-bh-ttf/template
@@ -3,8 +3,7 @@ pkgname=font-bh-ttf
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="Standard Bigelow and Holmes TrueType fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -19,11 +18,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/TTF"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-bh-ttf_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/TTF"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-bh-type1/template b/srcpkgs/font-bh-type1/template
index eebe4055f1f..afb6794ecd0 100644
--- a/srcpkgs/font-bh-type1/template
+++ b/srcpkgs/font-bh-type1/template
@@ -3,8 +3,7 @@ pkgname=font-bh-type1
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="Standard Bigelow and Holmes Type1 fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -19,11 +18,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/Type1"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-bh-type1_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/Type1"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-bitstream-100dpi/template b/srcpkgs/font-bitstream-100dpi/template
index 2f0aec349b1..c6141447c83 100644
--- a/srcpkgs/font-bitstream-100dpi/template
+++ b/srcpkgs/font-bitstream-100dpi/template
@@ -3,8 +3,7 @@ pkgname=font-bitstream-100dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="Standard 100dpi Bitstream PCF fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -19,11 +18,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/100dpi"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-bitstream-100dpi_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/100dpi"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-bitstream-75dpi/template b/srcpkgs/font-bitstream-75dpi/template
index 4d4236ca155..4187670a4e5 100644
--- a/srcpkgs/font-bitstream-75dpi/template
+++ b/srcpkgs/font-bitstream-75dpi/template
@@ -3,8 +3,7 @@ pkgname=font-bitstream-75dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="Standard 100dpi Bitstream PCF fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -19,11 +18,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/75dpi"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-bitstream-75dpi_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/75dpi"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-bitstream-speedo/template b/srcpkgs/font-bitstream-speedo/template
index c10b0578cab..8358c3715e4 100644
--- a/srcpkgs/font-bitstream-speedo/template
+++ b/srcpkgs/font-bitstream-speedo/template
@@ -25,3 +25,11 @@ post_install()
 {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-bitstream-speedo_package() {
+	noarch="yes"
+	font_dirs="/usr/lib/X11/fonts/Speedo"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-bitstream-type1/template b/srcpkgs/font-bitstream-type1/template
index 6973a3fa767..a19bb319791 100644
--- a/srcpkgs/font-bitstream-type1/template
+++ b/srcpkgs/font-bitstream-type1/template
@@ -3,8 +3,7 @@ pkgname=font-bitstream-type1
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="Standard Type1 Bitstream PCF fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -17,11 +16,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/Type1"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-bitstream-type1_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/Type1"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-cursor-misc/template b/srcpkgs/font-cursor-misc/template
index f0d04c7b245..b3e872b500d 100644
--- a/srcpkgs/font-cursor-misc/template
+++ b/srcpkgs/font-cursor-misc/template
@@ -3,8 +3,7 @@ pkgname=font-cursor-misc
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="Standard X11 cursors in PCF format"
 homepage="http://xorg.freedesktop.org/"
@@ -17,11 +16,15 @@ long_desc="
  cursor, crosshair, fleur cursor, iron cross, sailboat cursor, and
  many more."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/misc"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-cursor-misc_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/misc"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-daewoo-misc/template b/srcpkgs/font-daewoo-misc/template
index 46b85038441..b8b6bbcb08e 100644
--- a/srcpkgs/font-daewoo-misc/template
+++ b/srcpkgs/font-daewoo-misc/template
@@ -3,8 +3,7 @@ pkgname=font-daewoo-misc
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="Daewoo Gothic PCF format"
 homepage="http://xorg.freedesktop.org/"
@@ -16,11 +15,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/misc"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-daewoo-misc_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/misc"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-dec-misc/template b/srcpkgs/font-dec-misc/template
index 191cd979e34..f947a5c5bdd 100644
--- a/srcpkgs/font-dec-misc/template
+++ b/srcpkgs/font-dec-misc/template
@@ -3,8 +3,7 @@ pkgname=font-dec-misc
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="DEC cursor and session PCF fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -18,11 +17,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/misc"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-dec-misc_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/misc"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-ibm-type1/template b/srcpkgs/font-ibm-type1/template
index a7d30aa92f6..2523c2f5292 100644
--- a/srcpkgs/font-ibm-type1/template
+++ b/srcpkgs/font-ibm-type1/template
@@ -3,8 +3,7 @@ pkgname=font-ibm-type1
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="IBM Courier Type1 fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -16,11 +15,15 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/Type1"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-ibm-type1_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/Type1"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-isas-misc/template b/srcpkgs/font-isas-misc/template
index 24c719dfdae..cea93de3106 100644
--- a/srcpkgs/font-isas-misc/template
+++ b/srcpkgs/font-isas-misc/template
@@ -3,8 +3,7 @@ pkgname=font-isas-misc
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="72dpi PCF versions of the Chinese Song Ti fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -15,11 +14,15 @@ long_desc="
  These are the PCF versions of the Song Si fonts for 72dpi displays.
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/misc"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-isas-misc_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/misc"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-jis-misc/template b/srcpkgs/font-jis-misc/template
index 79051439cf5..9e0ab1e0bd2 100644
--- a/srcpkgs/font-jis-misc/template
+++ b/srcpkgs/font-jis-misc/template
@@ -3,8 +3,7 @@ pkgname=font-jis-misc
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="78dpi PCF versions of the Japanese fixed fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -15,11 +14,15 @@ long_desc="
  These are the PCF versions of the JIS fixed fonts for 78dpi displays.
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/misc"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-jis-misc_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/misc"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-misc-misc/template b/srcpkgs/font-misc-misc/template
index 091fae101c1..8ffde9c9ae0 100644
--- a/srcpkgs/font-misc-misc/template
+++ b/srcpkgs/font-misc-misc/template
@@ -3,8 +3,7 @@ pkgname=font-misc-misc
 version=1.1.2
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="Standard X11 fixed PCF fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -15,11 +14,15 @@ long_desc="
  The standard X11 public domain fixed font that you can
  share and enjoy. It is in PCF format."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/misc"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-misc-misc_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/misc"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-mutt-misc/template b/srcpkgs/font-mutt-misc/template
index 9066672c048..73d0808c984 100644
--- a/srcpkgs/font-mutt-misc/template
+++ b/srcpkgs/font-mutt-misc/template
@@ -3,8 +3,7 @@ pkgname=font-mutt-misc
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="100dpi PCF versions of the ClearlyU fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -15,11 +14,15 @@ long_desc="
  These are the PCF versions of the ClearlyU fonts for 100dpi displays.
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/share/fonts/X11/misc"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-mutt-misc_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/X11/misc"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-sony-misc/template b/srcpkgs/font-sony-misc/template
index 8f02bf0a81a..79d6e55b209 100644
--- a/srcpkgs/font-sony-misc/template
+++ b/srcpkgs/font-sony-misc/template
@@ -3,8 +3,7 @@ pkgname=font-sony-misc
 version=1.0.0
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
+makedepends="pkg-config bdftopcf font-util"
 revision=2
 short_desc="Standard X11 sony PCF fonts"
 homepage="http://xorg.freedesktop.org/"
@@ -15,11 +14,15 @@ long_desc="
  The standard X11 sony fonts that you can share and enjoy.
  It is in PCF format."
 
-
-noarch=yes
-font_dirs="/usr/lib/X11/fonts/misc"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
+
+font-sony-misc_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/lib/X11/fonts/misc"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template
index 197cf23c3d7..39f825ef5a8 100644
--- a/srcpkgs/font-unifont-bdf/template
+++ b/srcpkgs/font-unifont-bdf/template
@@ -1,11 +1,11 @@
 # Template build file for 'font-unifont'.
 pkgname=font-unifont-bdf
 version=5.1.20080820
+revision=1
 create_wrksrc=yes
 homepage="http://unifoundry.com/unifont.html"
 distfiles="http://unifoundry.com/unifont-${version}.bdf.gz"
-fulldepends="font-util"
-revision=1
+makedepends="font-util"
 short_desc="GNU Unifont Glyphs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, Freeware"
@@ -14,15 +14,21 @@ long_desc="
  This page contains GNU Unifont, with glyphs for every printable code point
  in the Unicode 5.1 Basic Multilingual Plane (BMP)."
 
-
 noextract=yes
 noarch=yes
-font_dirs="/usr/share/fonts/misc"
 
-do_install()
-{
+do_install() {
 	gunzip -c ${XBPS_SRCDISTDIR}/unifont-${version}.bdf.gz \
 		> unifont-${version}.bdf
 	vinstall unifont-${version}.bdf \
 		644 usr/share/fonts/misc unifont.bdf
 }
+
+font-unifont-bdf_package() {
+	depends="font-util"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/misc"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/font-util/template b/srcpkgs/font-util/template
index 134ed54333f..d7327844f55 100644
--- a/srcpkgs/font-util/template
+++ b/srcpkgs/font-util/template
@@ -4,11 +4,6 @@ version=1.3.0
 revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf"
-#
-# These aren't really required, but this is to centralize the
-# requirement of dependent packages.
-#
-depends="font-alias expat freetype fontconfig mkfontdir mkfontscale"
 short_desc="Tools for truncating and subseting of ISO10646-1 BDF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -21,3 +16,14 @@ long_desc="
  and generating truncated BDF font from ISO 10646-1-encoded BDF
  font. It also provides mapping-files (character set tables)
  and the fontutil pkg-config and autoconf macro files."
+
+font-util_package() {
+	#
+	# These aren't really required, but this is to centralize the
+	# requirement of dependent packages.
+	#
+	depends="font-alias expat freetype fontconfig mkfontdir mkfontscale"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fontcacheproto/template b/srcpkgs/fontcacheproto/template
index 3bb1dd46dd4..2f5132818c1 100644
--- a/srcpkgs/fontcacheproto/template
+++ b/srcpkgs/fontcacheproto/template
@@ -13,4 +13,9 @@ long_desc="
  This package provides the Fontcache extension headers from the
  modular X.org X11 project."
 
-noarch=yes
+fontcacheproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fontconfig/fontconfig-devel.template b/srcpkgs/fontconfig/fontconfig-devel.template
deleted file mode 100644
index c5744cd50da..00000000000
--- a/srcpkgs/fontconfig/fontconfig-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'fontconfig-devel'.
-#
-noarch=yes
-depends="expat-devel freetype-devel fontconfig>=${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/doc usr/share
-}
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index df1dfdf2965..d1d6f667f5e 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,9 +1,7 @@
 # Template build file for 'fontconfig'.
 pkgname=fontconfig
 version=2.10.91
-revision=1
-conf_files="/etc/fonts/fonts.conf"
-subpackages="$pkgname-devel"
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --enable-docs --with-cache-dir=/var/cache/$pkgname"
 hostmakedepends="pkg-config"
@@ -14,3 +12,22 @@ homepage="http://www.fontconfig.org"
 license="MIT"
 distfiles="http://www.freedesktop.org/software/fontconfig/release/$pkgname-$version.tar.bz2"
 checksum=a4727954e950c0b8ae71580e2328bf54457d835ff3023ae4bd7221f9073e63ee
+
+fontconfig-devel_package() {
+	depends="expat-devel freetype-devel fontconfig>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+	}
+}
+
+fontconfig_package() {
+	conf_files="/etc/fonts/fonts.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fontsproto/template b/srcpkgs/fontsproto/template
index 0cbf5bb66fb..15f7645a4dc 100644
--- a/srcpkgs/fontsproto/template
+++ b/srcpkgs/fontsproto/template
@@ -13,4 +13,9 @@ long_desc="
  This package provides the fonts extension headers from the modular
  X.org X11 project."
 
-noarch=yes
+fontsproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/foobillard++/template b/srcpkgs/foobillard++/template
index eda69bd2c40..1cd6cae5198 100644
--- a/srcpkgs/foobillard++/template
+++ b/srcpkgs/foobillard++/template
@@ -5,8 +5,7 @@ revision=4
 wrksrc=foobillardplus-${version}
 homepage="http://foobillardplus.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/foobillardplus/foobillardplus-$version.tar.gz"
-makedepends="freetype-devel libpng-devel>=1.5.12 MesaLib-devel SDL_net-devel"
-fulldepends="desktop-file-utils"
+makedepends="freetype-devel libpng-devel>=1.5.12 MesaLib-devel SDL_net-devel desktop-file-utils"
 short_desc="An OpenGL billard game - fork of foobillard"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -37,3 +36,10 @@ do_install() {
 	vinstall foobillardplus.xbm 644 usr/share/pixmaps
 	find ${DESTDIR} -depth  -type d -name .svn -exec rm -rf  {} \;
 }
+
+foobillard++_package() {
+	depends="desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/foomatic-db-engine/template b/srcpkgs/foomatic-db-engine/template
index 72022c2a87f..9dd97f64894 100644
--- a/srcpkgs/foomatic-db-engine/template
+++ b/srcpkgs/foomatic-db-engine/template
@@ -4,8 +4,8 @@ version=4.0.8
 homepage="https://www.openprinting.org/"
 distfiles="https://www.openprinting.org/download/foomatic/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+hostmakedepends="wget perl foomatic-db foomatic-filters ghostscript cups"
 makedepends="libxml2-devel cups-devel"
-fulldepends="wget perl foomatic-db foomatic-filters ghostscript>=0 cups>=0"
 revision=1
 short_desc="OpenPrinting printer support - programs"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -23,4 +23,9 @@ long_desc="
  using Ghostscript as the print processor, as well as some common glue code
  used in other filter systems."
 
-
+foomatic-db-engine_package() {
+	depends="${hostmakedepends}"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/foomatic-db-nonfree/template b/srcpkgs/foomatic-db-nonfree/template
index 5b91549f3f6..f09535049c2 100644
--- a/srcpkgs/foomatic-db-nonfree/template
+++ b/srcpkgs/foomatic-db-nonfree/template
@@ -1,15 +1,13 @@
 # Template file for 'foomatic-db-nonfree'
 pkgname=foomatic-db-nonfree
 version=20130331
-noarch=yes
-distfiles="https://www.openprinting.org/download/foomatic/$pkgname-$version.tar.gz"
-build_style=gnu-configure
 revision=2
+build_style=gnu-configure
 short_desc="OpenPrinting printer support - nonfree database"
 homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/databasefoomatic"
-license="Custom"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="nonfree"
+distfiles="https://www.openprinting.org/download/foomatic/$pkgname-$version.tar.gz"
 checksum=fdf48560c06e6cbafd50b8d5319e4be28512326119edb35c96c599e3d1c4c74f
 long_desc="
  Foomatic is a printing system designed to make it easier to set up common
@@ -21,3 +19,10 @@ long_desc="
  manufactured-supplied PPD drivers released under non-free licenses.
  You will probably need the foomatic-db-engine package for this package to be
  useful."
+
+foomatic-db-nonfree_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/foomatic-db/template b/srcpkgs/foomatic-db/template
index 0679e489b18..3fcf337400b 100644
--- a/srcpkgs/foomatic-db/template
+++ b/srcpkgs/foomatic-db/template
@@ -2,7 +2,6 @@
 pkgname=foomatic-db
 version=20120626
 revision=2
-noarch=yes
 build_style=gnu-configure
 short_desc="OpenPrinting printer support - database"
 homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/databasefoomatic"
@@ -19,3 +18,10 @@ long_desc="
  This package contains the printer database distributed by OpenPrinting for
  most common drivers. You will probably need the foomatic-db-engine package
  for this package to be useful."
+
+foomatic-db_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/foomatic-filters/template b/srcpkgs/foomatic-filters/template
index b86888e9490..af3942a7536 100644
--- a/srcpkgs/foomatic-filters/template
+++ b/srcpkgs/foomatic-filters/template
@@ -4,9 +4,8 @@ version=4.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-dbus"
-makedepends="pkg-config enscript dbus-devel cups-devel"
-fulldepends="perl>=0"
-conf_files="/etc/foomatic/filter.conf"
+hostmakedepends="pkg-config perl enscript"
+makedepends="dbus-devel cups-devel"
 short_desc="OpenPrinting printer support - filters"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, MIT"
@@ -24,3 +23,11 @@ long_desc="
  printer-specific, but spooler-independent PPD file.
 
  For use with CUPS, you will need the cups package installed on your system."
+
+foomatic-filters_package() {
+	depends="perl"
+	conf_files="/etc/foomatic/filter.conf"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/foremost/template b/srcpkgs/foremost/template
index da5f9f9ebd5..7ffb6f5c3b8 100644
--- a/srcpkgs/foremost/template
+++ b/srcpkgs/foremost/template
@@ -17,8 +17,6 @@ long_desc="
  specify built-in file types. These built-in types look at the data structures
  of a given file format allowing for a more reliable and faster recovery."
 
-conf_files="/etc/${pkgname}.conf"
-
 do_build() {
 	make RAW_CC="$CC" ${makejobs}
 }
@@ -28,3 +26,11 @@ do_install() {
 	vinstall foremost.8.gz 644 usr/share/man/man8
 	vinstall foremost.conf 644 etc
 }
+
+foremost_package() {
+	conf_files="/etc/foremost.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index 2eaf5fb241a..aadeb2f0e28 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -28,3 +28,9 @@ do_install() {
 	# Install license.
 	vinstall COPYRIGHT-BSD2.txt 644 usr/share/licenses/${pkgname} LICENSE
 }
+
+fossil_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/freealut/freealut-devel.template b/srcpkgs/freealut/freealut-devel.template
deleted file mode 100644
index f860d5ec800..00000000000
--- a/srcpkgs/freealut/freealut-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'freealut-devel'.
-#
-depends="libopenal-devel freealut"
-short_desc="${short_desc} - Development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
-	vmove usr/bin usr
-        vmove usr/include usr
-        vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/freealut/template b/srcpkgs/freealut/template
index a5c3f0e1446..f24a2b196d4 100644
--- a/srcpkgs/freealut/template
+++ b/srcpkgs/freealut/template
@@ -2,9 +2,9 @@
 pkgname=freealut
 version=1.1.0
 build_style=gnu-configure
+revision=3
 homepage="http://www.openal.org"
 distfiles="http://connect.creativelabs.com/openal/Downloads/ALUT/$pkgname-$version.tar.gz"
-revision=2
 makedepends="pkg-config libopenal-devel"
 short_desc="OpenAL Utility Toolkit (ALUT)"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -13,6 +13,19 @@ checksum=60d1ea8779471bb851b89b49ce44eecb78e46265be1a6e9320a28b100c8df44f
 long_desc="
  freealut is a free implementation of OpenAL's ALUT standard."
 
-subpackages="$pkgname-devel"
-
+freealut-devel_package() {
+	depends="libopenal-devel freealut>=${version}"
+	short_desc="${short_desc} - Development files"
+	pkg_install() {
+		vmove usr/bin
+        	vmove usr/include
+        	vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
 
+freealut_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/freefont-ttf/template b/srcpkgs/freefont-ttf/template
index 58a7f170dad..87c3838b707 100644
--- a/srcpkgs/freefont-ttf/template
+++ b/srcpkgs/freefont-ttf/template
@@ -2,10 +2,9 @@
 pkgname=freefont-ttf
 version=20120503
 revision=3
-noarch=yes
 wrksrc=freefont-${version}
-makedepends="unzip"
-fulldepends="font-util xbps-triggers>=0.58"
+hostmakedepends="unzip"
+makedepends="font-util xbps-triggers>=0.58"
 short_desc="Free family of scalable outline fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.nongnu.org/freefont/"
@@ -13,10 +12,17 @@ license="GPL-2"
 distfiles="http://ftp.gnu.org/gnu/freefont/${pkgname}-${version}.zip"
 checksum=7c85baf1bf82a1a1845d1322112bc6ca982221b484e3b3925022e25b5cae89af
 
-font_dirs="/usr/share/fonts/TTF"
-
 do_install() {
 	vmkdir usr/share/fonts/TTF
 	install -m644 ${wrksrc}/*.ttf ${DESTDIR}/usr/share/fonts/TTF
 	vinstall ${FILESDIR}/conf.avail 644 etc/fonts/conf.avail 69-freefont.conf
 }
+
+freefont-ttf_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/TTF"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/freetype/freetype-devel.template b/srcpkgs/freetype/freetype-devel.template
deleted file mode 100644
index c38b42708f2..00000000000
--- a/srcpkgs/freetype/freetype-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'freetype-devel'.
-#
-depends="zlib-devel bzip2-devel freetype>=$version"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	for f in bin include share; do
-		vmove usr/${f} usr
-	done
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index cea8fb06470..d17f3e4e636 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -6,10 +6,27 @@ patch_args="-Np1"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="zlib-devel"
-subpackages="$pkgname-devel"
 short_desc="Font rendering engine and library API"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freetype.org/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 checksum=ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f
+
+freetype-devel_package() {
+	depends="zlib-devel bzip2-devel freetype>=$version"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		for f in bin include share; do
+			vmove usr/${f}
+		done
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+freetype_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fribidi/fribidi-devel.template b/srcpkgs/fribidi/fribidi-devel.template
deleted file mode 100644
index 6a8f16e57e7..00000000000
--- a/srcpkgs/fribidi/fribidi-devel.template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'fribidi-devel'.
-#
-depends="glib-devel fribidi"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-}
diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template
index a9e53cd328e..6516ca3977a 100644
--- a/srcpkgs/fribidi/template
+++ b/srcpkgs/fribidi/template
@@ -1,14 +1,14 @@
 # Template file for 'fribidi'
 pkgname=fribidi
 version=0.19.2
-revision=5
-distfiles="http://fribidi.org/download/$pkgname-$version.tar.gz"
+revision=7
 build_style=gnu-configure
-depends="glib"
+makedepends="glib-devel"
 short_desc="Free Implementation of the Unicode Bidirectional Algorithm"
 homepage="http://fribidi.org/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://fribidi.org/download/$pkgname-$version.tar.gz"
 checksum=49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177
 long_desc="
  The library implements all of the algorithm as described in the Unicode
@@ -17,4 +17,19 @@ long_desc="
  against Bidi Reference Code, and due to our best knowledge, does not contain
  any conformance bugs."
 
-subpackages="$pkgname-devel"
+fribidi-devel_package() {
+	depends="glib-devel fribidi>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+fribidi_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fs-uae/template b/srcpkgs/fs-uae/template
index 25a9f89a035..d919d872a12 100644
--- a/srcpkgs/fs-uae/template
+++ b/srcpkgs/fs-uae/template
@@ -12,8 +12,6 @@ long_desc="
  FS-UAE focuses on emulating Amiga games using the accurate emulation code
  from WinUAE. It also has features to emulate a high-end Amiga with expansions."
 
-depends="desktop-file-utils hicolor-icon-theme"
-
 makedepends="pkg-config SDL-devel glib-devel libpng-devel libopenal-devel"
 
 do_build() {
@@ -24,3 +22,10 @@ do_install() {
 	make prefix=${DESTDIR}/usr install
 	vinstall ${FILESDIR}/fs-uae.desktop 644 usr/share/applications
 }
+
+fs-uae_package() {
+	depends="desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fs-utils/template b/srcpkgs/fs-utils/template
index d30076c4de5..ab282c8e735 100644
--- a/srcpkgs/fs-utils/template
+++ b/srcpkgs/fs-utils/template
@@ -25,3 +25,9 @@ do_fetch() {
         msg_normal "Fetching source from $url ...\n"
         git clone -b${version} ${url} ${pkgname}-${version}
 }
+
+fs-utils_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ftgl/ftgl-devel.template b/srcpkgs/ftgl/ftgl-devel.template
deleted file mode 100644
index 782d0d8680f..00000000000
--- a/srcpkgs/ftgl/ftgl-devel.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'ftgl-devel'.
-#
-depends="freetype-devel glu-devel ftgl-${version}_${revision}"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/doc usr/share
-}
diff --git a/srcpkgs/ftgl/template b/srcpkgs/ftgl/template
index 04af406506f..dde71b579c2 100644
--- a/srcpkgs/ftgl/template
+++ b/srcpkgs/ftgl/template
@@ -3,7 +3,7 @@ pkgname=ftgl
 _distver=2.1.3
 _distrcver=rc5
 version=${_distver}${_distrcver}
-revision=4
+revision=5
 wrksrc="ftgl-${_distver}~${_distrcver}"
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -20,4 +20,18 @@ long_desc="
  pixmaps, texture maps, outlines, polygon mesh, and extruded polygon
  rendering modes."
 
-subpackages="ftgl-devel"
+ftgl-devel_package() {
+	depends="freetype-devel glu-devel ftgl-${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+	}
+}
+
+ftgl_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ftjam/template b/srcpkgs/ftjam/template
index d4651d4bb81..9948d9f6d32 100644
--- a/srcpkgs/ftjam/template
+++ b/srcpkgs/ftjam/template
@@ -3,7 +3,7 @@ pkgname=ftjam
 version=2.5.3rc2
 revision=1
 build_style=gnu-configure
-makedepends="bison"
+hostmakedepends="bison"
 short_desc="An enhanced version of the Jam build tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="ftjam - /usr/share/licenses/ftjam/LICENSE"
@@ -19,3 +19,11 @@ long_desc="
 post_install() {
 	vinstall ${FILESDIR}/LICENSE 644 usr/share/licenses/ftjam
 }
+
+ftjam_package() {
+	replaces="jam>=0"
+	provides="jam-${version}"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fuse-exfat/template b/srcpkgs/fuse-exfat/template
index 91f627040d7..ff872feb31f 100644
--- a/srcpkgs/fuse-exfat/template
+++ b/srcpkgs/fuse-exfat/template
@@ -2,8 +2,8 @@
 pkgname=fuse-exfat
 version=1.0.0
 revision=1
-fulldepends="exfat-utils>=${version}"
-makedepends="scons fuse-devel"
+hostmakedepends="scons"
+makedepends="fuse-devel exfat-utils>=${version}"
 short_desc="Free exFAT file system implementation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -18,3 +18,10 @@ do_install() {
 	install -Dm444 fuse/mount.exfat-fuse.8 \
 		${DESTDIR}/usr/share/man/man8/mount.exfat-fuse.8
 }
+
+fuse-exfat_package() {
+	depends="exfat-utils>=${version}"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/fuse/fuse-devel.template b/srcpkgs/fuse/fuse-devel.template
deleted file mode 100644
index b01d52e9f48..00000000000
--- a/srcpkgs/fuse/fuse-devel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'fuse-devel'.
-#
-noarch=yes
-depends="fuse-${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
-}
diff --git a/srcpkgs/fuse/template b/srcpkgs/fuse/template
index c67f9909aa6..32f3a9c1e18 100644
--- a/srcpkgs/fuse/template
+++ b/srcpkgs/fuse/template
@@ -1,9 +1,8 @@
 # Template file for 'fuse'
 pkgname=fuse
 version=2.9.2
-revision=1
+revision=2
 build_style=gnu-configure
-subpackages="fuse-devel"
 configure_args="--disable-static --enable-lib --enable-util"
 short_desc="Filesystem in Userspace"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -30,3 +29,18 @@ post_install() {
 	vmkdir usr/sbin
 	vmove "sbin/*" usr/sbin
 }
+
+fuse-devel_package() {
+	depends="fuse-${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+fuse_package() {
+	pkg_install() {
+		vmove usr
+	}
+}