From 706f09af67da338e6691c14afa25bee2129a4e9a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 11 Jul 2011 23:14:09 +0200
Subject: [PATCH] binutils: update to 2.21.1.

---
 srcpkgs/binutils/binutils-devel.template | 15 ++--------
 srcpkgs/binutils/template                | 37 ++++++++++++++++--------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/srcpkgs/binutils/binutils-devel.template b/srcpkgs/binutils/binutils-devel.template
index a048fbfe33e..7b378255843 100644
--- a/srcpkgs/binutils/binutils-devel.template
+++ b/srcpkgs/binutils/binutils-devel.template
@@ -5,20 +5,11 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+Add_dependency run glibc-devel
 Add_dependency run binutils
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr || return 1
-	for f in libopcodes libbfd libiberty; do
-		mv ${SRCPKGDESTDIR}/usr/lib/${f}.*a \
-			${DESTDIR}/usr/lib || return 1
-		if [ -f ${SRCPKGDESTDIR}/usr/lib/${f}.so ]; then
-			mv ${SRCPKGDESTDIR}/usr/lib/${f}.so \
-				${DESTDIR}/usr/lib || return 1
-		fi
-	done
-	mv ${SRCPKGDESTDIR}/usr/lib/ldscripts \
-		${DESTDIR}/usr/lib || return 1
+	vmove usr/include usr
+	vmove usr/lib usr
 }
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index f1afe104be8..9b86bcaf81e 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,14 +1,13 @@
 # Template file for 'binutils'
 pkgname=binutils
-version=2.21
-distfiles="http://ftp.gnu.org/gnu/binutils/$pkgname-$version.tar.bz2"
-build_style=gnu_configure
-configure_args="--enable-shared --enable-64-bit-bfd --enable-multilib 
---enable-plugins --enable-secureplt --with-mmap --with-gnu-ld"
-make_install_args="tooldir=/usr"
+version=2.21.1
+distfiles="${GNU_SITE}/binutils/$pkgname-$version.tar.bz2"
+build_style=custom-install
 short_desc="GNU binary utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=60abec5bf448eb930a5a15acb8712612377dc8bcfb13dfd5131228f70561d0c7
+homepage="http://www.gnu.org/software/binutils/"
+license="GPL-3"
+checksum=f769b64350a02fbee009e1582cc12b6ed43b41985de65effb741e258e075dd05
 long_desc="
  The GNU binutils package contains essential tools to assemble, link and
  manipulate binary and object files. They are often used with a compiler
@@ -24,6 +23,7 @@ long_desc="
 
 bootstrap=yes
 subpackages="$pkgname-devel"
+
 Add_dependency run glibc
 Add_dependency run zlib
 
@@ -32,23 +32,36 @@ if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
 	Add_dependency build texinfo
 fi
 
-pre_install()
+do_build()
+{
+	./configure ${CONFIGURE_SHARED_ARGS} --enable-threads \
+		--enable-64-bit-bfd --enable-multilib --enable-plugins \
+		--enable-secureplt --with-mmap
+	
+	make ${makejobs}
+}
+
+do_install()
 {
 	if [ "$xbps_machine" = "x86_64" ]; then
 		mkdir -p ${SRCPKGDESTDIR}/usr/lib
 		cd ${SRCPKGDESTDIR}/usr && ln -s lib lib64 && cd ${wrksrc}
 	fi
-}
 
-post_install()
-{
+	make DESTDIR=${DESTDIR} tooldir=/usr install
+
 	# Remove info file that conflicts with autoconf.
 	rm -f ${DESTDIR}/usr/share/info/standards.info
 	rm -f ${DESTDIR}/usr/lib64
 
+	# Remove useless manpages.
+	for f in dlltool nlmconv windres windmc; do
+		rm -f ${DESTDIR}/usr/share/man/man1/${f}.1
+	done
+
 	# Fix for multilib builds.
 	if [ -d ${DESTDIR}/usr/lib32 ]; then
-		mv ${DESTDIR}/usr/lib32/* ${DESTDIR}/usr/lib || return 1
+		mv ${DESTDIR}/usr/lib32/* ${DESTDIR}/usr/lib
 		rmdir ${DESTDIR}/usr/lib32
 	fi
 }