From nobody Wed Jan 19 07:52:19 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 86423196DEBB; Wed, 19 Jan 2022 07:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JdyXg6Th0z4ZNp; Wed, 19 Jan 2022 07:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642578740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cPL1HSZeQZhrOCQN5DpYGKiUmXYcFPS2WaDKVrWUSBY=; b=dCYoPvvsk97pofqP3V6NOpAR8lVrdsQk4jsfsA36fW1otd/YJl5qiOLCryE/7fWeWYyUVP ZG+EXedOmxGQHunaOK2H4eFGmK6s53rtBTexuqX5WZFOEgwP8lJnXNjD3WzMQUT08OiA2q afn2nTaMImHmaXOyBjPX3SSAZ0iVY4iV43/qCjRq2lboGiTnZQadWDWIDUcwcIhqVPz7ZT HWIdt3qEwAltjX3ebcJ89AtgQYh6VG0ySncIxVCD/EQeDTdgnXUtnQ6W8ZJizD7xiF4Lyv oagBw3P2PChnnpEFPmQVcktIoDr88QzeNMjAMgqW9i1bO0LekiPjifzuA69LFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3387A1160E; Wed, 19 Jan 2022 07:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20J7qJAX088056; Wed, 19 Jan 2022 07:52:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20J7qJwm088055; Wed, 19 Jan 2022 07:52:19 GMT (envelope-from git) Date: Wed, 19 Jan 2022 07:52:19 GMT Message-Id: <202201190752.20J7qJwm088055@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 874013bdedfb - main - graphics/libspiro: Use upstream release archive List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 874013bdedfba5e55c3c96c8cbc1652a6c092ca0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642578740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cPL1HSZeQZhrOCQN5DpYGKiUmXYcFPS2WaDKVrWUSBY=; b=KvomnNGsVLIzBM7O5U8HhjNausI0MlQzdTnqrkJtKAc3JVikO89fnyFW+YVZWdk+uBelsJ l9ajTuscR8je3URXGeVk2I6YTwT6rVy2qerzt3XwPNBwAweCr924NVpnt+FSex3qENabiw uoYa8HSKivzi02vsHG/5Btz1Xma1QXbMa3LzkW2OXIlg14zUTcMcWLYycrlSyEbIwwjhSD ruhk0SBLUBz11yUhKvgdCwRNXnSCy8Wn5D9pixIorfI1xqVO5fkcD6BXEX3NkzlXsCSpnA izysNID1VBbgoaxkpF3oDEbvlD2Sma5no+e20SK0B3e0UzmFLfX+QTCyvyJawg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642578740; a=rsa-sha256; cv=none; b=elSTzDgtl3YYMD3LnWoapqF6/pOsg9GfkoU91OQjBpurJZ1iOYY0Y0r59fYy2QSEOx5vPR MZLKBiLvr3rBjMJ4JSDhSyS23t4z1vVEunBSaK/PbR0lYv5cuLVPOo+twOzBmSX3jez6Ry kEbToHB/nVQL50f+Dlbl6eTLl8wqaFkSKBIxY6y9EhJBdyb8YQwDrNjQMX5C/vNWbmED5f zeVFa5cyrfzVjdcQCQBiKk9BxVjf5GvhH1B4EQYoVi75KnG6cwK+e8CldV5nbyHDsY6ETK 54RltpvyKiF5WatStbC+fmxoHXXOb6Zt1613ECMpXFMMu71SkTzekYRz8/pfHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=874013bdedfba5e55c3c96c8cbc1652a6c092ca0 commit 874013bdedfba5e55c3c96c8cbc1652a6c092ca0 Author: Daniel Engberg AuthorDate: 2022-01-19 07:45:59 +0000 Commit: Daniel Engberg CommitDate: 2022-01-19 07:52:05 +0000 graphics/libspiro: Use upstream release archive Use upstream release archive as recommened by Porters Handbook While at it do some minor changes to Makefile PR: 261300 Reviewed by: Naram Qashat (maintainer) --- graphics/libspiro/Makefile | 11 +++++----- graphics/libspiro/distinfo | 6 +++--- graphics/libspiro/files/patch-Makefile.am | 33 ------------------------------ graphics/libspiro/files/patch-Makefile.in | 34 +++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/graphics/libspiro/Makefile b/graphics/libspiro/Makefile index e17bdb3b2c21..69c9ef5db1df 100644 --- a/graphics/libspiro/Makefile +++ b/graphics/libspiro/Makefile @@ -4,6 +4,8 @@ PORTNAME= libspiro DISTVERSION= 20200505 PORTEPOCH= 1 CATEGORIES= graphics +MASTER_SITES= https://github.com/fontforge/${PORTNAME}/releases/download/${DISTVERSION}/ +DISTNAME= ${PORTNAME}-dist-${DISTVERSION} MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Library to convert clothoid splines into Bezier splines @@ -11,15 +13,14 @@ COMMENT= Library to convert clothoid splines into Bezier splines LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= autoreconf cpe gmake libtool pathfix +USES= cpe libtool pathfix CPE_VENDOR= libspiro_project - -USE_GITHUB= yes -GH_ACCOUNT= fontforge - GNU_CONFIGURE= yes USE_LDCONFIG= yes + +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} + INSTALL_TARGET= install-strip .include diff --git a/graphics/libspiro/distinfo b/graphics/libspiro/distinfo index 865c80e7ffac..c345bb981b7f 100644 --- a/graphics/libspiro/distinfo +++ b/graphics/libspiro/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609565019 -SHA256 (fontforge-libspiro-20200505_GH0.tar.gz) = 00be530b5c0ea9274baadf6c05521f0b192d4c3c1db636ac8b08efd44aaea8f5 -SIZE (fontforge-libspiro-20200505_GH0.tar.gz) = 98636 +TIMESTAMP = 1642436312 +SHA256 (libspiro-dist-20200505.tar.gz) = 06c69a1e8dcbcabcf009fd96fd90b1a244d0257246e376c2c4d57c4ea4af0e49 +SIZE (libspiro-dist-20200505.tar.gz) = 422546 diff --git a/graphics/libspiro/files/patch-Makefile.am b/graphics/libspiro/files/patch-Makefile.am deleted file mode 100644 index 928d4d940646..000000000000 --- a/graphics/libspiro/files/patch-Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 diff --git a/graphics/libspiro/files/patch-Makefile.in b/graphics/libspiro/files/patch-Makefile.in new file mode 100644 index 000000000000..92126edc1137 --- /dev/null +++ b/graphics/libspiro/files/patch-Makefile.in @@ -0,0 +1,34 @@ +--- 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);