From b8841b7947807aa43793ed5b311907cd6d8ba01e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 14 Apr 2013 17:36:49 +0200
Subject: [PATCH] Convert packages to the new template format (w).

---
 srcpkgs/warsow-data/template                  |  8 ++-
 srcpkgs/warsow/template                       | 10 ++-
 srcpkgs/wavpack/libwavpack.template           | 13 ----
 srcpkgs/wavpack/template                      | 27 +++++++-
 srcpkgs/wavpack/wavpack-devel.template        | 16 -----
 srcpkgs/webkit-gtk3/template                  | 47 +++++++++++--
 srcpkgs/webkit-gtk3/webkit-gtk-devel.template | 20 ------
 srcpkgs/webkit-gtk3/webkit-gtk.template       | 25 -------
 .../webkit-gtk3/webkit-gtk3-devel.template    | 15 -----
 srcpkgs/webkitgtk/template                    | 20 +++++-
 srcpkgs/webkitgtk/webkitgtk-devel.template    | 16 -----
 srcpkgs/weechat/template                      | 66 ++++++++++++++++++-
 srcpkgs/weechat/weechat-aspell.template       |  8 ---
 srcpkgs/weechat/weechat-devel.template        | 10 ---
 srcpkgs/weechat/weechat-lua.template          |  8 ---
 srcpkgs/weechat/weechat-perl.template         |  8 ---
 srcpkgs/weechat/weechat-python.template       |  8 ---
 srcpkgs/weechat/weechat-ruby.template         |  8 ---
 srcpkgs/weechat/weechat-tcl.template          |  8 ---
 srcpkgs/weston/template                       | 12 ++--
 srcpkgs/wget/template                         | 14 ++--
 srcpkgs/wgetpaste/template                    | 15 +++--
 srcpkgs/whois/template                        | 13 ++--
 srcpkgs/wicd/template                         | 48 ++++++++++----
 srcpkgs/wicd/wicd-gtk.template                | 23 -------
 srcpkgs/wifi-firmware/template                |  9 ++-
 srcpkgs/wine-gecko/template                   |  8 ++-
 srcpkgs/wine-mono/template                    | 14 +++-
 .../wine-unstable/libwine-unstable.template   | 11 ----
 srcpkgs/wine-unstable/template                | 42 ++++++++++--
 .../wine-unstable-devel.template              | 11 ----
 srcpkgs/wine/libwine.template                 | 13 ----
 srcpkgs/wine/template                         | 30 ++++++++-
 srcpkgs/wine/wine-devel.template              | 14 ----
 srcpkgs/wineasio/template                     | 19 +++---
 srcpkgs/wireless_tools/template               | 17 ++++-
 .../wireless_tools-devel.template             |  9 ---
 srcpkgs/wmfs/template                         |  9 ++-
 srcpkgs/wmname/template                       |  6 ++
 srcpkgs/wok/template                          | 14 ++--
 srcpkgs/wpa_supplicant/template               |  9 ++-
 srcpkgs/wv/libwv.template                     | 10 ---
 srcpkgs/wv/template                           | 26 +++++++-
 srcpkgs/wv/wv-devel.template                  | 13 ----
 srcpkgs/wxGTK/template                        | 19 +++++-
 srcpkgs/wxGTK/wxGTK-devel.template            | 12 ----
 srcpkgs/wxPython/template                     | 19 +++++-
 srcpkgs/wxPython/wxPython-devel.template      |  9 ---
 48 files changed, 439 insertions(+), 370 deletions(-)
 delete mode 100644 srcpkgs/wavpack/libwavpack.template
 delete mode 100644 srcpkgs/wavpack/wavpack-devel.template
 delete mode 100644 srcpkgs/webkit-gtk3/webkit-gtk-devel.template
 delete mode 100644 srcpkgs/webkit-gtk3/webkit-gtk.template
 delete mode 100644 srcpkgs/webkit-gtk3/webkit-gtk3-devel.template
 delete mode 100644 srcpkgs/webkitgtk/webkitgtk-devel.template
 delete mode 100644 srcpkgs/weechat/weechat-aspell.template
 delete mode 100644 srcpkgs/weechat/weechat-devel.template
 delete mode 100644 srcpkgs/weechat/weechat-lua.template
 delete mode 100644 srcpkgs/weechat/weechat-perl.template
 delete mode 100644 srcpkgs/weechat/weechat-python.template
 delete mode 100644 srcpkgs/weechat/weechat-ruby.template
 delete mode 100644 srcpkgs/weechat/weechat-tcl.template
 delete mode 100644 srcpkgs/wicd/wicd-gtk.template
 delete mode 100644 srcpkgs/wine-unstable/libwine-unstable.template
 delete mode 100644 srcpkgs/wine-unstable/wine-unstable-devel.template
 delete mode 100644 srcpkgs/wine/libwine.template
 delete mode 100644 srcpkgs/wine/wine-devel.template
 delete mode 100644 srcpkgs/wireless_tools/wireless_tools-devel.template
 delete mode 100644 srcpkgs/wv/libwv.template
 delete mode 100644 srcpkgs/wv/wv-devel.template
 delete mode 100644 srcpkgs/wxGTK/wxGTK-devel.template
 delete mode 100644 srcpkgs/wxPython/wxPython-devel.template

diff --git a/srcpkgs/warsow-data/template b/srcpkgs/warsow-data/template
index 548eb11b94..f6e3186648 100644
--- a/srcpkgs/warsow-data/template
+++ b/srcpkgs/warsow-data/template
@@ -2,7 +2,6 @@
 pkgname=warsow-data
 version=1.0
 revision=1
-noarch=yes
 wrksrc="warsow_${version}"
 short_desc="Warsow FPS data files"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -20,3 +19,10 @@ do_install() {
 	vcopy "basewsw/*" usr/share/warsow/basewsw
 	vinstall docs/license.txt 644 usr/share/licenses/warsow
 }
+
+warsow-data_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/warsow/template b/srcpkgs/warsow/template
index aac4f5c967..a9903796f5 100644
--- a/srcpkgs/warsow/template
+++ b/srcpkgs/warsow/template
@@ -3,8 +3,6 @@ pkgname=warsow
 version=1.0
 revision=2
 wrksrc="warsow_${version}_sdk"
-# libopenal is dlopen(3)ed at runtime.
-depends="desktop-file-utils warsow-data>=$version libopenal"
 makedepends="pkg-config libcurl-devel libvorbis-devel libtheora-devel
  libjpeg-turbo-devel libpng-devel SDL-devel libopenal-devel MesaLib-devel
  libXext-devel libXinerama-devel libXrandr-devel libXxf86vm-devel
@@ -32,3 +30,11 @@ do_install() {
 	vinstall ${FILESDIR}/warsow.desktop 644 usr/share/applications
 	vinstall ${FILESDIR}/warsow.png 644 usr/share/pixmaps
 }
+
+warsow_package() {
+	# libopenal is dlopen(3)ed at runtime.
+	depends="desktop-file-utils warsow-data>=1.0 libopenal"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wavpack/libwavpack.template b/srcpkgs/wavpack/libwavpack.template
deleted file mode 100644
index fd342c7900..0000000000
--- a/srcpkgs/wavpack/libwavpack.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'libwavpack'.
-#
-short_desc="${short_desc} - shared library"
-long_desc="${long_desc}
-
- This package contains the shared library."
-
-
-
-do_install()
-{
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/wavpack/template b/srcpkgs/wavpack/template
index 133a8148cf..63f5b3061a 100644
--- a/srcpkgs/wavpack/template
+++ b/srcpkgs/wavpack/template
@@ -1,8 +1,7 @@
 # Template file for 'wavpack'
 pkgname=wavpack
 version=4.60.1
-revision=4
-distfiles="http://www.wavpack.com//${pkgname}-${version}.tar.bz2"
+revision=5
 build_style=gnu-configure
 configure_args="--enable-mmx"
 makedepends="pkg-config"
@@ -10,6 +9,7 @@ short_desc="An audio codec (lossy and lossless)"
 homepage="http://www.wavpack.com/"
 license="BSD"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://www.wavpack.com//${pkgname}-${version}.tar.bz2"
 checksum=175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5
 long_desc="
  WavPack is a completely open audio compression format providing lossless,
@@ -18,4 +18,25 @@ long_desc="
  4 format has been designed from the ground up to offer unparalleled
  performance and functionality."
 
-subpackages="libwavpack $pkgname-devel"
+libwavpack_package() {
+	short_desc="${short_desc} - shared library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+wavpack-devel_package() {
+	depends="libwavpack>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+wavpack_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wavpack/wavpack-devel.template b/srcpkgs/wavpack/wavpack-devel.template
deleted file mode 100644
index 281796ab61..0000000000
--- a/srcpkgs/wavpack/wavpack-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'wavpack-devel'.
-#
-depends="glib-devel libwavpack"
-short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-
-do_install()
-{
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/webkit-gtk3/template b/srcpkgs/webkit-gtk3/template
index 10f7b97683..737cd2f0da 100644
--- a/srcpkgs/webkit-gtk3/template
+++ b/srcpkgs/webkit-gtk3/template
@@ -1,13 +1,12 @@
 # Template file for 'webkit-gtk3'
 pkgname=webkit-gtk3
 version=1.10.2
-revision=2
+revision=3
 wrksrc="webkitgtk-${version}"
 makedepends="perl pkg-config intltool which gperf bison25 flex
  libjpeg-turbo-devel libpng-devel>=1.5.10 sqlite-devel gtk+-devel gtk+3-devel
  gst-plugins-base-devel libsoup-devel libxslt-devel icu-devel>=49
  enchant-devel dbus-glib-devel geoclue-devel gobject-introspection ruby"
-subpackages="webkit-gtk webkit-gtk-devel ${pkgname}-devel"
 short_desc="GTK+3 port of the WebKit browser engine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://webkitgtk.org/"
@@ -36,7 +35,7 @@ do_build() {
 	for ver in 2 3; do
 		msg_normal "Building GTK+${ver} version...\n"
 		cd ${wrksrc}/build-gtk${ver}
-		make ${makejobs} || return 1
+		make ${makejobs}
 	done
 }
 
@@ -44,6 +43,46 @@ do_install() {
 	for ver in 2 3; do
 		msg_normal "Installing GTK+${ver} version...\n"
 		cd ${wrksrc}/build-gtk${ver}
-		make DESTDIR=${DESTDIR} install || return 1
+		make DESTDIR=${DESTDIR} install
 	done
 }
+
+webkit-gtk_package() {
+	short_desc="GTK+ port of the WebKit browser engine"
+	pkg_install() {
+		vmove usr/bin/jsc-1
+		vmove "usr/lib/libwebkitgtk-1.0.so*"
+		vmove "usr/lib/libjavascriptcoregtk-1.0.so*"
+		vmove "usr/lib/girepository-1.0/*-1.0.typelib"
+		for f in $(echo ${DESTDIR}/usr/share/locale/*); do
+			vmove usr/share/locale/$(basename $f)/LC_MESSAGES/webkitgtk-2.0.mo
+		done
+		vmove usr/share/webkitgtk-1.0
+	}
+}
+
+webkit-gtk-devel_package() {
+	depends="libglib-devel gtk+-devel libsoup-devel webkit-gtk-${version}_${revision}"
+	short_desc="GTK+ port of the WebKit browser engine - development files"
+	pkg_install() {
+		vmove usr/include/webkitgtk-1.0
+		vmove "usr/lib/pkgconfig/*-1.0.pc"
+		vmove "usr/share/gir-1.0/*-1.0.gir"
+	}
+}
+
+webkit-gtk3-devel_package() {
+	depends="libglib-devel gtk+3-devel>=3.6.0_2 libsoup-devel webkit-gtk3-${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/share/gir*"
+	}
+}
+
+webkit-gtk3_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/webkit-gtk3/webkit-gtk-devel.template b/srcpkgs/webkit-gtk3/webkit-gtk-devel.template
deleted file mode 100644
index 84b37aad36..0000000000
--- a/srcpkgs/webkit-gtk3/webkit-gtk-devel.template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'webkit-gtk-devel'.
-#
-noarch=yes
-depends="glib-devel gtk+-devel libsoup-devel
- webkit-gtk-${version}_${revision}"
-short_desc="GTK+ port of the WebKit browser engine - development files"
-long_desc="${long_desc}
- WebKit is an open source web browser engine. WebKit is also the name of
- the Mac OS X system framework version of the engine that's used by
- Safari, Dashboard, Mail, and many other OS X applications. WebKit's HTML
- and JavaScript code began as a branch of the KHTML and KJS libraries
- from KDE.
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include/webkitgtk-1.0 usr/include
-	vmove "usr/lib/pkgconfig/*-1.0.pc" usr/lib/pkgconfig
-	vmove "usr/share/gir-1.0/*-1.0.gir" usr/share/gir-1.0
-}
diff --git a/srcpkgs/webkit-gtk3/webkit-gtk.template b/srcpkgs/webkit-gtk3/webkit-gtk.template
deleted file mode 100644
index 91539403d9..0000000000
--- a/srcpkgs/webkit-gtk3/webkit-gtk.template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'webkit-gtk'.
-#
-short_desc="GTK+ port of the WebKit browser engine"
-long_desc="
- WebKit is an open source web browser engine. WebKit is also the name of
- the Mac OS X system framework version of the engine that's used by
- Safari, Dashboard, Mail, and many other OS X applications. WebKit's HTML
- and JavaScript code began as a branch of the KHTML and KJS libraries
- from KDE.
-
- This is the GTK+ port of the engine."
-
-do_install() {
-	vmkdir usr/lib/girepository-1.0
-
-	vmove usr/bin/jsc-1 usr/bin
-	vmove "usr/lib/libwebkitgtk-1.0.so*" usr/lib
-	vmove "usr/lib/libjavascriptcoregtk-1.0.so*" usr/lib
-	vmove "usr/lib/girepository-1.0/*-1.0.typelib" usr/lib/girepository-1.0
-	for f in $(echo ${SRCPKGDESTDIR}/usr/share/locale/*); do
-		vmove usr/share/locale/$(basename $f)/LC_MESSAGES/webkitgtk-2.0.mo \
-			usr/share/locale/$(basename $f)/LC_MESSAGES
-	done
-	vmove usr/share/webkitgtk-1.0 usr/share
-}
diff --git a/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template b/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template
deleted file mode 100644
index bad9146fdd..0000000000
--- a/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'webkit-gtk-devel'.
-#
-noarch=yes
-depends="glib-devel gtk+3-devel>=3.6.0_2 libsoup-devel
- webkit-gtk3-${version}_${revision}"
-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
-	vmove "usr/share/gir*" usr/share
-}
diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template
index 908be24847..3222f24a4e 100644
--- a/srcpkgs/webkitgtk/template
+++ b/srcpkgs/webkitgtk/template
@@ -4,7 +4,6 @@ version=2.0.0
 revision=2
 provides="webkit-gtk3-${version}"
 replaces="webkit-gtk3>=0"
-subpackages=" ${pkgname}-devel"
 short_desc="GTK+3 port of the WebKit browser engine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://webkitgtk.org/"
@@ -26,3 +25,22 @@ makedepends="libjpeg-turbo-devel libpng-devel>=1.5.10 sqlite-devel
  gst-plugins-base1-devel libsoup-devel>=2.42 libxslt-devel icu-devel>=49
  enchant-devel dbus-glib-devel geoclue-devel libwebp-devel libsecret-devel
  gtk+-devel gtk+3-devel>=3.8 libgudev-devel"
+
+webkitgtk-devel_package() {
+	replaces="webkit-gtk3-devel>=0"
+	provides="webkit-gtk3-devel-${version}"
+	depends="gtk+3-devel>=2.8 libsoup-devel>=2.42 ${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+		vmove usr/share/gtk-doc
+	}
+}
+
+webkitgtk_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/webkitgtk/webkitgtk-devel.template b/srcpkgs/webkitgtk/webkitgtk-devel.template
deleted file mode 100644
index 9b80c3cfc4..0000000000
--- a/srcpkgs/webkitgtk/webkitgtk-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'webkitgtk-devel'.
-#
-replaces="webkit-gtk3-devel>=0"
-provides="webkit-gtk3-devel-${version}"
-
-depends="gtk+3-devel>=2.8 libsoup-devel>=2.42
- ${sourcepkg}-${version}_${revision}"
-
-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/gtk-doc usr/share
-}
diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 8d54ec9e92..5525f0d118 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,9 +1,8 @@
 # Template file for 'weechat'
 pkgname=weechat
 version=0.4.0
-revision=1
+revision=3
 build_style=cmake
-subpackages="weechat-aspell weechat-devel weechat-perl weechat-python
  weechat-ruby weechat-tcl weechat-lua"
 makedepends="cmake perl>=5.16 pkg-config tcl-devel aspell-devel
  libgcrypt-devel gnutls-devel>=3.1.5 python-devel ruby-devel lua-devel
@@ -14,3 +13,66 @@ license="GPL-3"
 homepage="http://www.weechat.org"
 distfiles="${homepage}/files/src/$pkgname-$version.tar.bz2"
 checksum=1df12201d8b0ac25f62ddbfb675e8f3d978e52bc5b644d55ccf4c755956fa60d
+
+weechat-aspell_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} -- aspell plugin"
+	pkg_install() {
+		vmove usr/lib/weechat/plugins/aspell.so
+	}
+}
+
+weechat-devel_package() {
+	depends="ncurses-devel"
+	short_desc="${short_desc} - development package"
+	pkg_install() {
+		vmove usr/include usr
+		vmove usr/lib/pkgconfig usr/lib
+	}
+}
+
+weechat-perl_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} -- perl plugin"
+	pkg_install() {
+		vmove usr/lib/weechat/plugins/perl.so
+	}
+}
+
+weechat-python_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} -- python plugin"
+	pkg_install() {
+		vmove usr/lib/weechat/plugins/python.so
+	}
+}
+
+weechat-ruby_package() {
+	depends="${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- ruby plugin"
+	pkg_install() {
+		vmove usr/lib/weechat/plugins/ruby.so
+	}
+}
+
+weechat-tcl_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} -- tcl plugin"
+	pkg_install() {
+		vmove usr/lib/weechat/plugins/tcl.so
+	}
+}
+
+weechat-lua_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} -- lua plugin"
+	pkg_install() {
+		vmove usr/lib/weechat/plugins/lua.so
+	}
+}
+
+weechat_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/weechat/weechat-aspell.template b/srcpkgs/weechat/weechat-aspell.template
deleted file mode 100644
index b477e3755e..0000000000
--- a/srcpkgs/weechat/weechat-aspell.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'weechat-aspell'.
-#
-depends="${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} -- aspell plugin"
-
-do_install() {
-	vmove usr/lib/weechat/plugins/aspell.so usr/lib/weechat/plugins
-}
diff --git a/srcpkgs/weechat/weechat-devel.template b/srcpkgs/weechat/weechat-devel.template
deleted file mode 100644
index b8fe8ecdf2..0000000000
--- a/srcpkgs/weechat/weechat-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'weechat-devel'.
-#
-noarch=yes
-depends="ncurses-devel"
-short_desc="${short_desc} - development package"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/weechat/weechat-lua.template b/srcpkgs/weechat/weechat-lua.template
deleted file mode 100644
index 86d8990114..0000000000
--- a/srcpkgs/weechat/weechat-lua.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'weechat-lua'.
-#
-depends="${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} -- lua plugin"
-
-do_install() {
-	vmove usr/lib/weechat/plugins/lua.so usr/lib/weechat/plugins
-}
diff --git a/srcpkgs/weechat/weechat-perl.template b/srcpkgs/weechat/weechat-perl.template
deleted file mode 100644
index c42458efc8..0000000000
--- a/srcpkgs/weechat/weechat-perl.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'weechat-perl'.
-#
-depends="${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} -- perl plugin"
-
-do_install() {
-	vmove usr/lib/weechat/plugins/perl.so usr/lib/weechat/plugins
-}
diff --git a/srcpkgs/weechat/weechat-python.template b/srcpkgs/weechat/weechat-python.template
deleted file mode 100644
index f2d499ddc2..0000000000
--- a/srcpkgs/weechat/weechat-python.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'weechat-python'.
-#
-depends="${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} -- python plugin"
-
-do_install() {
-	vmove usr/lib/weechat/plugins/python.so usr/lib/weechat/plugins
-}
diff --git a/srcpkgs/weechat/weechat-ruby.template b/srcpkgs/weechat/weechat-ruby.template
deleted file mode 100644
index ef13f13e21..0000000000
--- a/srcpkgs/weechat/weechat-ruby.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'weechat-ruby'.
-#
-depends="${sourcepkg}>=${version}"
-short_desc="${short_desc} -- ruby plugin"
-
-do_install() {
-	vmove usr/lib/weechat/plugins/ruby.so usr/lib/weechat/plugins
-}
diff --git a/srcpkgs/weechat/weechat-tcl.template b/srcpkgs/weechat/weechat-tcl.template
deleted file mode 100644
index 14d4643233..0000000000
--- a/srcpkgs/weechat/weechat-tcl.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'weechat-tcl'.
-#
-depends="${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} -- tcl plugin"
-
-do_install() {
-	vmove usr/lib/weechat/plugins/tcl.so usr/lib/weechat/plugins
-}
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index 933a7562e0..65e170f4bc 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -4,7 +4,6 @@ version=1.0.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-cairo-glesv2"
-depends="wayland>=${version}"
 short_desc="Reference implementation of a Wayland compositor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wayland.freedesktop.org/"
@@ -12,9 +11,6 @@ license="MIT"
 distfiles="http://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz"
 checksum=c833bc4dc8667561d2639b57220541531c039aa9332ce2a7022a3c466eb894f1
 
-# cairo built with gles2 option.
-depends="cairo>=1.12.14_5"
-
 # XXX xcb-xkb.pc 
 makedepends="pkg-config wayland-devel>=${version} libxkbcommon-devel
  xcb-util-keysyms-devel pixman-devel libXcursor-devel MesaLib-devel>=9.0.1_6
@@ -28,3 +24,11 @@ post_install() {
 		vinstall clients/$f 755 usr/bin weston-$f
 	done
 }
+
+weston_package() {
+	# cairo built with gles2 option.
+	depends="wayland>=${version} cairo>=1.12.14_5"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 582500757c..9820e2bdf7 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -11,16 +11,22 @@ license="GPL-3"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 checksum=f3a6898e3a765bb94435b04a6668db9e5d19b3e90e0c69a503a2773ae936c269
 
-conf_files="/etc/wgetrc"
-depends="ca-certificates"
 hostmakedepends="perl"
-makedepends="openssl-devel libidn-devel"
+makedepends="openssl-devel libidn-devel ca-certificates"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args="${configure_args} --with-libssl-prefix=$XBPS_CROSS_BASE"
+	configure_args+=" --with-libssl-prefix=$XBPS_CROSS_BASE"
 fi
 
 post_install() {
 	echo "ca_certificate=/etc/ssl/certs/ca-certificates.crt" \
 		>> ${DESTDIR}/etc/wgetrc
 }
+
+wget_package() {
+	conf_files="/etc/wgetrc"
+	depends="ca-certificates"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wgetpaste/template b/srcpkgs/wgetpaste/template
index ba6504ace3..91c52cf90c 100644
--- a/srcpkgs/wgetpaste/template
+++ b/srcpkgs/wgetpaste/template
@@ -1,23 +1,28 @@
 # Template file for 'wgetpaste'
 pkgname=wgetpaste
 version=2.20
-distfiles="http://wgetpaste.zlin.dk/$pkgname-$version.tar.bz2"
-fulldepends="bash wget"
 revision=1
+makedepends="bash wget"
 short_desc="A script that automates pasting to a number of pastebin services"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wgetpaste.zlin.dk/"
 license="Public domain"
+distfiles="http://wgetpaste.zlin.dk/$pkgname-$version.tar.bz2"
 checksum=7a53836d02e07cefc3c2978bb129a037fa1e1222ba0e275c4e818230a6d6fb9e
 long_desc="
  A script that automates pasting to a number of pastebin services."
 
-noarch=yes
-
-
 do_install() {
         vinstall ${pkgname} 755 usr/bin
         vinstall _${pkgname} 644 usr/share/zsh/site-functions
         vinstall ${FILESDIR}/${pkgname}.example 644 \
 		usr/share/examples/${pkgname} ${pkgname}.conf.example
 }
+
+wgetpaste_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index 72abdd721c..ceccc2f746 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -2,9 +2,6 @@
 pkgname=whois
 version=5.0.20
 revision=1
-build_style=gnu-makefile
-make_install_args="prefix=/usr BASEDIR=${XBPS_DESTDIR}/${pkgname}-${version}"
-make_install_target="install-whois"
 makedepends="perl libidn-devel"
 short_desc="The whois client by Marco d Itri"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -18,11 +15,17 @@ long_desc="
 
 do_build() {
 	# This is needed to set CFLAGS properly
-	make ${makejobs} prefix=/usr CFLAGS="${XBPS_CFLAGS}" HAVE_LIBIDN=1
+	make ${makejobs} prefix=/usr CFLAGS="$CFLAGS" HAVE_LIBIDN=1
 }
 
-post_install() {
+do_install() {
+	make prefix=/usr BASEDIR=${DESTDIR} install-whois
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 
 }
 
+whois_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template
index efeb7d1051..d4a046a10b 100644
--- a/srcpkgs/wicd/template
+++ b/srcpkgs/wicd/template
@@ -2,7 +2,8 @@
 pkgname=wicd
 version=1.7.1
 revision=4
-fulldepends="dhcpcd wpa_supplicant wireless_tools ethtool dbus-python pygobject2 python-urwid>=0.9.9"
+makedepends="dhcpcd wpa_supplicant wireless_tools ethtool dbus-python
+ pygobject2 python-urwid>=0.9.9"
 short_desc="Open source wired and wireless network manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wicd.sourceforge.net"
@@ -26,17 +27,6 @@ long_desc="
    * Tray icon showing network activity and signal strength
    * A full-featured console interface"
 
-noarch=yes
-subpackages="wicd-gtk"
-pycompile_module="wicd"
-pycompile_dirs="usr/lib/wicd usr/share/wicd"
-
-conf_files="
-/etc/dbus-1/system.d/wicd.conf
-/etc/wicd/encryption/templates/active"
-
-systemd_services="wicd.service on"
-
 do_install() {
 	python setup.py configure \
 		--resume=/usr/share/wicd/scripts \
@@ -51,3 +41,37 @@ do_install() {
 
 	vmove "lib/*" usr/lib
 }
+
+wicd-gtk_package() {
+	noarch=yes
+	depends="wicd>=${version} pygtk notify-python shared-mime-info desktop-file-utils hicolor-icon-theme"
+	short_desc="${short_desc} - GTK UI"
+	pycompile_dirs="usr/share/wicd/gtk"
+	pkg_install() {
+		vmove etc/xdg
+		vmove usr/bin/wicd-client
+		vmove usr/bin/wicd-gtk
+		vmove usr/share/applications
+		vmove usr/share/pixmaps
+		vmove usr/share/icons
+		vmove usr/share/wicd/gtk
+		vmove usr/share/man/man1/wicd-client.1
+		vmove usr/share/man/nl/man1/wicd-client.1
+	}
+}
+
+wicd_package() {
+	noarch=yes
+	depends="${makedepends}"
+	pycompile_module="wicd"
+	pycompile_dirs="usr/lib/wicd usr/share/wicd"
+	conf_files="
+		/etc/dbus-1/system.d/wicd.conf
+		/etc/wicd/encryption/templates/active"
+	systemd_services="wicd.service on"
+	pkg_install() {
+		vmove etc
+		vmove usr
+		vmove var
+	}
+}
diff --git a/srcpkgs/wicd/wicd-gtk.template b/srcpkgs/wicd/wicd-gtk.template
deleted file mode 100644
index 6b4c83928d..0000000000
--- a/srcpkgs/wicd/wicd-gtk.template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'wicd-gtk'.
-#
-depends="wicd>=1.7.1 pygtk notify-python shared-mime-info desktop-file-utils hicolor-icon-theme"
-short_desc="${short_desc} - GTK UI"
-long_desc="${long_desc}
-
- This package contains the WICD GTK+ UI."
-
-noarch=yes
-
-pycompile_dirs="usr/share/wicd/gtk"
-
-do_install() {
-	vmove etc/xdg etc
-	vmove usr/bin/wicd-client usr/bin
-	vmove usr/bin/wicd-gtk usr/bin
-	vmove usr/share/applications usr/share
-	vmove usr/share/pixmaps usr/share
-	vmove usr/share/icons usr/share
-	vmove usr/share/wicd/gtk usr/share/wicd
-	vmove usr/share/man/man1/wicd-client.1 usr/share/man/man1
-	vmove usr/share/man/nl/man1/wicd-client.1 usr/share/man/nl/man1
-}
diff --git a/srcpkgs/wifi-firmware/template b/srcpkgs/wifi-firmware/template
index e48a3922ce..9b91b8b70c 100644
--- a/srcpkgs/wifi-firmware/template
+++ b/srcpkgs/wifi-firmware/template
@@ -1,9 +1,9 @@
 # Template file for 'wifi-firmware'
 pkgname=wifi-firmware
 version=1.2
-build_style=meta-template
-fulldepends="ipw2100-firmware ipw2200-firmware zd1211-firmware"
 revision=2
+build_style=meta-template
+makedepends="ipw2100-firmware ipw2200-firmware zd1211-firmware"
 short_desc="WiFi firmware meta-package"
 homepage="http://kernel.org/"
 license="Custom"
@@ -12,4 +12,7 @@ long_desc="
  This is the wifi-firmware meta-package for installing the required firmware
  files for some WiFi drivers in the Linux kernel."
 
-noarch=yes
+wifi-firmware_package() {
+	depends="${makedepends}"
+	noarch="yes"
+}
diff --git a/srcpkgs/wine-gecko/template b/srcpkgs/wine-gecko/template
index 325f16f744..c633e43a03 100644
--- a/srcpkgs/wine-gecko/template
+++ b/srcpkgs/wine-gecko/template
@@ -10,7 +10,6 @@ else
 	checksum=19d0364a43621738fa3fd1713ef9590ad0cc61ea4c8858ad3f8703a81b13c927
 fi
 distfiles="${SOURCEFORGE_SITE}/wine/${pkgname2}-${version}-${gecko_arch}.msi"
-depends="wine-unstable"
 homepage="http://wiki.winehq.org/Gecko"
 license="MPL-2"
 short_desc="Mozilla Gecko Layout Engine for WINE to replace Internet Explorer."
@@ -37,3 +36,10 @@ do_install() {
 	mv -v "wine_gecko-${version}-${gecko_arch}.msi" \
 		"${DESTDIR}/usr/share/wine/gecko"
 }
+
+wine-gecko_package() {
+	depends="wine-unstable"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index c46d266d9d..fe3acc7f92 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -2,13 +2,13 @@
 pkgname=wine-mono
 version="0.0.4"
 revision=1
-distfiles="${SOURCEFORGE_SITE}/wine/Wine%20Mono/${version}/${pkgname}-${version}.msi"
-checksum=15d8a612cdeca4eff3137353f29fdeb7a99e055cd633844c91cd00e0186b8882
-depends="wine-unstable"
+makedepends="wine-unstable"
 homepage="http://wiki.winehq.org/Mono"
 license="MIT,GPL-3,LGPL-2"
 short_desc="Mono built for running .NET applications with WINE."
 maintainer="davehome <davehome@redthumb.info.tm>"
+distfiles="${SOURCEFORGE_SITE}/wine/Wine%20Mono/${version}/${pkgname}-${version}.msi"
+checksum=15d8a612cdeca4eff3137353f29fdeb7a99e055cd633844c91cd00e0186b8882
 long_desc="
  Mono is an open-source and cross-platform implementation of the .NET Framework.
  WINE can use a Windows build of Mono to run .NET applications."
@@ -29,3 +29,11 @@ do_install() {
 	mkdir -pv "${DESTDIR}/usr/share/wine/mono"
 	mv -v "${pkgname}-${version}.msi" "${DESTDIR}/usr/share/wine/mono"
 }
+
+wine-mono_package() {
+	noarch="yes"
+	depends="wine-unstable"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wine-unstable/libwine-unstable.template b/srcpkgs/wine-unstable/libwine-unstable.template
deleted file mode 100644
index 0f66bdd270..0000000000
--- a/srcpkgs/wine-unstable/libwine-unstable.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libwine-unstable'.
-#
-short_desc="${short_desc} - Runtime library"
-replaces="libwine>=0"
-provides="libwine-${version}"
-conflicts="libwine>=0"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-	vmove usr/lib/wine usr/lib
-}
diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index 8a2264f9e2..88a46834ae 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -13,11 +13,6 @@ checksum=ac77c1dd1a31ccc67f0391b4965959096aeb98745f52c4d91b7bd280e3c8b350
 
 only_for_archs=i686
 disable_debug=yes
-replaces="wine>=0"
-provides="wine-${version}"
-conflicts="wine>=0"
-subpackages="lib${pkgname} ${pkgname}-devel"
-
 # XXX OpenCL
 # XXX libcapi20 (ISDN support)
 makedepends="flex gettext-devel autoconf lcms-devel zlib-devel ncurses-devel
@@ -29,10 +24,43 @@ makedepends="flex gettext-devel autoconf lcms-devel zlib-devel ncurses-devel
  giflib-devel libpng-devel v4l-utils-devel fontconfig-devel gnutls-devel
  dbus-devel cups-devel sane-devel prelink"
 
-# libOSMesa is loaded with dlopen(3) at runtime
-fulldepends="desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
+makedepends+=" desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  fontconfig libOSMesa"
 
 pre_configure() {
 	sed -i 's/\(libncurses\)/\1w/g' configure
 }
+
+libwine-unstable_package() {
+	short_desc="${short_desc} - Runtime library"
+	replaces="libwine>=0"
+	provides="libwine-${version}"
+	conflicts="libwine>=0"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+		vmove usr/lib/wine
+	}
+}
+
+wine-unstable-devel_package() {
+	depends="libwine-unstable-${version}_${revision}"
+	short_desc="${short_desc} - Development files"
+	replaces="wine-devel>=0"
+	provides="wine-devel-${version}"
+	conflicts="wine-devel>=0"
+	pkg_install() {
+        	vmove usr/include
+	}
+}
+
+wine-unstable_package() {
+	replaces="wine>=0"
+	provides="wine-${version}"
+	conflicts="wine>=0"
+	# libOSMesa is loaded with dlopen(3) at runtime
+	depends="desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
+		fontconfig libOSMesa"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wine-unstable/wine-unstable-devel.template b/srcpkgs/wine-unstable/wine-unstable-devel.template
deleted file mode 100644
index a453f13b12..0000000000
--- a/srcpkgs/wine-unstable/wine-unstable-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libwine-unstable'.
-#
-depends="libwine-unstable-${version}_${revision}"
-short_desc="${short_desc} - Development files"
-replaces="wine-devel>=0"
-provides="wine-devel-${version}"
-conflicts="wine-devel>=0"
-
-do_install() {
-        vmove usr/include usr
-}
diff --git a/srcpkgs/wine/libwine.template b/srcpkgs/wine/libwine.template
deleted file mode 100644
index d96e50bee6..0000000000
--- a/srcpkgs/wine/libwine.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'libwine'.
-#
-short_desc="${short_desc} - Runtime library"
-long_desc="${long_desc}
-
- This package contains the wine runtime."
-
-replaces="libwine>=0"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-	vmove usr/lib/wine usr/lib
-}
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 18b8577992..646dcd61d7 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -16,8 +16,6 @@ long_desc="
  Windows."
 
 only_for_archs=i686
-replaces="wine>=0"
-subpackages="libwine wine-devel"
 
 # XXX OpenCL
 # XXX libcapi20 (ISDN support)
@@ -31,9 +29,35 @@ makedepends="flex gettext-devel lcms-devel zlib-devel ncurses-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  cups-devel prelink"
 
-fulldepends="desktop-file-utils hicolor-icon-theme liberation-fonts-ttf fontconfig"
+makedepends+=" desktop-file-utils hicolor-icon-theme liberation-fonts-ttf fontconfig"
 
 # Otherwise, throws a nasty warning.
 pre_configure() {
 	sed -i 's/\(libncurses\)/\1w/g' configure
 }
+
+libwine_package() {
+	short_desc="${short_desc} - Runtime library"
+	replaces="libwine>=0"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+		vmove usr/lib/wine
+	}
+}
+
+wine-devel_package() {
+	depends="libwine-${version}_${revision}"
+	short_desc="${short_desc} - Development files"
+	replaces="wine-unstable-devel>=0"
+	conflicts="wine-unstable-devel>=0"
+	pkg_install() {
+        	vmove usr/include
+	}
+}
+
+wine_package() {
+	replaces="wine>=0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wine/wine-devel.template b/srcpkgs/wine/wine-devel.template
deleted file mode 100644
index 48a3994034..0000000000
--- a/srcpkgs/wine/wine-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'wine-devel'.
-#
-depends="libwine-${version}_${revision}"
-short_desc="${short_desc} - Development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-replaces="wine-unstable-devel>=0"
-conflicts="wine-unstable-devel>=0"
-
-do_install() {
-        vmove usr/include usr
-}
diff --git a/srcpkgs/wineasio/template b/srcpkgs/wineasio/template
index 9cfb623845..a2a9af17cd 100644
--- a/srcpkgs/wineasio/template
+++ b/srcpkgs/wineasio/template
@@ -3,7 +3,6 @@ pkgname=wineasio
 version="0.9.0.git"
 revision=2
 homepage="http://sourceforge.net/projects/wineasio"
-depends="jack"
 makedepends="wine-unstable wine-unstable-devel jack-devel"
 short_desc="JACK driver for WINE to provide Windows Apps with ASIO support."
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -12,27 +11,31 @@ long_desc="
  WineASIO provides an ASIO to JACK driver for WINE. ASIO is the most common
  Windows low-latency driver, so is commonly used in audio workstation programs."
 
-nonfree=yes
 only_for_archs=i686
 nofetch=yes
 noextract=yes
 
-do_fetch()
-{
+do_fetch() {
 	local url="git://wineasio.git.sourceforge.net/gitroot/wineasio/wineasio"
 	msg_normal " Fetching source from $url ...\n"
 	git clone ${url} ${pkgname}-${version}
 }
 
-do_build()
-{
+do_build() {
 	local url="http://stellarbox.co.cc/asio.h"
 	msg_normal " Fetching ${url} ...\n"
 	$XBPS_FETCH_CMD ${url}
 	make ${makejobs}
 }
 
-do_install()
-{
+do_install() {
 	vinstall wineasio.dll.so 755 usr/lib/wine
 }
+
+wineasio_package() {
+	nonfree="yes"
+	depends="jack"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wireless_tools/template b/srcpkgs/wireless_tools/template
index d5e3f5a66c..55ed9b4c9a 100644
--- a/srcpkgs/wireless_tools/template
+++ b/srcpkgs/wireless_tools/template
@@ -1,7 +1,7 @@
 # Template file for 'wireless_tools'
 pkgname=wireless_tools
 version=29
-revision=4
+revision=5
 wrksrc="${pkgname}.${version}"
 short_desc="Set of tools allowing to manipulate the Wireless Extensions"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -9,7 +9,6 @@ homepage="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
 license="GPL-2"
 distfiles="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$pkgname.$version.tar.gz"
 checksum=6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1
-subpackages="$pkgname-devel"
 
 do_build() {
 	sed -e "s|CFLAGS=|CFLAGS+=|g" -i Makefile
@@ -28,3 +27,17 @@ do_install() {
 		INSTALL_INC=${DESTDIR}/usr/include \
 		INSTALL_MAN=${DESTDIR}/usr/share/man install
 }
+
+wireless_tools-devel_package() {
+	depends="wireless_tools>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}
+
+wireless_tools_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wireless_tools/wireless_tools-devel.template b/srcpkgs/wireless_tools/wireless_tools-devel.template
deleted file mode 100644
index e9c195f138..0000000000
--- a/srcpkgs/wireless_tools/wireless_tools-devel.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'wireless_tools-devel'.
-#
-depends="wireless_tools>=${version}"
-short_desc="${short_desc} -- development files"
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-}
diff --git a/srcpkgs/wmfs/template b/srcpkgs/wmfs/template
index 97e2058880..5f38dcd3ad 100644
--- a/srcpkgs/wmfs/template
+++ b/srcpkgs/wmfs/template
@@ -3,7 +3,6 @@ pkgname=wmfs
 version=201104
 revision=3
 build_style=configure
-conf_files="/etc/xdg/wmfs/wmfsrc"
 configure_args="--prefix /usr --man-prefix /usr/share/man --xdg-config-dir /etc/xdg"
 makedepends="pkg-config libXft-devel libXrender-devel fontconfig-devel libXinerama-devel libXrandr-devel imlib2-devel"
 short_desc="Window Manager From Scratch"
@@ -23,3 +22,11 @@ long_desc="
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/wmfs
 }
+
+wmfs_package() {
+	conf_files="/etc/xdg/wmfs/wmfsrc"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wmname/template b/srcpkgs/wmname/template
index 2824b14ad0..02b3146690 100644
--- a/srcpkgs/wmname/template
+++ b/srcpkgs/wmname/template
@@ -13,3 +13,9 @@ checksum=559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5
 do_install() {
 	make install DESTDIR=${DESTDIR} PREFIX=/usr
 }
+
+wmname_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wok/template b/srcpkgs/wok/template
index 04cee309b1..6d5e522041 100644
--- a/srcpkgs/wok/template
+++ b/srcpkgs/wok/template
@@ -3,15 +3,21 @@ pkgname=wok
 version=0.9
 revision=2
 create_srcdir=yes
-noarch=yes
-pycompile_module="wok"
 build_style=python-module
-depends="python>=2.7 python-jinja pyyaml python-docutils python-Markdown python-Pygments"
 hostmakedepends="python-distribute"
-makedepends="python-devel"
+makedepends="python-devel python-jinja pyyaml python-docutils python-Markdown python-Pygments"
 short_desc="A simple static site generator in python"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://github.com/mythmon/wok"
 license="MIT"
 distfiles="https://github.com/mythmon/wok/archive/v${version}.tar.gz"
 checksum=e5c5d24dbda05d396e5d22aeac05ce40bf4f362da9ca04a82c04c80ebade12b8
+
+wok_package() {
+	noarch="yes"
+	pycompile_module="wok"
+	depends="python>=2.7 python-jinja pyyaml python-docutils python-Markdown python-Pygments"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index 0578c31bd8..89e6fe0f1c 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,6 @@ checksum=2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09
 
 hostmakedepends="pkg-config"
 makedepends="libnl3-devel openssl-devel dbus-devel readline-devel"
-conf_files="/etc/${pkgname}.conf"
 
 do_build() {
 	sed -i 's|/usr/local|$(PREFIX)|g' Makefile
@@ -49,3 +48,11 @@ do_install() {
 	vmkdir usr/lib/systemd/system
 	install -m644 systemd/*.service ${DESTDIR}/usr/lib/systemd/system
 }
+
+wpa_supplicant_package() {
+	conf_files="/etc/wpa_supplicant.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wv/libwv.template b/srcpkgs/wv/libwv.template
deleted file mode 100644
index 11a2cf1192..0000000000
--- a/srcpkgs/wv/libwv.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libwv'.
-#
-short_desc="${short_desc} - Runtime library"
-long_desc="${long_desc}
-
- This package contains the runtime."
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/wv/template b/srcpkgs/wv/template
index fe0f12276f..e286c94d16 100644
--- a/srcpkgs/wv/template
+++ b/srcpkgs/wv/template
@@ -2,9 +2,8 @@
 pkgname=wv
 version=1.2.4
 build_style=gnu-configure
-revision=4
+revision=5
 makedepends="pkg-config glib-devel libxml2-devel libpng-devel>=1.5.10 libgsf-devel"
-subpackages="libwv wv-devel"
 short_desc="wv is a library which allows access to Microsoft Word files."
 homepage="http://wvware.sourceforge.net/"
 license="GPL-3"
@@ -16,3 +15,26 @@ long_desc="
  parse Word 2000, 97, 95 and 6 file formats. (These are the file formats
  known internally as Word 9, 8, 7 and 6.) There is some support for reading
  earlier formats as well: Word 2 docs are converted to plaintext."
+
+libwv_package() {
+	short_desc="${short_desc} - Runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+wv-devel_package() {
+	depends="libwv>=$version"
+	short_desc="${short_desc} - Development files"
+	pkg_install() {
+        	vmove usr/include
+        	vmove "usr/lib/*.a"
+        	vmove usr/lib/pkgconfig
+	}
+}
+
+wv_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wv/wv-devel.template b/srcpkgs/wv/wv-devel.template
deleted file mode 100644
index 3e4926c82b..0000000000
--- a/srcpkgs/wv/wv-devel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'wv-devel'.
-#
-depends="glibc-devel libwv>=$version"
-short_desc="${short_desc} - Development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-        vmove usr/include usr
-        vmove "usr/lib/*.a" usr/lib
-        vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/wxGTK/template b/srcpkgs/wxGTK/template
index 5a0b4fd86a..a26af52876 100644
--- a/srcpkgs/wxGTK/template
+++ b/srcpkgs/wxGTK/template
@@ -3,7 +3,6 @@ pkgname=wxGTK
 version=2.8.12.1
 revision=3
 wrksrc="wxPython-src-${version}"
-subpackages="${pkgname}-devel"
 # XXX: GStreamer support?
 makedepends="pkg-config zlib-devel libpng-devel>=1.5.10 libjpeg-turbo-devel
  libXpm-devel tiff-devel expat-devel libXinerama-devel GConf-devel
@@ -34,3 +33,21 @@ do_install() {
 	make -C contrib/src DESTDIR="${DESTDIR}" install
 	vinstall docs/licence.txt 0644 "usr/share/licenses/${pkgname}" LICENSE
 }
+
+wxGTK-devel_package() {
+	depends="wxGTK>=$version"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share/aclocal
+		vmove usr/share/bakefile
+		vmove usr/lib/wx
+		vmove usr/bin
+	}
+}
+
+wxGTK_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wxGTK/wxGTK-devel.template b/srcpkgs/wxGTK/wxGTK-devel.template
deleted file mode 100644
index 7eb372dc75..0000000000
--- a/srcpkgs/wxGTK/wxGTK-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'wxGTK-devel'.
-#
-depends="wxGTK>=$version"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/share/aclocal usr/share
-	vmove usr/share/bakefile usr/share
-	vmove usr/lib/wx usr/lib
-	vmove usr/bin usr
-}
diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template
index aca3fabbe3..f4c8ebc311 100644
--- a/srcpkgs/wxPython/template
+++ b/srcpkgs/wxPython/template
@@ -1,13 +1,11 @@
 # Template build file for 'wxPython'
 pkgname=wxPython
 version=2.8.12.1
-revision=3
-subpackages="${pkgname}-devel"
+revision=4
 wrksrc="${pkgname}-src-${version}"
 makedepends="pkg-config zlib-devel libpng-devel libjpeg-turbo-devel libXpm-devel
  tiff-devel expat-devel libX11-devel libXinerama-devel GConf-devel cairo-devel
  gtk+-devel MesaLib-devel wxGTK-devel python-devel"
-fulldepends="python"
 short_desc="The wxWidgets GUI toolkit library (Python Bindings)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.wxwidgets.org/"
@@ -40,3 +38,18 @@ do_install() {
 	vinstall ../docs/licence.txt 0644 \
 		"usr/share/licenses/${pkgname}" LICENSE
 }
+
+wxPython-devel_package() {
+	depends="wxGTK-devel wxPython>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}
+
+wxPython_package() {
+	depends="python"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/wxPython/wxPython-devel.template b/srcpkgs/wxPython/wxPython-devel.template
deleted file mode 100644
index 90505b44f3..0000000000
--- a/srcpkgs/wxPython/wxPython-devel.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'wxPython-devel'.
-#
-depends="wxGTK-devel wxPython>=${version}"
-short_desc="${short_desc} -- development files"
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-}