libfyaml: use proper distfile

avoids dependency on autotools, and fixes build since pkg-config m4
file was not depended on.

4 files changed, 64 insertions, 65 deletions

diff --git a/textproc/libfyaml/Makefile b/textproc/libfyaml/Makefile
index 5794d483f04..cfb127fd1e9 100644
--- a/textproc/libfyaml/Makefile
+++ b/textproc/libfyaml/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2022/12/08 19:16:20 khorben Exp $
+# $NetBSD: Makefile,v 1.2 2022/12/14 15:38:59 wiz Exp $
 
 DISTNAME=	libfyaml-0.7.12
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pantoniou/}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+# remove on next update
+DIST_SUBDIR=	libfyaml-0.7.12
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/pantoniou/libfyaml/
@@ -11,12 +13,8 @@ COMMENT=	Feature-complete YAML parser and emitter
 LICENSE=	mit
 
 USE_LIBTOOL=	yes
-USE_TOOLS+=	autoconf automake autoreconf
 GNU_CONFIGURE=	yes
 
 PKGCONFIG_OVERRIDE+=	libfyaml.pc.in
 
-pre-configure:
-	cd ${WRKSRC} && autoreconf -fvi
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libfyaml/distinfo b/textproc/libfyaml/distinfo
index 44c45d55a2a..1016e9ca23c 100644
--- a/textproc/libfyaml/distinfo
+++ b/textproc/libfyaml/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2022/12/08 19:16:20 khorben Exp $
+$NetBSD: distinfo,v 1.2 2022/12/14 15:38:59 wiz Exp $
 
-BLAKE2s (libfyaml-0.7.12.tar.gz) = d3a2986816a70ee0f0155233b7aea9b83de297a57af9932145ebca7bc64576bf
-SHA512 (libfyaml-0.7.12.tar.gz) = 9153563353b167be5a396b71f9a2c7b9b59afde492c7515043b2d94348093bcb65cde823a83d41812b7d20a5a9ed2ed06ca4f30a8c65f842add1a75a28ca113d
-Size (libfyaml-0.7.12.tar.gz) = 354250 bytes
-SHA1 (patch-configure.ac) = 6050829ddfe6d04833190d910c226cef54e4dd91
+BLAKE2s (libfyaml-0.7.12/libfyaml-0.7.12.tar.gz) = c43756b236e54d048fdbace52e60927875566b188d3247e5dac5977a13dcab2b
+SHA512 (libfyaml-0.7.12/libfyaml-0.7.12.tar.gz) = 568beadf007d002babd760abbf8153ef8c4191dface276d8614b30ffc0c9606eb7cffc2f63047042f843da5ded7ef4b302b36a36ed19a6f38e2c6e22f310aa29
+Size (libfyaml-0.7.12/libfyaml-0.7.12.tar.gz) = 757218 bytes
+SHA1 (patch-configure) = 75356f186f967f0048707153e5a051d18d8f0efa
 SHA1 (patch-include_libfyaml.h) = e50484d638d0fd0ab850d154249b9996cb3f5101
 SHA1 (patch-src_internal_libfyaml-parser.c) = 44567a6ee961bd304b4c3ea677d02d5516374281
 SHA1 (patch-src_lib_fy-atom.c) = 3a5390ea153bb8642cd8c6ebcae06a3d72e87be7
diff --git a/textproc/libfyaml/patches/patch-configure b/textproc/libfyaml/patches/patch-configure
new file mode 100644
index 00000000000..73e2908cc21
--- /dev/null
+++ b/textproc/libfyaml/patches/patch-configure
@@ -0,0 +1,55 @@
+$NetBSD: patch-configure,v 1.1 2022/12/14 15:38:59 wiz Exp $
+
+Fix unportable test(1) operator.
+https://github.com/pantoniou/libfyaml/pull/62
+
+--- configure.orig	2022-01-19 10:32:36.000000000 +0000
++++ configure
+@@ -18525,7 +18525,7 @@ fi
+ 
+ 
+ HAVE_COMPATIBLE_CHECK=0
+-if test "x$HAVE_CHECK" == "x1" ; then
++if test "x$HAVE_CHECK" = "x1" ; then
+ 	save_LIBS="$LIBS"
+ 	save_CFLAGS="$CFLAGS"
+ 	LIBS="$LIBS $CHECK_LIBS"
+@@ -18744,7 +18744,7 @@ $as_echo "N/A" >&6; }
+ 
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sphinx installation works" >&5
+ $as_echo_n "checking whether sphinx installation works... " >&6; }
+-	if test "x$HAVE_SPHINX" == "x1" ; then
++	if test "x$HAVE_SPHINX" = "x1" ; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -18829,25 +18829,25 @@ fi
+ 
+ 
+ 
+-if test "x$TESTSUITEURL" == "x" ; then
++if test "x$TESTSUITEURL" = "x" ; then
+ 	TESTSUITEURL="https://github.com/yaml/yaml-test-suite"
+ fi
+ 
+ 
+ 
+-if test "x$TESTSUITECHECKOUT" == "x" ; then
++if test "x$TESTSUITECHECKOUT" = "x" ; then
+ 	TESTSUITECHECKOUT="6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f"
+ fi
+ 
+ 
+ 
+-if test "x$JSONTESTSUITEURL" == "x" ; then
++if test "x$JSONTESTSUITEURL" = "x" ; then
+ 	JSONTESTSUITEURL="https://github.com/nst/JSONTestSuite"
+ fi
+ 
+ 
+ 
+-if test "x$JSONTESTSUITECHECKOUT" == "x" ; then
++if test "x$JSONTESTSUITECHECKOUT" = "x" ; then
+ 	JSONTESTSUITECHECKOUT="d64aefb55228d9584d3e5b2433f720ea8fd00c82"
+ fi
+ 
diff --git a/textproc/libfyaml/patches/patch-configure.ac b/textproc/libfyaml/patches/patch-configure.ac
deleted file mode 100644
index db01f905ef4..00000000000
--- a/textproc/libfyaml/patches/patch-configure.ac
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2022/12/08 19:16:20 khorben Exp $
-
-Compatibility fixes
-
---- configure.ac.orig	2022-01-19 10:32:21.000000000 +0000
-+++ configure.ac
-@@ -162,7 +162,7 @@ AC_DEFINE_UNQUOTED([HAVE_CHECK], [$HAVE_
- AM_CONDITIONAL([HAVE_CHECK], [ test x$HAVE_CHECK = x1 ])
- 
- HAVE_COMPATIBLE_CHECK=0
--if test "x$HAVE_CHECK" == "x1" ; then
-+if test "x$HAVE_CHECK" = "x1" ; then
- 	save_LIBS="$LIBS"
- 	save_CFLAGS="$CFLAGS"
- 	LIBS="$LIBS $CHECK_LIBS"
-@@ -257,7 +257,7 @@ if test "x$SPHINX" != "x" ; then
- 	fi
- 
- 	AC_MSG_CHECKING([whether sphinx installation works])
--	if test "x$HAVE_SPHINX" == "x1" ; then
-+	if test "x$HAVE_SPHINX" = "x1" ; then
- 		AC_MSG_RESULT([yes])
- 	else
- 		AC_MSG_RESULT([no])
-@@ -279,25 +279,25 @@ AM_CONDITIONAL([HAVE_GIT], [ test x$HAVE
- 
- AC_ARG_VAR(TESTSUITEURL, [Testsuite git repo URL (default: https://github.com/yaml/yaml-test-suite)])
- 
--if test "x$TESTSUITEURL" == "x" ; then
-+if test "x$TESTSUITEURL" = "x" ; then
- 	TESTSUITEURL="https://github.com/yaml/yaml-test-suite"
- fi
- 
- AC_ARG_VAR(TESTSUITECHECKOUT, [Testsuite checkout (default: 6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f)])
- 
--if test "x$TESTSUITECHECKOUT" == "x" ; then
-+if test "x$TESTSUITECHECKOUT" = "x" ; then
- 	TESTSUITECHECKOUT="6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f"
- fi
- 
- AC_ARG_VAR(JSONTESTSUITEURL, [JSON Testsuite git repo URL (default: https://github.com/nst/JSONTestSuite)])
- 
--if test "x$JSONTESTSUITEURL" == "x" ; then
-+if test "x$JSONTESTSUITEURL" = "x" ; then
- 	JSONTESTSUITEURL="https://github.com/nst/JSONTestSuite"
- fi
- 
- AC_ARG_VAR(JSONTESTSUITECHECKOUT, [JSON Testsuite checkout (default: d64aefb55228d9584d3e5b2433f720ea8fd00c82)])
- 
--if test "x$JSONTESTSUITECHECKOUT" == "x" ; then
-+if test "x$JSONTESTSUITECHECKOUT" = "x" ; then
- 	JSONTESTSUITECHECKOUT="d64aefb55228d9584d3e5b2433f720ea8fd00c82"
- fi
-