Convert packages to the new template format (l).

srcpkgs/ladish/ladish-devel.template

@@ -1,14 +0,0 @@
-# Template file for 'ladish-devel'.
-#
-noarch=yes
-depends="libuuid-devel ladish>=${version}"
-short_desc="${short_desc} (Development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install()
-{
-        vmove usr/include usr
-        vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/ladish/template

@@ -1,15 +1,13 @@
 # Template file for 'ladish'
 pkgname=ladish
 version=1
-revision=3
+revision=4
 build_style=waf
 configure_args="--enable-liblash --enable-pylash"
-depends="jack a2jmidid"
 makedepends="perl intltool python-devel pkg-config alsa-lib-devel jack-devel
-dbus-devel dbus-glib-devel libuuid-devel expat-devel glib-devel gtk+-devel
+ dbus-devel dbus-glib-devel libuuid-devel expat-devel glib-devel gtk+-devel
-flowcanvas-devel boost-devel libgnomecanvasmm-devel gtkmm2-devel"
+ flowcanvas-devel boost-devel libgnomecanvasmm-devel gtkmm2-devel"
-fulldepends="hicolor-icon-theme"
+short_desc="Session management system for JACK applications"
-short_desc="Session management system for JACK applications."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
 homepage="http://ladish.org"
@@ -26,6 +24,19 @@ long_desc="
  together. It can also be used to move entire sessions between computers, or
  post sessions on the Internet for download."
 
-subpackages="${pkgname}-devel"
+ladish-devel_package() {
+	depends="libuuid-devel ladish>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+        	vmove usr/include
+        	vmove usr/lib/pkgconfig
+	}
+}
 
-pycompile_module="lash.py"
+ladish_package() {
+	pycompile_module="lash.py"
+	depends="jack a2jmidid hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/laditools/template

@@ -2,14 +2,14 @@
 pkgname=laditools
 version=1.0.rc2
 revision=2
+wrksrc="ladish-1/${pkgname}"
 homepage="http://www.marcochapeau.org/software/laditools"
 license="GPL-3"
-distfiles="http://ladish.org/download/ladish-1-with-deps.tar.bz2"
 build_style=python-module
-fulldepends="python"
+makepends="python"
-depends="ladish jack pygtk pyyaml vte"
 short_desc="Linux Audio Desktop Integration Tools"
 maintainer="davehome <davehome@redthumb.info.tm>"
+distfiles="http://ladish.org/download/ladish-1-with-deps.tar.bz2"
 checksum=b31b9ca69c42e4e68b5159993a1f505e137d43737430778444bc5e852adeb461
 long_desc="
  LADITools is a set of tools aiming to achieve the goals of the LADI project to
@@ -18,5 +18,10 @@ long_desc="
  to JACK and LASH to ease the configuration and use of those two great
  softwares."
 
-wrksrc=ladish-1/${pkgname}
+laditools_package() {
-pycompile_module=laditools
+	pycompile_module="laditools"
+	depends="ladish jack pygtk pyyaml vte"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/ladspa-sdk/ladspa-sdk-docs.template

@@ -1,20 +0,0 @@
-# Template file for 'ladspa-sdk-docs'.
-#
-depends="ladspa-sdk"
-short_desc="${short_desc} (Documentation)"
-long_desc="${long_desc}
-
- This package contains the HTML documentation
- to be installed in /usr/share/doc/ladspa."
-
-
-noarch=yes
-
-
-do_install()
-{
-	vmkdir usr/share/doc
-	cd ${wrksrc}/doc && rm ladspa.h.txt && \
-		ln -s /usr/include/ladspa.h ladspa.h.txt
-        vcopy ${wrksrc}/doc usr/share/doc/ladspa
-}

srcpkgs/ladspa-sdk/ladspa-sdk-example-plugins.template

@@ -1,12 +0,0 @@
-# Template file for 'ladspa-sdk-example-plugins'.
-#
-short_desc="${short_desc} (Example plugins)"
-long_desc="${long_desc}
-
- This package contains the example plugins."
-
-do_install()
-{
-	vmkdir usr/lib/ladspa
-        vcopy "${wrksrc}/plugins/*.so*" usr/lib/ladspa
-}

srcpkgs/ladspa-sdk/ladspa-sdk-progs.template

@@ -1,12 +0,0 @@
-# Template file for 'ladspa-sdk-progs'.
-#
-short_desc="${short_desc} (Example programs)"
-long_desc="${long_desc}
-
- This package contains the example programs."
-
-do_install()
-{
-	vmkdir usr
-        vcopy ${wrksrc}/bin usr
-}

srcpkgs/ladspa-sdk/template

@@ -2,8 +2,9 @@
 pkgname=ladspa-sdk
 version=1.13
 revision=2
+wrksrc=ladspa_sdk
 distfiles="http://www.ladspa.org/download/ladspa_sdk.tgz"
-makedepends="libsndfile-progs libstdc++"
+makedepends="libsndfile-progs"
 short_desc="Linux Audio Developer's Simple Plugin API (LADSPA)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.ladspa.org/"
@@ -19,20 +20,47 @@ long_desc="
  Definitive technical documentation on LADSPA plugins for both host and plugin
  writers is contained within copious comments in the ladspa.h header file."
 
-subpackages="$pkgname-docs $pkgname-example-plugins $pkgname-progs"
+do_build() {
-
-noarch=yes
-
-wrksrc=ladspa_sdk
-
-
-do_build()
-{
 	make -C src
 }
 
-do_install()
+do_install() {
-{
 	vmkdir usr/include
 	vcopy src/ladspa.h usr/include
 }
+
+ladspa-sdk-docs_package() {
+	depends="ladspa-sdk"
+	short_desc="${short_desc} (Documentation)"
+	noarch=yes
+	pkg_install() {
+		vmkdir usr/share/doc
+		cd ${wrksrc}/doc
+		rm ladspa.h.txt
+		ln -s /usr/include/ladspa.h ladspa.h.txt
+		vcopy ${wrksrc}/doc usr/share/doc/ladspa
+	}
+}
+
+ladspa-sdk-example-plugins_package() {
+	short_desc="${short_desc} (Example plugins)"
+	pkg_install() {
+		vmkdir usr/lib/ladspa
+        	vcopy "${wrksrc}/plugins/*.so*" usr/lib/ladspa
+	}
+}
+
+ladspa-sdk-progs_package() {
+	short_desc="${short_desc} (Example programs)"
+	pkg_install() {
+		vmkdir usr
+        	vcopy ${wrksrc}/bin usr
+	}
+}
+
+ladspa-sdk_package() {
+	noarch=yes
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/lame/lame-devel.template

@@ -1,9 +0,0 @@
-# Template file for 'lame-devel'.
-#
-depends="lame>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-}

srcpkgs/lame/template

@@ -2,7 +2,6 @@
 pkgname=lame
 version=3.99.4
 revision=1
-subpackages="$pkgname-devel"
 build_style=gnu-configure
 configure_args="--enable-nasm --enable-shared"
 makedepends="ncurses-devel"
@@ -30,3 +29,18 @@ long_desc="
  MP3. Another goal of the LAME project is to use these improvements for
  the basis of a patent free audio compression codec for the GNU
  project."
+
+lame-devel_package() {
+	depends="lame>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
+
+lame_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/laptop-mode/template

@@ -3,26 +3,14 @@ pkgname=laptop-mode
 version=1.62
 revision=4
 wrksrc=$pkgname-tools_$version
-noarch=yes
 short_desc="Laptop power saving package for Linux systems"
 maintainer="tripledes <tripledes@gmail.com>"
 license="GPL-2"
 homepage="http://samwel.tk/laptop_mode/"
 distfiles="${homepage}/tools/downloads/$pkgname-tools_$version.tar.gz"
 checksum=d40b3d2fb4dc120b4a427ef7dbddc9dd4d9ea0c475685538d36d3457b39158cd
-depends="acpid hdparm sdparm wireless_tools xset bluez"
-conf_files="/etc/laptop-mode/lm-profiler.conf /etc/laptop-mode/conf.d/lcd-brightness.conf /etc/laptop-mode/conf.d/video-out.conf
-	/etc/laptop-mode/conf.d/wireless-iwl-power.conf /etc/laptop-mode/conf.d/nmi-watchdog.conf /etc/laptop-mode/conf.d/dpms-standby.conf
-	/etc/laptop-mode/conf.d/runtime-pm.conf /etc/laptop-mode/conf.d/ethernet.conf /etc/laptop-mode/conf.d/eee-superhe.conf
-	/etc/laptop-mode/conf.d/hal-polling.conf /etc/laptop-mode/conf.d/cpufreq.conf /etc/laptop-mode/conf.d/battery-level-polling.conf
-	/etc/laptop-mode/conf.d/intel-hda-powersave.conf /etc/laptop-mode/conf.d/configuration-file-control.conf /etc/laptop-mode/conf.d/bluetooth.conf
-	/etc/laptop-mode/conf.d/usb-autosuspend.conf /etc/laptop-mode/conf.d/wireless-ipw-power.conf /etc/laptop-mode/conf.d/start-stop-programs.conf
-	/etc/laptop-mode/conf.d/ac97-powersave.conf /etc/laptop-mode/conf.d/auto-hibernate.conf /etc/laptop-mode/conf.d/intel-sata-powermgmt.conf
-	/etc/laptop-mode/conf.d/wireless-power.conf /etc/laptop-mode/conf.d/sched-smt-power-savings.conf /etc/laptop-mode/conf.d/sched-mc-power-savings.conf
-	/etc/laptop-mode/conf.d/terminal-blanking.conf /etc/laptop-mode/conf.d/exec-commands.conf /etc/laptop-mode/laptop-mode.conf"
 
-do_install()
+do_install() {
-{
 	export DESTDIR=${XBPS_DESTDIR}/${pkgname}-${version} ACPI=force APM=disabled PMU=disabled INIT_D=none MAN_D=/usr/share/man
 	sed -i 's|/etc/udev|/usr/lib/udev|g' install.sh
 	# see /lib -> /usr/lib move
@@ -31,3 +19,40 @@ do_install()
 	sed -i 's|/sbin/udevadm|/usr/bin/udevadm|g' usr/share/laptop-mode-tools/modules/hdparm
 	$wrksrc/install.sh
 }
+
+laptop-mode_package() {
+	conf_files="
+		/etc/laptop-mode/lm-profiler.conf
+		/etc/laptop-mode/conf.d/lcd-brightness.conf
+		/etc/laptop-mode/conf.d/video-out.conf
+		/etc/laptop-mode/conf.d/wireless-iwl-power.conf
+		/etc/laptop-mode/conf.d/nmi-watchdog.conf
+		/etc/laptop-mode/conf.d/dpms-standby.conf
+		/etc/laptop-mode/conf.d/runtime-pm.conf
+		/etc/laptop-mode/conf.d/ethernet.conf
+		/etc/laptop-mode/conf.d/eee-superhe.conf
+		/etc/laptop-mode/conf.d/hal-polling.conf
+		/etc/laptop-mode/conf.d/cpufreq.conf
+		/etc/laptop-mode/conf.d/battery-level-polling.conf
+		/etc/laptop-mode/conf.d/intel-hda-powersave.conf
+		/etc/laptop-mode/conf.d/configuration-file-control.conf
+		/etc/laptop-mode/conf.d/bluetooth.conf
+		/etc/laptop-mode/conf.d/usb-autosuspend.conf
+		/etc/laptop-mode/conf.d/wireless-ipw-power.conf
+		/etc/laptop-mode/conf.d/start-stop-programs.conf
+		/etc/laptop-mode/conf.d/ac97-powersave.conf
+		/etc/laptop-mode/conf.d/auto-hibernate.conf
+		/etc/laptop-mode/conf.d/intel-sata-powermgmt.conf
+		/etc/laptop-mode/conf.d/wireless-power.conf
+		/etc/laptop-mode/conf.d/sched-smt-power-savings.conf
+		/etc/laptop-mode/conf.d/sched-mc-power-savings.conf
+		/etc/laptop-mode/conf.d/terminal-blanking.conf
+		/etc/laptop-mode/conf.d/exec-commands.conf
+		/etc/laptop-mode/laptop-mode.conf"
+	noarch="yes"
+	depends="acpid hdparm sdparm wireless_tools xset bluez"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/latencytop/template

@@ -1,14 +1,15 @@
 # Template file for 'latencytop'
 pkgname=latencytop
 version=0.5
-homepage="http://www.latencytop.org"
-distfiles="http://www.latencytop.org/download/$pkgname-$version.tar.gz"
-build_style=gnu-makefile
-makedepends="pkg-config gtk+-devel ncurses-devel"
 revision=1
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="gtk+-devel ncurses-devel"
 short_desc="Measuring and fixing Linux latency"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://www.latencytop.org"
+distfiles="http://www.latencytop.org/download/$pkgname-$version.tar.gz"
 checksum=9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef
 long_desc="
  Skipping audio, slower servers, everyone knows the symptoms of latency. But to know
@@ -20,7 +21,12 @@ long_desc="
  operation/action is causing the latency to happen so that the code can be changed
  to avoid the worst latency hiccups."
 
-
 pre_install() {
 	vmkdir usr/sbin
 }
+
+latencytop_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/lbreakout2/template

@@ -1,7 +1,7 @@
 # Template file for 'lbreakout2'
 pkgname=lbreakout2
 version=2.6.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-sdl-net --localstatedir=/var/games/$pkgname"
 make_install_args="doc_dir=/usr/share/doc"
@@ -23,8 +23,13 @@ long_desc="
  levelsets with the integrated easy-to-use level editor!"
 
 post_install() {
-	install -Dm755 ${FILESDIR}/lbreakout2.desktop \
+	vinstall ${FILESDIR}/lbreakout2.desktop 644 usr/share/applications
-		${DESTDIR}/usr/share/applications/lbreakout2.desktop
+	vinstall ${FILESDIR}/lbreakout2.png 644 usr/share/pixmaps
-	install -Dm755 ${FILESDIR}/lbreakout2.png \
+}
-		${DESTDIR}/usr/share/pixmaps/lbreakout2.png
+
+lbreakout2_package() {
+	pkg_install() {
+		vmove usr
+		vmove var
+	}
 }

srcpkgs/leveldb/leveldb-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'leveldb-devel'.
-#
-noarch=yes
-depends="${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/share/doc usr/share
-}

srcpkgs/leveldb/template

@@ -1,8 +1,7 @@
 # Template file for 'leveldb'
 pkgname=leveldb
 version=1.8.0
-revision=1
+revision=2
-subpackages="${pkgname}-devel"
 short_desc="A fast and lightweight key/value database library by Google"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -32,3 +31,18 @@ do_install() {
 	# license
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
 }
+
+leveldb-devel_package() {
+	depends="${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share/doc
+	}
+}
+
+leveldb_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/lftp/template

@@ -5,10 +5,17 @@ revision=1
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex --with-openssl"
 makedepends="ncurses-devel readline-devel openssl-devel expat-devel"
-conf_files="/etc/lftp.conf"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://lftp.yar.ru/"
 license="GPL-3"
 distfiles="http://ftp.yars.free.net/pub/source/lftp/lftp-$version.tar.xz"
 checksum=86d399b1515950e54c47950a99260919b9bb9cb5775ac14334e66b6b88b5ce84
+
+lftp_package() {
+	conf_files="/etc/lftp.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/lftpfs/template

@@ -1,14 +1,14 @@
 # Template file for 'lftpfs'
 pkgname=lftpfs
 version=0.4.3
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl-Fuse perl-IPC-Run lftp"
 revision=1
+build_style=perl-module
+makedepends="perl-Fuse perl-IPC-Run lftp"
 short_desc="Filesystem with caching based on FUSE and LFTP"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://lftpfs.sourceforge.net/"
 license="GPL-2"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=5116e06dfc03c4000f3157916d4bf2b9bcd6f47667790217dbf3b9f04861bf39
 long_desc="
  LftpFS is a read-only network filesystem with caching for smart mirror of
@@ -23,10 +23,15 @@ long_desc="
     using as mirror tool with on-demand download of files
 "
 
-noarch=yes
+post_install() {
-
-post_install()
-{
 	vmkdir usr
 	mv ${DESTDIR}/usr/lib/perl5/vendor_perl/bin ${DESTDIR}/usr
 }
+
+lftpfs_package() {
+	depends="perl-Fuse perl-IPC-Run lftp"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/lgi/template

@@ -3,9 +3,8 @@ pkgname=lgi
 version=0.6.2
 revision=2
 build_style=gnu-makefile
-make_install_args="LUA_LIBDIR=/usr/lib/lua/5.1 LUA_SHAREDIR=/usr/share/lua/5.1"
+makedepends="glib-devel libffi-devel lua-devel>=5.1<5.2
-depends="gir-freedesktop"
+ gobject-introspection gir-freedesktop"
-makedepends="glib-devel libffi-devel lua-devel>=5.1<5.2 gobject-introspection"
 short_desc="Lua binadings for gnome/gobject using gobject-introspection library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -13,7 +12,17 @@ homepage="https://github.com/pavouk/lgi"
 distfiles="https://github.com/downloads/pavouk/lgi/lgi-${version}.tar.gz"
 checksum=93b0a520f03822794d94cb86273d0744a3808792e2832b67f17ee03d7ded8773
 
-post_install() {
+do_install() {
+	make DESTDIR=${DESTDIR} LUA_LIBDIR=/usr/lib/lua/5.1 \
+		LUA_SHAREDIR=/usr/share/lua/5.1 install
+
 	vinstall tools/dump-typelib.lua 755 usr/bin dump-typelib
 	vinstall LICENSE 644 usr/share/licenses/lgi
 }
+
+lgi_package() {
+	depends="gir-freedesktop"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libHX/libHX-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'libHX-devel'.
-#
-depends="${sourcepkg}-${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
-}

srcpkgs/libHX/template

@@ -4,10 +4,25 @@ version=3.14.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-static"
-subpackages="${pkgname}-devel"
 short_desc="C library providing data structures and common functions"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://libhx.sourceforge.net/"
 license="LGPL-2.1"
 distfiles="${SOURCEFORGE_SITE}/libhx/${pkgname}-${version}.tar.xz"
 checksum=a1550dc9cb8d441dce83dbd1f2b609ae45439e95568c945499d0a084cc76f1e6
+
+libHX-devel_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+libHX_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libICE/libICE-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'libICE-devel'.
-#
-depends="xtrans xproto libICE-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/share usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-}

srcpkgs/libICE/template

@@ -2,7 +2,6 @@
 pkgname=libICE
 version=1.0.8
 revision=3
-subpackages="$pkgname-devel"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xtrans xproto"
@@ -12,3 +11,20 @@ license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
+
+libICE-devel_package() {
+	depends="xtrans xproto libICE-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+libICE_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libIDL/libIDL-devel.template

@@ -1,18 +0,0 @@
-# Template file for 'libIDL-devel'.
-#
-depends="libIDL"
-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/bin ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-}

srcpkgs/libIDL/template

@@ -1,14 +1,15 @@
 # Template build file for 'libIDL'.
 pkgname=libIDL
 version=0.8.13
-revision=4
+revision=5
-distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config flex glib-devel"
+hostmakedepends="pkg-config flex"
+makedepends="libglib-devel"
 short_desc="CORBA Interface Definition Language parser"
 homepage="http://projects.gnome.org/ORBit2/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
 checksum=bccc7e10dae979518ff012f8464e47ec4b3558a5456a94c8679653aa0b262b71
 long_desc="
  libIDL is a library licensed under the GNU LGPL for creating trees of
@@ -33,4 +34,23 @@ long_desc="
  full semantic analysis with some optimizations, and will attempt to
  generate meaningful errors and warnings for invalid or deprecated IDL."
 
-subpackages="$pkgname-devel"
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" libfl-devel"
+fi
+
+libIDL-devel_package() {
+	depends="libIDL>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+libIDL_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libSM/libSM-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'libSM-devel'.
-#
-depends="xproto libICE-devel libSM>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/doc usr/share
-}

srcpkgs/libSM/template

@@ -2,7 +2,6 @@
 pkgname=libSM
 version=1.2.1
 revision=2
-subpackages="$pkgname-devel"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libuuid-devel libICE-devel"
@@ -12,3 +11,20 @@ license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
+
+libSM-devel_package() {
+	depends="xproto libICE-devel libSM>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+	}
+}
+
+libSM_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXScrnSaver/libXScrnSaver-devel.template

@@ -1,15 +0,0 @@
-# Template file for 'libXScrnSaver-devel'.
-#
-depends="scrnsaverproto libX11-devel libXext-devel libXScrnSaver"
-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
-	vmove usr/share usr
-}

srcpkgs/libXScrnSaver/template

@@ -1,17 +1,33 @@
 # Template build file for 'libXScrnSaver'.
 pkgname=libXScrnSaver
 version=1.2.2
-homepage="${XORG_SITE}"
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-makedepends="pkg-config xextproto scrnsaverproto libX11-devel libXext-devel"
 revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="xextproto scrnsaverproto libX11-devel libXext-devel"
 short_desc="X11 Screen Saver Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
+homepage="${XORG_SITE}"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
 long_desc="
  This package contains the library for the X11 Screen Saver extension.
  This is from the modular X.org X11 project."
 
-subpackages="$pkgname-devel"
+libXScrnSaver-devel_package() {
+	depends="scrnsaverproto libX11-devel libXext-devel libXScrnSaver>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libXScrnSaver_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXaw/libXaw-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'libXaw-devel'.
-#
-depends="xproto libXext-devel libXt-devel libXmu-devel libXpm-devel libXaw>=$version"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}

srcpkgs/libXaw/template

@@ -4,7 +4,6 @@ version=1.0.11
 revision=2
 build_style=gnu-configure
 configure_args="--without-xmlto"
-subpackages="$pkgname-devel"
 hostmakedepends="pkg-config"
 makedepends="libXext-devel libXt-devel libXmu-devel libXpm-devel"
 short_desc="X Athena Widgets Library from modular Xorg X11"
@@ -16,3 +15,20 @@ checksum=87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
 long_desc="
  Xaw is the X Athena Widget Set. Xaw is a widget set based on the
  X Toolkit Intrinsics (Xt) Library."
+
+libXaw-devel_package() {
+	depends="xproto libXext-devel libXt-devel libXmu-devel libXpm-devel libXaw>=$version"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libXaw_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXevie/libXevie-devel.template

@@ -1,17 +0,0 @@
-# Template file for 'libXevie-devel'.
-#
-depends="pkg-config xproto xextproto evieext libX11-devel libXext-devel libXevie"
-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/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-}

srcpkgs/libXevie/template

@@ -1,17 +1,33 @@
 # Template build file for 'libXevie'.
 pkgname=libXevie
 version=1.0.3
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=3
-makedepends="pkg-config xproto xextproto evieext libX11-devel libXext-devel"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="xproto xextproto evieext libX11-devel libXext-devel"
 short_desc="X Event Interceptor Library"
 homepage="http://xorg.freedesktop.org"
 license="MIT/X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=c00b382123e58f595b3cecaa50471ebec534660e5f92ae46d94266345844fd73
 long_desc="
  This package contains the library and header files for the X Event
  Interceptor Library. This is from the modular X.org project."
  
-subpackages="$pkgname-devel"
+libXevie-devel_package() {
+	depends="xproto xextproto evieext libX11-devel libXext-devel libXevie>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+libXevie_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXfont/libXfont-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'libXfont-devel'.
-#
-depends="xproto fontsproto zlib-devel libfontenc-devel freetype-devel
- libXfont-${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
-}

srcpkgs/libXfont/template

@@ -11,10 +11,26 @@ license="MIT"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
 
-subpackages="$pkgname-devel"
 hostmakedepends="pkg-config xtrans"
 makedepends="xproto xtrans fontcacheproto fontsproto freetype-devel libfontenc-devel"
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }
+
+libXfont-devel_package() {
+	depends="xproto fontsproto zlib-devel libfontenc-devel freetype-devel
+		libXfont-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+libXfont_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXfontcache/libXfontcache-devel.template

@@ -1,17 +0,0 @@
-# Template file for 'libXfontcache-devel'.
-#
-depends="fontcacheproto libXfontcache"
-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/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-}

srcpkgs/libXfontcache/template

@@ -1,18 +1,30 @@
 # Template build file for 'libXfontcache'.
 pkgname=libXfontcache
 version=1.0.4
-revision=4
+revision=5
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config xproto fontcacheproto libX11-devel libXext-devel"
+hostmakedepends="pkg-config"
-short_desc="X-TrueType font cache extension client library "
+makedepends="xproto fontcacheproto libX11-devel libXext-devel"
+short_desc="X-TrueType font cache extension client library"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=ffe747cfbf81cdd862af1b05d021ad1ab83b623eab5b32b0a618efb4c0f3e01c
-long_desc="
- This package provides the X-TrueType font cache extension client library.
 
- This is from the modular X.org X11 project."
+libXfontcache-devel_package() {
+	depends="fontcacheproto libXfontcache>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
 
-subpackages="$pkgname-devel"
+libXfontcache_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXmu/libXmu-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'libXmu-devel'.
-#
-depends="xproto libXext-devel libXt-devel libXmu>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/libXmu/template

@@ -3,7 +3,6 @@ pkgname=libXmu
 version=1.1.1
 revision=2
 build_style=gnu-configure
-subpackages="$pkgname-devel"
 hostmakedepends="pkg-config"
 makedepends="libXext-devel libXt-devel"
 short_desc="X Miscellaneous Utilities library"
@@ -19,3 +18,19 @@ long_desc="
  Xlib or Xt.
 
  This also includes the Mini Xmu library that does not use Xt and Xaw."
+
+libXmu-devel_package() {
+	depends="xproto libXext-devel libXt-devel libXmu>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libXmu_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXp/libXp-devel.template

@@ -1,17 +0,0 @@
-# Template file for 'libXp-devel'.
-#
-depends="libXp"
-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/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-}

srcpkgs/libXp/template

@@ -1,20 +1,34 @@
 # Template build file for 'libXp'.
 pkgname=libXp
 version=1.0.0
-revision=4
+revision=5
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config xproto xextproto printproto libX11-devel libXext-devel"
+hostmakedepends="pkg-config"
+makedepends="xproto xextproto printproto libX11-devel libXext-devel"
 short_desc="X Print Service Extension Library"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7e64b1550ce85b05762e960459ac676a0406c786756b200ff29c57f84bce9cae
 long_desc="
  The X Print Service Extension Library (libXp) provides public APIs
  to allow client applications to render to non-display devices.
- It can query about printers, send jobs, and more.
+ It can query about printers, send jobs, and more."
 
- This is from the modular X.org."
+libXp-devel_package() {
+	depends="libXp>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
 
-subpackages="$pkgname-devel"
+libXp_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXpm/libXpm-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'libXpm-devel'.
-#
-depends="libX11-devel libXpm>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/libXpm/template

@@ -2,7 +2,6 @@
 pkgname=libXpm
 version=3.5.10
 revision=1
-subpackages="$pkgname-devel"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xproto libSM-devel libXext-devel libXt-devel"
@@ -15,3 +14,19 @@ checksum=a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735
 long_desc="
  XPM (X PixMap) is a format for storing and retrieving X pixmaps
  to and from files."
+
+libXpm-devel_package() {
+	depends="libX11-devel libXpm>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libXpm_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXres/libXres-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'libXres-devel'.
-#
-depends="xproto libXext-devel libXres>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}

srcpkgs/libXres/template

@@ -2,7 +2,6 @@
 pkgname=libXres
 version=1.0.6
 revision=2
-subpackages="$pkgname-devel"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="resourceproto libXext-devel"
@@ -18,3 +17,20 @@ long_desc="
 
  X-Resource is an extension that allows a client to query the X
  server about its usage of various resources."
+
+libXres-devel_package() {
+	depends="xproto libXext-devel libXres>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libXres_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXt/libXt-devel.template

@@ -1,12 +0,0 @@
-# Template file for 'libXt-devel'.
-#
-depends="xproto libSM-devel libICE-devel libX11-devel libXt>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man usr/share
-	vmove usr/share/doc usr/share
-}

srcpkgs/libXt/template

@@ -5,7 +5,6 @@ revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xproto kbproto libSM-devel libX11-devel"
-subpackages="$pkgname-devel"
 short_desc="X Toolkit Intrinsics library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -19,6 +18,24 @@ long_desc="
  windows, and interpreting resource files."
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="pkg-config xproto"
+	hostmakedepends+=" xproto"
 	configure_args="CC_FOR_BUILD=cc CFLAGS_FOR_BUILD="
 fi
+
+libXt-devel_package() {
+	depends="xproto libSM-devel libICE-devel libX11-devel libXt>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man
+		vmove usr/share/doc
+	}
+}
+
+libXt_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXtst/libXtst-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'libXtst-devel'.
-#
-depends="recordproto libXext-devel libXi-devel libXtst>=${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 usr
-}

srcpkgs/libXtst/template

@@ -3,7 +3,6 @@ pkgname=libXtst
 version=1.2.1
 revision=3
 build_style=gnu-configure
-subpackages="$pkgname-devel"
 hostmakedepends="pkg-config"
 makedepends="recordproto inputproto libXext-devel libXi-devel"
 short_desc="X Tst Library"
@@ -12,3 +11,20 @@ license="MIT"
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
+
+libXtst-devel_package() {
+	depends="recordproto libXext-devel libXi-devel libXtst>=${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+libXtst_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXxf86dga/libXxf86dga-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'libXxf86dga-devel'.
-#
-depends="xf86dgaproto libXext-devel libXxf86dga>=$version"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}

srcpkgs/libXxf86dga/template

@@ -3,7 +3,6 @@ pkgname=libXxf86dga
 version=1.1.3
 revision=2
 build_style=gnu-configure
-subpackages="$pkgname-devel"
 hostmakedepends="pkg-config"
 makedepends="xf86dgaproto libXext-devel"
 short_desc="Library for the XFree86-DGA X extension"
@@ -16,3 +15,20 @@ long_desc="
  These functions provide an interface to the server extension
  XFree86-DGA Extension which allows local programs direct access
  to the video frame buffer."
+
+libXxf86dga-devel_package() {
+	depends="xf86dgaproto libXext-devel libXxf86dga>=$version"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libXxf86dga_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libXxf86misc/libXxf86misc-devel.template

@@ -1,17 +0,0 @@
-# Template file for 'libXxf86misc-devel'.
-#
-depends="pkg-config xproto xextproto xf86miscproto libX11-devel libXxf86misc"
-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/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-}

srcpkgs/libXxf86misc/template

@@ -1,18 +1,34 @@
 # Template build file for 'libXxf86misc'.
 pkgname=libXxf86misc
 version=1.0.1
-revision=4
+revision=5
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config xproto xextproto xf86miscproto libX11-devel libXext-devel"
+hostmakedepends="pkg-config"
+makedepends="xproto xextproto xf86miscproto libX11-devel libXext-devel"
 short_desc="Library for the XFree86-Misc X extension"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289
 long_desc="
  This library from the modular X.org project provides an interface
  to the XFree86-Misc extension which allows various server settings
  to be queried and changed dynamically."
 
-subpackages="$pkgname-devel"
+libXxf86misc-devel_package() {
+	depends="xproto xextproto xf86miscproto libX11-devel libXxf86misc>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+libXxf86misc_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libao/libao-devel.template

@@ -1,12 +0,0 @@
-# Template file for 'libao-devel'.
-#
-noarch=yes
-depends="libao>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/doc usr/share
-	vmove usr/share/aclocal usr/share
-}

srcpkgs/libao/template

@@ -1,7 +1,7 @@
 # Template file for 'libao'
 pkgname=libao
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-alsa-mmap"
 homepage="http://xiph.org/ao/"
@@ -11,10 +11,28 @@ license="GPL-2"
 distfiles="http://downloads.xiph.org/releases/ao/${pkgname}-${version}.tar.gz"
 checksum=29de5bb9b1726ba890455ef7e562d877df87811febb0d99ee69164b88c171bd4
 
-subpackages="libao-devel"
+hostmakedepends="pkg-config"
-makedepends="pkg-config alsa-lib-devel pulseaudio-devel"
+makedepends="alsa-lib-devel pulseaudio-devel"
-conf_files="/etc/libao.conf"
 
 post_install() {
 	vinstall ${FILESDIR}/libao.conf 644 etc
 }
+
+libao-devel_package() {
+	depends="libao>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove usr/share/aclocal
+	}
+}
+
+libao_package() {
+	conf_files="/etc/libao.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/libapp/libapp-devel.template

@@ -1,9 +0,0 @@
-# Template file for 'libapp-devel'.
-short_desc="${short_desc} - development files"
-depends="${sourcepkg}>=${version}"
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/libapp/template

@@ -1,9 +1,8 @@
 # Template file for 'libapp'
 pkgname=libapp
 version=20110513
-revision=1
+revision=3
-subpackages="libapp-devel"
+short_desc="Utilities for repetitive tasks in app development"
-short_desc="utilities for repetitive tasks in app development"
 maintainer="pancake <pancake@nopcode.org>"
 license="LGPL-3"
 homepage="https://github.com/drotiro/libapp"
@@ -26,3 +25,18 @@ do_build() {
 do_install() {
 	make install PREFIX=${DESTDIR}/usr
 }
+
+libapp-devel_package() {
+	depends="${sourcepkg}>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libapp_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libart/libart-devel.template

@@ -1,19 +0,0 @@
-# Template file for 'libart-devel'.
-#
-depends="libart"
-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/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
-}

srcpkgs/libart/template

@@ -1,15 +1,15 @@
 # Template build file for 'libart'.
 pkgname=libart
 version=2.3.21
-revision=4
+revision=5
 wrksrc="libart_lgpl-$version"
-distfiles="${GNOME_SITE}/libart_lgpl/2.3/libart_lgpl-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config"
+hostmakedepends="pkg-config"
 short_desc="High-performance 2D graphics library"
 homepage="http://www.levien.com/libart/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${GNOME_SITE}/libart_lgpl/2.3/libart_lgpl-$version.tar.bz2"
 checksum=fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa
 long_desc="
  Libart is a library for high-performance 2D graphics. It is currently
@@ -25,4 +25,19 @@ long_desc="
  of Region of Interest, as well as a two-phase rendering pipeline
  optimized for interactive display."
 
-subpackages="$pkgname-devel"
+libart-devel_package() {
+	depends="libart>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/bin
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+libart_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libass/libass-devel.template

@@ -1,15 +0,0 @@
-# Template file for 'libass-devel'.
-#
-depends="fontconfig-devel enca-devel fribidi-devel
- libass-${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
-}

srcpkgs/libass/template

@@ -1,22 +1,34 @@
 # Template build file for 'libass.
 pkgname=libass
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-makedepends="pkg-config enca-devel fontconfig-devel fribidi-devel
+hostmakedepends="pkg-config"
- harfbuzz-devel>=0.9.5"
+makedepends="enca-devel fontconfig-devel fribidi-devel harfbuzz-devel>=0.9.5"
 short_desc="A portable library for SSA/ASS subtitles rendering"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org/"
 license="MIT"
 distfiles="http://libass.googlecode.com/files/${pkgname}-${version}.tar.xz"
 checksum=fbf287ac6d0dbdf015783b7354280ad8371c106326ad3f77a99471bc5aa18210
-long_desc="
- The $pkgname package contains $short_desc."
-
-subpackages="$pkgname-devel"
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }
+
+libass-devel_package() {
+	depends="fontconfig-devel enca-devel fribidi-devel
+		libass-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libass_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libassuan/libassuan-devel.template

@@ -1,15 +0,0 @@
-# Template file for 'libassuan-devel'.
-#
-depends="libgpg-error-devel libassuan"
-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/{bin,include} ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-}

srcpkgs/libassuan/template

@@ -1,19 +1,32 @@
 # Template file for 'libassuan'
 pkgname=libassuan
 version=2.0.3
-homepage="http://www.gnupg.org/related_software/libassuan"
+revision=2
-distfiles="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 makedepends="libgpg-error-devel"
-revision=1
 short_desc="IPC library used by some GnuPG related software"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://www.gnupg.org/related_software/libassuan"
+distfiles="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$version.tar.bz2"
 checksum=bad5682374c76bcc0abb1a7a34c9557af6874a477500748e64a7d3def79cac1b
 long_desc="
  Libassuan is a small library implementing the so-called Assuan protocol. This
  protocol is used for IPC between most newer GnuPG components. Both, server
  and client side functions are provided."
 
-subpackages="$pkgname-devel"
+libassuan-devel_package() {
+	depends="libgpg-error-devel libassuan>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/include
+		vmove usr/share
+	}
+}
 
+libassuan_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libasyncns/libasyncns-devel.template

@@ -1,18 +0,0 @@
-# Template file for 'libasyncns-devel'.
-#
-depends="glibc-devel libasyncns"
-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/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-}

srcpkgs/libasyncns/template

@@ -1,14 +1,14 @@
 # Template file for 'libasyncns'
 pkgname=libasyncns
 version=0.8
-revision=4
+revision=6
-distfiles="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="CFLAGS=-fPIC"
 short_desc="C library for executing name service queries asynchronously"
 homepage="http://0pointer.de/lennart/projects/libasyncns/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$version.tar.gz"
 checksum=4f1a66e746cbe54ff3c2fbada5843df4fbbbe7481d80be003e8d11161935ab74
 long_desc="
  libasyncns is a C library for Linux/Unix for executing name service queries
@@ -20,4 +20,19 @@ long_desc="
  name queries. Instead, the API exports a standard UNIX file descriptor which
  may be integerated cleanly into custom main loops."
 
-subpackages="$pkgname-devel"
+libasyncns-devel_package() {
+	depends="libasyncns>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+libasyncns_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libatasmart/libatasmart-devel.template

@@ -1,15 +0,0 @@
-# Template file for 'libatasmart-devel'.
-#
-depends="libudev-devel libatasmart-${version}_${revision}"
-short_desc="${sourcepkg} 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 usr
-}

srcpkgs/libatasmart/template

@@ -1,16 +1,30 @@
 # Template file for 'libatasmart'
 pkgname=libatasmart
 version=0.17
-revision=6
+revision=8
 build_style=gnu-configure
 configure_args="--disable-static"
-makedepends="pkg-config libudev-devel>=183"
+hostmakedepends="pkg-config"
-subpackages="$pkgname-devel"
+makedepends="libudev-devel>=183"
 short_desc="ATA S.M.A.R.T. Reading and Parsing Library"
 homepage="http://0pointer.de/blog/projects/being-smart.html"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="http://0pointer.de/public/$pkgname-$version.tar.gz"
 checksum=2d62a11274f32cde2f074adef9ceb662bf205618dfc8f8e74b9be6a8b1ed5ffd
-long_desc="
+
- ${short_desc}"
+libatasmart-devel_package() {
+	depends="libudev-devel libatasmart-${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+libatasmart_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libbluray/libbluray-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'libbluray-devel'.
-#
-depends="${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/libbluray/template

@@ -1,14 +1,29 @@
 # Template file for 'libbluray'
 pkgname=libbluray
 version=0.2.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-bdjava"
-makedepends="pkg-config libxml2-devel"
+hostmakedepends="pkg-config"
-subpackages="${pkgname}-devel"
+makedepends="libxml2-devel"
 short_desc="Library to access Blu-Ray disks for video playback"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.videolan.org/developers/libbluray.html"
 license="LGPL-2.1"
 distfiles="ftp://ftp.videolan.org/pub/videolan/$pkgname/$version/$pkgname-$version.tar.bz2"
 checksum=2c65cfb02aeec31721f9ea65ee2c085a9bfe163e99dd01b52ccb3f53ba205eea
+
+libbluray-devel_package() {
+	depends="${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libbluray_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libbsd/libbsd-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'libbsd-devel'.
-#
-depends="${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/share usr
-}

srcpkgs/libbsd/template

@@ -3,7 +3,6 @@ pkgname=libbsd
 version=0.4.2
 revision=1
 build_style=gnu-configure
-subpackages="${pkgname}-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://libbsd.freedesktop.org/wiki/"
@@ -15,3 +14,20 @@ long_desc="
  lacking on others like GNU systems, thus making it easier to port projects
  with strong BSD origins, without needing to embed the same code over and
  over again on each project."
+
+libbsd-devel_package() {
+	depends="${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+libbsd_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libburn/cdrskin.template

@@ -1,8 +0,0 @@
-# Template file for 'cdrskin'.
-#
-short_desc="Command line CD/DVD/BD writing tool"
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/share usr
-}

srcpkgs/libburn/libburn-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'libburn-devel'.
-#
-noarch=yes
-depends="glibc-devel libburn>=$version"
-short_desc="${sourcepkg} development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/libburn/template

@@ -1,13 +1,35 @@
 # Template file for 'libburn'
 pkgname=libburn
 version=1.2.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-subpackages="cdrskin $pkgname-devel"
 short_desc="Library for reading, mastering and writing optical discs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.libburnia-project.org"
 distfiles="http://files.libburnia-project.org/releases/$pkgname-${version}.tar.gz"
 checksum=7b99a3036834c18259a59293b2aab37892550bd1d19a8a010fa338379555188f
+
+cdrskin_package() {
+	short_desc="Command line CD/DVD/BD writing tool"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share
+	}
+}
+
+libburn-devel_package() {
+	depends="libburn>=$version"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libburn_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libcaca/libcaca-devel.template

@@ -1,12 +0,0 @@
-# Template file for 'libcaca-devel'.
-#
-depends="libcaca>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/bin/caca-config usr/bin
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man/man1/caca-config.1 usr/share/man/man1
-}

srcpkgs/libcaca/template

@@ -3,7 +3,6 @@ pkgname=libcaca
 version=0.99.beta18
 revision=3
 build_style=gnu-configure
-subpackages="${pkgname}-devel"
 short_desc="Graphics library that outputs text instead of pixels"
 maintainer="pancake <pancake@nopcode.org>"
 makedepends="ncurses-devel"
@@ -19,3 +18,21 @@ if [ "$CROSS_BUILD" ]; then
 		autoreconf -fi
 	}
 fi
+
+libcaca-devel_package() {
+	depends="libcaca>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/bin/caca-config
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man1/caca-config.1
+	}
+}
+
+libcaca_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libcanberra/libcanberra-devel.template

@@ -1,15 +0,0 @@
-# Template file for 'libcanberra-devel'.
-#
-noarch=yes
-depends="gtk+-devel gtk+3-devel ${sourcepkg}-${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/gtk-doc usr/share
-	vmove usr/share/vala usr/share
-}

srcpkgs/libcanberra/template

@@ -1,7 +1,7 @@
 # Template build file for 'libcanberra'.
 pkgname=libcanberra
 version=0.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-alsa --enable-null
  --enable-gstreamer --disable-oss --with-builtin=dso --disable-lynx
@@ -9,7 +9,6 @@ configure_args="--enable-alsa --enable-null
 makedepends="pkg-config gtk+-devel gtk+3-devel libvorbis-devel libltdl-devel
  gstreamer1-devel alsa-lib-devel tdb-devel pulseaudio-devel
  libudev-devel>=183 vala-devel"
-subpackages="$pkgname-devel"
 short_desc="XDG Sound Theme and Name Specification library implementation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://0pointer.de/lennart/projects/libcanberra/"
@@ -27,3 +26,20 @@ long_desc="
       from Gtk+ applications
    3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
       trigger input feedback event sounds"
+
+libcanberra-devel_package() {
+	depends="gtk+-devel gtk+3-devel ${sourcepkg}-${version}_${revision}"
+	short_desc="${sourcepkg} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gtk-doc
+		vmove usr/share/vala
+	}
+}
+
+libcanberra_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libcap-ng/libcap-ng-devel.template

@@ -1,15 +0,0 @@
-# Template file for 'libcap-ng-devel'.
-#
-depends="glibc-devel libcap-ng>=${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
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/share/man/man3 usr/share/man
-	vmove usr/share/aclocal usr/share
-}

srcpkgs/libcap-ng/libcap-ng-progs.template

@@ -1,11 +0,0 @@
-# Template file for 'libcap-ng-progs'.
-#
-short_desc="${sourcepkg} utilities"
-long_desc="${long_desc}
-
- This package contains binary utilities provided by the ${sourcepkg} package."
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/share usr
-}

srcpkgs/libcap-ng/libcap-ng-python.template

@@ -1,13 +0,0 @@
-# Template file for 'libcap-ng-python'.
-#
-depends="python"
-short_desc="${sourcepkg} python bindings"
-long_desc="${long_desc}
-
- This package contains the python language bindings."
-
-pycompile_module="capng"
-
-do_install() {
-	vmove "usr/lib/python*" usr/lib/python
-}

srcpkgs/libcap-ng/template

@@ -1,9 +1,8 @@
 # Template file for 'libcap-ng'
 pkgname=libcap-ng
 version=0.7.1
-revision=1
+revision=2
 build_style=gnu-configure
-subpackages="$pkgname-devel $pkgname-progs $pkgname-python"
 makedepends="python-devel swig"
 short_desc="An alternate POSIX capabilities library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -19,3 +18,38 @@ long_desc="
 
  The libcap-ng library is intended to make programming with posix capabilities
  much easier than the traditional libcap library."
+
+libcap-ng-devel_package() {
+	depends="libcap-ng>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share/man/man3
+		vmove usr/share/aclocal
+	}
+}
+
+libcap-ng-progs_package() {
+	short_desc+=" -- utilities"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share
+	}
+}
+
+libcap-ng-python_package() {
+	short_desc+=" -- python bindings"
+	depends="python"
+	pycompile_module="capng"
+	pkg_install() {
+		vmove "usr/lib/python*"
+	}
+}
+
+libcap-ng_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libcddb/libcddb-devel.template

@@ -1,17 +0,0 @@
-# Template file for 'libcddb-devel'.
-#
-depends="glibc-devel libcddb"
-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/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-}

srcpkgs/libcddb/template

@@ -1,14 +1,14 @@
 # Template file for 'libcddb'
 pkgname=libcddb
 version=1.3.2
-revision=4
+revision=5
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
-makedepends="pkg-config"
+hostmakedepends="pkg-config"
 short_desc="Library to access data on a CDDB server"
 homepage="http://libcddb.sourceforge.net/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=68e9b53918b9bea727fb2db78936526671c039dcd7396cb82ecd6854e866048c
 long_desc="
  Libcddb is a library that implements the different protocols (CDDBP,
@@ -16,4 +16,18 @@ long_desc="
  tries to be as cross-platform as possible. The initial library will
  have a C API."
 
-subpackages="$pkgname-devel"
+libcddb-devel_package() {
+	depends="libcddb>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+libcddb_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libcdio/libcdio-devel.template

@@ -1,18 +0,0 @@
-# Template file for 'libcdio-devel'.
-#
-depends="ncurses-devel libcddb-devel libcdio"
-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
-	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/info ${DESTDIR}/usr/share
-}

srcpkgs/libcdio/template

@@ -1,14 +1,15 @@
 # Template file for 'libcdio'
 pkgname=libcdio
 version=0.83
-homepage="http://www.gnu.org/software/libcdio/"
-distfiles="http://ftp.gnu.org/gnu/libcdio/$pkgname-$version.tar.gz"
 build_style=gnu-configure
-revision=2
+revision=3
-makedepends="pkg-config ncurses-devel libcddb-devel"
+hostmakedepends="pkg-config"
+makedepends="ncurses-devel libcddb-devel"
 short_desc="CD-ROM access library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
+homepage="http://www.gnu.org/software/libcdio/"
+distfiles="http://ftp.gnu.org/gnu/libcdio/$pkgname-$version.tar.gz"
 checksum=235017e3eccb86424f9c108f2c5d5fca62630bda8c9dcf23b425ba9c5e2482c0
 long_desc="
  This library is to encapsulate CD-ROM reading and
@@ -19,4 +20,19 @@ long_desc="
  so applications that use this library also have the ability to read
  disc images as though they were CDs."
 
-subpackages="$pkgname-devel"
+libcdio-devel_package() {
+	depends="libcddb-devel libcdio>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+libcdio_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libcec/cec-client.template

@@ -1,8 +0,0 @@
-# Template file for 'cec-client'.
-#
-depends="libcec>=${version}"
-short_desc="${short_desc} -- client tool"
-
-do_install() {
-	vmove usr/bin usr
-}

srcpkgs/libcec/libcec-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'libcec-devel'.
-#
-depends="libcec>=$version"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/libcec/template

@@ -3,7 +3,6 @@ pkgname=libcec
 version=2.1.1
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
-subpackages="cec-client ${pkgname}-devel"
 short_desc="USB CEC Adapter communication Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://github.com/Pulse-Eight/libcec"
@@ -15,7 +14,7 @@ hostmakedepends="automake pkg-config"
 makedepends="libudev-devel lockdev-devel"
 
 if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
-	makedepends="${makedepends} rpi-firmware"
+	makedepends+=" rpi-firmware"
 fi
 
 pre_configure() {
@@ -23,14 +22,16 @@ pre_configure() {
 }
 
 do_configure() {
+	local _rpiargs
+
 	if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
 		_rpiargs="--enable-rpi"
 		if [ "$XBPS_CROSS_BASE" ]; then
-			_rpiargs="${_rpiargs} --with-rpi-include-path=${XBPS_CROSS_BASE}/opt/vc/include"
+			_rpiargs+=" --with-rpi-include-path=${XBPS_CROSS_BASE}/opt/vc/include"
-			_rpiargs="${_rpiargs} --with-rpi-lib-path=${XBPS_CROSS_BASE}/opt/vc/lib"
+			_rpiargs+=" --with-rpi-lib-path=${XBPS_CROSS_BASE}/opt/vc/lib"
 		else
-			_rpiargs="${_rpiargs} --with-rpi-include-path=/opt/vc/include"
+			_rpiargs+=" --with-rpi-include-path=/opt/vc/include"
-			_rpiargs="${_rpiargs} --with-rpi-lib-path=/opt/vc/lib"
+			_rpiargs+=" --with-rpi-lib-path=/opt/vc/lib"
 		fi
 	fi
 	./configure ${CONFIGURE_SHARED_ARGS} ${_rpiargs} LDFLAGS=
@@ -43,3 +44,17 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} install
 }
+
+cec-client_package() {
+	depends="libcec>=${version}"
+	short_desc="${short_desc} -- client tool"
+	pkg_install() {
+		vmove usr/bin
+	}
+}
+
+libcec_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libcgroup/libcgroup-devel.template

@@ -1,13 +0,0 @@
-# Template file for 'libcgroup-devel'.
-#
-noarch=yes
-depends="libcgroup>=${version}"
-short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/libcgroup/template

@@ -1,11 +1,11 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
 version=0.38
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pam-module-dir=/usr/lib/security"
-subpackages="$pkgname-devel"
+hostmakedepends="flex"
-makedepends="flex pam-devel"
+makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -15,3 +15,22 @@ checksum=5d36d1a48b95f62fe9fcdf74a5a4089512e5e43e6011aa1504fd6f2a0909867f
 long_desc="
  ${pkgname} aims to provide programmers easily usable APIs to use the
  control group file system."
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" libfl-devel"
+fi
+
+libcgroup-devel_package() {
+	depends="libcgroup>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libcgroup_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libchamplain/libchamplain-devel.template

@@ -1,13 +0,0 @@
-# Template file for 'libchamplain-devel'.
-#
-depends="libsoup-gnome-devel gtk+3-devel>=3.8 clutter-gtk-devel>=1.4.4
-json-glib-devel sqlite-devel libchamplain>=$version"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/share/gir-1.0 usr/share
-	vmove usr/share/gtk-doc usr/share
-	vmove usr/share/vala usr/share
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/libchamplain/template

@@ -3,7 +3,6 @@ pkgname=libchamplain
 version=0.12.3
 revision=3
 build_style=gnu-configure
-subpackages="$pkgname-devel"
 configure_args="--disable-debug --disable-static"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="libsoup-gnome-devel gtk+3-devel>=3.8 cogl-devel>=1.14
@@ -14,3 +13,22 @@ homepage="http://projects.gnome.org/libchamplain/"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/$pkgname/0.12/$pkgname-$version.tar.xz"
 checksum=3d03d4e6892305a3b5b78e0718e486f6a13271df33d82383fd8361ef71f3e658
+
+libchamplain-devel_package() {
+	depends="libsoup-gnome-devel gtk+3-devel>=3.8 clutter-gtk-devel>=1.4.4
+		json-glib-devel sqlite-devel libchamplain>=$version"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/gtk-doc
+		vmove usr/share/vala
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libchamplain_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libconfig/libconfig++-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'libconfig++-devel'.
-#
-depends="libconfig++>=${version}"
-short_desc="C++ Configuration File Library -- development files"
-
-do_install() {
-	vmove usr/include/libconfig.h++ usr/include
-	vmove usr/lib/pkgconfig/libconfig++.pc usr/lib/pkgconfig
-	vmove "usr/lib/libconfig++.a" usr/lib
-}

srcpkgs/libconfig/libconfig++.template

@@ -1,7 +0,0 @@
-# Template file for 'libconfig++'.
-#
-short_desc="C++ Configuration File Library"
-
-do_install() {
-	vmove "usr/lib/libconfig++.so*" usr/lib
-}

srcpkgs/libconfig/libconfig-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'libconfig-devel'.
-#
-depends="libconfig>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/libconfig.a" usr/lib
-	vmove usr/share usr
-}

srcpkgs/libconfig/template

@@ -3,10 +3,43 @@ pkgname=libconfig
 version=1.4.8
 revision=1
 build_style=gnu-configure
-subpackages="${pkgname}++ ${pkgname}++-devel ${pkgname}-devel"
 short_desc="C Configuration File Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://hyperrealm.com/libconfig/libconfig.html"
 license="LGPL-2.1"
 distfiles="http://www.hyperrealm.com/libconfig/${pkgname}-${version}.tar.gz"
 checksum=18b1509fbf438a8c7f9b0af32284e458189b5f6dfd044f898926109f3c3c01ed
+
+libconfig++_package() {
+	short_desc="C++ Configuration File Library"
+	pkg_install() {
+		vmove "usr/lib/libconfig++.so*"
+	}
+}
+
+libconfig++-devel_package() {
+	depends="libconfig++>=${version}"
+	short_desc="C++ Configuration File Library -- development files"
+	pkg_install() {
+		vmove usr/include/libconfig.h++
+		vmove usr/lib/pkgconfig/libconfig++.pc
+		vmove "usr/lib/libconfig++.a"
+	}
+}
+
+libconfig-devel_package() {
+	depends="libconfig>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libconfig.a"
+		vmove usr/share
+	}
+}
+
+libconfig_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libcprops/libcprops-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'cprops-devel'.
-#
-depends="${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/share usr
-}

srcpkgs/libcprops/template

@@ -4,11 +4,30 @@ version=0.1.12
 revision=1
 build_style=gnu-configure
 configure_args="--disable-cpsp --disable-cpsvc"
-subpackages="${pkgname}-devel"
+hostmakedepends="which flex makedepend"
-makedepends="which flex makedepend"
 short_desc="C prototyping tools"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cprops.sourceforge.net/"
 license="LGPL-2.1"
 distfiles="${SOURCEFORGE_SITE}/cprops/${pkgname}-${version}.tar.bz2"
 checksum=3737772d2718a2c550adf4ca92cc492e613aa9200aae2bbaaf128d90f4ef67f2
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends="libfl-devel"
+fi
+
+libcprops-devel_package() {
+	depends="${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+libcprops_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libcroco/libcroco-devel.template

@@ -1,12 +0,0 @@
-# Template file for 'libcroco-devel'.
-#
-depends="glib-devel libxml2-devel ${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/share usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/bin/croco-*config" usr/bin
-}

srcpkgs/libcroco/template

@@ -2,7 +2,6 @@
 pkgname=libcroco
 version=0.6.8
 revision=2
-subpackages="$pkgname-devel"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libglib-devel libxml2-devel"
@@ -17,3 +16,21 @@ long_desc="
  parsing and manipulation toolkit. It provides a Simple Api for CSS
  and Cascading Style Sheet Object Model parser, a CSS2 selection
  engine, and an XML/CSS layout/rendering engine."
+
+libcroco-devel_package() {
+	depends="glib-devel libxml2-devel ${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove "usr/bin/croco-*config"
+	}
+}
+
+libcroco_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libcryptui/libcryptui-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'libcryptui-devel'.
-#
-depends="gtk+3-devel dbus-glib-devel libcryptui>=${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/gtk-doc usr/share
-}