Convert packages to the new template format (z).

srcpkgs/zd1211-firmware/template

@@ -3,7 +3,6 @@ pkgname=zd1211-firmware
 version=1.4
 revision=3
 wrksrc=${pkgname}
-noarch=yes
 short_desc="Firmware for the Zydas 1211 wifi cards"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://zd1211.wiki.sourceforge.net/"
@@ -15,3 +14,10 @@ do_install() {
 	vmkdir usr/lib/firmware/zd1211
 	install -m644 zd1211* ${DESTDIR}/usr/lib/firmware/zd1211
 }
+
+zd1211-firmware_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/zeitgeist/template

@@ -3,7 +3,6 @@ pkgname=zeitgeist
 version=0.9.5
 revision=1
 build_style=gnu-configure
-depends="python>=2.7<3 dbus-python pygobject"
 makedepends="pkg-config intltool python-devel vala-devel dbus-devel
  raptor xapian-core-devel python-rdflib"
 short_desc="logs the users’ activities and events"
@@ -20,9 +19,14 @@ long_desc="
  It is able to establish relationships between items based on similarity
  and usage patterns."
 
-#LDFLAGS="-lgmodule-2.0 -lgthread-2.0"
-pycompile_module="${pkgname}"
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }
+
+zeitgeist_package() {
+	pycompile_module="zeitgeist"
+	depends="python>=2.7<3 dbus-python pygobject"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/zenity/template

@@ -16,3 +16,9 @@ long_desc="
  which allows you to display dialog boxes from the command line
  and shell scripts. If you understand, things are just as they
  are. If you don't understand, things are just as they are."
+
+zenity_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/zerofree/template

@@ -21,3 +21,9 @@ do_build() {
 do_install() {
 	vinstall zerofree 755 usr/sbin
 }
+
+zerofree_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/zeromq/template

@@ -1,11 +1,10 @@
 # Template file for 'zeromq'
 pkgname=zeromq
 version=3.2.2
-revision=1
+revision=2
-subpackages="${pkgname}-devel"
 build_style=gnu-configure
 configure_args="--disable-static"
-short_desc=" The Intelligent Transport Layer"
+short_desc="The Intelligent Transport Layer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 homepage="http://www.zeromq.org"
@@ -17,3 +16,19 @@ long_desc="
  *  Carries messages across inproc, IPC, TCP, and multicast.
  *  Connect N-to-N via fanout, pubsub, pipeline, request-reply.
  *  Asynch I/O for scalable multicore message-passing apps."
+
+zeromq-devel_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+	}
+}
+
+zeromq_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/zeromq/zeromq-devel.template

@@ -1,14 +0,0 @@
-# Template file for 'zeromq-devel'.
-#
-noarch=yes
-depends="${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man/man3 usr/share/man
-}

srcpkgs/zip/template

@@ -1,20 +1,25 @@
 # Template build file for 'zip'.
 pkgname=zip
 version=3.0
-license="BSD"
+revision=1
-distfiles="${SOURCEFORGE_SITE}/infozip/zip30.tar.gz"
-homepage="http://infozip.sf.net/"
 wrksrc="zip30"
 build_style=gnu-makefile
 make_build_target="-f unix/Makefile generic_gcc"
 make_install_args="-f unix/Makefile"
-revision=1
 short_desc="Create/update ZIP files compatible with pkzip"
 maintainer="Juan RP <xtraeme@gmail.com>"
+license="BSD"
+homepage="http://infozip.sf.net/"
 checksum=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
+distfiles="${SOURCEFORGE_SITE}/infozip/zip30.tar.gz"
 long_desc="
  Zip is a compression and file packaging utility. It is compatible with
  PKZIP 2.04g (Phil Katz ZIP) for MSDOS systems. There is a companion to zip
  called unzip (of course) which you should be able to find the same place
  you got zip."
 
+zip_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/zisofs-tools/template

@@ -1,15 +1,14 @@
 # Template file for 'zisofs-tools'
 pkgname=zisofs-tools
 version=1.0.8
-distfiles="http://pkgs.fedoraproject.org/repo/pkgs/zisofs-tools/zisofs-tools-1.0.8.tar.bz2/2d0ed8c9a1f60b45f949b136f9be1f6c/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-make_install_args="INSTALLROOT=$XBPS_DESTDIR/$pkgname-$version"
 revision=2
+build_style=gnu-configure
 makedepends="zlib-devel"
 short_desc="ISO9660 transparent compression tool"
 homepage="https://www.kernel.org/pub/linux/utils/fs/zisofs/"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://pkgs.fedoraproject.org/repo/pkgs/zisofs-tools/zisofs-tools-1.0.8.tar.bz2/2d0ed8c9a1f60b45f949b136f9be1f6c/$pkgname-$version.tar.bz2"
 checksum=ae4e53e4914934d41660248fb59d3c8761f1f1fd180d5ec993c17ddb3afd04f3
 long_desc="
  zisofs is an extension to the ISO 9660 file system that adds transparent
@@ -19,3 +18,12 @@ long_desc="
  Non-compressed files on a zisofs file system are still accessible by legacy
  systems."
 
+do_install() {
+	make INSTALLROOT=${DESTDIR} install
+}
+
+zisofs-tools_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/zlib32/template

@@ -3,9 +3,8 @@ pkgname=zlib32
 version=1.2.7
 revision=1
 distfiles="
-http://xbps.nopcode.org/repos/current//zlib-${version}_${revision}.i686.xbps
+ http://xbps.nopcode.org/repos/current//zlib-${version}_${revision}.i686.xbps
-http://xbps.nopcode.org/repos/current//zlib-devel-${version}_${revision}.i686.xbps"
+ http://xbps.nopcode.org/repos/current//zlib-devel-${version}_${revision}.i686.xbps"
-depends="glibc32"
 makedepends="bsdtar"
 short_desc="A compression/decompression Library (32 bits)"
 homepage="http://www.zlib.net"
@@ -21,13 +20,9 @@ long_desc="
 
  This package installs the 32 bit libraries for x86_64 systems."
 
-subpackages="$pkgname-devel"
-nostrip=yes
 noextract=yes
-noverifyrdeps=yes
 only_for_archs=x86_64
 
-
 do_install() {
 	for f in ${distfiles}; do
 		local srcfile="${XBPS_SRCDISTDIR}/$(basename ${f})"
@@ -37,3 +32,21 @@ do_install() {
 	vcopy "usr/lib/*.a" usr/lib32
 	vcopy "usr/lib/*.so*" usr/lib32
 }
+
+zlib32-devel_package() {
+	depends="glibc32-devel zlib32>=${version}"
+	nostrip=yes
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/lib32/libz.a
+	}
+}
+
+zlib32_package() {
+	depends="glibc32"
+	nostrip=yes
+	noverifyrdeps=yes
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/zlib32/zlib32-devel.template

@@ -1,14 +0,0 @@
-# Template file for 'zlib32-devel'.
-#
-depends="glibc32-devel zlib32"
-short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-
-do_install()
-{
-	vmove usr/lib32/libz.a usr/lib32
-}

srcpkgs/zope.interface/template

@@ -3,7 +3,6 @@ pkgname=zope.interface
 version=4.0.1
 revision=2
 build_style=python-module
-pycompile_module="zope/interface"
 hostmakedepends="python-distribute"
 makedepends="python-devel"
 short_desc="zope.interface package from Zope 3"
@@ -12,3 +11,10 @@ homepage="http://pypi.python.org/pypi/zope.interface"
 license="ZPL"
 distfiles="http://pypi.python.org/packages/source/z/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=b9f4b92c91ac4defbf0269ec891c3528110224259019b009a24d50e0ebebe9c9
+
+zope.interface_package() {
+	pycompile_module="zope/interface"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/zsh/template

@@ -13,7 +13,6 @@ configure_args="--enable-etcdir=/etc/zsh --enable-zshenv=/etc/zsh/zshenv
  --enable-scriptdir=/usr/share/zsh/scripts --enable-pcre
  --enable-multibyte --enable-cap --with-tcsetpgrp"
 makedepends="gdbm-devel pcre-devel>=8.30 libcap-devel ncurses-devel"
-register_shell="/bin/zsh"
 short_desc="The Z SHell"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.zsh.org"
@@ -35,3 +34,10 @@ pre_configure() {
 post_install() {
 	vinstall LICENCE 644 usr/share/licenses/zsh
 }
+
+zsh_package() {
+	register_shell="/bin/zsh"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/zsync/template

@@ -18,3 +18,9 @@ long_desc="
  a control file (.zsync file) that describes the file to be downloaded, which
  it uses to determine the blocks to fetch. This file is created once on the
  server (and not for each request) and sits next to actual file to download."
+
+zsync_package() {
+	pkg_install() {
+		vmove usr
+	}
+}