xbps: fix bootstrap build and remove obsolete stuff.

srcpkgs/xbps/template

@@ -12,10 +12,7 @@ license="2-clause-BSD"
 makedepends="zlib-devel libressl-devel libarchive-devel"
 depends="xbps-triggers"
 
-if [ -z "$CHROOT_READY" ]; then
-	CFLAGS+=" -idirafter ${XBPS_MASTERDIR}/usr/include"
-	LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib"
-else
+if [ "$CHROOT_READY" ]; then
 	hostmakedepends="git pkg-config"
 	makedepends+=" atf-devel"
 	xbps-tests_package() {
@@ -31,6 +28,7 @@ do_fetch() {
 	git clone -b${version} git://github.com/voidlinux/xbps ${wrksrc}
 }
 do_configure() {
+	CFLAGS+=" -Wno-error=redundant-decls"
 	HAVE_VASPRINTF=1 ./configure --prefix=/usr --sysconfdir=/etc --enable-debug \
 		${CHROOT_READY:+--enable-tests}
 }