Convert packages to the new template format (p).

srcpkgs/p7zip/template

@@ -2,22 +2,20 @@
 pkgname=p7zip
 version=9.20.1
 wrksrc=${pkgname}_${version}
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}_src_all.tar.bz2"
 revision=2
-makedepends="yasm nasm"
+hostmakedepends="yasm nasm"
 short_desc="Command-line version of the 7zip compressed file archive"
 homepage="http://p7zip.sourceforge.net/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}_src_all.tar.bz2"
 checksum=49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782
 long_desc="
  p7zip is the Unix port of 7-Zip, a file archiver that archives with very
  high compression ratios."
 
-
+do_build() {
-do_build()
+	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-{
-	if [ "$XBPS_MACHINE" = "x86_64" ]; then
 		cp makefile.linux_amd64_asm makefile.machine
 	else
 		cp makefile.linux_x86_asm_gcc_4.X makefile.machine
@@ -27,11 +25,16 @@ do_build()
 	make ${makejobs} all3 OPTFLAGS="${CXXFLAGS}"
 }
 
-do_install()
+do_install() {
-{
 	make install DEST_HOME="${DESTDIR}/usr" \
 		DEST_MAN="${DESTDIR}/usr/share/man" \
 		DEST_SHARE_DOC="${DESTDIR}/usr/share/doc/${pkgname}"
 
 	sed "s|${DESTDIR}/usr|/usr|g" -i ${DESTDIR}/usr/bin/7z{,a,r}
 }
+
+p7zip_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pangomm/pangomm-devel.template

@@ -1,15 +0,0 @@
-# Template file for 'pangomm-devel'.
-#
-depends="glibmm-devel cairomm-devel pango-devel pangomm"
-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/{pango*,pkgconfig} ${DESTDIR}/usr/lib
-}

srcpkgs/pangomm/template

@@ -1,15 +1,16 @@
 # Template build file for 'pangomm'.
 pkgname=pangomm
 version=2.28.4
-homepage="http://gtkmm.sourceforge.net"
+revision=3
-distfiles="${GNOME_SITE}/pangomm/2.28/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-documentation"
-revision=2
+hostmakedepends="pkg-config
-makedepends="pkg-config libsigc++-devel glibmm-devel cairomm-devel pango-devel"
+makedepends="libsigc++-devel glibmm-devel cairomm-devel pango-devel"
 short_desc="C++ bindings for the pango library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
+homepage="http://gtkmm.sourceforge.net"
+distfiles="${GNOME_SITE}/pangomm/2.28/$pkgname-$version.tar.xz"
 checksum=778dcb66a793cbfd52a9f92ee5a71b888c3603a913fc1ddc48a30204de6d6c82
 long_desc="
  pangomm (used to be part of gtkmm) is the official C++ interface for the
@@ -17,5 +18,18 @@ long_desc="
  extensible via inheritance and a comprehensive set of widget classes that
  can be freely combined to quickly create complex user interfaces."
  
-subpackages="$pkgname-devel"
+pangomm-devel_package() {
+	depends="glibmm-devel cairomm-devel pango-devel pangomm>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/pango*"
+	}
+}
 
+pangomm_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pangox-compat/pangox-compat-devel.template

@@ -1,13 +0,0 @@
-# Template file for 'pangox-compat-devel'.
-#
-noarch=yes
-depends="libX11-devel pango-devel>=1.31 ${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
-}

srcpkgs/pangox-compat/template

@@ -1,12 +1,11 @@
 # Template build file for 'pangox-compat'.
 pkgname=pangox-compat
 version=0.0.2
-revision=1
+revision=2
 build_style=gnu-configure
-replaces="pango<1.32"
 configure_args="--disable-static"
-makedepends="pkg-config pango-devel"
+hostmakedepends="pkg-config"
-subpackages="${pkgname}-devel"
+makedepends="pango-devel"
 short_desc="Library for layout and rendering of text (pangox compat library)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.pango.org/"
@@ -17,3 +16,19 @@ long_desc="
  This is a compatibility library providing the obsolete pangox library
  that is not shipped by Pango itself anymore.  If you are still using
  pangox, well, really, get a life..."
+
+pangox-compat-devel_package() {
+	depends="libX11-devel pango-devel>=1.31 ${sourcepkg}-${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+pangox-compat_package() {
+	replaces="pango<1.32"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/papyon/template

@@ -1,16 +1,14 @@
 # Template file for 'papyon'
 pkgname=papyon
 version=0.5.6
-distfiles="http://www.freedesktop.org/software/papyon/releases/papyon-${version}.tar.gz"
-build_style=python-module
-depends="gst-python farstream"
-makedepends="farstream-devel gst-python-devel"
-fulldepends="python pygobject pyopenssl pycrypto"
 revision=2
+build_style=python-module
+makedepends="farstream-devel gst-python-devel pygobject pyopenssl pycrypto"
 short_desc="MSN library purely written in Python"
 homepage="http://www.freedesktop.org/wiki/Software/papyon"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://www.freedesktop.org/software/papyon/releases/papyon-${version}.tar.gz"
 checksum=85ce086ad8c0a47609d908325008c27f4fc1d88b9e9f30ed6586bf943bc828ec
 long_desc="
  Features
@@ -30,6 +28,11 @@ long_desc="
   - Very solid and extensible architecture
   - Solid networking through a new sublibrary : gnet"
 
-noarch=yes
+papyon_package() {
-pycompile_module="$pkgname tests"
+	noarch="yes"
-
+	pycompile_module="papyon tests"
+	depends="gst-python farstream pygobject pyopenssl pycrypto"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/parted/libparted-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'libparted-devel'.
-#
-depends="libparted-${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/parted/libparted.template

@@ -1,7 +0,0 @@
-# Template file for 'libparted'.
-#
-short_desc="${short_desc} - shared library"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}

srcpkgs/parted/template

@@ -2,7 +2,6 @@
 pkgname=parted
 version=3.1
 revision=3
-subpackages="libparted libparted-devel"
 build_style=gnu-configure
 configure_args="--without-included-regex --disable-rpath"
 hostmakedepends="pkg-config"
@@ -17,3 +16,26 @@ long_desc="
  GNU Parted is a program that allows you to create, destroy, resize, move and
  copy hard disk partitions. This is useful for creating space for new
  operating systems, reorganising disk usage, and copying data to new hard disks."
+
+libparted_package() {
+	short_desc="${short_desc} - shared library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+libparted-devel_package() {
+	depends="libparted-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+parted_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/patch/template

@@ -2,14 +2,20 @@
 pkgname=patch
 version=2.7.1
 revision=3
-conflicts="chroot-patch>=0"
 build_style=gnu-configure
-# Required by patch -e functionality.
+makedepends="attr-devel ed"
-fulldepends="ed"
-makedepends="attr-devel"
 short_desc="Patch files using diff output"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/patch/patch.html"
 license="GPL-3"
 distfiles="http://ftp.gnu.org/gnu/patch/patch-$version.tar.bz2"
 checksum=aae676de9e95051f425af4507fcc9a019941a2a1f78405e7dbd40bccf786aa11
+
+patch_package() {
+	# Required by patch -e functionality.
+	depends="ed"
+	conflicts="chroot-patch>=0"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/patchage/template

@@ -5,9 +5,9 @@ revision=4
 build_style=waf
 configure_args="--jack-dbus"
 makedepends="pkg-config python dbus-devel dbus-glib-devel gtkmm2-devel
-libgnomecanvasmm-devel libglade-devel libglademm-devel flowcanvas-devel
+ libgnomecanvasmm-devel libglade-devel libglademm-devel flowcanvas-devel
-alsa-lib-devel jack-devel raul-devel boost-devel"
+ alsa-lib-devel jack-devel raul-devel boost-devel
-fulldepends="graphviz jack hicolor-icon-theme"
+ graphviz jack hicolor-icon-theme"
 short_desc="Modular patch bay for audio and MIDI based on JACK and ALSA."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -18,4 +18,9 @@ long_desc="
  Patchage is a modular patch bay for audio and MIDI systems based on JACK and
  ALSA."
 
-
+patchage_package() {
+	depends="graphviz jack hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/patchelf/template

@@ -16,3 +16,9 @@ long_desc="
   * Change the dynamic loader (ELF interpreter) of executables
   * Change the RPATH of executables and libraries
   * Shrink the RPATH of executables and libraries"
+
+patchelf_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pavucontrol/template

@@ -1,14 +1,15 @@
 # Template file for 'pavucontrol'
 pkgname=pavucontrol
 version=1.0
-build_style=gnu-configure
-homepage="http://freedesktop.org/software/pulseaudio/pavucontrol/"
-distfiles="${homepage}/${pkgname}-${version}.tar.xz"
 revision=1
-makedepends="pkg-config intltool gtkmm-devel atkmm-devel glibmm-devel libsigc++-devel libcanberra-devel gtk+3-devel glib-devel pulseaudio-devel libstdc++-devel"
+build_style=gnu-configure
+makedepends="pkg-config intltool"
+makedepends="gtkmm-devel libcanberra-devel gtk+3-devel pulseaudio-devel"
 short_desc="PulseAudio Volume Control"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
+homepage="http://freedesktop.org/software/pulseaudio/pavucontrol/"
+distfiles="${homepage}/${pkgname}-${version}.tar.xz"
 checksum=3dbe2865b6e3a195a8951967d9234f62cd254c30b08bdea1ecf8997b58f68cde
 long_desc="
  PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control
@@ -16,3 +17,8 @@ long_desc="
  tools this one allows you to control both the volume of hardware devices and
  of each playback stream separately."
 
+pavucontrol_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pbzip2/template

@@ -23,3 +23,9 @@ post_install() {
 
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }
+
+pbzip2_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pcc-libs/template

@@ -1,15 +1,14 @@
 # Template file for 'pcc-libs'
 pkgname=pcc-libs
 version=1.0.0
-wrksrc=${pkgname}-${version}
-distfiles="http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/$pkgname-$version.tgz"
-depends="glibc"
-makedepends="flex"
 revision=2
+wrksrc=${pkgname}-${version}
+makedepends="flex"
 short_desc="Portable C Compiler - Support Libraries"
 homepage="http://pcc.ludd.ltu.se/"
 license="Custom (BSD-like)"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/$pkgname-$version.tgz"
 checksum=f89ac94e30927a28c78fc8b8b7fef617eeaf843e2268063d43e414cf3179dd62
 long_desc="
  The compiler is based on the original Portable C Compiler by S. C. Johnson,
@@ -18,15 +17,18 @@ long_desc="
 
  This package includes some required object files for PCC to work."
 
-
+do_build() {
-do_build()
-{
 	# Force gcc compiler.
 	env CC=gcc ./configure --prefix=/usr
 	make ${makejobs}
 }
 
-do_install()
+do_install() {
-{
 	make DESTDIR=${DESTDIR} install
 }
+
+pcc-libs_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pcc/template

@@ -1,16 +1,15 @@
 # Template file for 'pcc'
 pkgname=pcc
 version=1.0.0
-distfiles="http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/pcc-$version.tgz"
+revision=2
 build_style=gnu-configure
 configure_args="--enable-tls"
-revision=2
+makedepends="flex pcc-libs"
-makedepends="flex"
-fulldepends="pcc-libs"
 short_desc="Portable C Compiler"
 homepage="http://pcc.ludd.ltu.se/"
 license="Custom (BSD-like)"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/pcc-$version.tgz"
 checksum=5802dbba46d6ea3f9badaa55b9044a0416bb410020c24a5c2a8a2eaaf41156cb
 long_desc="
  The compiler is based on the original Portable C Compiler by S. C. Johnson,
@@ -19,10 +18,15 @@ long_desc="
 
 disable_parallel_build=yes
 
-
+post_install() {
-post_install()
-{
 	# Rename conflicting cpp.1 manpage.
 	mv ${DESTDIR}/usr/share/man/man1/cpp.1 \
 		${DESTDIR}/usr/share/man/man1/pcc-cpp.1
 }
+
+pcc_package() {
+	depends="pcc-libs"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pciutils/pciutils-devel.template

@@ -1,14 +0,0 @@
-# Template file for 'pciutils-devel'.
-#
-depends="glibc-devel pciutils>=$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/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man/man7 usr/share/man
-}

srcpkgs/pciutils/template

@@ -1,7 +1,7 @@
 # Template file for 'pciutils'
 pkgname=pciutils
 version=3.1.10
-revision=1
+revision=2
 homepage="http://mj.ucw.cz/pciutils.html"
 distfiles="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${version}.tar.gz"
 subpackages="$pkgname-devel"
@@ -36,3 +36,20 @@ do_install() {
 	rm -f ${DESTDIR}/usr/sbin/update-pciids
 	rm -f ${DESTDIR}/usr/share/man/man8/update-pciids.8
 }
+
+pciutils-devel_package() {
+	depends="pciutils>=$version"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man7
+	}
+}
+
+pciutils_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pcmanfm/template

@@ -3,12 +3,20 @@ pkgname=pcmanfm
 version=1.1.0
 revision=1
 build_style=gnu-configure
-depends="libfm>=1.1.0 desktop-file-utils"
+hostmakedepends="pkg-config intltool"
-makedepends="pkg-config intltool gtk+-devel libfm-devel>=1.1.0"
+makedepends="gtk+-devel libfm-devel>=1.1.0"
-conf_files="/etc/xdg/pcmanfm/default/pcmanfm.conf"
 short_desc="LXDE file manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://pcmanfm.sourceforge.net/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=1f6301f330ad648f3322708ec6c0f680a8695a9453932fe19653bab6731e5582
+
+pcmanfm_package() {
+	conf_files="/etc/xdg/pcmanfm/default/pcmanfm.conf"
+	depends="libfm>=1.1.0 desktop-file-utils"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/pekwm/template

@@ -10,19 +10,26 @@ homepage="https://www.pekwm.org/projects/pekwm"
 distfiles="http://www.pekwm.org/projects/pekwm/files/pekwm-$version.tar.bz2"
 checksum=899eef35d5d1f472dd65a08c180b9719935cb1f42eda7fada6f9b8b551c79c96
 
-conf_files="
+hostmakedepends="pkg-config"
-/etc/pekwm/vars
+makedepends="libjpeg-turbo-devel libpng-devel>=1.5.10 libXinerama-devel
-/etc/pekwm/mouse
-/etc/pekwm/menu
-/etc/pekwm/start
-/etc/pekwm/keys
-/etc/pekwm/autoproperties_typerules
-/etc/pekwm/config
-/etc/pekwm/autoproperties
-/etc/pekwm/mouse_system
-/etc/pekwm/mouse_sloppy
-/etc/pekwm/mouse_click
-/etc/pekwm/config_system"
-
-makedepends="pkg-config libjpeg-turbo-devel libpng-devel>=1.5.10 libXinerama-devel
  libXft-devel libXrender-devel fontconfig-devel libXpm-devel libXrandr-devel"
+
+pekwm_package() {
+	conf_files="
+		/etc/pekwm/vars
+		/etc/pekwm/mouse
+		/etc/pekwm/menu
+		/etc/pekwm/start
+		/etc/pekwm/keys
+		/etc/pekwm/autoproperties_typerules
+		/etc/pekwm/config
+		/etc/pekwm/autoproperties
+		/etc/pekwm/mouse_system
+		/etc/pekwm/mouse_sloppy
+		/etc/pekwm/mouse_click
+		/etc/pekwm/config_system"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/pelican/template

@@ -4,16 +4,23 @@ version=3.1.1
 revision=2
 create_srcdir=yes
 noarch=yes
-pycompile_module="pelican"
 build_style=python-module
-depends="python>=2.7 python-feedgenerator python-jinja
+hostmakedepends="python-distribute"
+makedepends="python-devel python-feedgenerator python-jinja
  python-Pygments python-docutils python-blinker python-Unidecode
  python-Markdown"
-hostmakedepends="python-distribute"
-makedepends="python-devel"
 short_desc="Static site generator, written in Python"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://github.com/getpelican/pelican"
 license="AGPL-3"
 distfiles="https://github.com/getpelican/pelican/archive/${version}.tar.gz"
 checksum=d7e2f83a0168ab9b3fd7c7380abbe58f0a95088221e1ecc0a610d72902d39cd8
+
+pelican_package() {
+	noarch="yes"
+	pycompile_module="pelican"
+	depends="${makedepends}"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pen/template

@@ -1,14 +1,14 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.18.0
-homepage="http://siag.nu/pen"
+revision=1
-distfiles="http://siag.nu/pub/pen/pen-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-docdir=/usr/share/doc/pen"
-revision=1
 short_desc="Load balancer for simple TCP based protocols"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://siag.nu/pen"
+distfiles="http://siag.nu/pub/pen/pen-$version.tar.gz"
 checksum=48ab2a2ca3f564cb610a10d2d5252ecf8723ed8392bac5d1fba208946c3665fa
 long_desc="
  This is pen, a load balancer for simple tcp based protocols such as
@@ -16,3 +16,9 @@ long_desc="
  outside and automatically detects servers that are down and distributes
  clients among the available servers. This gives high availability and
  scalable performance."
+
+pen_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-Archive-Zip/template

@@ -2,13 +2,20 @@
 pkgname=perl-Archive-Zip
 version=1.30
 revision=1
-noarch=yes
 wrksrc="Archive-Zip-${version}"
 build_style=perl-module
-fulldepends="perl>=5.16"
+makedepends="perl>=5.16"
 short_desc="Provide a perl interface to ZIP archive files"
 maintainer="pancake <pancake@nopcode.org>"
 license="GPL, PerlArtistic"
 homepage="http://search.cpan.org/dist/Archive-Zip/"
 distfiles="http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Archive-Zip-${version}.tar.gz"
 checksum=f8b472ff77b7238e423bcb351968accc562f9d20700fbf2d8ed2a65fa0fa6318
+
+perl-Archive-Zip_package() {
+	noarch="yes"
+	depends="${makedepends}"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-CPAN-Meta-Requirements/template

@@ -3,8 +3,7 @@ pkgname=perl-CPAN-Meta-Requirements
 version=2.122
 wrksrc="CPAN-Meta-Requirements-${version}"
 revision=2
-noarch=yes
+makedepends="perl"
-fulldepends="perl"
 build_style=perl-module
 short_desc="CPAN::Meta::Requirements - A set of version requirements for a CPAN dist"
 maintainer="tripledes <tripledes@gmail.com>"
@@ -12,3 +11,11 @@ homepage="http://search.cpan.org/dist/CPAN-Meta-Requirements"
 license="GPL-1, Artistic"
 distfiles="${CPAN_SITE}/CPAN/${pkgname#perl-}-${version}.tar.gz"
 checksum=d0399f89f9fecc00f4db1db6222e04d35f86472562b2541d194a5a9f385d02bb
+
+perl-CPAN-Meta-Requirements_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-CPAN-Meta-YAML/template

@@ -3,8 +3,7 @@ pkgname=perl-CPAN-Meta-YAML
 version=0.008
 wrksrc="CPAN-Meta-YAML-${version}"
 revision=2
-noarch=yes
+makedepends="perl"
-fulldepends="perl"
 build_style=perl-module
 short_desc="CPAN::Meta::YAML - Read and write a subset of YAML for CPAN Meta files"
 maintainer="tripledes <tripledes@gmail.com>"
@@ -12,3 +11,11 @@ homepage="http://search.cpan.org/dist/CPAN-Meta-YAML"
 license="GPL-1, Artistic"
 distfiles="${CPAN_SITE}/CPAN/${pkgname#perl-}-${version}.tar.gz"
 checksum=e05bb0c4fb4579fbb3e06d55ca5c56cadd0ae3cbc9d8807dffaf55639747acbb
+
+perl-CPAN-Meta-YAML_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-CPAN-Meta/template

@@ -3,8 +3,7 @@ pkgname=perl-CPAN-Meta
 version=2.120921
 wrksrc="CPAN-Meta-${version}"
 revision=2
-noarch=yes
+makedepends="perl-CPAN-Meta-Requirements perl-CPAN-Meta-YAML"
-fulldepends="perl perl-CPAN-Meta-Requirements perl-CPAN-Meta-YAML"
 build_style=perl-module
 short_desc="CPAN::Meta - The distribution metadata for a CPAN dist"
 maintainer="tripledes <tripledes@gmail.com>"
@@ -12,3 +11,11 @@ homepage="http://search.cpan.org/dist/CPAN-Meta-Requirements"
 license="GPL-1, Artistic"
 distfiles="${CPAN_SITE}/CPAN/${pkgname#perl-}-${version}.tar.gz"
 checksum=e9a829a3149920655f1bdb36cd061c21b3bfa52f05b67d12a3534933cccc9789
+
+perl-CPAN-Meta_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-Crypt-Blowfish/template

@@ -16,4 +16,11 @@ long_desc="
  to take full advantage of Crypt::CBC when desired.  Blowfish keys may be
  up to 448 bits (56 bytes) long."
 
-fulldepends="perl"
+makedepends="perl"
+
+perl-Crypt-Blowfish_package() {
+	depends="perl"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-Crypt-DH/template

@@ -17,5 +17,12 @@ long_desc="
  an insecure network without the two parties ever passing the actual
  shared secret, or their private keys, between them."
 
-noarch=yes
+makedepends="perl-Math-BigInt-GMP"
-fulldepends="perl perl-Math-BigInt-GMP"
+
+perl-Crypt-DH_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-Crypt-OpenSSL-Bignum/template

@@ -18,5 +18,11 @@ long_desc="
  used to provide access to bignum values produced by other OpenSSL
  modules, such as key parameters from Crypt::OpenSSL::RSA."
 
-fulldepends="perl"
+makedepends="perl openssl-devel"
-makedepends="openssl-devel"
+
+perl-Crypt-OpenSSL-Bignum_package() {
+	depends="perl"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-Encode-Locale/template

@@ -1,16 +1,15 @@
 # Template build file for 'perl-Encode-Locale'.
 pkgname=perl-Encode-Locale
 version=1.02
-noarch=yes
-wrksrc="Encode-Locale-$version"
-distfiles="${CPAN_SITE}/Encode/Encode-Locale-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl"
 revision=1
+wrksrc="Encode-Locale-$version"
+build_style=perl-module
+makedepends="perl"
 short_desc="Encode::Locale - Determine the locale encoding"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/Encode-Locale-1.02/lib/Encode/Locale.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/Encode/Encode-Locale-$version.tar.gz"
 checksum=20c5ba2ab0ac00f0e6d5c5d405f2ccb3fdb0212de3519ec8d16688574d8d5340
 long_desc="
  In many applications it's wise to let Perl use Unicode for the strings it
@@ -26,3 +25,11 @@ long_desc="
  can be converted to Unicode strings by calling Encode::encode(locale =>
  $bytes) and converted back again with Encode::decode(locale => $string)."
 
+
+perl-Encode-Locale_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-ExtUtils-Depends/template

@@ -3,13 +3,13 @@ pkgname=perl-ExtUtils-Depends
 version=0.301
 revision=3
 wrksrc="ExtUtils-Depends-$version"
-distfiles="${SOURCEFORGE_SITE}/gtk2-perl/ExtUtils-Depends-$version.tar.gz"
 build_style=perl-module
-fulldepends="perl"
+makedepends="perl"
 short_desc="Easily build XS extensions that depend on XS extensions"
 homepage="http://gtk2-perl.sourceforge.net/"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${SOURCEFORGE_SITE}/gtk2-perl/ExtUtils-Depends-$version.tar.gz"
 checksum=c913136c2b6a19f7f9be2defb2ed86f01c84cd1685a0f76c9d50ee56fc2a42fc
 long_desc="
  This module tries to make it easy to build Perl extensions that use
@@ -17,4 +17,10 @@ long_desc="
  that a perl extension is treated like a shared library that provides
  also a C and an XS interface besides the perl one."
 
-noarch=yes
+perl-ExtUtils-Depends_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-ExtUtils-PkgConfig/template

@@ -3,13 +3,13 @@ pkgname=perl-ExtUtils-PkgConfig
 version=1.12
 revision=3
 wrksrc="ExtUtils-PkgConfig-$version"
-distfiles="${SOURCEFORGE_SITE}/gtk2-perl/ExtUtils-PkgConfig-$version.tar.gz"
 build_style=perl-module
-fulldepends="perl pkg-config"
+makedepends="perl pkg-config"
 short_desc="Simplistic perl interface to pkg-config"
 homepage="http://search.cpan.org/~xaoc/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${SOURCEFORGE_SITE}/gtk2-perl/ExtUtils-PkgConfig-$version.tar.gz"
 checksum=6330b9d1165363837ac1ab014888e3d908f8fb9eb76b31a36096d0e504f6ff42
 long_desc="
  The pkg-config program retrieves information about installed libraries,
@@ -20,4 +20,10 @@ long_desc="
  libraries that pkg-config knows. It is really just boilerplate code
  that you would've written yourself."
 
-noarch=yes
+perl-ExtUtils-PkgConfig_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-File-Listing/template

@@ -1,19 +1,24 @@
 # Template build file for 'perl-File-Listing'.
 pkgname=perl-File-Listing
 version=6.02
-wrksrc="File-Listing-$version"
-distfiles="${CPAN_SITE}/File/File-Listing-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl-HTTP-Date perl"
 revision=1
+wrksrc="File-Listing-$version"
+build_style=perl-module
+makedepends="perl-HTTP-Date perl"
 short_desc="File::Listing - parse directory listing"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/File-Listing-6.02/lib/File/Listing.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/File/File-Listing-$version.tar.gz"
 checksum=10d74be7373c1719363876c146f1f1730264585e74b6ddb7b7cb36cbc7b1ed19
 long_desc="
  This module exports a single function called parse_dir(), which can be used
  to parse directory listings."
 
-noarch=yes
+perl-File-Listing_package() {
-
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-Fuse/template

@@ -3,15 +3,21 @@ pkgname=perl-Fuse
 version=0.14
 revision=2
 wrksrc="Fuse-$version"
-distfiles="${CPAN_SITE}/Fuse/Fuse-$version.tar.gz"
 build_style=perl-module
-makedepends="pkg-config fuse-devel"
+makedepends="pkg-config fuse-devel perl>=5.16"
-fulldepends="perl>=5.16"
 short_desc="Write filesystems in Perl using FUSE"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/~dpavlin/Fuse-0.13/Fuse.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/Fuse/Fuse-$version.tar.gz"
 checksum=bbdd8e3933f87798736f85c2a21ad9857b2c6b2323537369cec139d6cd06da5b
 long_desc="
  This lets you implement filesystems in perl, through the FUSE
  (Filesystem in USErspace) kernel/lib interface."
+
+perl-Fuse_package() {
+	depends="perl>=5.16"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-Glib/template

@@ -3,14 +3,13 @@ pkgname=perl-Glib
 version=1.242
 revision=1
 wrksrc="Glib-$version"
+build_style=perl-module
+makedepends="perl-ExtUtils-Depends>=0.300 perl-ExtUtils-PkgConfig>=1.00 glib-devel"
+short_desc="Perl bindings for Glib 2"
+maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gtk2-perl.sourceforge.net/"
 license="LGPL-2.1"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Glib-$version.tar.gz"
-build_style=perl-module
-makedepends="perl-ExtUtils-Depends>=0.300 perl-ExtUtils-PkgConfig>=1.00 glib-devel"
-fulldepends="perl>=5.16"
-short_desc="Perl bindings for Glib 2"
-maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0ebb78bcb3d10c9564473b084ef2989cf86347c1ba4acd5e55bc6c46b6d08d78
 long_desc="
  This module provides perl access to GLib and GLib's GObject libraries.
@@ -19,3 +18,10 @@ long_desc="
  these libraries are used as the foundation for many of the libraries
  that make up the Gnome environment, and are used in many unrelated
  projects."
+
+perl-Glib_package() {
+	depends="perl>=5.16"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-HTML-Form/template

@@ -1,15 +1,15 @@
 # Template build file for 'perl-HTML-Form'.
 pkgname=perl-HTML-Form
 version=6.00
-wrksrc="HTML-Form-$version"
-distfiles="${CPAN_SITE}/HTML/HTML-Form-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl-HTML-Parser perl-URI perl-HTTP-Message perl"
 revision=1
+wrksrc="HTML-Form-$version"
+build_style=perl-module
+makedepends="perl-HTML-Parser perl-URI perl-HTTP-Message perl"
 short_desc="HTML::Form - Class that represents an HTML form element"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTML-Form-6.00/lib/HTML/Form.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/HTML/HTML-Form-$version.tar.gz"
 checksum=b41b6f5480493d427a56974c0fb6f51e807d93938ef1518dd22454b93cad4987
 long_desc="
  Objects of the HTML::Form class represents a single HTML FORM tag instance.
@@ -18,5 +18,10 @@ long_desc="
  then be asked to provide HTTP::Request objects that can be passed to the
  request() method of LWP::UserAgent."
 
-noarch=yes
+perl-HTML-Form_package() {
-
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-HTML-Parser/template

@@ -3,14 +3,21 @@ pkgname=perl-HTML-Parser
 version=3.70
 revision=1
 wrksrc="HTML-Parser-$version"
-distfiles="${CPAN_SITE}/HTML/HTML-Parser-$version.tar.gz"
 build_style=perl-module
-fulldepends="perl>=5.16 perl-HTML-Tagset"
+makedepends="perl>=5.16 perl-HTML-Tagset"
 short_desc="HTML::Parser - HTML parser class"
 homepage="http://search.cpan.org/~gaas/HTML-Parser-3.68/Parser.pm"
 license="GPL-1+/Artistic"
 maintainer="davehome <davehome@redthumb.info.tm>"
+distfiles="${CPAN_SITE}/HTML/HTML-Parser-$version.tar.gz"
 checksum=a9a18c79b1d2b315daedafe7598dc1068d562eaeaa5bd46265a6ebd2805446c1
 long_desc="
  The HTML-Parser distribution is is a collection of modules that parse and
  extract information from HTML documents."
+
+perl-HTML-Parser_package() {
+	depends="${makedepends}"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-HTML-Tagset/template

@@ -1,19 +1,24 @@
 # Template build file for 'perl-Tagset'.
 pkgname=perl-HTML-Tagset
 version=3.20
-wrksrc="HTML-Tagset-$version"
-distfiles="${CPAN_SITE}/HTML/HTML-Tagset-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl"
 revision=2
+wrksrc="HTML-Tagset-$version"
+build_style=perl-module
+makedepends="perl"
 short_desc="HTML::Tagset - data tables useful in parsing HTML"
 homepage="http://search.cpan.org/~petdance/HTML-Tagset-3.20/Tagset.pm"
 license="GPL-1+/Artistic"
 maintainer="davehome <davehome@redthumb.info.tm>"
+distfiles="${CPAN_SITE}/HTML/HTML-Tagset-$version.tar.gz"
 checksum=adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2
 long_desc="
  This module contains several data tables useful in various kinds of HTML
  parsing operations."
 
-noarch=yes
+perl-HTML-Tagset_package() {
- 
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-HTTP-Cookies/template

@@ -1,15 +1,15 @@
 # Template build file for 'perl-HTTP-Cookies'.
 pkgname=perl-HTTP-Cookies
 version=6.00
-wrksrc="HTTP-Cookies-$version"
-distfiles="${CPAN_SITE}/HTTP/HTTP-Cookies-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl-HTTP-Message perl"
 revision=1
+wrksrc="HTTP-Cookies-$version"
+build_style=perl-module
+makedepends="perl-HTTP-Message"
 short_desc="HTTP::Cookies - HTTP cookie jars"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTTP-Cookies-6.00/lib/HTTP/Cookies.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/HTTP/HTTP-Cookies-$version.tar.gz"
 checksum=30b5741894696493748336226b91e1a6bda66480f5fa758f5ce10b21f360a81c
 long_desc="
  This class is for objects that represent a cookie jar -- that is, a database
@@ -27,5 +27,10 @@ long_desc="
  initialize Cookie-headers in HTTP::Request objects. The state of a
  HTTP::Cookies object can be saved in and restored from files."
 
-noarch=yes
+perl-HTTP-Cookies_package() {
-
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-HTTP-Daemon/template

@@ -1,20 +1,25 @@
 # Template build file for 'perl-HTTP-Daemon'.
 pkgname=perl-HTTP-Daemon
 version=6.00
-wrksrc="HTTP-Daemon-$version"
-distfiles="${CPAN_SITE}/HTTP/HTTP-Daemon-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl-HTTP-Message perl-LWP-MediaTypes perl"
 revision=1
+wrksrc="HTTP-Daemon-$version"
+build_style=perl-module
+makedepends="perl-HTTP-Message perl-LWP-MediaTypes"
 short_desc="HTTP::Daemon - a simple http server class"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTTP-Daemon-6.00/lib/HTTP/Daemon.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/HTTP/HTTP-Daemon-$version.tar.gz"
 checksum=4801d349c52813a1e49d6b31962f45705bae76fb907279e75933596c04e0de89
 long_desc="
  Instances of the HTTP::Daemon class are HTTP/1.1 servers that listen on a
  socket for incoming requests. The HTTP::Daemon is a subclass of
  IO::Socket::INET, so you can perform socket operations directly on it too."
 
-noarch=yes
+perl-HTTP-Daemon_package() {
-
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-HTTP-Date/template

@@ -1,20 +1,25 @@
 # Template build file for 'perl-HTTP-Date'.
 pkgname=perl-HTTP-Date
 version=6.00
-wrksrc="HTTP-Date-$version"
-distfiles="${CPAN_SITE}/HTTP/HTTP-Date-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl"
 revision=1
+wrksrc="HTTP-Date-$version"
+build_style=perl-module
+makedepends="perl"
 short_desc="HTTP::Date - date conversion routines"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTTP-Date-6.00/lib/HTTP/Date.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/HTTP/HTTP-Date-$version.tar.gz"
 checksum=466f7328a1ff465e64c57d18ba2bf5a577fe137c126850e9680d7792a3b3d996
 long_desc="
  This module provides functions that deal the date formats used by the HTTP
  protocol (and then some more). Only the first two functions, time2str() and
  str2time(), are exported by default."
 
-noarch=yes
+perl-HTTP-Date_package() {
-
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-HTTP-Message/template

@@ -3,13 +3,13 @@ pkgname=perl-HTTP-Message
 version=6.02
 revision=2
 wrksrc="HTTP-Message-$version"
-distfiles="${CPAN_SITE}/HTTP/HTTP-Message-$version.tar.gz"
 build_style=perl-module
-fulldepends="perl-LWP-MediaTypes perl-Encode-Locale perl-URI perl-HTTP-Date perl-HTML-Parser perl"
+makedepends="perl-LWP-MediaTypes perl-Encode-Locale perl-URI perl-HTTP-Date perl-HTML-Parser"
 short_desc="HTTP::Message - HTTP style message (base class)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTTP-Message-6.02/lib/HTTP/Message.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/HTTP/HTTP-Message-$version.tar.gz"
 checksum=2331b3c82e8a9674e596e4583f13a655d24d2e3c7165f3bdc6def4b5d4165181
 long_desc='
  An HTTP::Message object contains some headers and a content body. The
@@ -19,5 +19,10 @@ long_desc='
    $mess = HTTP::Message->new( $headers )
    $mess = HTTP::Message->new( $headers, $content )'
 
-noarch=yes
+perl-HTTP-Message_package() {
-
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-HTTP-Negotiate/template

@@ -1,15 +1,15 @@
 # Template build file for 'perl-HTTP-Negotiate'.
 pkgname=perl-HTTP-Negotiate
 version=6.00
-wrksrc="HTTP-Negotiate-$version"
-distfiles="${CPAN_SITE}/HTTP/HTTP-Negotiate-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl-HTTP-Message perl"
 revision=1
+wrksrc="HTTP-Negotiate-$version"
+build_style=perl-module
+makedepends="perl-HTTP-Message"
 short_desc="HTTP::Negotiate - choose a variant to serve"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTTP-Negotiate-6.00/lib/HTTP/Negotiate.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/HTTP/HTTP-Negotiate-$version.tar.gz"
 checksum=4e070ea67427ab1843620debc923b820bd41b9018914dfef54bbc7af9257ae82
 long_desc="
  This module provides a complete implementation of the HTTP content
@@ -18,5 +18,10 @@ long_desc="
  representation based upon attributes of the negotiable variants and the value
  of the various Accept* header fields in the request."
 
-noarch=yes
+perl-HTTP-Negotiate_package() {
-
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-IO-Tty/template

@@ -3,13 +3,20 @@ pkgname=perl-IO-Tty
 version=1.10
 revision=1
 wrksrc="IO-Tty-$version"
-distfiles="${CPAN_SITE}/IO/IO-Tty-$version.tar.gz"
 build_style=perl-module
-fulldepends="perl>=5.16"
+makedepends="perl>=5.16"
 short_desc="IO::Tty - Perl interface to Low-level allocate a pseudo-Tty"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/dist/IO-Tty/"
 license="GPL-2"
+distfiles="${CPAN_SITE}/IO/IO-Tty-$version.tar.gz"
 checksum=31a6e21ad187ec5ea93c2b898d6b3519647c5fce9f394b6d3c05a1f7c3f6f8b1
 long_desc="
  IO::Tty and IO::Pty provide an interface to pseudo tty's."
+
+perl-IO-Tty_package() {
+	depends="${makedepends}"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-IPC-Run/template

@@ -1,15 +1,15 @@
 # Template build file for 'perl-IPC-Run'.
 pkgname=perl-IPC-Run
 version=0.90
-wrksrc="IPC-Run-$version"
-distfiles="${CPAN_SITE}/IPC/IPC-Run-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl"
 revision=1
+wrksrc="IPC-Run-$version"
+build_style=perl-module
+makedepends="perl"
 short_desc="system() and background procs w/ piping, redirs, ptys"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/dist/IPC-Run/lib/IPC/Run.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/IPC/IPC-Run-$version.tar.gz"
 checksum=2f0070e34e5a10e5e4e4efdb812b01c7e32919818d43a030d90ca34200902883
 long_desc="
  IPC::Run allows you to run and interact with child processes using files,
@@ -17,4 +17,10 @@ long_desc="
  supported and may be mixed. Likewise, functional and OO API styles are
  both supported and may be mixed."
 
-noarch=yes
+perl-IPC-Run_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-LWP-MediaTypes/template

@@ -1,15 +1,15 @@
 # Template build file for 'perl-LWP-MediaTypes'.
 pkgname=perl-LWP-MediaTypes
 version=6.01
-wrksrc="LWP-MediaTypes-$version"
-distfiles="${CPAN_SITE}/LWP/LWP-MediaTypes-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl"
 revision=1
+wrksrc="LWP-MediaTypes-$version"
+build_style=perl-module
+makedepends="perl"
 short_desc="LWP::MediaTypes - guess media type for a file or a URL"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/LWP-MediaTypes-6.01/lib/LWP/MediaTypes.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/LWP/LWP-MediaTypes-$version.tar.gz"
 checksum=df25a848796bb53ae465924fb1192a19400f37d7446b2fe7f73443db07c51dba
 long_desc="
  This module provides functions for handling media (also known as MIME) types
@@ -17,5 +17,10 @@ long_desc="
  the media.types file. If the ~/.media.types file exists it is used instead.
  For backwards compatibility we will also look for ~/.mime.types."
 
-noarch=yes
+perl-LWP-MediaTypes_package() {
-
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-LWP/template

@@ -1,15 +1,17 @@
 # Template build file for 'perl-LWP'.
 pkgname=perl-LWP
 version=6.02
-wrksrc="libwww-perl-$version"
-distfiles="${CPAN_SITE}/LWP/libwww-perl-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl-URI perl-LWP-MediaTypes perl-Encode-Locale perl-HTTP-Message perl-File-Listing perl-HTTP-Negotiate perl-HTTP-Daemon perl-Net-HTTP perl-HTTP-Cookies perl-WWW-RobotRules perl"
 revision=1
+wrksrc="libwww-perl-$version"
+build_style=perl-module
+makedepends="perl-URI perl-LWP-MediaTypes perl-Encode-Locale perl-HTTP-Message
+ perl-File-Listing perl-HTTP-Negotiate perl-HTTP-Daemon perl-Net-HTTP
+ perl-HTTP-Cookies perl-WWW-RobotRules perl"
 short_desc="LWP - The World-Wide Web library for Perl (libwww-perl)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/libwww-perl-6.02/lib/LWP.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/LWP/libwww-perl-$version.tar.gz"
 checksum=b5193e9e2eb2fa6ff8b7d4d22ec4e9010706f65b6042e86cc537d7f2f362c232
 long_desc="
  The libwww-perl collection is a set of Perl modules which provides a simple
@@ -23,5 +25,10 @@ long_desc="
  by objects. This makes a simple and powerful interface to these services. The
  interface is easy to extend and customize for your own needs."
 
-noarch=yes
+perl-LWP_package() {
-
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-Math-BigInt-GMP/template

@@ -1,8 +1,8 @@
 # Template build file for 'perl-Math-BigInt-GMP'.
 pkgname=perl-Math-BigInt-GMP
 version=1.36
-wrksrc="Math-BigInt-GMP-${version}"
 revision=1
+wrksrc="Math-BigInt-GMP-${version}"
 build_style=perl-module
 short_desc="Math::BigInt::GMP - Use the GMP library for Math::BigInt routines"
 maintainer="Juan RP <xtraeme@gmail.com"
@@ -13,5 +13,11 @@ checksum=278115a882d0cb50fbbef36706d8fff44122de58f8e7d5f6dcebf00e2df1b449
 long_desc="
  Provides support for big integer calculations by means of the GMP c-library."
 
-fulldepends="perl"
+makedepends="perl gmp-devel"
-makedepends="gmp-devel"
+
+perl-Math-BigInt-GMP_package() {
+	depends="perl"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-Net-HTTP/template

@@ -1,20 +1,25 @@
 # Template build file for 'perl-Net-HTTP'.
 pkgname=perl-Net-HTTP
 version=6.01
-wrksrc="Net-HTTP-$version"
-distfiles="${CPAN_SITE}/Net/Net-HTTP-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl"
 revision=1
+wrksrc="Net-HTTP-$version"
+build_style=perl-module
+makedepends="perl"
 short_desc="Net::HTTP - Low-level HTTP connection (client)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/Net-HTTP-6.01/lib/Net/HTTP.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/Net/Net-HTTP-$version.tar.gz"
 checksum=76d883f9b249b16393dc183de04b4e4fed99bb0eb776ab9149d915607c69ea46
 long_desc="
  The Net::HTTP class is a low-level HTTP client. An instance of the
  Net::HTTP class represents a connection to an HTTP server. The HTTP protocol
  is described in RFC 2616. The Net::HTTP class supports HTTP/1.0 and HTTP/1.1."
 
-noarch=yes
+perl-Net-HTTP_package() {
-
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-Parse-CPAN-Meta/template

@@ -1,10 +1,9 @@
 # Template build file for 'perl-Parse-CPAN-Meta'.
 pkgname=perl-Parse-CPAN-Meta
 version=1.4404
-wrksrc="Parse-CPAN-Meta-${version}"
 revision=2
-noarch=yes
+wrksrc="Parse-CPAN-Meta-${version}"
-fulldepends="perl perl-CPAN-Meta-YAML"
+makedepends="perl-CPAN-Meta-YAML"
 build_style=perl-module
 short_desc="Parse::CPAN::Meta - Parse META.yml and META.json CPAN metadata files"
 maintainer="tripledes <tripledes@gmail.com>"
@@ -12,3 +11,11 @@ homepage="http://search.cpan.org/dist/Parse-CPAN-Meta"
 license="GPL-1, Artistic"
 distfiles="${CPAN_SITE}/Parse/${pkgname#perl-}-${version}.tar.gz"
 checksum=b03ad539129a30fc76311a4d341878172a5aade8338c4d7a0184ce5961c995f8
+
+perl-Parse-CPAN-Meta_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-URI/template

@@ -1,15 +1,15 @@
 # Template build file for 'perl-URI'.
 pkgname=perl-URI
 version=1.58
-wrksrc="URI-$version"
-distfiles="${CPAN_SITE}/URI/GAAS/URI-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl"
 revision=2
+wrksrc="URI-$version"
+build_style=perl-module
+makedepends="perl"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 homepage="http://search.cpan.org/~gaas/URI-1.58/URI.pm"
 license="GPL-1+/Artisti"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${CPAN_SITE}/URI/GAAS/URI-$version.tar.gz"
 checksum=5ddeb8e4707bd4c37a3a60f634de8424e40c85bba98cf6c1053ae5e71c9b8289
 long_desc="
   This package contains the URI.pm module with friends. The module
@@ -25,4 +25,10 @@ long_desc="
  URI::URL interface. The emulated URI::URL implements both the old and
  the new interface."
 
-noarch=yes
+perl-URI_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-WWW-RobotRules/template

@@ -1,15 +1,15 @@
 # Template build file for 'perl-WWW-RobotRules'.
 pkgname=perl-WWW-RobotRules
 version=6.01
-wrksrc="WWW-RobotRules-$version"
-distfiles="${CPAN_SITE}/WWW/WWW-RobotRules-$version.tar.gz"
-build_style=perl-module
-fulldepends="perl-URI perl"
 revision=1
+wrksrc="WWW-RobotRules-$version"
+build_style=perl-module
+makedepends="perl-URI"
 short_desc="WWW::RobotRules - database of robots.txt-derived permissions"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/WWW-RobotRules-6.01/lib/WWW/RobotRules.pm"
 license="GPL-2"
+distfiles="${CPAN_SITE}/WWW/WWW-RobotRules-$version.tar.gz"
 checksum=f817e3e982c9d869c7796bcb5737c3422c2272355424acd162d0f3b132bec9d3
 long_desc="
  This module parses /robots.txt files as specified in
@@ -22,5 +22,10 @@ long_desc="
  WWW::RobotRules object can be used for one or more parsed /robots.txt files
  on any number of hosts."
 
-noarch=yes
+perl-WWW-RobotRules_package() {
-
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-XML-Simple/template

@@ -2,10 +2,9 @@
 pkgname=perl-XML-Simple
 version=2.20
 revision=1
-noarch=yes
 wrksrc="XML-Simple-$version"
 build_style=perl-module
-fulldepends="perl>=5.16 expat perl-XML-Parser perl-XML-SAX"
+makedepends="perl>=5.16 expat perl-XML-Parser perl-XML-SAX"
 short_desc="Easy Perl API to read/write XML"
 homepage="http://search.cpan.org/dist/XML-Simple/"
 license="GPL-1+/Artistic"
@@ -15,3 +14,11 @@ checksum=5cff13d0802792da1eb45895ce1be461903d98ec97c9c953bc8406af7294434a
 long_desc="
  This Perl module provides an easy API to read and write XML
  (especially configuration files)."
+
+perl-XML-Simple_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pidgin-gpg/template

@@ -1,14 +1,19 @@
 # Template file for 'pidgin-gpg'
 pkgname=pidgin-gpg
 version=0.9
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="pkg-config libpurple-devel gpgme-devel"
+hostmakedepends="pkg-config"
+makedepends="libpurple-devel gpgme-devel"
 short_desc="A GnuPG plug-in for the Pidgin IM"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://github.com/segler-alex/Pidgin-GPG"
 distfiles="http://github.com/downloads/segler-alex/Pidgin-GPG/${pkgname}-${version}.tar.gz"
 checksum=736681cb25da31eb8ced96055d4150d649fe6ef6e523b6f65846c3446ac09a96
-long_desc="
+
- This package contains ${pkgname}, ${short_desc}."
+pidgin-gpg_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pidgin/finch-devel.template

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

srcpkgs/pidgin/finch.template

@@ -1,8 +0,0 @@
-# Template file for 'finch-devel'.
-#
-short_desc="A ncurses-based messaging client"
-
-do_install() {
-	vmove usr/bin/finch usr/bin
-	vmove usr/share/man/man1/finch.1 usr/share/man/man1
-}

srcpkgs/pidgin/libgnt-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'libgnt-devel'.
-#
-noarch=yes
-depends="glib-devel libgnt>=${version}"
-short_desc="IM library extracted from Pidgin (GNT) -- development files"
-
-do_install() {
-	vmove usr/include/gnt usr/include
-	vmove usr/lib/pkgconfig/gnt.pc usr/lib/pkgconfig
-}

srcpkgs/pidgin/libgnt.template

@@ -1,9 +0,0 @@
-# Template file for 'libgnt'.
-#
-short_desc="IM library extracted from Pidgin (GNT)"
-
-do_install() {
-	vmove "usr/lib/libgnt*.so*" usr/lib
-	vmove usr/lib/finch usr/lib
-	vmove usr/lib/gnt usr/lib
-}

srcpkgs/pidgin/libpurple-devel.template

@@ -1,12 +0,0 @@
-# Template file for 'libpurple-devel'.
-#
-noarch=yes
-depends="glib-devel libpurple>=${version}"
-short_desc="IM library extracted from Pidgin -- development files"
-
-do_install() {
-	vmove usr/include/libpurple usr/include
-	vmove usr/lib/pkgconfig/purple.pc usr/lib/pkgconfig
-	vmove usr/share/aclocal/purple.m4 usr/share/aclocal
-	vmove usr/share/man/man3/Purple.3p usr/share/man/man3
-}

srcpkgs/pidgin/libpurple.template

@@ -1,12 +0,0 @@
-# Template file for 'libpurple'.
-#
-short_desc="IM library extracted from Pidgin"
-
-do_install() {
-	vmove "usr/bin/purple-*" usr/bin
-	vmove "usr/lib/libpurple*.so*" usr/lib
-	vmove usr/lib/purple-2 usr/lib
-	vmove usr/share/purple usr/share
-	vmove usr/share/sounds/purple usr/share/sounds
-	vmove usr/share/gconf usr/share
-}

srcpkgs/pidgin/pidgin-devel.template

@@ -1,14 +0,0 @@
-# Template file for 'pidgin-devel'.
-#
-noarch=yes
-depends="gtk+-devel libpurple-devel>=${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
-	vmove usr/share/man/man3/Pidgin.3p usr/share/man/man3
-}

srcpkgs/pidgin/template

@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
 version=2.10.6
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --disable-vv
@@ -18,11 +18,6 @@ long_desc="
  Pidgin is an easy to use and free chat client used by millions. Connect to
  AIM, MSN, Yahoo, and more chat networks all at once."
 
-subpackages="libpurple libpurple-devel libgnt libgnt-devel
- finch finch-devel pidgin-devel"
-
-depends="cyrus-sasl-modules"
-
 makedepends="pkg-config intltool glib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel GConf-devel gst-plugins-base-devel libidn-devel python-devel
@@ -34,3 +29,78 @@ post_install() {
         gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/purple.schemas \
                 --domain purple ${wrksrc}/*.schemas
 }
+
+libpurple_package() {
+	short_desc="IM library extracted from Pidgin"
+	pkg_install() {
+		vmove "usr/bin/purple-*"
+		vmove "usr/lib/libpurple*.so*"
+		vmove usr/lib/purple-2
+		vmove usr/share/purple
+		vmove usr/share/sounds/purple
+		vmove usr/share/gconf
+	}
+}
+
+libpurple-devel_package() {
+	depends="libglib-devel libpurple>=${version}"
+	short_desc="IM library extracted from Pidgin -- development files"
+	pkg_install() {
+		vmove usr/include/libpurple
+		vmove usr/lib/pkgconfig/purple.pc
+		vmove usr/share/aclocal/purple.m4
+		vmove usr/share/man/man3/Purple.3p
+	}
+}
+
+libgnt_package() {
+	short_desc="IM library extracted from Pidgin (GNT)"
+	pkg_install() {
+		vmove "usr/lib/libgnt*.so*"
+		vmove usr/lib/finch
+		vmove usr/lib/gnt
+	}
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}"
+	short_desc="IM library extracted from Pidgin (GNT) -- development files"
+	pkg_install() {
+		vmove usr/include/gnt
+		vmove usr/lib/pkgconfig/gnt.pc
+	}
+}
+
+finch_package() {
+	short_desc="A ncurses-based messaging client"
+	pkg_install() {
+		vmove usr/bin/finch
+		vmove usr/share/man/man1/finch.1
+	}
+}
+
+finch-devel_package() {
+	depends="libgnt-devel>=${version} libpurple-devel>=${version}"
+	short_desc="A ncurses-based messaging client -- development files"
+	pkg_install() {
+		vmove usr/include/finch
+		vmove usr/lib/pkgconfig/finch.pc
+	}
+}
+
+pidgin-devel_package() {
+	depends="gtk+-devel libpurple-devel>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3/Pidgin.3p
+	}
+}
+
+pidgin_package() {
+	depends="cyrus-sasl-modules"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pkg-config/template

@@ -11,8 +11,8 @@ license="GPL-2"
 distfiles="http://pkgconfig.freedesktop.org/releases/$pkgname-$version.tar.gz"
 checksum=6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845
 
-if [ -n "$CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
-	configure_args="${configure_args} glib_cv_long_long_format=I64
+	configure_args+=" glib_cv_long_long_format=I64
 		glib_cv_stack_grows=no glib_cv_rtldglobal_broken=no
 		glib_cv_uscore=no blib_cv_use_pid_surrogate=yes
 		ac_cv_func_vsnprintf_c99=yes
@@ -21,3 +21,9 @@ if [ -n "$CROSS_BUILD" ]; then
 		ac_cv_func_posix_getgrgid_r=yes
 		ac_cv_func_posix_getgrgid_r=yes"
 fi
+
+pkg-config_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/polipo/template

@@ -14,8 +14,6 @@ long_desc="
  small group of people, there is nothing that prevents it from being used
  by a larger group."
 
-systemd_services="polipo.service on"
-
 do_build() {
 	make ${makejobs}
 }
@@ -32,3 +30,10 @@ do_install() {
 	# systemd service
 	vinstall ${FILESDIR}/polipo.service 644 usr/lib/systemd/system
 }
+
+polipo_package() {
+	systemd_services="polipo.service on"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/polkit-gnome/template

@@ -3,8 +3,8 @@ pkgname=polkit-gnome
 version=0.105
 revision=3
 build_style=gnu-configure
-makedepends="pkg-config intltool gobject-introspection polkit-devel
+hostmakedepends="pkg-config intltool gobject-introspection"
-gtk+3-devel>=3.6.0_2"
+makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
@@ -20,3 +20,9 @@ long_desc="
  method) for unprivileged (desktop) applications.
 
  This package contains the glue to integrate with the GNOME desktop."
+
+polkit-gnome_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/polkit-qt/polkit-qt-devel.template

@@ -1,14 +0,0 @@
-# Template file for 'polkit-qt-devel'.
-#
-noarch=yes
-depends="qt-devel polkit-devel polkit-qt>=${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
-	vmove usr/lib/cmake usr/lib
-}

srcpkgs/polkit-qt/template

@@ -1,11 +1,11 @@
 # Template file for 'polkit-qt'
 pkgname=polkit-qt
 version=0.103.0
-revision=2
+revision=3
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
-makedepends="pkg-config cmake automoc4 polkit-devel qt-devel"
+hostmakedepends="pkg-config cmake automoc4"
-subpackages="${pkgname}-devel"
+makedepends="polkit-devel qt-devel"
 short_desc="Qt-style PolicyKit API"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://projects.kde.org/projects/kdesupport/polkit-qt-1"
@@ -22,3 +22,19 @@ long_desc="
 
  ${pkgname} provides convenience classes and methods for Qt/KDE applications
  that want to use PolicyKit."
+
+polkit-qt-devel_package() {
+	depends="qt-devel polkit-devel polkit-qt>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+	}
+}
+
+polkit-qt_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/polysh/template

@@ -13,7 +13,13 @@ long_desc="
  Polysh is a tool to aggregate several remote shells into one. It is used to
  launch an interactive remote shell on many machines at once."
 
-noarch=yes
-depends="python>=2.7<3.0 openssh"
 makedepends="python-devel"
-pycompile_module="polysh"
+
+polysh_package() {
+	noarch="yes"
+	pycompile_module="polysh"
+	depends="python>=2.7<3.0 openssh"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/poppler-data/template

@@ -1,10 +1,9 @@
 # Template file for 'poppler-data'
 pkgname=poppler-data
 version=0.4.5
-noarch=yes
+revision=1
 homepage="http://poppler.freedesktop.org/"
 distfiles="http://poppler.freedesktop.org/$pkgname-$version.tar.gz"
-revision=1
 short_desc="Encoding data for the poppler PDF rendering library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT, GPL-2, Adobe (BSD alike)"
@@ -23,3 +22,10 @@ do_install() {
 	vmkdir usr/share/licenses/$pkgname
 	install -m644 COPYING COPYING.adobe $DESTDIR/usr/share/licenses/$pkgname
 }
+
+poppler-data_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/poppler-qt4/poppler-qt4-devel.template

@@ -1,14 +0,0 @@
-# Template file for 'poppler-qt4-devel'.
-#
-noarch=yes
-depends="${sourcepkg}-${version}_${revision}"
-short_desc="${sourcepkg} QT 4 bindings (development files)"
-long_desc="${long_desc}
-
- This package contains development files for QT 4 bindings."
-
-do_install() {
-	vmove usr/include/poppler/qt4 usr/include/poppler
-	vmove usr/lib/pkgconfig/poppler-qt4.pc usr/lib/pkgconfig
-	rm -rf ${SRCPKGDESTDIR}/usr/include
-}

srcpkgs/poppler-qt4/template

@@ -3,17 +3,15 @@ pkgname=poppler-qt4
 version=0.20.2
 revision=2
 wrksrc="poppler-${version}"
-depends="qt>=4.8.2_2"
 build_style=gnu-configure
 configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
  --enable-libtiff --disable-libopenjpeg --enable-cairo-output
  --enable-xpdf-headers --disable-gtk-test --disable-poppler-glib
  --enable-poppler-qt4 --disable-poppler-cpp --disable-utils
  --disable-static"
-subpackages="poppler-qt4-devel"
+hostmakedepends="pkg-config"
-makedepends="pkg-config libpng-devel>=1.5.10 gobject-introspection
+makedepends="libpng-devel>=1.5.10 gobject-introspection
  tiff-devel lcms2-devel libcurl-devel qt-devel>=4.8.2_2"
-fulldepends="poppler-data"
 short_desc="PDF rendering library -- QT bindings"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -37,3 +35,20 @@ post_install() {
 		rm -f ${DESTDIR}/usr/lib/pkgconfig/${f}.pc
 	done
 }
+
+poppler-qt4-devel_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc="${sourcepkg} QT 4 bindings (development files)"
+	pkg_install() {
+		vmove usr/include/poppler/qt4
+		vmove usr/lib/pkgconfig/poppler-qt4.pc
+		rm -rf ${DESTDIR}/usr/include
+	}
+}
+
+poppler-qt4_package() {
+	depends="poppler-data qt>=4.8.2_2"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/portaudio/portaudio-devel.template

@@ -1,14 +0,0 @@
-# Template file for 'portaudio-devel'.
-#
-depends="portaudio glibc-devel libstdc++-devel alsa-lib-devel jack-devel"
-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/*.h" usr/include
-	vmove usr/lib/pkgconfig/portaudio-2.0.pc usr/lib/pkgconfig
-}

srcpkgs/portaudio/portaudiocpp-devel.template

@@ -1,16 +0,0 @@
-# Template file for 'portaudiocpp-devel'.
-#
-depends="portaudiocpp portaudio-devel"
-short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains development, headers, static libs, etc
- for the C++ bindings."
-
-
-do_install()
-{
-	vmove usr/include/portaudiocpp usr/include
-	vmove usr/lib/pkgconfig/portaudiocpp.pc usr/lib/pkgconfig
-	vmove "usr/lib/libportaudiocpp.a*" usr/lib
-}

srcpkgs/portaudio/portaudiocpp.template

@@ -1,11 +0,0 @@
-# Template file for 'portaudiocpp'.
-#
-short_desc="${short_desc} - C++ Bindings"
-long_desc="${long_desc}
-
- This package contains the C++ version."
-
-do_install()
-{
-	vmove "usr/lib/libportaudiocpp.so*" usr/lib
-}

srcpkgs/portaudio/template

@@ -1,16 +1,15 @@
 # Template file for 'portaudio'
 pkgname=portaudio
 version=19.20110326
+revision=6
 wrksrc=portaudio
-distfiles="http://www.${pkgname}.com/archives/pa_stable_v19_20110326.tgz"
 build_style=gnu-configure
 configure_args="--enable-cxx --with-jack"
 homepage="http://www.portaudio.com"
 license="PA, GPL"
-revision=5
-makedepends="glibc-devel libstdc++-devel alsa-lib-devel jack-devel"
 short_desc="Portable cross-platform audio i/o library"
 maintainer="davehome <davehome@redthumb.info.tm>"
+distfiles="http://www.${pkgname}.com/archives/pa_stable_v19_20110326.tgz"
 checksum=328a89adc42c66840641d2d557d01e8bd9e6be32e12d3802e3b638e0791de540
 long_desc="
  PortAudio is a free, cross-platform, open-source, audio I/O library.  It lets
@@ -20,6 +19,36 @@ long_desc="
  different platforms."
 
 disable_parallel_build=yes
-subpackages="$pkgname-devel ${pkgname}cpp ${pkgname}cpp-devel"
+makedepends="alsa-lib-develjack-devel"
 
+portaudio-devel_package() {
+	depends="portaudio>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove "usr/include/*.h"
+		vmove usr/lib/pkgconfig/portaudio-2.0.pc
+	}
+}
 
+portaudiocpp_package() {
+	short_desc="${short_desc} - C++ Bindings"
+	pkg_install() {
+		vmove "usr/lib/libportaudiocpp.so*"
+	}
+}
+
+portaudiocpp-devel_package() {
+	depends="portaudiocpp>=${version} portaudio-devel>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include/portaudiocpp
+		vmove usr/lib/pkgconfig/portaudiocpp.pc
+		vmove "usr/lib/libportaudiocpp.a*"
+	}
+}
+
+portaudio_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/postfix/template

@@ -2,8 +2,6 @@
 pkgname=postfix
 version=2.10.0
 revision=1
-makedepends="perl openssl-devel db-devel pcre-devel>=8.30 libsasl-devel
- libldap-devel libmysqlclient-devel>=5.5.27 postgresql-libs-devel sqlite-devel"
 short_desc="High-performance mail transport agent"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="IBM Public License 1.0, BSD-alike"
@@ -11,43 +9,9 @@ homepage="http://www.postfix.org/"
 distfiles="ftp://ftp.porcupine.org/mirrors/postfix-release/official/$pkgname-$version.tar.gz"
 checksum=4a42a6029af418cbd4a8668b4f8c7e1ea9975cbe9756df760649c0a941bfeb7b
 
-conf_files="
+hostmakedepends="perl"
-/etc/postfix/access
+makedepends="openssl-devel db-devel pcre-devel>=8.30 libsasl-devel
-/etc/postfix/aliases
+ libldap-devel libmysqlclient-devel>=5.5.27 postgresql-libs-devel sqlite-devel"
-/etc/postfix/canonical
-/etc/postfix/generic
-/etc/postfix/header_checks
-/etc/postfix/main.cf
-/etc/postfix/master.cf
-/etc/postfix/relocated
-/etc/postfix/transport
-/etc/postfix/virtual"
-
-make_dirs="
-/var/lib/postfix		0750	postfix	root
-/var/spool/postfix/active	0750	postfix	root
-/var/spool/postfix/bounce	0750	postfix	root
-/var/spool/postfix/corrupt	0750	postfix	root
-/var/spool/postfix/defer	0750	postfix	root
-/var/spool/postfix/deferred	0750	postfix	root
-/var/spool/postfix/flush	0750	postfix	root
-/var/spool/postfix/hold		0750	postfix	root
-/var/spool/postfix/incoming	0750	postfix	root
-/var/spool/postfix/private	0750	postfix	root
-/var/spool/postfix/maildrop	0750	postfix	postdrop
-/var/spool/postfix/public	0750	postfix	postdrop
-/var/spool/postfix/pid		0750	root	root
-/var/spool/postfix/saved	0750	postfix	root
-/var/spool/postfix/trace	0750	postfix	root"
-
-systemd_services="postfix.service true"
-
-system_accounts="postfix"
-postfix_homedir="/var/spool/postfix"
-system_groups="postdrop"
-
-provides="smtp-server-0"
-replaces="smtp-server>=0"
 
 do_build() {
 	make makefiles DEBUG='' CCARGS=' \
@@ -90,3 +54,44 @@ do_install() {
 	# systemd.
 	vinstall ${FILESDIR}/postfix.service 644 usr/lib/systemd/system
 }
+
+postfix_package() {
+	conf_files="
+		/etc/postfix/access
+		/etc/postfix/aliases
+		/etc/postfix/canonical
+		/etc/postfix/generic
+		/etc/postfix/header_checks
+		/etc/postfix/main.cf
+		/etc/postfix/master.cf
+		/etc/postfix/relocated
+		/etc/postfix/transport
+		/etc/postfix/virtual"
+	depends="shadow"
+	systemd_services="postfix.service true"
+	system_accounts="postfix"
+	postfix_homedir="/var/spool/postfix"
+	system_groups="postdrop"
+	provides="smtp-server-0"
+	replaces="smtp-server>=0"
+	make_dirs="
+		/var/lib/postfix		0750	postfix	root
+		/var/spool/postfix/active	0750	postfix	root
+		/var/spool/postfix/bounce	0750	postfix	root
+		/var/spool/postfix/corrupt	0750	postfix	root
+		/var/spool/postfix/defer	0750	postfix	root
+		/var/spool/postfix/deferred	0750	postfix	root
+		/var/spool/postfix/flush	0750	postfix	root
+		/var/spool/postfix/hold		0750	postfix	root
+		/var/spool/postfix/incoming	0750	postfix	root
+		/var/spool/postfix/private	0750	postfix	root
+		/var/spool/postfix/maildrop	0750	postfix	postdrop
+		/var/spool/postfix/public	0750	postfix	postdrop
+		/var/spool/postfix/pid		0750	root	root
+		/var/spool/postfix/saved	0750	postfix	root
+		/var/spool/postfix/trace	0750	postfix	root"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/postgresql/postgresql-client.template

@@ -1,32 +0,0 @@
-# Template file for 'postgresql-client'.
-#
-short_desc="Client frontends programs for PostgreSQL"
-long_desc="${long_desc}
-
- This package contains client and administrative programs for PostgreSQL:
- these are the interactive terminal client psql and programs for creating
- and removing users and databases.
-
- This is the client package for PostgreSQL 8.4. If you install PostgreSQL
- 8.4 on a standalone machine, you need the server package postgresql, too.
- On a network, you can install this package on many client machines, while
- the server package may be installed on only one machine."
-
-do_install() {
-	for f in clusterdb createdb createlang createuser dropdb droplang \
-		dropuser pg_dump pg_dumpall pg_restore psql reindexdb \
-		vacuumdb; do
-		vmove usr/bin/${f} usr/bin
-		vmove usr/share/man/man1/${f}.1 usr/share/man/man1
-	done
-	vmove usr/share/man/man7 usr/share/man
-	for d in $(find ${SRCPKGDESTDIR}/usr/share/locale \
-		   -type f -name pgscripts\* -o \
-			   -name psql\* -o \
-			   -name pg_dump\*); do
-		mkdir -p ${DESTDIR}/$(dirname ${d#${SRCPKGDESTDIR}})
-		mv ${d} ${DESTDIR}/$(dirname ${d#${SRCPKGDESTDIR}})
-	done
-	mv ${SRCPKGDESTDIR}/usr/share/postgresql/psqlrc.* \
-		${DESTDIR}/usr/share/postgresql
-}

srcpkgs/postgresql/postgresql-doc.template

@@ -1,15 +0,0 @@
-# Template file for 'postgresql-doc'.
-#
-short_desc="${sourcepkg} documentation"
-long_desc="${long_desc}
-
- This package contains all README files, user manual, and examples for
- PostgreSQL 8.4. The manual is in HTML format."
-
-noarch=yes
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
-}

srcpkgs/postgresql/postgresql-libs-devel.template

@@ -1,23 +0,0 @@
-# Template file for 'postgresql-libs-devel'.
-#
-depends="postgresql-libs>=$version"
-short_desc="PostgreSQL shared libraries (development files)"
-long_desc="${long_desc}
-
- This package provides the development files required to build any
- PostgreSQL application."
-
-do_install() {
-	for f in pg_config ecpg; do
-		vmove usr/bin/${f} usr/bin
-		vmove "usr/share/man/man1/${f}*" usr/share/man/man1
-	done
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/postgresql/pgxs usr/lib/postgresql
-	for d in $(find ${SRCPKGDESTDIR}/usr/share/locale \
-		   -type f -name pg_config\* -o -name ecpg\*); do
-		mkdir -p ${DESTDIR}/$(dirname ${d#${SRCPKGDESTDIR}})
-		mv ${d} ${DESTDIR}/$(dirname ${d#${SRCPKGDESTDIR}})
-	done
-}

srcpkgs/postgresql/postgresql-libs.template

@@ -1,15 +0,0 @@
-# Template file for 'postgresql-libs'.
-#
-short_desc="PostgreSQL shared libraries"
-long_desc="${long_desc}
-
- This package provides the shared libraries used by PostgreSQL applications."
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-        for d in $(find ${SRCPKGDESTDIR}/usr/share/locale \
-                   -type f -name libpq5\*); do
-                mkdir -p ${DESTDIR}/$(dirname ${d#${SRCPKGDESTDIR}})
-                mv ${d} ${DESTDIR}/$(dirname ${d#${SRCPKGDESTDIR}})
-        done
-}

srcpkgs/postgresql/postgresql-plperl.template

@@ -1,18 +0,0 @@
-# Template file for 'postgresql-plperl'.
-#
-depends="perl>=5.16 postgresql>=$version"
-short_desc="PL/Perl procedural language for PostgreSQL"
-long_desc="${long_desc}
-
- PL/Tcl enables an SQL developer to write procedural language functions for
- PostgreSQL 8.4 in Perl. You need this package if you have any PostgreSQL 8.4
- functions that use the languages plperl or plperlu."
-
-do_install() {
-	vmove "usr/lib/postgresql/plperl*" usr/lib/postgresql
-	for d in $(find ${SRCPKGDESTDIR}/usr/share/locale \
-		   -type f -name plperl\*); do
-		mkdir -p ${DESTDIR}/$(dirname ${d#${SRCPKGDESTDIR}})
-		mv ${d} ${DESTDIR}/$(dirname ${d#${SRCPKGDESTDIR}})
-	done
-}

srcpkgs/postgresql/postgresql-plpython.template

@@ -1,19 +0,0 @@
-# Template file for 'postgresql-plpython'.
-#
-depends="postgresql>=$version"
-short_desc="PL/Python procedural language for PostgreSQL"
-long_desc="${long_desc}
-
- PL/Tcl enables an SQL developer to write procedural language functions for
- PostgreSQL 8.4 in Python. You need this package if you have any PostgreSQL 8.4
- functions that use the languages plpython or plpythonu."
-
-
-do_install() {
-	vmove "usr/lib/postgresql/plpython*" usr/lib/postgresql
-	for d in $(find ${SRCPKGDESTDIR}/usr/share/locale \
-		   -type f -name plpython\*); do
-		mkdir -p ${DESTDIR}/$(dirname ${d#${SRCPKGDESTDIR}})
-		mv ${d} ${DESTDIR}/$(dirname ${d#${SRCPKGDESTDIR}})
-	done
-}

srcpkgs/postgresql/postgresql-pltcl.template

@@ -1,21 +0,0 @@
-# Template file for 'postgresql-pltcl'.
-#
-depends="postgresql>=$version"
-short_desc="PL/Tcl procedural language for PostgreSQL"
-long_desc="${long_desc}
-
- PL/Tcl enables an SQL developer to write procedural language functions for
- PostgreSQL 8.4 in Tcl. You need this package if you have any PostgreSQL 8.4
- functions that use the languages pltcl or pltclu."
-
-
-do_install() {
-	vmove "usr/bin/pltcl*" usr/bin
-	vmove "usr/lib/postgresql/pltcl*" usr/lib/postgresql
-	for d in $(find ${SRCPKGDESTDIR}/usr/share/locale \
-		   -type f -name pltcl\*); do
-		mkdir -p ${DESTDIR}/$(dirname ${d#${SRCPKGDESTDIR}})
-		mv ${d} ${DESTDIR}/$(dirname ${d#${SRCPKGDESTDIR}})
-	done
-	vmove "usr/share/postgresql/*.pltcl" usr/share/postgresql
-}

srcpkgs/postgresql/template

@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=8.4.15
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-docdir=/usr/share/doc --with-openssl --with-python
  --with-pam --datadir=/usr/share/postgresql --enable-thread-safety
@@ -20,25 +20,10 @@ long_desc="
  that has earned it a strong reputation for reliability, data integrity,
  and correctness."
 
-makedepends="flex readline-devel openssl-devel perl>=5.16
+hostmakedepends="flex"
+makedepends="readline-devel openssl-devel perl>=5.16
  tcl-devel python-devel libxml2-devel libxslt-devel pam-devel"
 
-subpackages="${pkgname}-doc ${pkgname}-libs ${pkgname}-libs-devel
- ${pkgname}-plperl ${pkgname}-plpython ${pkgname}-pltcl ${pkgname}-client"
-
-conf_files="
-/etc/default/${pkgname}
-/etc/pam.d/${pkgname}
-/etc/${pkgname}/${pkgname}.conf"
-
-systemd_services="${pkgname}.service on"
-
-# Create 'postgres' user for the server.
-system_accounts="postgres"
-postgres_homedir="/var/lib/${pkgname}"
-postgres_shell="/bin/sh"
-postgres_descr="PostgreSQL database server user"
-
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.confd 644 etc/default ${pkgname}
 	vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
@@ -47,3 +32,122 @@ post_install() {
 	vinstall ${DESTDIR}/usr/share/${pkgname}/${pkgname}.conf.sample \
 		644 etc/${pkgname} ${pkgname}.conf
 }
+
+postgresql-doc_package() {
+	short_desc="PostgreSQL documentation"
+	noarch=yes
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
+
+postgresql-libs_package() {
+	short_desc="PostgreSQL shared libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*" usr/lib
+        	for d in $(find ${DESTDIR}/usr/share/locale \
+                   -type f -name libpq5\*); do
+                	mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+                	mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+        	done
+	}
+}
+
+postgresql-libs-devel_package() {
+	depends="postgresql-libs>=$version"
+	short_desc="PostgreSQL shared libraries (development files)"
+	pkg_install() {
+		for f in pg_config ecpg; do
+			vmove usr/bin/${f}
+			vmove "usr/share/man/man1/${f}*"
+		done
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/postgresql/pgxs
+		for d in $(find ${DESTDIR}/usr/share/locale \
+		   -type f -name pg_config\* -o -name ecpg\*); do
+			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+		done
+	}
+}
+
+postgresql-plperl_package() {
+	depends="perl>=5.16 postgresql>=$version"
+	short_desc="PL/Perl procedural language for PostgreSQL"
+	pkg_install() {
+		vmove "usr/lib/postgresql/plperl*" usr/lib/postgresql
+		for d in $(find ${DESTDIR}/usr/share/locale \
+		   -type f -name plperl\*); do
+			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+		done
+	}
+}
+
+postgresql-plpython_package() {
+	depends="postgresql>=$version"
+	short_desc="PL/Python procedural language for PostgreSQL"
+	pkg_install() {
+		vmove "usr/lib/postgresql/plpython*"
+		for d in $(find ${DESTDIR}/usr/share/locale \
+		   -type f -name plpython\*); do
+			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+		done
+	}
+}
+
+postgresql-pltcl_package() {
+	depends="postgresql>=$version"
+	short_desc="PL/Tcl procedural language for PostgreSQL"
+	pkg_install() {
+		vmove "usr/bin/pltcl*"
+		vmove "usr/lib/postgresql/pltcl*"
+		for d in $(find ${DESTDIR}/usr/share/locale \
+		   -type f -name pltcl\*); do
+			mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+			mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+		done
+		vmove "usr/share/postgresql/*.pltcl"
+	}
+}
+
+postgresql-client_package() {
+	short_desc="Client frontends programs for PostgreSQL"
+	pkg_install() {
+		for f in clusterdb createdb createlang createuser dropdb droplang \
+			dropuser pg_dump pg_dumpall pg_restore psql reindexdb \
+			vacuumdb; do
+			vmove usr/bin/${f}
+			vmove usr/share/man/man1/${f}.1
+		done
+		vmove usr/share/man/man7
+		for d in $(find ${DESTDIR}/usr/share/locale \
+		   -type f -name pgscripts\* -o \
+			   -name psql\* -o \
+			   -name pg_dump\*); do
+		mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+		mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+	done
+	mv ${DESTDIR}/usr/share/postgresql/psqlrc.* \
+		${PKGDESTDIR}/usr/share/postgresql
+}
+}
+
+postgresql_package() {
+	conf_files="
+		/etc/default/${pkgname}
+		/etc/pam.d/${pkgname}
+		/etc/${pkgname}/${pkgname}.conf"
+	systemd_services="${pkgname}.service on"
+	# Create 'postgres' user for the server.
+	system_accounts="postgres"
+	postgres_homedir="/var/lib/${pkgname}"
+	postgres_shell="/bin/sh"
+	postgres_descr="PostgreSQL database server user"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/powertop/template

@@ -3,10 +3,17 @@ pkgname=powertop
 version=2.2
 revision=2
 build_style=gnu-configure
-makedepends="pkg-config ncurses-devel pciutils-devel libnl3-devel"
+hostmakedepends="pkg-config
+makedepends="ncurses-devel pciutils-devel libnl3-devel"
 short_desc="Linux tool to find out what is using power on computer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="https://01.org/powertop/"
 distfiles="http://01.org/powertop/sites/default/files/downloads/${pkgname}-${version}.tar.gz"
 checksum=1339e1bc3b9675c71dd70fed1132abf215d01469b348d23be7344bc65557b028
+
+powertop_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/ppp/ppp-devel.template

@@ -1,15 +0,0 @@
-# Template file for 'ppp-devel'.
-#
-depends="libpcap-devel"
-short_desc="${sourcepkg} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-noarch=yes
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-}

srcpkgs/ppp/template

@@ -1,16 +1,12 @@
 # Template file for 'ppp'
 pkgname=ppp
 version=2.4.5
-distfiles="ftp://ftp.samba.org/pub/ppp/ppp-$version.tar.gz"
-build_style=configure
-configure_args="--prefix=/usr"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version/usr install"
 revision=3
-makedepends="libpcap-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
-homepage=https://ppp.samba.org/
+homepage="https://ppp.samba.org/"
 license="BSD and LGPLv2+ and GPLv2+ and Public Domain"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="ftp://ftp.samba.org/pub/ppp/ppp-$version.tar.gz"
 checksum=43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505
 long_desc="
  This packages provides a daemon which implements the PPP protocol for
@@ -18,70 +14,87 @@ long_desc="
 
 CFLAGS="-D_GNU_SOURCE"
 
-conf_files="
+makedepends="libpcap-devel"
-/etc/ppp/ip-up
-/etc/ppp/chap-secrets
-/etc/ppp/options
-/etc/ppp/ip-down
-/etc/ppp/pap-secrets"
 
-subpackages="ppp-devel"
+do_configure() {
-
-
-pre_configure()
-{
 	# Custom CFLAGS.
-	sed -i "s:-O2 -pipe -Wall -g:${XBPS_CFLAGS}:" \
+	sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" \
 		${wrksrc}/pppd/Makefile.linux
-	sed -i "s:-g -O2:${XBPS_CFLAGS}:" ${wrksrc}/pppd/plugins/Makefile.linux
+	sed -i "s:-g -O2:${CFLAGS}:" ${wrksrc}/pppd/plugins/Makefile.linux
-	sed -i "s:-O2:${XBPS_CFLAGS}:" ${wrksrc}/pppstats/Makefile.linux
+	sed -i "s:-O2:${CFLAGS}:" ${wrksrc}/pppstats/Makefile.linux
-	sed -i "s:-O2 -g -pipe:${XBPS_CFLAGS}:" ${wrksrc}/chat/Makefile.linux
+	sed -i "s:-O2 -g -pipe:${CFLAGS}:" ${wrksrc}/chat/Makefile.linux
-	sed -i "s:-O:${XBPS_CFLAGS}:" ${wrksrc}/pppdump/Makefile.linux
+	sed -i "s:-O:${CFLAGS}:" ${wrksrc}/pppdump/Makefile.linux
 	# Enable active filter
 	sed -i "s:^#FILTER=y:FILTER=y:" ${wrksrc}/pppd/Makefile.linux
 	# Enable ipv6 support
 	sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" ${wrksrc}/pppd/Makefile.linux
 	# Enable Microsoft Proprietary Callback Control Protocol
-	sed -i "s:^#CBCP=y:CBCP=y:" ${wrksrc}/pppd/Makefile.linux 
+	sed -i "s:^#CBCP=y:CBCP=y:" ${wrksrc}/pppd/Makefile.linux
+
+	./configure --prefix=/usr 
 }
 
-pre_install()
+do_build() {
-{
+	make ${makejobs}
+}
+
+do_install() {
 	for f in $(find ${wrksrc} -type f -name Makefile); do
-		sed -i -e "s|\$(INSTALL) -s|\$(INSTALL|g" ${f} || return 1
+		sed -i -e "s|\$(INSTALL) -s|\$(INSTALL|g" ${f}
 	done
-}
 
-post_install()
+	make DESTDIR=${DESTDIR}/usr install
-{
+
 	chmod 755 ${DESTDIR}/usr/lib/pppd/${version}/*.so
 	install -m755 ${wrksrc}/pppd/pppd ${DESTDIR}/usr/sbin
 
 	install -m755 ${wrksrc}/chat/chat ${DESTDIR}/usr/sbin
 	install -D -m644 ${FILESDIR}/options \
-		${DESTDIR}/etc/ppp/options || return 1
+		${DESTDIR}/etc/ppp/options
 	install -D -m755 ${FILESDIR}/ip-up \
-		${DESTDIR}/etc/ppp/ip-up || return 1
+		${DESTDIR}/etc/ppp/ip-up
 	install -D -m755 ${FILESDIR}/ip-down \
-		${DESTDIR}/etc/ppp/ip-down || return 1
+		${DESTDIR}/etc/ppp/ip-dowm
-	install -d -m755 ${DESTDIR}/etc/ppp/ip-up.d || return 1
+	install -d -m755 ${DESTDIR}/etc/ppp/ip-up.d
-	install -d -m755 ${DESTDIR}/etc/ppp/ip-down.d || return 1
+	install -d -m755 ${DESTDIR}/etc/ppp/ip-down.d
 	install -m755 ${FILESDIR}/ip-up.d.dns.sh \
-		${DESTDIR}/etc/ppp/ip-up.d/00-dns.sh || return 1
+		${DESTDIR}/etc/ppp/ip-up.d/00-dns.sh
 	install -m755 ${FILESDIR}/ip-down.d.dns.sh \
-		${DESTDIR}/etc/ppp/ip-down.d/00-dns.sh || return 1
+		${DESTDIR}/etc/ppp/ip-down.d/00-dns.sh
 	install -D -m755 ${FILESDIR}/pon \
-		${DESTDIR}/usr/bin/pon || return 1
+		${DESTDIR}/usr/bin/pon
 	install -D -m755 ${FILESDIR}/poff \
-		${DESTDIR}/usr/bin/poff || return 1
+		${DESTDIR}/usr/bin/poff
 	install -D -m755 ${FILESDIR}/plog \
-		${DESTDIR}/usr/sbin/plog || return 1
+		${DESTDIR}/usr/sbin/plog
 	install -D -m600 ${wrksrc}/etc.ppp/pap-secrets \
-		${DESTDIR}/etc/ppp/pap-secrets  || return 1
+		${DESTDIR}/etc/ppp/pap-secrets
 	install -D -m600 ${wrksrc}/etc.ppp/chap-secrets \
-		${DESTDIR}/etc/ppp/chap-secrets || return 1
+		${DESTDIR}/etc/ppp/chap-secrets
 	#install -D -m644 ${FILESDIR}/pon.1 \
 	#	${DESTDIR}/usr/share/man/man1/pon.1 || return 1
-	install -d -m755 ${DESTDIR}/etc/ppp/peers || return 1
+	install -d -m755 ${DESTDIR}/etc/ppp/peers
 	touch -f ${DESTDIR}/etc/ppp/peers/.empty_on_purpose
 }
+
+ppp-devel_package() {
+	noarch=yes
+	depends="libpcap-devel>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}
+
+ppp_package() {
+	conf_files="
+		/etc/ppp/ip-up
+		/etc/ppp/chap-secrets
+		/etc/ppp/options
+		/etc/ppp/ip-down
+		/etc/ppp/pap-secrets"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/prelink/template

@@ -1,14 +1,15 @@
 # Template file for 'prelink'
 pkgname=prelink
 version=20111012
-build_style=gnu-configure
-homepage="http://people.redhat.com/jakub/prelink/"
-distfiles="http://people.redhat.com/jakub/${pkgname}/${pkgname}-${version}.tar.bz2"
 revision=1
+wrksrc=prelink
+build_style=gnu-configure
 makedepends="libelf-devel"
 short_desc="ELF prelinking utility to speed up dynamic linking."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
+homepage="http://people.redhat.com/jakub/prelink/"
+distfiles="http://people.redhat.com/jakub/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=b86df2e6c051176da711a85982b80d87c8ce8e053e04bd0ffb2f9ba817f62aaf
 long_desc="
  prelink is a free program written by Jakub Jelínek of Red Hat for 
@@ -16,7 +17,8 @@ long_desc="
  executables). It is intended to speed up a system by reducing the time a
  program needs to begin."
 
-wrksrc=prelink
+prelink_package() {
-
+	pkg_install() {
-
+		vmove usr
-
+	}
+}

srcpkgs/printproto/template

@@ -1,17 +1,20 @@
 # Template build file for 'printproto'.
 pkgname=printproto
 version=1.0.4
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
+revision=3
 build_style=gnu-configure
-revision=2
 short_desc="Print extension headers from X.org"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=f059a93188e7143dbb6cc55e31ccf81b976776aa3023bfa57f47501fd1bfd3be
 long_desc="
- Definitions needed by the X Print server, library, and clients.
+ Definitions needed by the X Print server, library, and clients."
 
- From the modular X.org X11 project."
+printproto_package() {
-
+	noarch="yes"
-noarch=yes
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/procps-ng/template

@@ -7,11 +7,6 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
 homepage="http://gitorious.org/procps"
 
-conf_files="/etc/sysctl.conf"
-replaces="procps>=0"
-provides="procps-${version}"
-conflicts="coreutils<8.21_3"
-
 nofetch=yes
 noextract=yes
 
@@ -59,3 +54,14 @@ do_install() {
 		${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig
 
 }
+
+procps-ng_package() {
+	conf_files="/etc/sysctl.conf"
+	replaces="procps>=0"
+	provides="procps-${version}"
+	conflicts="coreutils<8.21_3"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/proot/template

@@ -25,3 +25,9 @@ do_install() {
 	vinstall src/proot 755 usr/bin
 	vinstall doc/proot.1 644 usr/share/man/man1
 }
+
+proot_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/proplib/proplib-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'proplib-devel'.
-#
-depends="zlib-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
-}

srcpkgs/proplib/template

@@ -3,7 +3,6 @@ pkgname=proplib
 version=0.6.3
 revision=1
 build_style=gnu-configure
-subpackages="$pkgname-devel"
 makedepends="zlib-devel"
 short_desc="Portable Property container object library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -11,3 +10,20 @@ license="Simplified BSD"
 homepage="http://code.google.com/p/portableproplib"
 distfiles="https://portableproplib.googlecode.com/files/$pkgname-$version.tar.xz"
 checksum=a2acc281ad7993ae61ce417dfe10d27960aa4c8b6abc186b76a3f15e325e6f21
+
+proplib-devel_package() {
+	depends="zlib-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
+	}
+}
+
+proplib_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/protobuf-vala/libprotobuf-vala.template

@@ -1,7 +0,0 @@
-# Template file for 'libprotobuf-vala'.
-#
-short_desc="${short_desc} -- shared library"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}

srcpkgs/protobuf-vala/template

@@ -4,9 +4,6 @@ version=0.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-subpackages="lib${pkgname}"
-disable_parallel_build=yes
-depends="pkg-config glib-devel"
 makedepends="pkg-config libgee08-devel protobuf-devel vala-devel"
 short_desc="A plugin for the Google protocol buffer compiler to generate Vala code"
 maintainer="pancake <pancake@nopcode.org>"
@@ -14,3 +11,19 @@ license="GPL-3"
 homepage="http://launchpad.net/protobuf-vala/"
 distfiles="${homepage}/trunk/${version}/+download/${pkgname}-${version}.tar.xz"
 checksum=c12547813fa22ee2b15967f17146b08e2a4d90800810fe63730332aea6777c48
+
+disable_parallel_build=yes
+
+libprotobuf-vala_package() {
+	short_desc="${short_desc} -- shared library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+protobuf-vala_package() {
+	depends="pkg-config glib-devel"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/protobuf/protobuf-devel.template

@@ -1,16 +0,0 @@
-# Template file for 'protobuf-devel'.
-#
-depends="protobuf protobuf-lite zlib-devel"
-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
-}

srcpkgs/protobuf/protobuf-lite.template

@@ -1,11 +0,0 @@
-# Template file for 'protobuf-lite'.
-#
-short_desc="${short_desc} - Lite version"
-long_desc="${long_desc}
-
- This package contains the Lite version."
-
-do_install()
-{
-	vmove "usr/lib/libprotobuf-lite.so*" usr/lib
-}

srcpkgs/protobuf/template

@@ -1,19 +1,39 @@
 # Template file for 'protobuf'
 pkgname=protobuf
 version=2.4.1
-distfiles="http://${pkgname}.googlecode.com/files/${pkgname}-${version}.tar.bz2"
+revision=3
 build_style=gnu-configure
 homepage="http://code.google.com/p/${pkgname}/"
 license="BSD"
-revision=2
 makedepends="libstdc++-devel zlib-devel pkg-config"
 short_desc="Google's data interchange format"
 maintainer="davehome <davehome@redthumb.info.tm>"
+distfiles="http://${pkgname}.googlecode.com/files/${pkgname}-${version}.tar.bz2"
 checksum=cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf
 long_desc="
  Protocol Buffers are a way of encoding structured data in an efficient yet
  extensible format. Google uses Protocol Buffers for almost all of its
  internal RPC protocols and file formats."
 
-subpackages="$pkgname-devel $pkgname-lite"
+protobuf-devel_package() {
+	depends="protobuf>=${version} protobuf-lite>=${version} zlib-devel"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
 
+protobuf-lite_package() {
+	short_desc="${short_desc} - Lite version"
+	pkg_install() {
+		vmove "usr/lib/libprotobuf-lite.so*"
+	}
+}
+
+protobuf_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/psmisc/template

@@ -16,3 +16,9 @@ if [ "$CROSS_BUILD" ]; then
 			ac_cv_func_realloc_0_nonnull=yes
 			ac_cv_func_memcmp_working=yes"
 fi
+
+psmisc_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pyatspi/template

@@ -1,19 +1,23 @@
 # Template file for 'pyatspi'
 pkgname=pyatspi
 version=2.3.92
-distfiles="${GNOME_SITE}/$pkgname/2.3/$pkgname-$version.tar.xz"
-build_style=gnu-configure
-depends="at-spi2-core pygobject"
-makedepends="at-spi2-core-devel pygobject-devel"
 revision=1
+build_style=gnu-configure
+makedepends="at-spi2-core-devel pygobject-devel"
 short_desc="Python bindings for AT-SPI"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
+distfiles="${GNOME_SITE}/$pkgname/2.3/$pkgname-$version.tar.xz"
 checksum=d3df7d62b384d0274387422744df4fc7079a1945dbe81a5eef32318285196ac1
 long_desc="
  This packages the Python language bindings for AT-SPI."
 
-pycompile_module="$pkgname"
+pyatspi_package() {
-noarch=yes
+	noarch="yes"
-
+	pycompile_module="pyatspi"
+	depends="at-spi2-core pygobject"
+	pkg_install() {
+		vmove usr
+	}
+}