Convert to the new template format another set of pkgs.

srcpkgs/acl/acl-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'acl-devel'.
-#
-depends="attr-devel acl>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.*a" usr/lib
-	vmove "usr/share/man/man[235]" usr/share/man
-	rm -rf ${SRCPKGDESTDIR}/usr/share/doc
-}

srcpkgs/acl/acl-progs.template

@@ -1,8 +0,0 @@
-# Template file for 'acl-progs'.
-#
-short_desc="${short_desc} -- utilities"
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/share usr
-}

srcpkgs/acl/template

@@ -2,7 +2,6 @@
 pkgname=acl
 version=2.2.51
 revision=5
-subpackages="acl-devel acl-progs"
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
 makedepends="attr-devel"
@@ -15,4 +14,29 @@ checksum=06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225
 
 do_install() {
 	make DIST_ROOT=${DESTDIR} install install-lib install-dev
+	rm -rf ${DESTDIR}/usr/share/doc
+}
+
+acl-devel_package() {
+	depends="attr-devel acl>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.*a"
+		vmove "usr/share/man/man[235]"
+	}
+}
+
+acl-progs_package() {
+	short_desc+=" -- utilities"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share
+	}
+}
+
+acl_package() {
+	pkg_install() {
+		vmove usr
+	}
 }

srcpkgs/attr/attr-devel.template

@@ -1,13 +0,0 @@
-# Template file for 'attr-devel'.
-#
-depends="glibc-devel attr>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.*a" usr/lib
-	vmove usr/share/man/man2 usr/share/man
-	vmove usr/share/man/man3 usr/share/man
-	vmove usr/share/man/man5 usr/share/man
-	vmove usr/share/doc usr/share
-}

srcpkgs/attr/attr-progs.template

@@ -1,9 +0,0 @@
-# Template file for 'attr-progs'.
-#
-short_desc="${short_desc} -- utilities"
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/share/man/man1 usr/share/man
-	vmove usr/share/locale usr/share
-}

srcpkgs/attr/template

@@ -1,9 +1,8 @@
 # Template file for 'attr'
 pkgname=attr
 version=2.4.46
-revision=6
+revision=7
 build_style=gnu-configure
-subpackages="attr-devel attr-progs"
 configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
 short_desc="Extended attribute support library for ACL support"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -15,3 +14,31 @@ checksum=dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f
 do_install() {
 	make DIST_ROOT=${DESTDIR} install install-lib install-dev
 }
+
+attr-devel_package() {
+	depends="attr>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.*a"
+		vmove usr/share/man/man2
+		vmove usr/share/man/man3
+		vmove usr/share/man/man5
+		vmove usr/share/doc
+	}
+}
+
+attr-progs_package() {
+	short_desc="${short_desc} -- utilities"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/man/man1
+		vmove usr/share/locale
+	}
+}
+
+attr_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/coreutils/coreutils-doc.template

@@ -1,10 +0,0 @@
-# Template file for 'coreutils-doc'.
-#
-noarch=yes
-short_desc="${short_desc} -- documentation files"
-replaces="coreutils<8.20_4"
-
-do_install() {
-	vmove usr/share/info usr/share
-	vmove usr/share/man usr/share
-}

srcpkgs/coreutils/template

@@ -2,6 +2,8 @@
 pkgname=coreutils
 version=8.21
 revision=3
+hostmakedepends="perl"
+makedepends="gmp-devel acl-devel libcap-devel"
 short_desc="The GNU core utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/coreutils"
@@ -9,16 +11,6 @@ license="GPL-3"
 distfiles="http://ftp.gnu.org/gnu/coreutils/${pkgname}-${version}.tar.xz"
 checksum=adaa44bdab3fa5eb352e80d8a31fdbf957b78653d0c2cd30d63e161444288e18
 
-subpackages="coreutils-doc"
-conflicts="chroot-coreutils>=0 procps-ng<3.3.5_3"
-hostmakedepends="perl"
-makedepends="gmp-devel acl-devel libcap-devel"
-depends="coreutils-doc-${version}_${revision}"
-
-if [ "$CROSS_BUILD" ]; then
-	unset subpackages
-fi
-
 do_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		_confargs="fu_cv_sys_stat_statfs2_bsize=yes \
@@ -60,3 +52,23 @@ do_install() {
 		rm -rf ${DESTDIR}/usr/share/info
 	fi
 }
+
+coreutils_package() {
+	conflicts="chroot-coreutils>=0 procps-ng<3.3.5_3"
+	depends="coreutils-doc-${version}_${revision}"
+	pkg_install() {
+		vmove usr
+	}
+}
+
+if [ -z "$CROSS_BUILD" ]; then
+	coreutils-doc_package() {
+		noarch=yes
+		short_desc+=" -- documentation files"
+		replaces="coreutils<8.20_4"
+		pkg_install() {
+			vmove usr/share/info
+			vmove usr/share/man
+		}
+	}
+fi

srcpkgs/cracklib/cracklib-devel.template

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

srcpkgs/cracklib/cracklib-python.template

@@ -1,9 +0,0 @@
-# Template file for 'cracklib-python'.
-#
-depends="python"
-short_desc="${short_desc} -- python bindings"
-pycompile_module="cracklib.py"
-
-do_install() {
-	vmove "usr/lib/python*" usr/lib
-}

srcpkgs/cracklib/libcracklib.template

@@ -1,8 +0,0 @@
-# Template file for 'libcracklib'.
-#
-short_desc="${short_desc} -- runtime library"
-replaces="cracklib<2.8.22_2"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}

srcpkgs/cracklib/template

@@ -1,8 +1,7 @@
 # Template file for 'cracklib'
 pkgname=cracklib
 version=2.8.22
-revision=3
+revision=4
-subpackages="libcracklib ${pkgname}-devel ${pkgname}-python"
 create_wrksrc=yes
 build_wrksrc="${pkgname}-${version}"
 build_style=gnu-configure
@@ -28,6 +27,39 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 post_install() {
-	[ -e ../cracklib-words-1.2.gz ] && gunzip ../cracklib-words-1.2.gz
+	if [ -e ../cracklib-words-1.2.gz ]; then
+		gunzip ../cracklib-words-1.2.gz
+	fi
 	vinstall ../cracklib-words-1.2 644 usr/share/cracklib cracklib-words
 }
+
+cracklib-devel_package() {
+	depends="zlib-devel libcracklib>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}
+
+cracklib-python_package() {
+	depends="python"
+	short_desc="${short_desc} -- python bindings"
+	pycompile_module="cracklib.py"
+	pkg_install() {
+		vmove "usr/lib/python*"
+	}
+}
+
+libcracklib_package() {
+	short_desc="${short_desc} -- runtime library"
+	replaces="cracklib<2.8.22_2"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+cracklib_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/dash/template

@@ -3,9 +3,7 @@ pkgname=dash
 version=0.5.7
 revision=6
 build_style=gnu-configure
-register_shell="/bin/sh"
+hostmakedepends="bison coreutils"
-depends="coreutils"
-makedepends="bison"
 short_desc="POSIX-compliant Unix shell, much smaller than GNU bash"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gondor.apana.org.au/~herbert/dash/"
@@ -16,3 +14,11 @@ checksum=ae89fa9f1145b7748cf0740e1df04cd52fdf8a285da4911dd0f04983efba4e39
 post_install() {
 	ln -sfr ${DESTDIR}/usr/bin/dash ${DESTDIR}/usr/bin/sh
 }
+
+dash_package() {
+	register_shell="/bin/sh"
+	depends="coreutils"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/gperf/template

@@ -2,12 +2,12 @@
 pkgname=gperf
 version=3.0.3
 revision=4
-distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 short_desc="Perfect hash function generator"
 homepage="https://www.gnu.org/software/gperf/"
 license="GPL-3"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 checksum=63287527c8d9e27e801cf0804436f3494bd569db05d49dcdd2a942ae72fa9055
 long_desc="
  GNU gperf is a perfect hash function generator. For a given list of strings,
@@ -20,7 +20,12 @@ long_desc="
  code, for emitting switch statements or nested ifs instead of a hash table,
  and for tuning the algorithm employed by gperf."
 
-post_install()
+post_install() {
-{
 	touch -f ${DESTDIR}/usr/share/info/dir
 }
+
+gperf_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/libcap/libcap-devel.template

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

srcpkgs/libcap/libcap-pam.template

@@ -1,9 +0,0 @@
-# Template file for 'libcap-pam'.
-#
-conf_files="/etc/security/capability.conf"
-short_desc="${short_desc} -- PAM module"
-
-do_install() {
-	vmove usr/lib/security usr/lib
-	vmove etc
-}

srcpkgs/libcap/libcap-progs.template

@@ -1,8 +0,0 @@
-# Template file for 'libcap-progs'.
-#
-short_desc="${short_desc} -- utilities"
-
-do_install() {
-	vmove usr/sbin usr
-	vmove usr/share usr
-}

srcpkgs/libcap/template

@@ -2,7 +2,6 @@
 pkgname=libcap
 version=2.22
 revision=8
-subpackages="$pkgname-devel $pkgname-pam $pkgname-progs"
 hostmakedepends="gperf perl"
 makedepends="pam-devel attr-devel"
 short_desc="POSIX.1e capabilities suite"
@@ -32,3 +31,36 @@ do_install() {
 	vinstall pam_cap/capability.conf 644 etc/security
 	chmod 755 ${DESTDIR}/usr/lib/libcap.so.*
 }
+
+libcap-devel_package() {
+	depends="libcap>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/libcap.a
+		vmove usr/share/man/man3
+	}
+}
+
+libcap-pam_package() {
+	conf_files="/etc/security/capability.conf"
+	short_desc="${short_desc} -- PAM module"
+	pkg_install() {
+		vmove usr/lib/security
+		vmove etc
+	}
+}
+
+libcap-progs_package() {
+	short_desc="${short_desc} -- utilities"
+	pkg_install() {
+		vmove usr/sbin
+		vmove usr/share
+	}
+}
+
+libcap_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/pam/pam-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'pam-devel'.
-#
-noarch=yes
-depends="cracklib-devel db-devel pam-libs>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/share/man/man3 usr/share/man
-	vmove usr/share/doc usr/share
-}

srcpkgs/pam/pam-libs.template

@@ -1,8 +0,0 @@
-# Template file for 'pam-lib'.
-#
-short_desc="${short_desc} -- runtime libraries"
-replaces="pam<1.1.6_3"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}

srcpkgs/pam/pam-userdb.template

@@ -1,8 +0,0 @@
-# Template file for 'pam-userdb'.
-#
-short_desc="PAM module to authenticate against a db database"
-
-do_install() {
-	vmove usr/lib/security/pam_userdb.so usr/lib/security
-	vmove usr/share/man/man8/pam_userdb.8.gz usr/share/man/man8
-}

srcpkgs/pam/template

@@ -1,13 +1,11 @@
 # Template file for 'pam'
 pkgname=pam
 version=1.1.6
-revision=4
+revision=5
 wrksrc="Linux-PAM-$version"
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --sbindir=/usr/sbin
  --docdir=/usr/share/doc/pam --disable-nis"
-depends="cracklib"
-subpackages="pam-devel pam-userdb pam-libs"
 hostmakedepends="flex"
 makedepends="cracklib-devel db-devel"
 short_desc="A flexible mechanism for authenticating users"
@@ -18,15 +16,6 @@ license="GPL-2"
 distfiles="https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$version.tar.bz2"
 checksum=bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2
 
-conf_files="
-/etc/environment
-/etc/security/access.conf
-/etc/security/group.conf
-/etc/security/limits.conf
-/etc/security/namespace.conf
-/etc/security/pam_env.conf
-/etc/security/time.conf"
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake gettext-devel pkg-config libtool"
 	makedepends+=" libfl-devel"
@@ -46,3 +35,44 @@ post_install() {
 		${DESTDIR}/etc/security/namespace.init
 	chmod 755 ${DESTDIR}/etc/security/namespace.init
 }
+
+pam-devel_package() {
+	depends="pam-libs>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+	}
+}
+
+pam-libs_package() {
+	short_desc="${short_desc} -- runtime libraries"
+	replaces="pam<1.1.6_3"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+pam-userdb_package() {
+	short_desc="PAM module to authenticate against a db database"
+	pkg_install() {
+		vmove usr/lib/security/pam_userdb.so
+		vmove usr/share/man/man8/pam_userdb.8
+	}
+}
+
+pam_package() {
+	conf_files="
+		/etc/environment
+		/etc/security/access.conf
+		/etc/security/group.conf
+		/etc/security/limits.conf
+		/etc/security/namespace.conf
+		/etc/security/pam_env.conf
+		/etc/security/time.conf"
+	depends="cracklib"
+	pkg_install() {
+		vmove usr
+	}
+}