Convert packages the new template format (a-c range).

srcpkgs/cryptsetup/cryptsetup-devel.template

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

srcpkgs/cryptsetup/libcryptsetup.template

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

srcpkgs/cryptsetup/template

@@ -1,8 +1,7 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=1.6.0
-revision=1
-subpackages="libcryptsetup cryptsetup-devel"
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pwquality"
 hostmakedepends="pkg-config"
@@ -15,8 +14,30 @@ distfiles="https://cryptsetup.googlecode.com/files/$pkgname-$version.tar.bz2"
 checksum=dd9686fce5d3276b2eb2ac40d513a9b64850af8fff881442f2cfe87257ba2406
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="automake gettext-devel pkg-config libgcrypt-devel"
+	hostmakedepends+=" automake gettext-devel libgcrypt-devel"
 	pre_configure() {
 		autoreconf -fi
 	}
 fi
+
+libcryptsetup_package() {
+	short_desc="${short_desc} - runtime libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+cryptsetup-devel_package() {
+	depends="libcryptsetup-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+cryptsetup_package() {
+	pkg_install() {
+		vmove usr
+	}
+}