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

srcpkgs/binutils/binutils-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'binutils-devel'.
-#
-depends="binutils>=$version"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/libbfd.so usr/lib
-	vmove usr/lib/libopcodes.so usr/lib
-}

srcpkgs/binutils/template

@@ -3,8 +3,7 @@ pkgname=binutils
 version=2.23.51.0.3
 revision=2
 hostmakedepends="flex perl"
-makedepends="libfl-devel zlib-devel"
-subpackages="$pkgname-devel"
+makedepends="zlib-devel"
 short_desc="GNU binary utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/binutils/"
@@ -12,6 +11,10 @@ license="GPL-3"
 distfiles="${KERNEL_SITE}/devel/binutils/$pkgname-$version.tar.xz"
 checksum=2162905dabf191a2a803eab8d31e7be52d96d6ccd1e0ce42e25d82c6be918cd0
 
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" libfl-devel"
+fi
+
 do_configure() {
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		CONFIGFLAG="--enable-64-bit-bfd --enable-multilib"
@@ -89,3 +92,20 @@ do_install() {
 	# from bfd.h... wth?
 	sed -i 35,+3d ${DESTDIR}/usr/include/bfd.h
 }
+
+binutils-devel_package() {
+	depends="binutils>=$version"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/libbfd.so
+		vmove usr/lib/libopcodes.so
+	}
+}
+
+binutils_package() {
+	pkg_install() {
+		vmove usr
+	}
+}