# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1553194800 -3600
# Node ID 9e95fda0e5c69fe297e8b295f2ffa59cbb064285
# Parent  da8439572c16180fa9eb735770f08141019d52cf
vanilla: fix many packages

Also add templates/python-hybrid.sh and update template/python.sh

diff -r da8439572c16 -r 9e95fda0e5c6 core/attr/attr.sh
--- a/core/attr/attr.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/core/attr/attr.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -49,8 +49,8 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--build=CBUILD \
-		--host=CHOST \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-static \
diff -r da8439572c16 -r 9e95fda0e5c6 core/sysvinit/sysvinit.sh
--- a/core/sysvinit/sysvinit.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/core/sysvinit/sysvinit.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -42,7 +42,7 @@
 		-e 's|$(ROOT)/sbin|$(ROOT)/usr/sbin|g' src/Makefile
 	make CC="$CC" CFLAGS="$CFLAGS"
 	make install ROOT=$DESTDIR
-	install -Dm0644 ../inittab
+	install -Dm0644 ../inittab $DESTDIR/etc/inittab
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
diff -r da8439572c16 -r 9e95fda0e5c6 databases/gdbm/gdbm.sh
--- a/databases/gdbm/gdbm.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/databases/gdbm/gdbm.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -44,7 +44,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
 		--enable-libgdbm-compat
 	make
 	make install DESTDIR=$DESTDIR
diff -r da8439572c16 -r 9e95fda0e5c6 dev/gcc/gcc.sh
--- a/dev/gcc/gcc.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/dev/gcc/gcc.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -63,7 +63,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--target=$CTARGET \
-		--prefix=/usr
+		--prefix=/usr \
 		--enable-languages=c,c++ \
 		--enable-threads=posix \
 		--enable-__cxa_atexit \
diff -r da8439572c16 -r 9e95fda0e5c6 lib/efivar/efivar.sh
--- a/lib/efivar/efivar.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/lib/efivar/efivar.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -31,7 +31,7 @@
 	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
 	pushd $PKGNAME-$PKGVERSION
 
-	make CC="$CC" CFLAGS="$CFLAGS" libdir=/usr/lib
+	make CC="$CC" CC_FOR_BUILD="$CC" CFLAGS="$CFLAGS" libdir=/usr/lib
 	make libdir=/usr/lib DESTDIR=$DESTDIR install
 
 	popd
diff -r da8439572c16 -r 9e95fda0e5c6 lib/libaio/libaio.sh
--- a/lib/libaio/libaio.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/lib/libaio/libaio.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -33,7 +33,7 @@
 	pushd $PKGNAME-$PKGVERSION
 
 	patch -p0 < ../disable-static.patch
-	make install \
+	make CC="$CC" CFLAGS="$CFLAGS" install \
 		prefix=$DESTDIR/usr \
 		sysconfdir=$DESTDIR/etc \
 		mandir=$DESTDIR/usr/share/man \
diff -r da8439572c16 -r 9e95fda0e5c6 lib/libcddb/libcddb.sh
--- a/lib/libcddb/libcddb.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/lib/libcddb/libcddb.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -22,8 +22,6 @@
 PKGSUMMARY="library to access CDDB server"
 PKGDOWNLOAD="https://downloads.sourceforge.net/sourceforge/${PKGNAME}/${PKGNAME}-${PKGVERSION}.tar.bz2"
 
-: ${CHOST:=$(uname -m)-linux-musl}
-: ${CBUILD:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}
@@ -40,8 +38,6 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
 		--prefix=/usr \
 		--enable-shared \
 		--disable-static
diff -r da8439572c16 -r 9e95fda0e5c6 lib/libogg/libogg.sh
--- a/lib/libogg/libogg.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/lib/libogg/libogg.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
 		--enable-shared \
 		--disable-static
 	make
diff -r da8439572c16 -r 9e95fda0e5c6 lib/libzip/libzip.sh
--- a/lib/libzip/libzip.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/lib/libzip/libzip.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="zip library in C"
 PKGDOWNLOAD="https://libzip.org/download/libzip-1.5.1.tar.xz"
-PKGDEPENDS="dev/cmake lib/zlib"
+PKGDEPENDS="dev/cmake lib/zlib lib/musl-fts:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -40,6 +40,7 @@
 	cmake .. \
 		-DBUILD_SHARED_LIBS=On \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DCMAKE_EXE_LINKER_FLAGS="-lfts" \
 		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
 		-DDOCUMENTATION_FORMAT="man" \
 		-DCMAKE_INSTALL_PREFIX=/usr
diff -r da8439572c16 -r 9e95fda0e5c6 lib/ncurses/ncurses.sh
--- a/lib/ncurses/ncurses.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/lib/ncurses/ncurses.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -44,7 +44,7 @@
 	../configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
 		--enable-pc-files \
 		--enable-widec \
 		--prefix=/usr \
diff -r da8439572c16 -r 9e95fda0e5c6 lib/pcre/pcre.sh
--- a/lib/pcre/pcre.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/lib/pcre/pcre.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -47,9 +47,6 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
-		--build=$CBUILD \
-		--host=$CHOST \
 		--prefix=/usr \
 		--disable-static \
 		--enable-jit \
diff -r da8439572c16 -r 9e95fda0e5c6 lib/popt/popt.sh
--- a/lib/popt/popt.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/lib/popt/popt.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -23,8 +23,6 @@
 PKGDOWNLOAD="http://rpm5.org/files/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
 PKGOPTIONS="NLS"
 
-: ${CHOST:=$(uname -m)-linux-musl}
-: ${CBUILD:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
 : ${CXX:=g++}
@@ -51,9 +49,7 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
 		--enable-shared \
 		--disable-static \
 		$with_nls
diff -r da8439572c16 -r 9e95fda0e5c6 lib/readline/readline.sh
--- a/lib/readline/readline.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/lib/readline/readline.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
diff -r da8439572c16 -r 9e95fda0e5c6 network/curl/curl.sh
--- a/network/curl/curl.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/network/curl/curl.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -21,7 +21,6 @@
 PKGLICENSE="MIT"
 PKGSUMMARY="command line tool for transferring data with URLs"
 PKGDOWNLOAD="https://curl.haxx.se/download/$PKGNAME-$PKGVERSION.tar.xz"
-#PKGDEPENDS="category/foo category/bar"
 PKGOPTIONS="IDN2 IPV6 NGHTTP2 SSH SSL"
 
 : ${CHOST:=$(uname -m)-linux-musl}
diff -r da8439572c16 -r 9e95fda0e5c6 network/inetutils/inetutils.sh
--- a/network/inetutils/inetutils.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/network/inetutils/inetutils.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -42,9 +42,6 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
-		--build=$CBUILD \
-		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
diff -r da8439572c16 -r 9e95fda0e5c6 network/openssh/openssh.sh
--- a/network/openssh/openssh.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/network/openssh/openssh.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -47,7 +47,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
 		--sysconfdir=/etc/ssh \
 		--without-pam \
 		--with-pid-dir=/var/run \
diff -r da8439572c16 -r 9e95fda0e5c6 python/py-docutils/py-docutils.sh
--- a/python/py-docutils/py-docutils.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/python/py-docutils/py-docutils.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -26,13 +26,15 @@
 
 build()
 {
-	rm -rf docutils-$PKGVERSION
-	tar xvaf docutils-$PKGVERSION.tar.gz
-	pushd docutils-$PKGVERSION
+	for py in python python2; do
+		rm -rf docutils-$PKGVERSION
+		tar xvaf docutils-$PKGVERSION.tar.gz
+		pushd docutils-$PKGVERSION
 
-	python2 setup.py install --root=${DESTDIR:-/} -O1
-	python setup.py install --root=${DESTDIR:-/} -O1
+		$py setup.py build
+		$py setup.py install --root=${DESTDIR:-/} -O1
 
-	popd
-	rm -rf docutils-$PKGVERSION
+		popd
+		rm -rf docutils-$PKGVERSION
+	done
 }
diff -r da8439572c16 -r 9e95fda0e5c6 python/python2/python2.sh
--- a/python/python2/python2.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/python/python2/python2.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -58,9 +58,15 @@
 		--with-system-ffi \
 		$with_ipv6
 	make
-	make altinstall DESTDIR=$DESTDIR
+	make altinstall maninstall DESTDIR=$DESTDIR
 	ln -sf python2.7 $DESTDIR/usr/bin/python2
 
+	# Avoid conflicts with python 3.
+	rm -f $DESTDIR/usr/bin/2to3
+	mv $DESTDIR/usr/bin/smtpd.py{,2.7}
+	mv $DESTDIR/usr/bin/idle{,2.7}
+	mv $DESTDIR/usr/bin/pydoc{,2.7}
+
 	popd
 	rm -rf Python-$PKGVERSION
 }
diff -r da8439572c16 -r 9e95fda0e5c6 templates/python-hybrid.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/python-hybrid.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 FirstName LastName <mailaddress>
+#
+# 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=name
+PKGVERSION=1.0.0
+PKGREVISION=1
+PKGLICENSE="one of README.licenses.md or CUSTOM"
+PKGSUMMARY="short summary"
+PKGDOWNLOAD="http://example.org/$PKGNAME-$PKGVERSION.tar.xz"
+PKGDEPENDS="python/python python/py-setuptools"
+# PKGOPTIONS="FOO BAR BAZ"
+
+build()
+{
+	for py in python python2; do
+		rm -rf $PKGNAME-$PKGVERSION
+		tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+		pushd $PKGNAME-$PKGVERSION
+
+		$py setup.py build
+		$py setup.py install --root=${DESTDIR:-/} -O1
+
+		popd
+		rm -rf $PKGNAME-$PKGVERSION
+	done
+}
diff -r da8439572c16 -r 9e95fda0e5c6 templates/python.sh
--- a/templates/python.sh	Wed Mar 20 23:50:00 2019 +0100
+++ b/templates/python.sh	Thu Mar 21 20:00:00 2019 +0100
@@ -30,6 +30,7 @@
 	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
 	pushd $PKGNAME-$PKGVERSION
 
+	python setup.py build
 	python setup.py install --root=${DESTDIR:-/} -O1
 
 	popd