--- a/core/texinfo/texinfo.sh	Mon Mar 11 11:45:04 2019 +0100
+++ b/core/texinfo/texinfo.sh	Mon Mar 11 14:59:13 2019 +0100
@@ -15,36 +15,49 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+PKGNAME=texinfo
+PKGVERSION=6.6
+PKGREVISION=1
+PKGLICENSE="GPLv3"
+PKGSUMMARY="GNU documentation format"
+PKGDOWNLOAD="https://ftp.gnu.org/pub/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
+PKGDEPENDS="perl/perl"
+PKGOPTIONS="NLS"
+
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
+: ${LDFLAGS:=}
+: ${LIBS:=}
 : ${NLS:=yes}
 
-source ./texinfo.info
-
-set -ex
-
 if [ "$NLS" = "yes" ]; then
+	PKGDEPENDS="core/gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
 fi
 
-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 \
-	${with_nls}
-make
-make install DESTDIR=$DESTDIR
-rm -f $DESTDIR/usr/lib/texinfo/{Parsetexi,MiscXS,XSParagraph}.la
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		${with_nls}
+	make
+	make install DESTDIR=$DESTDIR
+	rm -f $DESTDIR/usr/lib/texinfo/{Parsetexi,MiscXS,XSParagraph}.la
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}