From nobody Wed May 3 01:30:09 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 4Q9zsG5SbGz48hcl; Wed, 3 May 2023 01:30:10 +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 4Q9zsG48Tkz4490; Wed, 3 May 2023 01:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683077410; 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=r04KqG6BkHp/AuIIOXipoKE15ykj8CfA8riHzoLN3Tk=; b=vLZWseYjWyP8uPifJZW3I9KxySEx2SnUQKOONyzXiiAatcMhFdesp5r/9dJa1RA3Wm2ABq PyuDtDxbmCyanOZu/FsK4HB5rcIc4rchbk2x1G67FU0ROLIp7pHR7yygpXWZm0q449/R6o mnpxmNTzaGX2xYxojzMuuxt2r1mQ0YvDGODw0hsvtbN2pzkJHMIXZkIN5p/0sIC2H95rmn A/OF9sQRGh5u5ddhtbftiEkMXRrZdQUmr0yP1dyKulxC1HjB4SeiMb4X7HlslZy4R3Bpee tWGR7CLKevs3XNSmWoewTYTfaVoJnI6aJp1M5pQkcmuAzoqd0sEyjXQ7eeaA3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683077410; 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=r04KqG6BkHp/AuIIOXipoKE15ykj8CfA8riHzoLN3Tk=; b=uSW+L31s2jxgXWSlrnHGna607n0caIuzonoe8zm88ACsv4iTQ5kWNyuCLcsfB2fm9jnEcW YTp+y/44kHVQ/k849ranbe4uUUQCMBTg4WISOtQ+SceM3NTrJuZ1xG/qiI/9SE6vjE6kcz sAwq4HSJwk6PRvn+VwtOEbZaz/RgdRjzrme8f8zMp2DtQg6Mif/H2xFCLKKBS5OfWUJkW/ mLkKRiAAwcPNdMTLCWxxSl/MckAeVQ0D6QahiGM2HVUSxp8zYOew9NP/rK8JfvKkVFi7Za uyUwhPf0n/CRGYZfaUuDKvDMvZT97yJhJX8+OyYjse4ssjNahFVDLcOEyIwveA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683077410; a=rsa-sha256; cv=none; b=VO44PRf7D8OI7P67yacVWQPYztEWrIr649GVfX2MZkJATvkG0E9H0kItYpH7lGWANx6DXk SCLq4qi+PWTu1oLAfcba3m9+mOYkPUWNMwLot4nYn7gqI7UcL5ap0bEW5ZPRFFKf8xenKU h4dwK0rWoN0Kwdd2n+PBixVbB2ESqMc+1nbEyPC98ZQy2d7Z1aSJ4r+kq5ZNBhnMH2qhoE oan8KzQFR+2ypNvBB2V826EUlY/PL5kogl/RXcgXoSakEjQi1ythBmDPCSdKpEIA11kaL9 17AOr9SlWGMuACykwDF7fLIQAtXcx7WoCG/G/24ETaqvPFFgvlr0TE3yIijCvw== 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 4Q9zsF3gVDz19Rl; Wed, 3 May 2023 01:30:09 +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 3431U9fg075518; Wed, 3 May 2023 01:30:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3431U9SQ075515; Wed, 3 May 2023 01:30:09 GMT (envelope-from git) Date: Wed, 3 May 2023 01:30:09 GMT Message-Id: <202305030130.3431U9SQ075515@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 23b2ba41c2cd - main - www/lagrange: Unbreak with OpenSSL 3.0.0 and later 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23b2ba41c2cd4322f24c44e63af3925efeb248d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=23b2ba41c2cd4322f24c44e63af3925efeb248d7 commit 23b2ba41c2cd4322f24c44e63af3925efeb248d7 Author: Muhammad Moinur Rahman AuthorDate: 2023-05-03 00:20:09 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-05-03 01:29:50 +0000 www/lagrange: Unbreak with OpenSSL 3.0.0 and later - Update version 1.7.3=>1.15.9 Changelog: https://github.com/skyjake/lagrange/releases/tag/v1.15.9 Approved by: portmgr (blanket) --- www/lagrange/Makefile | 13 ++++++----- www/lagrange/distinfo | 6 ++--- ...tch-Depends.cmake => patch-cmake_Depends.cmake} | 6 ++--- .../files/patch-lib_the__Foundation_CheckSSE.cmake | 8 +++++-- .../files/patch-lib_the__Foundation_Depends.cmake | 26 +++++++++++++--------- www/lagrange/pkg-plist | 1 + 6 files changed, 35 insertions(+), 25 deletions(-) diff --git a/www/lagrange/Makefile b/www/lagrange/Makefile index 20402916f4e1..a79deeaff76c 100644 --- a/www/lagrange/Makefile +++ b/www/lagrange/Makefile @@ -1,6 +1,5 @@ PORTNAME= lagrange -DISTVERSION= 1.7.3 -PORTREVISION= 1 +DISTVERSION= 1.15.9 CATEGORIES= www MASTER_SITES= https://git.skyjake.fi/gemini/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -14,20 +13,22 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md BROKEN_SSL= libressl BROKEN_SSL_REASON_libressl= needs features only available in OpenSSL +BUILD_DEPENDS= zip>0:archivers/zip LIB_DEPENDS= libfribidi.so:converters/fribidi \ libharfbuzz.so:print/harfbuzz \ libmpg123.so:audio/mpg123 \ - libpcre.so:devel/pcre \ + libpcre2-8.so:devel/pcre2 \ libunistring.so:devel/libunistring -USES= cmake compiler:c11 desktop-file-utils pkgconfig sdl ssl +USES= cmake compiler:c11 desktop-file-utils pkgconfig sdl ssl xorg USE_SDL= sdl2 +USE_XORG= x11 xext + +LDFLAGS+= -lssl -lcrypto OPTIONS_DEFINE= SSE41 SSE41_DESC= Enable SSE4.1 support SSE41_CMAKE_ON= -DTFDN_ENABLE_SSE41:BOOL=ON -OPENSSL_LDFLAGS= -lssl -lcrypto - .include diff --git a/www/lagrange/distinfo b/www/lagrange/distinfo index b59d929a0043..1626ab93e0bd 100644 --- a/www/lagrange/distinfo +++ b/www/lagrange/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635979811 -SHA256 (lagrange-1.7.3.tar.gz) = 46d9ad305aca2cbe0ef52060a28634c9ed20098e1784e7e9f787ae5d0394ef9d -SIZE (lagrange-1.7.3.tar.gz) = 22816390 +TIMESTAMP = 1683054333 +SHA256 (lagrange-1.15.9.tar.gz) = 43cb380c19fc51a2b7fda80e49956f1782b5012b6f271d0c3fd24f4dad2df6a6 +SIZE (lagrange-1.15.9.tar.gz) = 9987069 diff --git a/www/lagrange/files/patch-Depends.cmake b/www/lagrange/files/patch-cmake_Depends.cmake similarity index 77% rename from www/lagrange/files/patch-Depends.cmake rename to www/lagrange/files/patch-cmake_Depends.cmake index 4a12c1bc6db3..70c6aebf1c9d 100644 --- a/www/lagrange/files/patch-Depends.cmake +++ b/www/lagrange/files/patch-cmake_Depends.cmake @@ -1,6 +1,6 @@ ---- Depends.cmake.orig 2021-09-09 10:00:30 UTC -+++ Depends.cmake -@@ -138,6 +138,7 @@ else () +--- cmake/Depends.cmake.orig 2023-05-02 20:13:29 UTC ++++ cmake/Depends.cmake +@@ -42,6 +42,7 @@ else () set (TFDN_ENABLE_WEBREQUEST OFF CACHE BOOL "") add_subdirectory (lib/the_Foundation) add_library (the_Foundation::the_Foundation ALIAS the_Foundation) diff --git a/www/lagrange/files/patch-lib_the__Foundation_CheckSSE.cmake b/www/lagrange/files/patch-lib_the__Foundation_CheckSSE.cmake index 20c25373b943..2cac873b549c 100644 --- a/www/lagrange/files/patch-lib_the__Foundation_CheckSSE.cmake +++ b/www/lagrange/files/patch-lib_the__Foundation_CheckSSE.cmake @@ -5,10 +5,14 @@ feature-set, this becomes a problem when a build hosts support it, whilst package consumers do not, causing an instant crash upon startup. ---- lib/the_Foundation/CheckSSE.cmake.orig 2021-04-22 10:39:48 UTC +--- lib/the_Foundation/CheckSSE.cmake.orig 2023-05-02 19:35:44 UTC +++ lib/the_Foundation/CheckSSE.cmake -@@ -1,22 +1 @@ +@@ -1,26 +1 @@ set (SSE41_FOUND NO) +-if (DEFINED TFDN_ENABLE_SSE41 AND NOT TFDN_ENABLE_SSE41) +- return () +-endif () +- -try_run ( - sseRunCode - sseCompiled diff --git a/www/lagrange/files/patch-lib_the__Foundation_Depends.cmake b/www/lagrange/files/patch-lib_the__Foundation_Depends.cmake index 10c50eb016de..0c374da92768 100644 --- a/www/lagrange/files/patch-lib_the__Foundation_Depends.cmake +++ b/www/lagrange/files/patch-lib_the__Foundation_Depends.cmake @@ -1,13 +1,17 @@ ---- lib/the_Foundation/Depends.cmake.orig 2021-11-03 22:54:49 UTC +--- lib/the_Foundation/Depends.cmake.orig 2023-05-02 20:08:20 UTC +++ lib/the_Foundation/Depends.cmake -@@ -10,9 +10,8 @@ if (NOT IOS) - set (iHaveCurl NO) - endif () - if (TFDN_ENABLE_TLSREQUEST) -- pkg_check_modules (OPENSSL eopenssl11) # BSD - if (NOT OPENSSL_FOUND) -- pkg_check_modules (OPENSSL openssl) -+ find_package (OpenSSL REQUIRED) +@@ -24,13 +24,12 @@ if (NOT IOS AND NOT ANDROID) + target_link_libraries (libssl INTERFACE ${LIBSSL} ${LIBCRYPTO}) + set (OPENSSL_FOUND YES) + else () +- pkg_check_modules (OPENSSL eopenssl11) + if (OPENSSL_FOUND) + set (EOPENSSL_FOUND YES) + endif () + endif () + else () +- pkg_check_modules (OPENSSL openssl) ++ find_package (OpenSSL REQUIRED) endif () - else () - set (OPENSSL_FOUND NO) + endif () + # Unicode text strings diff --git a/www/lagrange/pkg-plist b/www/lagrange/pkg-plist index 6ac19a7b9d30..993da280f218 100644 --- a/www/lagrange/pkg-plist +++ b/www/lagrange/pkg-plist @@ -2,4 +2,5 @@ bin/lagrange %%DATADIR%%/resources.lgr share/applications/fi.skyjake.Lagrange.desktop share/icons/hicolor/256x256/apps/fi.skyjake.Lagrange.png +share/man/man1/lagrange.1.gz share/metainfo/fi.skyjake.Lagrange.appdata.xml