# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1552315455 -3600
# Node ID b3f3b8ed8cf295c219f1146ef8ab5723eaf157bc
# Parent  f443cbb93f37795cf8957d57b25ac57817367721
dev: merge .sh and .info

diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/autoconf/autoconf.info
--- a/dev/autoconf/autoconf.info	Mon Mar 11 15:10:39 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=autoconf
-PKGVERSION=2.69
-PKGREVISION=1
-PKGLICENSE="GPLv2+ GPLv3+"
-PKGSUMMARY="GNU tool for configuring source code"
-PKGDOWNLOAD="ftp://ftp.gnu.org/pub/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/m4 dev/make:build perl/perl"
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/autoconf/autoconf.sh
--- a/dev/autoconf/autoconf.sh	Mon Mar 11 15:10:39 2019 +0100
+++ b/dev/autoconf/autoconf.sh	Mon Mar 11 15:44:15 2019 +0100
@@ -15,26 +15,33 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-source ./autoconf.info
+PKGNAME=autoconf
+PKGVERSION=2.69
+PKGREVISION=1
+PKGLICENSE="GPLv2+ GPLv3+"
+PKGSUMMARY="GNU tool for configuring source code"
+PKGDOWNLOAD="ftp://ftp.gnu.org/pub/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
+PKGDEPENDS="dev/m4 dev/make:build perl/perl"
 
-case $(uname -m) in
-x86_64)
-	CFLAGS="-O2 -fPIC"
-	;;
-*)
-	CFLAGS="-O2"
-	;;
-esac
+: ${CC:=gcc}
+: ${CFLAGS:=-O2}
+: ${LDFLAGS:=}
+: ${LIBS:=}
 
-set -e
-
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-pushd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
+	pushd $PKGNAME-$PKGVERSION
 
-CFLAGS="$CFLAGS" ./configure --prefix=/usr
-make
-make install DESTDIR=$DESTDIR
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure --prefix=/usr
+	make
+	make install DESTDIR=$DESTDIR
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/automake/automake.info
--- a/dev/automake/automake.info	Mon Mar 11 15:10:39 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=automake
-PKGVERSION=1.16.1
-PKGREVISION=1
-PKGLICENSE="GPLv2+"
-PKGSUMMARY="GNU tool for automatically creating Makefiles"
-PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/automake/automake.sh
--- a/dev/automake/automake.sh	Mon Mar 11 15:10:39 2019 +0100
+++ b/dev/automake/automake.sh	Mon Mar 11 15:44:15 2019 +0100
@@ -15,26 +15,37 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-source ./automake.info
+PKGNAME=automake
+PKGVERSION=1.16.1
+PKGREVISION=1
+PKGLICENSE="GPLv2+"
+PKGSUMMARY="GNU tool for automatically creating Makefiles"
+PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
 
-case $(uname -m) in
-x86_64)
-	CFLAGS="-O2 -fPIC"
-	;;
-*)
-	CFLAGS="-O2"
-	;;
-esac
+: ${CHOST:=$(uname -m)-linux-musl}
+: ${CBUILD:=$(uname -m)-linux-musl}
+: ${CC:=gcc}
+: ${CFLAGS:=-O2}
+: ${LDFLAGS:=}
+: ${LIBS:=}
 
-set -e
-
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-pushd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
+	pushd $PKGNAME-$PKGVERSION
 
-CFLAGS="$CFLAGS" ./configure --prefix=/usr
-make
-make install DESTDIR=$DESTDIR
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
+	make
+	make install DESTDIR=$DESTDIR
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/binutils/binutils.info
--- a/dev/binutils/binutils.info	Mon Mar 11 15:10:39 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# 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"
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/binutils/binutils.sh
--- 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
+}
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/gcc/gcc.info
--- a/dev/gcc/gcc.info	Mon Mar 11 15:10:39 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=gcc
-PKGVERSION=8.3.0
-PKGREVISION=1
-PKGLICENSE="GPLv3+"
-PKGSUMMARY="GNU compiler collections"
-PKGDOWNLOAD="ftp://gcc.gnu.org/pub/gcc/releases/$PKGNAME-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/zlib lib/gmp lib/mpfr lib/mpc"
-PKGOPTIONS="NLS"
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/gcc/gcc.sh
--- a/dev/gcc/gcc.sh	Mon Mar 11 15:10:39 2019 +0100
+++ b/dev/gcc/gcc.sh	Mon Mar 11 15:44:15 2019 +0100
@@ -15,53 +15,74 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+PKGNAME=gcc
+PKGVERSION=8.3.0
+PKGREVISION=1
+PKGLICENSE="GPLv3+"
+PKGSUMMARY="GNU compiler collections"
+PKGDOWNLOAD="ftp://gcc.gnu.org/pub/gcc/releases/$PKGNAME-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
+PKGDEPENDS="lib/zlib lib/gmp lib/mpfr lib/mpc"
+PKGOPTIONS="NLS"
+
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
 : ${CTARGET:=$(uname -m)-linux-musl}
-
-source ./gcc.info
-
-set -ex
-
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-pushd $PKGNAME-$PKGVERSION
+: ${CC:=gcc}
+: ${CFLAGS:=-O2}
+: ${CXX:=g++}
+: ${CXXFLAGS:=-O2}
+: ${LDFLAGS:=}
+: ${LIBS:=}
 
-# on vanilla we use /lib rather than /lib64.
-sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
-sed -i 's/lib64/lib/' gcc/config/i386/linux64.h
-
-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
 
-mkdir build && pushd build
-../configure \
-	--target=${CTARGET} \
-	--build=${CBUILD} \
-	--host=${CHOST} \
-	--prefix=/usr \
-	--enable-languages=c,c++ \
-	--enable-threads=posix \
-	--enable-__cxa_atexit \
-	--libdir=/usr/lib \
-	--with-system-zlib \
-	--enable-shared \
-	--enable-tls \
-	--enable-default-pie \
-	--enable-default-ssp \
-	--disable-multilib \
-	--disable-bootstrap \
-	--disable-libsanitizer \
-	--with-pkgversion="vanilla 0.1" \
-	--disable-static \
-	${with_nls}
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
+	pushd $PKGNAME-$PKGVERSION
+
+	# on vanilla we use /lib rather than /lib64.
+	sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
+	sed -i 's/lib64/lib/' gcc/config/i386/linux64.h
 
-make
-make install DESTDIR=$DESTDIR
-popd
+	mkdir build && pushd build
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	CXX="$CXX" \
+	CXXFLAGS="$CXXFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	../configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--target=$CTARGET \
+		--prefix=/usr
+		--enable-languages=c,c++ \
+		--enable-threads=posix \
+		--enable-__cxa_atexit \
+		--libdir=/usr/lib \
+		--with-system-zlib \
+		--enable-shared \
+		--enable-tls \
+		--enable-default-pie \
+		--enable-default-ssp \
+		--disable-multilib \
+		--disable-bootstrap \
+		--disable-libsanitizer \
+		--with-pkgversion="vanilla 0.1" \
+		--disable-static \
+		${with_nls}
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	make
+	make install DESTDIR=$DESTDIR
+	popd
+
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/gperf/gperf.info
--- a/dev/gperf/gperf.info	Mon Mar 11 15:10:39 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=gperf
-PKGVERSION=3.1
-PKGREVISION=1
-PKGLICENSE="GPLv3+"
-PKGSUMMARY="GNU perfect hash function generator"
-PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/gperf/gperf.sh
--- a/dev/gperf/gperf.sh	Mon Mar 11 15:10:39 2019 +0100
+++ b/dev/gperf/gperf.sh	Mon Mar 11 15:44:15 2019 +0100
@@ -15,27 +15,37 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+PKGNAME=gperf
+PKGVERSION=3.1
+PKGREVISION=1
+PKGLICENSE="GPLv3+"
+PKGSUMMARY="GNU perfect hash function generator"
+PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
+
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
-
-source ./gperf.info
+: ${LDFLAGS:=}
+: ${LIBS:=}
 
-set -ex
-
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-pushd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+	pushd $PKGNAME-$PKGVERSION
 
-CC="$CC" \
-CFLAGS="$CFLAGS" \
-./configure \
-	--build=$CBUILD \
-	--host=$CHOST \
-	--prefix=/usr
-make
-make install DESTDIR=$DESTDIR
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
+	make
+	make install DESTDIR=$DESTDIR
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/libtool/libtool.info
--- a/dev/libtool/libtool.info	Mon Mar 11 15:10:39 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=libtool
-PKGVERSION=2.4.6
-PKGREVISION=1
-PKGLICENSE="GPLv2"
-PKGSUMMARY="GNU utility for libraries"
-PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/libtool/libtool.sh
--- a/dev/libtool/libtool.sh	Mon Mar 11 15:10:39 2019 +0100
+++ b/dev/libtool/libtool.sh	Mon Mar 11 15:44:15 2019 +0100
@@ -15,30 +15,40 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+PKGNAME=libtool
+PKGVERSION=2.4.6
+PKGREVISION=1
+PKGLICENSE="GPLv2"
+PKGSUMMARY="GNU utility for libraries"
+PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
+
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
-
-source ./libtool.info
+: ${LDFLAGS:=}
+: ${LIBS:=}
 
-set -ex
-
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-pushd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
+	pushd $PKGNAME-$PKGVERSION
 
-CC="$CC" \
-CFLAGS="$CFLAGS" \
-./configure \
-	--build=$CBUILD \
-	--host=$CHOST \
-	--prefix=/usr \
-	--enable-shared \
-	--disable-static
-make
-make install DESTDIR=$DESTDIR
-rm -f $DESTDIR/usr/lib/libltdl.la
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--enable-shared \
+		--disable-static
+	make
+	make install DESTDIR=$DESTDIR
+	rm -f $DESTDIR/usr/lib/libltdl.la
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/m4/m4.info
--- a/dev/m4/m4.info	Mon Mar 11 15:10:39 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=m4
-PKGVERSION=1.4.18
-PKGREVISION=1
-PKGLICENSE="GPLv3"
-PKGSUMMARY="GNU macro processor"
-PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/m4/m4.sh
--- a/dev/m4/m4.sh	Mon Mar 11 15:10:39 2019 +0100
+++ b/dev/m4/m4.sh	Mon Mar 11 15:44:15 2019 +0100
@@ -15,26 +15,37 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-source ./m4.info
+PKGNAME=m4
+PKGVERSION=1.4.18
+PKGREVISION=1
+PKGLICENSE="GPLv3"
+PKGSUMMARY="GNU macro processor"
+PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
 
-case $(uname -m) in
-x86_64)
-	CFLAGS="-O2 -fPIC"
-	;;
-*)
-	CFLAGS="-O2"
-	;;
-esac
+: ${CHOST:=$(uname -m)-linux-musl}
+: ${CBUILD:=$(uname -m)-linux-musl}
+: ${CC:=gcc}
+: ${CFLAGS:=-O2}
+: ${LDFLAGS:=}
+: ${LIBS:=}
 
-set -e
-
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-pushd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
+	pushd $PKGNAME-$PKGVERSION
 
-CFLAGS="$CFLAGS" ./configure --prefix=/usr
-make
-make install DESTDIR=$DESTDIR
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
+	make
+	make install DESTDIR=$DESTDIR
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/make/make.info
--- a/dev/make/make.info	Mon Mar 11 15:10:39 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=make
-PKGVERSION=4.2.1
-PKGREVISION=1
-PKGLICENSE="GPLv3+"
-PKGSUMMARY="short summary"
-PKGDOWNLOAD="http://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGOPTIONS="GUILE NLS"
-
-if [ "${GUILE:-yes}" = "yes" ]; then
-	PKGDEPENDS="dev/guile $PKGDEPENDS"
-fi
-if [ "${NLS:-yes}" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
-fi
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/make/make.sh
--- a/dev/make/make.sh	Mon Mar 11 15:10:39 2019 +0100
+++ b/dev/make/make.sh	Mon Mar 11 15:44:15 2019 +0100
@@ -15,40 +15,60 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+PKGNAME=make
+PKGVERSION=4.2.1
+PKGREVISION=1
+PKGLICENSE="GPLv3+"
+PKGSUMMARY="short summary"
+PKGDOWNLOAD="http://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
+PKGOPTIONS="GUILE NLS"
+
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
+: ${CTARGET:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
-
-source ./make.info
-
-set -ex
+: ${CXX:=g++}
+: ${CXXFLAGS:=-O2}
+: ${LDFLAGS:=}
+: ${LIBS:=}
+: ${GUILE:=yes}
+: ${NLS:=yes}
 
-if [ "${GUILE:-yes}" = "no" ]; then
-	with_nls="--without-guile"
+if [ "$GUILE" = "yes" ]; then
+	PKGDEPENDS="dev/guile $PKGDEPENDS"
+	with_nls="--with-guile"
 else
-	with_nls="--with-guile"
+	with_guile="--without-guile"
 fi
-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
 
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-pushd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+	pushd $PKGNAME-$PKGVERSION
 
-CC="$CC" \
-CFLAGS="$CFLAGS" \
-./configure \
-	--build=${CBUILD} \
-	--host=${CHOST} \
-	--prefix=/usr \
-	${with_guile} \
-	${with_nls}
-make
-make install DESTDIR=$DESTDIR
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	CXX="$CXX" \
+	CXXFLAGS="$CXXFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--target=$CTARGET \
+		${with_guile} \
+		${with_nls}
+	make
+	make install DESTDIR=$DESTDIR
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/patch/patch.info
--- a/dev/patch/patch.info	Mon Mar 11 15:10:39 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=patch
-PKGVERSION=2.7.6
-PKGREVISION=1
-PKGLICENSE="GPLv3+"
-PKGSUMMARY="GNU tool to patch files"
-PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/patch/patch.sh
--- a/dev/patch/patch.sh	Mon Mar 11 15:10:39 2019 +0100
+++ b/dev/patch/patch.sh	Mon Mar 11 15:44:15 2019 +0100
@@ -15,27 +15,37 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+PKGNAME=patch
+PKGVERSION=2.7.6
+PKGREVISION=1
+PKGLICENSE="GPLv3+"
+PKGSUMMARY="GNU tool to patch files"
+PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
+
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
-
-source ./patch.info
+: ${LDFLAGS:=}
+: ${LIBS:=}
 
-set -ex
-
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-pushd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
+	pushd $PKGNAME-$PKGVERSION
 
-CC="$CC" \
-CFLAGS="$CFLAGS" \
-./configure \
-	--build=$CBUILD \
-	--host=$CHOST \
-	--prefix=/usr
-make
-make install DESTDIR=$DESTDIR
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
+	make
+	make install DESTDIR=$DESTDIR
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/pkgconf/pkgconf.info
--- a/dev/pkgconf/pkgconf.info	Mon Mar 11 15:10:39 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=pkgconf
-PKGVERSION=1.6.0
-PKGREVISION=1
-PKGLICENSE="ISC"
-PKGSUMMARY="package compiler and linker metadata toolkit"
-PKGDOWNLOAD="https://git.dereferenced.org/$PKGNAME/$PKGNAME/archive/$PKGNAME-$PKGVERSION.tar.gz"
diff -r f443cbb93f37 -r b3f3b8ed8cf2 dev/pkgconf/pkgconf.sh
--- a/dev/pkgconf/pkgconf.sh	Mon Mar 11 15:10:39 2019 +0100
+++ b/dev/pkgconf/pkgconf.sh	Mon Mar 11 15:44:15 2019 +0100
@@ -15,28 +15,41 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-source ./pkgconf.info
+PKGNAME=pkgconf
+PKGVERSION=1.6.0
+PKGREVISION=1
+PKGLICENSE="ISC"
+PKGSUMMARY="package compiler and linker metadata toolkit"
+PKGDOWNLOAD="https://git.dereferenced.org/$PKGNAME/$PKGNAME/archive/$PKGNAME-$PKGVERSION.tar.gz"
 
-case $(uname -m) in
-x86_64)
-	CFLAGS="-O2 -fPIC"
-	;;
-*)
-	CFLAGS="-O2"
-	;;
-esac
-
-set -e
+: ${CHOST:=$(uname -m)-linux-musl}
+: ${CBUILD:=$(uname -m)-linux-musl}
+: ${CC:=gcc}
+: ${CFLAGS:=-O2}
+: ${LDFLAGS:=}
+: ${LIBS:=}
 
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-pushd $PKGNAME
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+	pushd $PKGNAME
 
-./autogen.sh
-CFLAGS="$CFLAGS" ./configure --prefix=/usr
-make
-make install DESTDIR=$DESTDIR
-ln -sf $DESTDIR/usr/bin/pkgconf $DESTDIR/usr/bin/pkg-config
+	./autogen.sh
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--target=$CTARGET \
+		--prefix=/usr
+	make
 
-popd
-rm -rf $PKGNAME
+	make install DESTDIR=$DESTDIR
+	ln -sf $DESTDIR/usr/bin/pkgconf $DESTDIR/usr/bin/pkg-config
+
+	popd
+	rm -rf $PKGNAME
+}