Attachment #231111 for bug #261300

View | Details | Raw Unified | Return to bug 261300
Collapse All | Expand All

Lines 4-9 PORTNAME= libspiro Link Here

(-)b/graphics/libspiro/Makefile (-5 / +6 lines)
4	DISTVERSION= 20200505	4	DISTVERSION= 20200505
5	PORTEPOCH= 1	5	PORTEPOCH= 1
6	CATEGORIES= graphics	6	CATEGORIES= graphics
		7	MASTER_SITES= https://github.com/fontforge/${PORTNAME}/releases/download/${DISTVERSION}/
		8	DISTNAME= ${PORTNAME}-dist-${DISTVERSION}
7		9
8	MAINTAINER= cyberbotx@cyberbotx.com	10	MAINTAINER= cyberbotx@cyberbotx.com
9	COMMENT= Library to convert clothoid splines into Bezier splines	11	COMMENT= Library to convert clothoid splines into Bezier splines
Lines 11-25 COMMENT= Library to convert clothoid splines into Bezier splines Link Here
11	LICENSE= GPLv3+	13	LICENSE= GPLv3+
12	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
13		15
14	USES= autoreconf cpe gmake libtool pathfix	16	USES= cpe libtool pathfix
15		17
16	CPE_VENDOR= libspiro_project	18	CPE_VENDOR= libspiro_project
17
18	USE_GITHUB= yes
19	GH_ACCOUNT= fontforge
20
21	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
22	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
		21
		22	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
		23
23	INSTALL_TARGET= install-strip	24	INSTALL_TARGET= install-strip
24		25
25	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/graphics/libspiro/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1609565019	1	TIMESTAMP = 1642436312
2	SHA256 (fontforge-libspiro-20200505_GH0.tar.gz) = 00be530b5c0ea9274baadf6c05521f0b192d4c3c1db636ac8b08efd44aaea8f5	2	SHA256 (libspiro-dist-20200505.tar.gz) = 06c69a1e8dcbcabcf009fd96fd90b1a244d0257246e376c2c4d57c4ea4af0e49
3	SIZE (fontforge-libspiro-20200505_GH0.tar.gz) = 98636	3	SIZE (libspiro-dist-20200505.tar.gz) = 422546




--- Makefile.am.orig	2020-05-05 07:46:37 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 \
@@ -19,7 +19,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
 
@@ -39,13 +39,6 @@ man_MANS = libspiro.3
 
 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




--- Makefile.in.orig	2022-01-17 16:21:59 UTC
+++ Makefile.in
@@ -408,7 +408,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-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 \
 		call-test10 call-test11 call-test12 call-test13        \
@@ -421,7 +421,7 @@ 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
 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);

Return to bug 261300

Removed Link Here

(-)a/graphics/libspiro/files/patch-Makefile.am (-33 lines)
1	--- Makefile.am.orig 2020-05-05 07:46:37 UTC
2	+++ Makefile.am
3	@@ -1,6 +1,6 @@
4	# Makefile.am - Top level automakefile for libspiro
5
6	-SUBDIRS = . tests
7	+SUBDIRS = .
8
9	test_programs = call-test0 call-test1 call-test2 call-test3 call-test4 \
10	call-test5 call-test6 call-test7 call-test8 call-test9 \
11	@@ -19,7 +19,7 @@ AM_LDFLAGS = $(WLSLIB) $(LS_LIB) -no-undefined --mode=
12	LIBTOOL_DEPS = @LIBTOOL_DEPS@
13
14	DISTCLEANFILES = libspiro.pc
15	-DISTCHECK_CONFIGURE_FLAGS = --enable-verbose_lib --enable-test_inputs --enable-test-a-lot
16	+DISTCHECK_CONFIGURE_FLAGS = --enable-verbose_lib --disable-test_inputs --disable-test-a-lot
17
18	lib_LTLIBRARIES = libspiro.la
19
20	@@ -39,13 +39,6 @@ man_MANS = libspiro.3
21
22	libtool: $(LIBTOOL_DEPS)
23	$(SHELL) ./config.status libtool
24	-
25	-# test: run all tests in cwd and subdirs
26	-test: $(TEST_PROGS)
27	-
28	-.PHONY: test
29	-# run make test as part of make check
30	-check-local: test
31
32	check-valgrind:
33	if HAVEVALGRIND

Added Link Here

(-)b/graphics/libspiro/files/patch-Makefile.in (+34 lines)
1	--- Makefile.in.orig 2022-01-17 16:21:59 UTC
2	+++ Makefile.in
3	@@ -408,7 +408,7 @@ target_vendor = @target_vendor@
4	top_build_prefix = @top_build_prefix@
5	top_builddir = @top_builddir@
6	top_srcdir = @top_srcdir@
7	-SUBDIRS = . tests
8	+SUBDIRS = .
9	test_programs = call-test0 call-test1 call-test2 call-test3 call-test4 \
10	call-test5 call-test6 call-test7 call-test8 call-test9 \
11	call-test10 call-test11 call-test12 call-test13 \
12	@@ -421,7 +421,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
13	AM_CFLAGS = $(WCFLAGS) $(LS_CFLAGS)
14	AM_LDFLAGS = $(WLSLIB) $(LS_LIB) -no-undefined --mode=link
15	DISTCLEANFILES = libspiro.pc
16	-DISTCHECK_CONFIGURE_FLAGS = --enable-verbose_lib --enable-test_inputs --enable-test-a-lot
17	+DISTCHECK_CONFIGURE_FLAGS = --enable-verbose_lib --disable-test_inputs --disable-test-a-lot
18	lib_LTLIBRARIES = libspiro.la
19	libspiro_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBSPIRO_VERSION)
20	libspiro_la_SOURCES = spiro.c bezctx.c spiroentrypoints.c
21	@@ -1095,13 +1095,6 @@ libspiro_la.$(OBJEXT): bezctx.h bezctx_intf.h spiro.h
22
23	libtool: $(LIBTOOL_DEPS)
24	$(SHELL) ./config.status libtool
25	-
26	-# test: run all tests in cwd and subdirs
27	-test: $(TEST_PROGS)
28	-
29	-.PHONY: test
30	-# run make test as part of make check
31	-check-local: test
32
33	check-valgrind:
34	@HAVEVALGRIND_TRUE@ $(MAKE);