Attachment #206679 for bug #239951

Lines 2-8 Link Here

(-)Makefile (-2 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libspiro	4	PORTNAME= libspiro
5	DISTVERSION= 0.5.20150702	5	DISTVERSION= 20190731
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8		8
Lines 12-21 Link Here
12	LICENSE= GPLv3+	12	LICENSE= GPLv3+
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
		15	USES= autoreconf gmake libtool pathfix
		16
15	USE_GITHUB= yes	17	USE_GITHUB= yes
16	GH_ACCOUNT= fontforge	18	GH_ACCOUNT= fontforge
17		19
18	USES= autoreconf gmake libtool pathfix
19	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
20	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
21	INSTALL_TARGET= install-strip	22	INSTALL_TARGET= install-strip

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (fontforge-libspiro-0.5.20150702_GH0.tar.gz) = 14f761d83c7fa6be31c4e0317251ed1201b367dc5b2a8678e2da179d74938fc7	1	TIMESTAMP = 1566151460
2	SIZE (fontforge-libspiro-0.5.20150702_GH0.tar.gz) = 82909	2	SHA256 (fontforge-libspiro-20190731_GH0.tar.gz) = 25678f69416115c9d5f909de4013f7a5a44a3f7ca901f912bb6de566cbb70e89
		3	SIZE (fontforge-libspiro-20190731_GH0.tar.gz) = 96096




--- Makefile.am.orig	2019-07-31 14:22:46 UTC
+++ Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am - Top level automakefile for libspiro

-SUBDIRS = . tests
+SUBDIRS = .
 
 test_programs = call-test0 call-test1 call-test2 call-test3 call-test4 \
 		call-test5 call-test6 call-test7 call-test8 call-test9 \
@@ -18,7 +18,7 @@ AM_LDFLAGS = $(WLSLIB) $(LS_LIB) -no-undefined --mode=
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 
 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
 
 lib_LTLIBRARIES = libspiro.la
 
@@ -31,20 +31,13 @@ EXTRA_DIST = bezctx.md get-spiro-src.sh README-RaphLev
 	java/ShowPlate.java java/Spiro.java java/SpiroBezierContext.java    \
 	java/SpiroCanvas.java java/SpiroCP.java java/SpiroGeneralPath.java  \
 	java/SpiroPointType.java README-GeorgeWilliams fontforge-debug.txt  \
-	fontforge.sh m4/ax_check_compile_flag.m4 tests/call-test.c	    \
+	fontforge.sh m4/ax_check_compile_flag.m4	    \
 	path5.png path6.png
 
 include_HEADERS = bezctx.h bezctx_intf.h spiro.h spiroentrypoints.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:
 if HAVEVALGRIND

Lines 15-18 Link Here

(-)pkg-descr (-1 / +1 lines)
15		15
16	(Above taken from Introduction on the library's website)	16	(Above taken from Introduction on the library's website)
17		17
18	WWW: http://libspiro.sourceforge.net/	18	WWW: https://github.com/fontforge/libspiro

Lines 4-9 Link Here

(-)pkg-plist (-2 / +2 lines)
4	include/spiroentrypoints.h	4	include/spiroentrypoints.h
5	lib/libspiro.a	5	lib/libspiro.a
6	lib/libspiro.so	6	lib/libspiro.so
7	lib/libspiro.so.0	7	lib/libspiro.so.1
8	lib/libspiro.so.0.0.5	8	lib/libspiro.so.1.0.0
9	libdata/pkgconfig/libspiro.pc	9	libdata/pkgconfig/libspiro.pc

Return to bug 239951

Lines 1-4 Link Here

(-)files/patch-Makefile.am (-12 / +15 lines)
1	--- Makefile.am.orig 2016-10-03 14:37:13 UTC	1	--- Makefile.am.orig 2019-07-31 14:22:46 UTC
2	+++ Makefile.am	2	+++ Makefile.am
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	# Makefile.am - Top level automakefile for libspiro	4	# Makefile.am - Top level automakefile for libspiro
Lines 6-38 Link Here
6	-SUBDIRS = . tests	6	-SUBDIRS = . tests
7	+SUBDIRS = .	7	+SUBDIRS = .
8		8
9	pkgconfigdir = $(prefix)/libdata/pkgconfig	9	test_programs = call-test0 call-test1 call-test2 call-test3 call-test4 \
10	pkgconfig_DATA = libspiro.pc	10	call-test5 call-test6 call-test7 call-test8 call-test9 \
11	@@ -13,7 +13,7 @@ AM_LDFLAGS = $(WLSLIB) $(LS_LIB) -no-und	11	@@ -18,7 +18,7 @@ AM_LDFLAGS = $(WLSLIB) $(LS_LIB) -no-undefined --mode=
12	LIBTOOL_DEPS = @LIBTOOL_DEPS@	12	LIBTOOL_DEPS = @LIBTOOL_DEPS@
13		13
14	DISTCLEANFILES = libspiro.pc	14	DISTCLEANFILES = libspiro.pc
15	-DISTCHECK_CONFIGURE_FLAGS = --enable-verbose_lib --enable-test_inputs	15	-DISTCHECK_CONFIGURE_FLAGS = --enable-verbose_lib --enable-test_inputs --enable-test-a-lot
16	+DISTCHECK_CONFIGURE_FLAGS = --enable-verbose_lib --disable-test_inputs	16	+DISTCHECK_CONFIGURE_FLAGS = --enable-verbose_lib --disable-test_inputs --disable-test-a-lot
17		17
18	lib_LTLIBRARIES = libspiro.la	18	lib_LTLIBRARIES = libspiro.la
19		19
20	@@ -26,17 +26,10 @@ EXTRA_DIST = bezctx.md get-spiro-src.sh	20	@@ -31,20 +31,13 @@ EXTRA_DIST = bezctx.md get-spiro-src.sh README-RaphLev
21	java/ShowPlate.java java/Spiro.java java/SpiroBezierContext.java \	21	java/ShowPlate.java java/Spiro.java java/SpiroBezierContext.java \
22	java/SpiroCanvas.java java/SpiroCP.java java/SpiroGeneralPath.java \	22	java/SpiroCanvas.java java/SpiroCP.java java/SpiroGeneralPath.java \
23	java/SpiroPointType.java README-GeorgeWilliams fontforge-debug.txt \	23	java/SpiroPointType.java README-GeorgeWilliams fontforge-debug.txt \
24	- fontforge.sh m4/ax_check_compile_flag.m4 tests/call-test.c	24	- fontforge.sh m4/ax_check_compile_flag.m4 tests/call-test.c \
25	+ fontforge.sh m4/ax_check_compile_flag.m4	25	+ fontforge.sh m4/ax_check_compile_flag.m4 \
		26	path5.png path6.png
26		27
27	include_HEADERS = bezctx.h bezctx_intf.h spiro.h spiroentrypoints.h	28	include_HEADERS = bezctx.h bezctx_intf.h spiro.h spiroentrypoints.h
28		29
29	libtool: $(LIBTOOL_DEPS)	30	libtool: $(LIBTOOL_DEPS)
30	$(SHELL) ./config.status libtool	31	$(SHELL) ./config.status libtool
31		32	-
32	-# test: run all tests in cwd and subdirs	33	-# test: run all tests in cwd and subdirs
33	-test: ${TEST_PROGS}	34	-test: $(TEST_PROGS)
34	-	35	-
35	-.PHONY: test	36	-.PHONY: test
36	-# run make test as part of make check	37	-# run make test as part of make check
37	-check-local: test	38	-check-local: test
38	-	39
		40	check-valgrind:
		41	if HAVEVALGRIND