From nobody Thu Jan 05 08:23:01 2023 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 4Nnfc54PSkz2r2t7; Thu, 5 Jan 2023 08:23:01 +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 4Nnfc53Q87z4ZMW; Thu, 5 Jan 2023 08:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672906981; 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=A5FEWhihl5HZ5VGsTH7jjLr4JTL0FP4lEY6ARN0D3Go=; b=EaXp7Fo7/7xaX/Imwe1oDcy3uP35mNA8+0m1mq3vaTfXLT0JvAF1o+4ZTAY+SY6Hf3HLgw V+lw9+kj0s4ZnjWrb10K88b20XQBoWWT2QDan4rCbfIH+UdxIpNMSxwc2921Q85moxzME6 fKCKa8l17ljeLeJgT8ngwKxQTGME3Z62/r+mDnptBHOLUCifD7onRCO9Sror1H+TNiunps /UaFlvhRGwyj+0NqcAmWocInkFZ0d/Y1MD2jLcxnKH2FXGpRRcmmn2qlGD9yE8bFZPy2fm vqgDnp0p9WmcMWSsrL4qzZcvjkbzKIa9KASkBvvRebTd7Fk19DXZ72FZbxLMjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672906981; 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=A5FEWhihl5HZ5VGsTH7jjLr4JTL0FP4lEY6ARN0D3Go=; b=N38IcYwPGUR5U7bjjo+dZK5PrHp3f2ZFWkucZR0Twarsx8CyDNY8FuPCaAF0I17jADQrY4 v9XXl0OBMV+yoUrNdHHQTCdpkpQr+ru6Rmy8eRm7lrEYlW7iEFri8v6xHPcw7mWATX5vg4 qoPabSiHZVzbdZCGYCgninwYSfHvXA7+jO+rJple9nEl68jxJZbLX9tURjNHWoRmGbFLud HA4q/+Dn26j2jJ2AVpNUgG1utG8pd54YL9EdFNrui8tai3zclhll6XNO8CUl8XQng/jiVm Q5Lw4yPZfZgZOg6J9czSYenfQg8p5AtPzXpdz2MgZQxnIlSHVkzlEaWEwd/YRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672906981; a=rsa-sha256; cv=none; b=agx5pEtS4bs6Dg/aD+IdwWUmKR7B16fKUIsZemTTeMXqd5EtnolHD7Zks/zlNsfbmIK/C1 2TahgANyAfecbKgyWe5glk/d7CNOp75fARS14/tEDYnSR5N3KBihPxA7tPLMrutMX037Rs 1IqZd8LXJxJznePg0UEJNqdJMiUzw9QB9j5eNATYSnL9kI6I0uOssY9cZjRoRChS/JM9Wc PzaHCnYJ4GmpyPFO6aoQSJ7UKqbo33UWlm05CcK6NVyxqMPd8jrsECMfsnylVmo+guCzVH Bh74fDS9lPJ2uj7rpJNcH4P5UpzGeOZhi2hZ4UwOiYaUPzlPw7Mpddix4APxig== 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 4Nnfc52Tnvzkfp; Thu, 5 Jan 2023 08:23:01 +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 3058N1JS017697; Thu, 5 Jan 2023 08:23:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3058N1gD017696; Thu, 5 Jan 2023 08:23:01 GMT (envelope-from git) Date: Thu, 5 Jan 2023 08:23:01 GMT Message-Id: <202301050823.3058N1gD017696@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: c8d13ef7f338 - main - archivers/libdeflate: update the port to version 1.15 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8d13ef7f3386389410c492dedb63858bbe7f1cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8d13ef7f3386389410c492dedb63858bbe7f1cc commit c8d13ef7f3386389410c492dedb63858bbe7f1cc Author: Daniel Engberg AuthorDate: 2023-01-05 08:21:46 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-01-05 08:21:46 +0000 archivers/libdeflate: update the port to version 1.15 - The build system had been switched to CMake, adjust the Makefile accordingly and convert outgrown PLIST_FILES into static pkg-plist - Backport one upstream commit for the sake of consistency, so unit tests reflect on release binaries (it also happens to inadvertently inhibit detection of futimes(2), which is deprecated interface as it does not provide nanosecond accuracy, so it's probably okay) - Do not pass "-O2 -DNDEBUG" on release CFLAGS: -O2 is redundant and NDEBUG is not actually used anywhere in the library source code PR: 268519 --- archivers/libdeflate/Makefile | 23 +++++++++++------------ archivers/libdeflate/distinfo | 8 +++++--- archivers/libdeflate/files/patch-Makefile | 29 ----------------------------- archivers/libdeflate/pkg-plist | 13 +++++++++++++ 4 files changed, 29 insertions(+), 44 deletions(-) diff --git a/archivers/libdeflate/Makefile b/archivers/libdeflate/Makefile index 0f8d236c45ac..bc4e5a370603 100644 --- a/archivers/libdeflate/Makefile +++ b/archivers/libdeflate/Makefile @@ -1,8 +1,11 @@ PORTNAME= libdeflate -PORTVERSION= 1.14 +PORTVERSION= 1.15 DISTVERSIONPREFIX= v CATEGORIES= archivers +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 98174ac5e6fe2a806923bcb6bfa24cdbf32c79d0.patch:-p1 + MAINTAINER= danfe@FreeBSD.org COMMENT= Fast, whole-buffer DEFLATE-based compression library WWW= https://github.com/ebiggers/libdeflate @@ -10,24 +13,20 @@ WWW= https://github.com/ebiggers/libdeflate LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake +USES= cmake:testing pathfix USE_GITHUB= yes GH_ACCOUNT= ebiggers USE_LDCONFIG= yes - -MAKE_ARGS= V=1 -TEST_TARGET= check - -PLIST_FILES= bin/libdeflate-gunzip bin/libdeflate-gzip \ - include/libdeflate.h \ - libdata/pkgconfig/libdeflate.pc \ - lib/libdeflate.a lib/libdeflate.so lib/libdeflate.so.0 -PORTDOCS= NEWS.md README.md +CMAKE_ON= LIBDEFLATE_USE_SHARED_LIB +CMAKE_TESTING_ON= LIBDEFLATE_BUILD_TESTS OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} -e '/-O2 -DNDEBUG/d' ${WRKSRC}/CMakeLists.txt + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR} .include diff --git a/archivers/libdeflate/distinfo b/archivers/libdeflate/distinfo index 3c91091c26a8..9a544dd48b48 100644 --- a/archivers/libdeflate/distinfo +++ b/archivers/libdeflate/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1662862430 -SHA256 (ebiggers-libdeflate-v1.14_GH0.tar.gz) = 89e7df898c37c3427b0f39aadcf733731321a278771d20fc553f92da8d4808ac -SIZE (ebiggers-libdeflate-v1.14_GH0.tar.gz) = 180182 +TIMESTAMP = 1670215210 +SHA256 (ebiggers-libdeflate-v1.15_GH0.tar.gz) = 58b95040df7383dc0413defb700d9893c194732474283cc4c8f144b00a68154b +SIZE (ebiggers-libdeflate-v1.15_GH0.tar.gz) = 180818 +SHA256 (98174ac5e6fe2a806923bcb6bfa24cdbf32c79d0.patch) = 3b80183158aee9c01274258548a938bfa2bf4377ccfb0d6f3277424126068a37 +SIZE (98174ac5e6fe2a806923bcb6bfa24cdbf32c79d0.patch) = 1502 diff --git a/archivers/libdeflate/files/patch-Makefile b/archivers/libdeflate/files/patch-Makefile deleted file mode 100644 index 66a8a1f66d06..000000000000 --- a/archivers/libdeflate/files/patch-Makefile +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.orig 2022-09-11 02:13:50 UTC -+++ Makefile -@@ -54,7 +54,7 @@ override CFLAGS := \ - 1>&2 2>/dev/null; then echo $(1); fi) - - override CFLAGS := \ -- -O2 -fomit-frame-pointer -std=c99 -I. -Wall -Wundef \ -+ -std=c99 -I. -Wall -Wundef \ - $(call cc-option,-Wdeclaration-after-statement) \ - $(call cc-option,-Wimplicit-fallthrough) \ - $(call cc-option,-Wmissing-prototypes) \ -@@ -340,7 +340,7 @@ install:all $(PKGCONFBASE) - $(DESTDIR)$(BINDIR) - install -m644 $(STATIC_LIB) $(DESTDIR)$(LIBDIR) - if [ -z "$(DISABLE_SHARED)" ]; then \ -- install -m755 $(SHARED_LIB) $(DESTDIR)$(LIBDIR); \ -+ install -s -m755 $(SHARED_LIB) $(DESTDIR)$(LIBDIR); \ - fi - sed -e "s|@PREFIX@|$(PREFIX)|" \ - -e "s|@LIBDIR@|$(LIBDIR)|" \ -@@ -349,7 +349,7 @@ install:all $(PKGCONFBASE) - $(PKGCONFBASE) > $(DESTDIR)$(LIBDIR)/pkgconfig/libdeflate.pc - chmod 644 $(DESTDIR)$(LIBDIR)/pkgconfig/libdeflate.pc - install -m644 libdeflate.h $(DESTDIR)$(INCDIR) -- install -m755 gzip$(PROG_SUFFIX) \ -+ install -s -m755 gzip$(PROG_SUFFIX) \ - $(DESTDIR)$(BINDIR)/libdeflate-gzip$(PROG_SUFFIX) - if [ -n "$(HARD_LINKS)" ]; then \ - ln -f $(DESTDIR)$(BINDIR)/libdeflate-gzip$(PROG_SUFFIX) \ diff --git a/archivers/libdeflate/pkg-plist b/archivers/libdeflate/pkg-plist new file mode 100644 index 000000000000..ec65047032dd --- /dev/null +++ b/archivers/libdeflate/pkg-plist @@ -0,0 +1,13 @@ +bin/libdeflate-gunzip +bin/libdeflate-gzip +include/libdeflate.h +lib/cmake/libdeflate/libdeflate-config-version.cmake +lib/cmake/libdeflate/libdeflate-config.cmake +lib/cmake/libdeflate/libdeflate-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/libdeflate/libdeflate-targets.cmake +lib/libdeflate.a +lib/libdeflate.so +lib/libdeflate.so.0 +libdata/pkgconfig/libdeflate.pc +%%PORTDOCS%%%%DOCSDIR%%/NEWS.md +%%PORTDOCS%%%%DOCSDIR%%/README.md