Convert to the new template format 8 pkgs.

srcpkgs/base-directories/template

@@ -2,7 +2,6 @@
 pkgname=base-directories
 version=0.22
 revision=1
-noarch=yes
 bootstrap=yes
 build_style=meta-template
 short_desc="Void Linux base system directories"
@@ -13,7 +12,6 @@ long_desc="
  This package installs the base system directories as specifed by FHS that aren't
  installed by any other package and are required on any GNU/Linux system."
 
-post_stow() {
+base-directories_package() {
-	. ${XBPS_SRCPKGDIR}/${pkgname}/INSTALL
+	noarch=yes
-	cd ${XBPS_MASTERDIR} && make_system_dirs
 }

srcpkgs/bison/template

@@ -3,8 +3,7 @@ pkgname=bison
 version=2.7
 revision=1
 build_style=gnu-configure
-makedepends="perl"
+hostmakedepends="perl"
-depends="m4"
 short_desc="GNU yacc(1) replacement"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/bison/bison.html"
@@ -14,3 +13,10 @@ checksum=43d8c5c466486031d5e7195a152ff49651ccac91599692e788b5ec5b693ca7fd
 long_desc="
  Bison is the GNU replacement for yacc(1). Some programs depend on
  extensions present in Bison."
+
+bison_package() {
+	depends="m4"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/cross-arm-linux-gnueabihf/cross-arm-linux-gnueabihf-libc.template

@@ -1,14 +0,0 @@
-# Template file for 'cross-arm-linux-gnueabihf-libc'.
-#
-short_desc="${short_desc} -- glibc files"
-
-noarch=yes
-nostrip=yes
-noverifydeps=yes
-
-do_install() {
-	vmove usr/${_CROSS_TARGET} usr
-	mkdir -p ${SRCPKGDESTDIR}/usr/${_CROSS_TARGET}/usr/
-	mv ${DESTDIR}/usr/${_CROSS_TARGET}/usr/bin \
-		${SRCPKGDESTDIR}/usr/${_CROSS_TARGET}/usr/
-}

srcpkgs/cross-arm-linux-gnueabihf/template

@@ -38,10 +38,7 @@ checksum="
 
 create_wrksrc=yes
 disable_debug=yes
-nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
-subpackages="${pkgname}-libc"
 makedepends="perl flex"
-depends="${pkgname}-libc-${version}_${revision}"
 
 _CROSS_TARGET=${_triplet}
 _CROSS_SYSROOT="/usr/${_CROSS_TARGET}"
@@ -292,3 +289,23 @@ do_clean() {
 	rm -rf /usr/lib/gcc/${_CROSS_TARGET}
 	rm -rf /usr/libexec/gcc/${_CROSS_TARGET}
 }
+
+# Packages
+cross-arm-linux-gnueabihf-libc_package() {
+	short_desc+=" -- glibc files"
+	noarch=yes
+	nostrip=yes
+	noverifyrdeps=yes
+
+	pkg_install() {
+		vmove usr/${_CROSS_TARGET}
+	}
+}
+
+cross-arm-linux-gnueabihf_package() {
+	depends="${pkgname}-libc-${version}_${revision}"
+	nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/cross-vpkg-dummy/template

@@ -2,7 +2,6 @@
 pkgname=cross-vpkg-dummy
 version=0.3
 revision=1
-depends="base-directories xbps-triggers"
 build_style=meta-template
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,8 +12,11 @@ noarch=yes
 nofetch=yes
 noextract=yes
 
+cross-vpkg-dummy_package() {
+	depends="base-directories xbps-triggers"
 	provides="binutils-2.23.51.0.3 bash-4.2 coreutils-8.17 diffutils-3.2
 		fakeroot-1.18.4_1 findutils-4.4.2 gawk-4.0.0 libgcc-4.7.2 libstdc++-4.7.2
 		libstdc++-devel-4.7.2 gcc-4.7.2 gcc-c++-4.7.2 gettext-0.18.1.1
 		glibc-2.17 glibc-devel-2.17 musl-0.9.9 grep-2.10 gzip-1.4 m4-1.4.16 make-3.82
 		patch-2.7.1 sed-4.2.1 tar-1.26 texinfo-4.13a util-linux-2.21 xz-5.0.4"
+}

srcpkgs/flex/libfl-devel.template

@@ -1,8 +0,0 @@
-# Template file for 'libfl-devel'.
-#
-short_desc="${short_desc} -- static library and headers"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-}

srcpkgs/flex/template

@@ -3,10 +3,7 @@ pkgname=flex
 version=2.5.37
 revision=2
 build_style=gnu-configure
-hostmakedepends="help2man"
+hostmakedepends="help2man bison"
-fulldepends="bison"
-depends="libfl-devel>=${version}"
-subpackages="libfl-devel"
 short_desc="The Fast Lexical Analyzer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://flex.sourceforge.net"
@@ -21,3 +18,19 @@ pre_install() {
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/flex
 }
+
+libfl-devel_package() {
+	short_desc+=" -- static library and headers"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
+
+flex_package() {
+	depends="bison libfl-devel>=${version}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share
+	}
+}

srcpkgs/help2man/template

@@ -3,10 +3,17 @@ pkgname=help2man
 version=1.41.1
 revision=1
 build_style=gnu-configure
-fulldepends="perl perl-Locale-gettext"
+hostmakedepends="perl perl-Locale-gettext"
 short_desc="GNU conversion tool to create man files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.gnu.org/software/help2man"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 checksum=3a650ada9453700e34355770d4f74f257fb1dda1a0f24f44b8a3c1d4cb1ee40d
+
+help2man_package() {
+	depends="${hostmakedepends}"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/perl-Locale-gettext/template

@@ -4,10 +4,17 @@ version=1.05
 revision=1
 wrksrc="gettext-$version"
 build_style=perl-module
-fulldepends="perl>=5.16"
+hostmakedepends="perl>=5.16"
 short_desc="Permits access from Perl to the gettext() family of functions"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/dist/gettext"
 license="GPL-2"
 distfiles="http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-${version}.tar.gz"
 checksum=27367f3dc1be79c9ed178732756e37e4cfce45f9e2a27ebf26e1f40d80124694
+
+perl-Locale-gettext_package() {
+	depends="${hostmakedepends}"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xbps-triggers/template

@@ -7,7 +7,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
 license="Simplified BSD"
 
-noarch=yes
+nofetch=yes
 noextract=yes
 bootstrap=yes
 
@@ -23,3 +23,11 @@ do_install() {
 	vmkdir var/db/xbps
 	cd ${DESTDIR}/var/db/xbps && ln -sf ../../../${_triggersdir} triggers
 }
+
+xbps-triggers_package() {
+	noarch=yes
+
+	pkg_install() {
+		vmove usr
+	}
+}