--- a/dev/binutils/binutils.sh	Mon Mar 11 15:10:39 2019 +0100
+++ b/dev/binutils/binutils.sh	Mon Mar 11 15:44:15 2019 +0100
@@ -15,56 +15,68 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+PKGNAME=binutils
+PKGVERSION=2.32
+PKGREVISION=1
+PKGLICENSE="GPLv3"
+PKGSUMMARY="programs to manipulate binary and object files"
+PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
+PKGDEPENDS="lib/zlib"
+PKGOPTIONS="GDB NLS"
+
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
-: ${CTARGET:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
 : ${CXX:=g++}
 : ${CXXFLAGS:=-O2}
-
-source ./binutils.info
-
-set -ex
-
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-pushd $PKGNAME-$PKGVERSION
+: ${LDFLAGS:=}
+: ${LIBS:=}
 
-if [ "${NLS:-yes}" = "no" ]; then
+if [ "$NLS" = "yes" ]; then
+	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	with_nls="--enable-nls"
+else
 	with_nls="--disable-nls"
-else
-	with_nls="--enable-nls"
 fi
-if [ "${GDB:-yes}" = "no" ]; then
+if [ "$GDB" = "yes" ]; then
+	with_gdb="--enable-gdb"
+else
 	with_gdb="--disable-gdb"
-else
-	with_gdb="--enable-gdb"
 fi
 
-CFLAGS="$CFLAGS" \
-CXXFLAGS="$CXXFLAGS" \
-CC="$CC" \
-CXX="$CXX" \
-./configure \
-	--build=${CBUILD} \
-	--host=${CHOST} \
-	--target=${CTARGET} \
-	--prefix=/usr \
-	--disable-werror \
-	--enable-gold \
-	--enable-ld=default \
-	--enable-lto \
-	--enable-plugins \
-	--enable-relro \
-	--enable-shared \
-	--enable-threads \
-	--with-pic \
-	--with-system-zlib \
-	${with_nls} \
-	${with_gdb}
-make tooldir=/usr
-make tooldir=/usr install DESTDIR=$DESTDIR
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
+	pushd $PKGNAME-$PKGVERSION
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	CFLAGS="$CFLAGS" \
+	CXXFLAGS="$CXXFLAGS" \
+	CC="$CC" \
+	CXX="$CXX" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--target=$CTARGET \
+		--prefix=/usr \
+		--disable-werror \
+		--enable-gold \
+		--enable-ld=default \
+		--enable-lto \
+		--enable-plugins \
+		--enable-relro \
+		--enable-shared \
+		--enable-threads \
+		--with-pic \
+		--with-system-zlib \
+		${with_nls} \
+		${with_gdb}
+	make tooldir=/usr
+	make tooldir=/usr install DESTDIR=$DESTDIR
+
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}