diff --git a/srcpkgs/obex-data-server/template b/srcpkgs/obex-data-server/template
index 58a009af1d..1c2f336113 100644
--- a/srcpkgs/obex-data-server/template
+++ b/srcpkgs/obex-data-server/template
@@ -2,24 +2,29 @@
 pkgname=obex-data-server
 version=0.4.6
 revision=4
-distfiles="http://tadas.dailyda.com/software/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-bip=gdk-pixbuf --enable-system-config"
-makedepends="glib-devel libusb-compat-devel dbus-devel dbus-glib-devel libbluetooth-devel libopenobex-devel gdk-pixbuf-devel"
+makedepends="libglib-devel libusb-compat-devel dbus-glib-devel
+ libbluetooth-devel libopenobex-devel gdk-pixbuf-devel"
 short_desc="D-Bus service providing high-level OBEX functionality"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wiki.muiline.com/obex-data-server"
 license="GPL-2"
+distfiles="http://tadas.dailyda.com/software/$pkgname-$version.tar.gz"
 checksum=b399465ddbd6d0217abedd9411d9d74a820effa0a6a142adc448268d3920094f
 long_desc="
  $pkgname is D-Bus service providing high-level OBEX client and server side
  functionality (currently supports OPP, FTP, BIP profiles, Bluetooth, USB
  and TTY transports)."
 
-replaces="obexd>=0"
-conflicts="obexd>=0"
-
-conf_files="
-/etc/obex-data-server/capability.xml
-/etc/obex-data-server/imaging_capabilities.xml"
-
+obex-data-server_package() {
+	conf_files="
+		/etc/obex-data-server/capability.xml
+		/etc/obex-data-server/imaging_capabilities.xml"
+	replaces="obexd>=0"
+	conflicts="obexd>=0"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/obexd/obexd-client.template b/srcpkgs/obexd/obexd-client.template
deleted file mode 100644
index b212202b00..0000000000
--- a/srcpkgs/obexd/obexd-client.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'obexd-client'.
-#
-short_desc="${short_desc} - client"
-long_desc="
- Implementation of OBEX client and server as a D-Bus service providing
- high-level functionality.
-
- This package contains the client implementation."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/libexec
-	install -d ${DESTDIR}/usr/share/dbus-1/services
-	mv ${SRCPKGDESTDIR}/usr/libexec/obex-client ${DESTDIR}/usr/libexec
-	mv ${SRCPKGDESTDIR}/usr/share/dbus-1/services/obex-client.service \
-		${DESTDIR}/usr/share/dbus-1/services
-}
diff --git a/srcpkgs/obexd/template b/srcpkgs/obexd/template
index c70b5957bc..9b9a130efe 100644
--- a/srcpkgs/obexd/template
+++ b/srcpkgs/obexd/template
@@ -1,12 +1,11 @@
 # Template file for 'obexd'
 pkgname=obexd
 version=0.48
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-usb"
-subpackages="obexd-client"
-conflicts="obex-data-server>=0"
-makedepends="pkg-config glib-devel dbus-devel libopenobex-devel
+hostmakedepends="pkg-config"
+makedepends="libglib-devel dbus-devel libopenobex-devel
  libbluetooth-devel>=4.99 libical-devel"
 short_desc="D-Bus OBEX service"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -16,7 +15,19 @@ distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
 checksum=6dfd10e1444b0d8a66f2d745d70336cd28e533e893a48f69879c4bb6d079edfb
 long_desc="
  Implementation of OBEX client and server as a D-Bus service providing
- high-level functionality.
+ high-level functionality."
 
- For the client part install the obexd-client package, this package
- contains the server."
+obexd-client_package() {
+	short_desc="${short_desc} - client"
+	pkg_install() {
+		vmove usr/libexec/obex-client
+		vmove usr/share/dbus-1/services/obex-client.service
+	}
+}
+
+obexd_package() {
+	conflicts="obex-data-server>=0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ocaml/ocaml-compiler-libs.template b/srcpkgs/ocaml/ocaml-compiler-libs.template
deleted file mode 100644
index 7c1dee0ffb..0000000000
--- a/srcpkgs/ocaml/ocaml-compiler-libs.template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'ocaml-compiler-libs'.
-#
-depends="ocaml-${version}"
-short_desc="${short_desc} (shared libraries)"
-long_desc="${long_desc}
-
- This package contains modules used internally by the OCaml compiler."
-
-do_install() {
-	local compiler_libs="${DESTDIR}/usr/lib/ocaml/compiler-libs"
-	mkdir -pv "${compiler_libs}"/{parsing,typing,utils}
-	cp -v parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "${compiler_libs}"/parsing
-	cp -v typing/*.{cmi,cmo,cmx,ml,mli,o} "${compiler_libs}"/typing
-	cp -v utils/*.{cmi,cmo,cmx,ml,mli,o} "${compiler_libs}"/utils
-	rm -fv "${compiler_libs}"/typing/outcometree.{cmi,mli}
-
-	vinstall LICENSE 644 usr/share/licenses/${pkgname}
-}
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 9f13d3a170..f8bbc5f1d1 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -2,13 +2,7 @@
 pkgname=ocaml
 _majorver=4.00
 version=${_majorver}.0
-revision=1
-build_style=configure
-configure_args="-prefix /usr -mandir /usr/share/man"
-make_build_args="world.opt"
-_ocprefix="${XBPS_DESTDIR}/${pkgname}-${version}/usr"
-make_install_args="PREFIX=${_ocprefix} MANDIR=${_ocprefix}/share/man"
-disable_parallel_build=yes
+revision=2
 makedepends="gdbm-devel ncurses-devel libX11-devel"
 short_desc="The main implementation of the Caml language"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -29,9 +23,41 @@ Some features are:
  - Expressive OO layer; multiple inheritance and parametric classes.
  - Efficient native code compilers."
 
-subpackages="${pkgname}-compiler-libs"
+disable_parallel_build=yes
+
+do_configure() {
+	./configure -prefix /usr -mandir /usr/share/man
+}
+
+do_build() {
+	make ${makejobs} world.opt
+}
+
+do_install() {
+	make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man install
 
-post_install() {
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
 }
 
+
+ocaml-compiler-libs_package() {
+	depends="ocaml-${version}"
+	short_desc+=" -- shared libraries"
+	pkg_install() {
+		local compiler_libs="${PKGDESTDIR}/usr/lib/ocaml/compiler-libs"
+	
+		mkdir -pv "${compiler_libs}"/{parsing,typing,utils}
+		cp -v parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "${compiler_libs}"/parsing
+		cp -v typing/*.{cmi,cmo,cmx,ml,mli,o} "${compiler_libs}"/typing
+		cp -v utils/*.{cmi,cmo,cmx,ml,mli,o} "${compiler_libs}"/utils
+		rm -f "${compiler_libs}"/typing/outcometree.{cmi,mli}
+
+		vinstall ${wrksrc}/LICENSE 644 usr/share/licenses/${pkgname}
+	}
+}
+
+ocaml_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template
index f949c46dcc..4e115079a8 100644
--- a/srcpkgs/omxplayer/template
+++ b/srcpkgs/omxplayer/template
@@ -13,7 +13,6 @@ noextract=yes
 # XXX only rpi
 only_for_archs="armv6l"
 hostmakedepends="pkg-config"
-depends="freefont-ttf"
 makedepends="rpi-firmware pcre-devel boost-devel freetype-devel ffmpeg-0.10x-compat-devel"
 
 do_fetch() {
@@ -28,16 +27,11 @@ do_build() {
 	_ffmpeg_lib="/usr/lib/ffmpeg-0.10x-compat"
 	
 	if [ "$CROSS_BUILD" ]; then
-		# Create this in masterdir to make gcc to keep rpath.
-		mkdir -p /opt/vc/lib ${_ffmpeg_lib}
-
 		INCLUDES="-I$XBPS_CROSS_BASE/include \
 			-I$XBPS_CROSS_BASE/include/freetype2 \
 			-I$XBPS_CROSS_BASE/${_ffmpeg_inc}"
 
-		LDFLAGS="-L$XBPS_CROSS_BASE/lib \
-			-L$XBPS_CROSS_BASE/${_ffmpeg_lib} \
-			-Wl,-rpath ${_ffmpeg_lib}"
+		LDFLAGS="-L$XBPS_CROSS_BASE/lib -L$XBPS_CROSS_BASE/${_ffmpeg_lib}"
 
 		sed -e "s|@INCLUDES@|${INCLUDES}|g" -i Makefile.include	
 		sed -e "s|@LDFLAGS@|${LDFLAGS}|g" -i Makefile.include
@@ -54,3 +48,10 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} install
 }
+
+omxplayer_package() {
+	depends="freefont-ttf"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/openbox/libopenbox.template b/srcpkgs/openbox/libopenbox.template
deleted file mode 100644
index a456fde761..0000000000
--- a/srcpkgs/openbox/libopenbox.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libopenbox'.
-#
-short_desc="openbox runtime shared libraries"
-long_desc="
- ${long_desc}
-
- This package includes the runtime shared libraries."
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/openbox/openbox-devel.template b/srcpkgs/openbox/openbox-devel.template
deleted file mode 100644
index 9c1df33e13..0000000000
--- a/srcpkgs/openbox/openbox-devel.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'openbox-devel'.
-#
-depends="libopenbox"
-short_desc="openbox development files"
-long_desc="
- ${long_desc}
-
- This package includes development files: headers, static libs, etc."
-
-
-do_install() {
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template
index 6e4b2276a8..938425cdd0 100644
--- a/srcpkgs/openbox/template
+++ b/srcpkgs/openbox/template
@@ -1,15 +1,17 @@
 # Template file for 'openbox'
 pkgname=openbox
 version=3.5.0
-revision=2
-homepage="http://www.openbox.org"
-distfiles="http://icculus.org/openbox/releases/$pkgname-$version.tar.gz"
+revision=3
 build_style=gnu-configure
 configure_args="--enable-startup-notification"
-makedepends="pkg-config startup-notification-devel libxml2-devel libXrandr-devel libXcursor-devel libXinerama-devel imlib2-devel pango-devel"
+hostmakedepends="pkg-config"
+makedepends="startup-notification-devel libxml2-devel libXrandr-devel
+ libXcursor-devel libXinerama-devel imlib2-devel pango-devel"
 short_desc="Standards compliant, fast, light-weight, extensible window manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://www.openbox.org"
+distfiles="http://icculus.org/openbox/releases/$pkgname-$version.tar.gz"
 checksum=6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a
 long_desc="
  Openbox works with your applications, and makes your desktop easier to
@@ -32,16 +34,35 @@ long_desc="
   * Multi-head Xinerama support!
   * Pipe menus"
 
-subpackages="${pkgname}-devel lib${pkgname}"
-
-conf_files="
-/etc/xdg/openbox/menu.xml
-/etc/xdg/openbox/rc.xml
-/etc/xdg/openbox/environment
-/etc/xdg/openbox/autostart"
-
-
 post_install() {
 	# Doesn't work with GNOME3.
 	rm -f ${DESTDIR}/usr/share/xsessions/openbox-gnome.desktop
 }
+
+openbox-devel_package() {
+	depends="libopenbox>=${version}"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libopenbox_package() {
+	short_desc="openbox runtime shared libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+openbox_package() {
+	conf_files="
+		/etc/xdg/openbox/menu.xml
+		/etc/xdg/openbox/rc.xml
+		/etc/xdg/openbox/environment
+		/etc/xdg/openbox/autostart"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/opencl-headers/template b/srcpkgs/opencl-headers/template
index 26b551b168..e232b43ca3 100644
--- a/srcpkgs/opencl-headers/template
+++ b/srcpkgs/opencl-headers/template
@@ -4,7 +4,6 @@ _openclver=1.2
 _distver=20121114
 version=${_openclver}.${_distver}
 revision=1
-noarch=yes
 short_desc="OpenCL (Open Computing Language) header files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -18,3 +17,10 @@ do_install() {
 	vmkdir usr/include/CL
 	install -m644 *.h *.hpp ${DESTDIR}/usr/include/CL
 }
+
+opencl-headers_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/openjade/openjade-devel.template b/srcpkgs/openjade/openjade-devel.template
deleted file mode 100644
index f5a7c4364d..0000000000
--- a/srcpkgs/openjade/openjade-devel.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'opensp-devel'.
-#
-depends="opensp-devel openjade"
-short_desc="${short_desc} - 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/lib/*.*a ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/openjade/template b/srcpkgs/openjade/template
index 34d8d304bd..ecd446fa9e 100644
--- a/srcpkgs/openjade/template
+++ b/srcpkgs/openjade/template
@@ -1,28 +1,24 @@
 # Template file for 'openjade'
 pkgname=openjade
 version=1.3.2
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-$version.tar.gz"
 build_style=gnu-configure
 configure_args="
---datadir=/usr/share/sgml/openjade
---enable-default-catalog=/usr/share/sgml/catalog
---enable-splibdir=/usr/lib"
+ --datadir=/usr/share/sgml/openjade
+ --enable-default-catalog=/usr/share/sgml/catalog
+ --enable-splibdir=/usr/lib"
 revision=2
-makedepends="perl>=0 opensp-devel"
+makedepends="perl opensp-devel"
 short_desc="SGML/XML parser toolkit and DSSSL engine, successor to "jade""
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://openjade.sourceforge.net/"
 license="MIT"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-$version.tar.gz"
 checksum=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
 long_desc="
  OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL
  language. It is based on the James Clark implementation of DSSSL named
  Jade. OpenJade is now developed and maintained by the OpenJade team."
 
-subpackages="${pkgname}-devel"
-export sgml_entries="CATALOG /usr/share/sgml/openjade/catalog --"
-
-
 post_install() {
 	cd ${DESTDIR}/usr/bin && ln -s openjade jade
 
@@ -35,4 +31,14 @@ post_install() {
 	cp -a ${wrksrc}/jadedoc/copying.txt \
 		${DESTDIR}/usr/share/licenses/${pkgname}
 	cp -a ${wrksrc}/jadedoc/images ${DESTDIR}/usr/share/sgml/${pkgname}/jadedoc
+
+	rm -f ${DESTDIR}/usr/lib/*.a
+}
+
+openjade_package() {
+	sgml_entries="CATALOG /usr/share/sgml/openjade/catalog --"
+	depends="xmlcatmgr"
+	pkg_install() {
+		vmove usr
+	}
 }
diff --git a/srcpkgs/openmpi/openmpi-devel.template b/srcpkgs/openmpi/openmpi-devel.template
deleted file mode 100644
index f4dfc8cdbc..0000000000
--- a/srcpkgs/openmpi/openmpi-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'openmpi-devel'.
-#
-depends="libstdc++-devel zlib-devel openmpi"
-short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
-}
diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index df9eb95f68..1cb4109ee4 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -1,14 +1,14 @@
 # Template file for 'openmpi'
 pkgname=openmpi
 version=1.4.1
-distfiles="http://www.open-mpi.org/software/ompi/v1.4/downloads/$pkgname-$version.tar.bz2"
+revision=4
 build_style=gnu-configure
-revision=3
-makedepends="libstdc++-devel zlib-devel libgomp-devel"
+makedepends="zlib-devel libgomp-devel"
 short_desc="A High Performance Message Passing Library"
 homepage="http://www.open-mpi.org/"
 license="Custom"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://www.open-mpi.org/software/ompi/v1.4/downloads/$pkgname-$version.tar.bz2"
 checksum=d4d71d7c670d710d2d283ea60af50d6c315318a4c35ec576bedfd0f3b7b8c218
 long_desc="
  The Open MPI Project is an open source MPI-2 implementation that is developed
@@ -17,10 +17,23 @@ long_desc="
  resources from all across the High Performance Computing community in order
  to build the best MPI library available."
 
-subpackages="$pkgname-devel"
-
-conf_files="
-/etc/openmpi-default-hostfile
-/etc/openmpi-mca-params.conf
-/etc/openmpi-totalview.tcl"
+openmpi-devel_package() {
+	depends="libstdc++-devel zlib-devel openmpi>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/share/man/man3
+	}
+}
 
+openmpi_package() {
+	conf_files="
+		/etc/openmpi-default-hostfile
+		/etc/openmpi-mca-params.conf
+		/etc/openmpi-totalview.tcl"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template
index 00f25f0b06..4854a88eda 100644
--- a/srcpkgs/openmsx/template
+++ b/srcpkgs/openmsx/template
@@ -25,3 +25,9 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} install
 }
+
+openmsx_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/openobex/libopenobex-devel.template b/srcpkgs/openobex/libopenobex-devel.template
deleted file mode 100644
index 3aeb3e5a0f..0000000000
--- a/srcpkgs/openobex/libopenobex-devel.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'libopenobex-devel'.
-#
-depends="libbluetooth-devel libusb-compat-devel libopenobex"
-short_desc="OBEX protocol library (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/libopenobex.*a ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/openobex/libopenobex.template b/srcpkgs/openobex/libopenobex.template
deleted file mode 100644
index e715009e1f..0000000000
--- a/srcpkgs/openobex/libopenobex.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'libopenobex'.
-#
-short_desc="OBEX protocol library"
-long_desc="${long_desc}
-
- This package contains the shared library provided by openobex."
-
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libopenobex.so* ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/openobex/template b/srcpkgs/openobex/template
index ff159d736e..1bf4186927 100644
--- a/srcpkgs/openobex/template
+++ b/srcpkgs/openobex/template
@@ -1,8 +1,7 @@
 # Template file for 'openobex'
 pkgname=openobex
 version=1.5
-revision=6
-distfiles="http://ftp.osuosl.org/pub/linux/bluetooth/$pkgname-$version.tar.bz2"
+revision=7
 build_style=gnu-configure
 configure_args="--enable-apps --enable-irda --enable-bluetooth --enable-usb"
 makedepends="pkg-config libusb-compat-devel libbluetooth-devel"
@@ -10,6 +9,7 @@ short_desc="OpenOBEX applications"
 homepage="http://dev.zuckschwerdt.org/openobex/"
 license="LGPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://ftp.osuosl.org/pub/linux/bluetooth/$pkgname-$version.tar.bz2"
 checksum=13996a1e3c69d857f1c7b1d0d9f1c674ccd395355dcae1442a91386b4d75254c
 long_desc="
  The Object Exchange protocol can best be described as binary HTTP. OBEX
@@ -21,4 +21,25 @@ long_desc="
  like the Ericsson R320, Siemens S25, Siemens S45, Siemens ME45, Nokia NM207
  and Nokia 9110 Communicator."
 
-subpackages="libopenobex libopenobex-devel"
+libopenobex_package() {
+	short_desc="OBEX protocol library"
+	pkg_install() {
+		vmove "usr/lib/libopenobex.so*"
+	}
+}
+
+libopenobex-devel_package() {
+	depends="libbluetooth-devel libusb-compat-devel libopenobex>=${version}"
+	short_desc="OBEX protocol library (development files)"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+openobex_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/opensp/opensp-devel.template b/srcpkgs/opensp/opensp-devel.template
deleted file mode 100644
index e592e8cf33..0000000000
--- a/srcpkgs/opensp/opensp-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'opensp-devel'.
-#
-depends="glibc-devel libstdc++-devel opensp"
-short_desc="${short_desc} - 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/*.*a ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/opensp/template b/srcpkgs/opensp/template
index 99cba9487b..e40d819ccd 100644
--- a/srcpkgs/opensp/template
+++ b/srcpkgs/opensp/template
@@ -1,15 +1,11 @@
 # Template file for 'opensp'
 pkgname=opensp
 version=1.5.2
-revision=3
+revision=4
 wrksrc="OpenSP-${version}"
 build_style=gnu-configure
 configure_args="--enable-http --enable-default-catalog=/usr/share/sgml/catalog"
-makedepends="xmlto docbook-xsl"
-fulldepends="xmlcatmgr"
-subpackages="opensp-devel"
-keep_libtool_archives=yes
-sgml_entries="CATALOG /usr/share/OpenSP/catalog --"
+makedepends="xmlto docbook-xsl xmlcatmgr"
 short_desc="SGML parser, successor to sp"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://openjade.sourceforge.net/"
@@ -24,7 +20,26 @@ long_desc="
  The central programs included in this package are 'onsgmls', which replaces
  sgmls, 'ospam', 'ospent', 'osgmlnorm', and 'osx'."
 
+keep_libtool_archives=yes
+
 post_install() {
 	# Some programs expect 'nsgmls'... make it a symlink.
 	cd ${DESTDIR}/usr/bin && ln -s onsgmls nsgmls
 }
+
+opensp-devel_package() {
+	depends="libstdc++-devel opensp>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
+
+opensp_package() {
+	sgml_entries="CATALOG /usr/share/OpenSP/catalog --"
+	depends="xmlcatmgr"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/openssh/openssh-server.template b/srcpkgs/openssh/openssh-server.template
deleted file mode 100644
index d82b11e8f1..0000000000
--- a/srcpkgs/openssh/openssh-server.template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'openssh-server'.
-#
-conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
-make_dirs="/var/chroot/ssh 0755 root root"
-depends="openssh>=$version"
-short_desc="The OpenSSH server"
-
-do_install() {
-	vmove usr/libexec/sftp-server usr/libexec
-	vmove etc/ssh/sshd_config etc/ssh
-	vmove usr/sbin usr
-	vmove usr/share/man/man5/sshd_config.5 usr/share/man/man5
-	for f in sftp-server sshd; do
-		vmove usr/share/man/man8/${f}.8 usr/share/man/man8
-	done
-	vmove etc/pam.d etc
-	vmkdir usr/lib/systemd/system
-	install -m644 ${FILESDIR}/*.{socket,service} \
-		${DESTDIR}/usr/lib/systemd/system
-}
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index e9ec7d4b7f..cd2141a450 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -8,11 +8,8 @@ configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
  --with-mantype=man --without-rpath --with-xauth=/usr/bin/xauth
  --with-ssl-engine --disable-strip --with-privsep-path=/var/chroot/ssh
  --with-kerberos5=/usr --with-pid-dir=/run --with-pam LD=$CC"
-replaces="openssh-client<6.1p1"
 hostmakedepends="perl"
 makedepends="zlib-devel openssl-devel pam-devel mit-krb5-devel"
-conf_files="/etc/ssh/moduli /etc/ssh/ssh_config"
-subpackages="$pkgname-server"
 short_desc="The OpenSSH implementation of SSH protocol versions 1 and 2 (client)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.openssh.org"
@@ -37,3 +34,32 @@ post_install() {
 	printf "session \trequired \tpam_systemd.so \tkill-session-processes=1\n" >> \
 		${DESTDIR}/etc/pam.d/sshd
 }
+
+openssh-server_package() {
+	conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
+	make_dirs="/var/chroot/ssh 0755 root root"
+	depends="openssh>=$version"
+	short_desc="The OpenSSH server"
+	pkg_install() {
+		vmove usr/libexec/sftp-server
+		vmove etc/ssh/sshd_config
+		vmove usr/sbin
+		vmove usr/share/man/man5/sshd_config.5
+		for f in sftp-server sshd; do
+			vmove usr/share/man/man8/${f}.8
+		done
+		vmove etc/pam.d
+		install -d ${PKGDESTDIR}/usr/lib/systemd/system
+		install -m644 ${FILESDIR}/*.{socket,service} \
+			${PKGDESTDIR}/usr/lib/systemd/system
+	}
+}
+
+openssh_package() {
+	replaces="openssh-client<6.1p1"
+	conf_files="/etc/ssh/moduli /etc/ssh/ssh_config"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 8bfd20ee4d..ce4d3bc736 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -19,3 +19,9 @@ post_install() {
 
 	rm -rf ${DESTDIR}/usr/include
 }
+
+openvpn_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/oprofile/oprofile-qt4-gui.template b/srcpkgs/oprofile/oprofile-qt4-gui.template
deleted file mode 100644
index 66b9981d99..0000000000
--- a/srcpkgs/oprofile/oprofile-qt4-gui.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'oprofile-qt4-gui'.
-#
-depends="oprofile-${version}_${revision}"
-short_desc="Qt GUI for oprofile"
-long_desc="${long_desc}
-
- This package contains oprof_start, a Qt4 GUI for oprofile."
-
-do_install() {
-	vmove usr/bin/oprof_start usr/bin
-}
diff --git a/srcpkgs/oprofile/template b/srcpkgs/oprofile/template
index 7182970674..56aaec853f 100644
--- a/srcpkgs/oprofile/template
+++ b/srcpkgs/oprofile/template
@@ -6,10 +6,6 @@ build_style=gnu-configure
 configure_args="--with-x --enable-gui=qt4 --disable-static"
 makedepends="popt-devel binutils-devel>=2.22.52.0.4_2 pkg-config
  libX11-devel icu-devel qt-devel"
-subpackages="$pkgname-qt4-gui"
-system_accounts="oprofile"
-oprofile_homedir="/var/lib/oprofile"
-make_dirs="/var/lib/oprofile 0750 oprofile oprofile"
 short_desc="Transparent low-overhead system-wide profiler for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -25,3 +21,21 @@ long_desc="
  for basic time-spent profiling. All code is profiled: hardware and software
  interrupt handlers, kernel modules, the kernel, shared libraries, and
  applications."
+
+oprofile-qt4-gui_package() {
+	depends="oprofile-${version}_${revision}"
+	short_desc="Qt GUI for oprofile"
+	pkg_install() {
+		vmove usr/bin/oprof_start
+	}
+}
+
+oprofile_package() {
+	depends="shadow"
+	system_accounts="oprofile"
+	oprofile_homedir="/var/lib/oprofile"
+	make_dirs="/var/lib/oprofile 0750 oprofile oprofile"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/optipng/template b/srcpkgs/optipng/template
index 5e011daec1..79350b16d0 100644
--- a/srcpkgs/optipng/template
+++ b/srcpkgs/optipng/template
@@ -4,10 +4,17 @@ version=0.7.4
 revision=1
 build_style=configure
 configure_args="-prefix=/usr -mandir=/usr/share/man -with-system-libpng -with-system-zlib"
-makedepends="pkg-config zlib-devel libpng-devel"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel libpng-devel"
 short_desc="Advanced PNG Optimizer"
 maintainer="pancake <pancake@nopcode.org>"
 license="zlib"
 homepage="http://optipng.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=520b5d5a9405dbdc5c905dd0cff87211e69c4ed2059744037510e613fe8237ff
+
+optipng_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/opus-tools/template b/srcpkgs/opus-tools/template
index 493f09605b..f022e0a4a5 100644
--- a/srcpkgs/opus-tools/template
+++ b/srcpkgs/opus-tools/template
@@ -2,7 +2,8 @@
 pkgname=opus-tools
 version=0.1.6
 revision=1
-makedepends="pkg-config libogg-devel opus-devel"
+hostmakedepends="pkg-config"
+makedepends="libogg-devel opus-devel"
 build_style=gnu-configure
 short_desc="Collection of tools for the Opus audio codec"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -14,3 +15,9 @@ checksum=cc86dbc2a4d76da7e1ed9afee85448c8f798c465a5412233f178783220f3a2c1
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/opus
 }
+
+opus-tools_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/opus/opus-devel.template b/srcpkgs/opus/opus-devel.template
deleted file mode 100644
index d35629c042..0000000000
--- a/srcpkgs/opus/opus-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'giflib-devel'.
-#
-depends="opus-${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
-	vmove usr/share/aclocal usr/share
-}
diff --git a/srcpkgs/opus/template b/srcpkgs/opus/template
index 681cad5cae..0a901f3f52 100644
--- a/srcpkgs/opus/template
+++ b/srcpkgs/opus/template
@@ -2,7 +2,6 @@
 pkgname=opus
 version=1.0.2
 revision=2
-subpackages="opus-devel"
 build_style=gnu-configure
 configure_args="--enable-float-approx"
 short_desc="Codec designed for interactive speech and audio transmission over the Internet"
@@ -15,3 +14,20 @@ checksum=da615edbee5d019c1833071d69a4782c19f178cf9ca1401375036ecef25cd78a
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/opus
 }
+
+opus-devel_package() {
+	depends="opus-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share/aclocal
+	}
+}
+
+opus_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/opusfile/opusfile-devel.template b/srcpkgs/opusfile/opusfile-devel.template
deleted file mode 100644
index 86eccd53a3..0000000000
--- a/srcpkgs/opusfile/opusfile-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'opusfile-devel'.
-#
-depends="libogg-devel openssl-devel opus-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/opusfile/template b/srcpkgs/opusfile/template
index bcbeb370c5..357824e5ca 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -10,7 +10,6 @@ license="BSD"
 distfiles="http://downloads.xiph.org/releases/opus/${pkgname}-${version}.tar.gz"
 checksum=b4a678b3b6c4adfb6aff1f67ef658becfe146ea7c7ff228e99543762171557f9
 
-subpackages="${pkgname}-devel"
 hostmakedepends="pkg-config"
 makedepends="libogg-devel opus-devel openssl-devel"
 
@@ -18,3 +17,19 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/share
 	vinstall COPYING 644 usr/share/licenses/opus
 }
+
+opusfile-devel_package() {
+	depends="libogg-devel openssl-devel opus-devel ${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+opusfile_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index f8873b157a..c4ac7af571 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,19 +1,21 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.8.3
-revision=1
-distfiles="http://archive.be.xfce.org/src/apps/orage/4.8/orage-$version.tar.bz2"
+revision=2
 build_style=gnu-configure
-depends="hicolor-icon-theme desktop-file-utils"
-makedepends="pkg-config intltool flex libical-devel libnotify-devel gtk+-devel dbus-glib-devel popt-devel xfce4-panel-devel libxfce4util-devel"
+hostmakedepends="pkg-config intltool flex"
+makedepends="libical-devel libnotify-devel gtk+-devel dbus-glib-devel
+ popt-devel xfce4-panel-devel libxfce4util-devel"
 short_desc="Simple calendar application for Xfce"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.xfce.org/projects/orage/"
 license="GPL-2"
+distfiles="http://archive.be.xfce.org/src/apps/orage/4.8/orage-$version.tar.bz2"
 checksum=9a5805c8a70de0cae67ae1a6282463bbd059d6a4d080f93ffb13f92aaacdbf2e
-long_desc="
- A simple calendar application with reminders for Xfce."
-
-
-
 
+orage_package() {
+	depends="hicolor-icon-theme desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template
index 08d7f5b284..cf617f1fdf 100644
--- a/srcpkgs/os-prober/template
+++ b/srcpkgs/os-prober/template
@@ -43,3 +43,9 @@ do_install() {
 	vcopy "os-probes/mounted/common/*" usr/lib/os-probes/mounted
 	vcopy "os-probes/mounted/${ARCH}/*" usr/lib/os-probes/mounted
 }
+
+os-prober_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/oxygen-icons/template b/srcpkgs/oxygen-icons/template
index a9e446d3f0..ea41a49668 100644
--- a/srcpkgs/oxygen-icons/template
+++ b/srcpkgs/oxygen-icons/template
@@ -2,7 +2,6 @@
 pkgname=oxygen-icons
 version=4.9.1
 revision=1
-noarch=yes
 build_style=cmake
 makedepends="cmake automoc4"
 short_desc="The Oxygen Icon Theme"
@@ -15,3 +14,10 @@ long_desc="
  Oxygen is the standard icon theme for KDE 4, but follows the freedesktop.org
  icon schemes, so it can be used in other desktop environments using this
  specification."
+
+oxygen-icons_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}