From ed6078d621dcd75c75da3eb0085002dee0b13ddd Mon Sep 17 00:00:00 2001
From: Naram Qashat <cyberbotx@cyberbotx.com>
Date: Tue, 29 Nov 2022 07:49:23 +0100
Subject: [PATCH] graphics/libspiro: Update to 20221101

Changelogs:

* https://github.com/fontforge/libspiro/releases/tag/20220722
* https://github.com/fontforge/libspiro/releases/tag/20221101

PR:		268048
Reported by:	cyberbotx@cyberbotx.com (maintainer)
---
 graphics/libspiro/Makefile                |  8 +++---
 graphics/libspiro/distinfo                |  6 ++---
 graphics/libspiro/files/patch-Makefile.in | 30 ++++++-----------------
 graphics/libspiro/pkg-plist               |  3 +--
 4 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/graphics/libspiro/Makefile b/graphics/libspiro/Makefile
index 50d549b0ccc6..03dd296e4c6b 100644
--- a/graphics/libspiro/Makefile
+++ b/graphics/libspiro/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libspiro
-DISTVERSION=	20200505
+DISTVERSION=	20221101
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/fontforge/${PORTNAME}/releases/download/${DISTVERSION}/
@@ -13,13 +13,13 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe libtool pathfix
-
 CPE_VENDOR=	libspiro_project
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
+GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
+
 .include <bsd.port.mk>
diff --git a/graphics/libspiro/distinfo b/graphics/libspiro/distinfo
index c345bb981b7f..0803f6126290 100644
--- a/graphics/libspiro/distinfo
+++ b/graphics/libspiro/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642436312
-SHA256 (libspiro-dist-20200505.tar.gz) = 06c69a1e8dcbcabcf009fd96fd90b1a244d0257246e376c2c4d57c4ea4af0e49
-SIZE (libspiro-dist-20200505.tar.gz) = 422546
+TIMESTAMP = 1669666198
+SHA256 (libspiro-dist-20221101.tar.gz) = 5984fb5af3e4e1f927f3a74850b705a711fb86284802a5e6170b09786440e8be
+SIZE (libspiro-dist-20221101.tar.gz) = 434906
diff --git a/graphics/libspiro/files/patch-Makefile.in b/graphics/libspiro/files/patch-Makefile.in
index 92126edc1137..30dc366d6b1a 100644
--- a/graphics/libspiro/files/patch-Makefile.in
+++ b/graphics/libspiro/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2022-01-17 16:21:59 UTC
+--- Makefile.in.orig	2022-11-02 03:59:47 UTC
 +++ Makefile.in
-@@ -408,7 +408,7 @@ target_vendor = @target_vendor@
+@@ -413,7 +413,7 @@ target_vendor = @target_vendor@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -9,26 +9,12 @@
  test_programs = call-test0 call-test1 call-test2 call-test3 call-test4 \
  		call-test5 call-test6 call-test7 call-test8 call-test9 \
  		call-test10 call-test11 call-test12 call-test13        \
-@@ -421,7 +421,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+@@ -426,7 +426,7 @@ pkgconfig_DATA = libspiro.pc
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  AM_CFLAGS = $(WCFLAGS) $(LS_CFLAGS)
- AM_LDFLAGS = $(WLSLIB) $(LS_LIB) -no-undefined --mode=link
  DISTCLEANFILES = libspiro.pc
--DISTCHECK_CONFIGURE_FLAGS = --enable-verbose_lib --enable-test_inputs --enable-test-a-lot
-+DISTCHECK_CONFIGURE_FLAGS = --enable-verbose_lib --disable-test_inputs --disable-test-a-lot
+-DISTCHECK_CONFIGURE_FLAGS = --disable-silent-rules --enable-verbose_lib --enable-test_inputs --enable-test-a-lot
++DISTCHECK_CONFIGURE_FLAGS = --disable-silent-rules --enable-verbose_lib --disable-test_inputs --disable-test-a-lot
  lib_LTLIBRARIES = libspiro.la
- libspiro_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBSPIRO_VERSION)
- libspiro_la_SOURCES = spiro.c bezctx.c spiroentrypoints.c
-@@ -1095,13 +1095,6 @@ libspiro_la.$(OBJEXT): bezctx.h bezctx_intf.h spiro.h 
- 
- libtool: $(LIBTOOL_DEPS)
- 	$(SHELL) ./config.status libtool
--
--# test: run all tests in cwd and subdirs
--test:	$(TEST_PROGS)
--
--.PHONY: test
--# run make test as part of make check
--check-local: test
- 
- check-valgrind:
- @HAVEVALGRIND_TRUE@	$(MAKE);
+ libspiro_la_LIBADD = $(WLSLIB) $(LS_LIB)
+ libspiro_la_LDFLAGS = -no-undefined -version-info $(LIBSPIRO_VERSION)
diff --git a/graphics/libspiro/pkg-plist b/graphics/libspiro/pkg-plist
index 0b77f4357dd5..42c60d6fcb51 100644
--- a/graphics/libspiro/pkg-plist
+++ b/graphics/libspiro/pkg-plist
@@ -1,10 +1,9 @@
 include/bezctx.h
-include/bezctx_intf.h
 include/spiro.h
 include/spiroentrypoints.h
 lib/libspiro.a
 lib/libspiro.so
 lib/libspiro.so.1
-lib/libspiro.so.1.0.1
+lib/libspiro.so.1.0.3
 libdata/pkgconfig/libspiro.pc
 man/man3/libspiro.3.gz