From nobody Thu Nov 23 21:50:35 2023 X-Original-To: dev-commits-ports-main@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 4SbsHH6dCyz526tK; Thu, 23 Nov 2023 21:50:35 +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 4SbsHH64Vbz4TTx; Thu, 23 Nov 2023 21:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700776235; 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=Ir5fjTNph2LDFtSgyJZH52SHRLXupNbe5UuY1X6Okzk=; b=lcTI1oWVz2S5JTdpYrVe5/7sBEvzGkToKIo+R2slb/Z9tw651ZiTBQ45vOG4mYW6FS6tvf Yk16/JEfir41d7KAHjo9IL/WAL1ob+Ww6ukdJaUy8hyco/H3P5ZLDTiE5oMbVZOmLQTbcL 0yHz1rM77iu7SEZH65XjDtGjE1iO/05/lmjRyr0rP8Oxa5pikuu8tCZqM3iPTwTNa+GyPc Z+StCw8L8pRwxpUtjC6w4KX0x/zK9ZamwxeY23oYNfrqwcVQqLEARtZrv7PW69p9YcJCbn ZzdYRJtoEBghj0wyoBaS3MASeRJDnZnr0bw/yeIOmkYn7PSEe6zgmnXtm0VodQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700776235; 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=Ir5fjTNph2LDFtSgyJZH52SHRLXupNbe5UuY1X6Okzk=; b=v9zQzo3hnA8ucIXS1pRsHp5YGrwHgQQXHiHoaMJgKfPgaT3QOzhR5mRR8zGrH2MccKqN75 pGR+ODqnyJ1KYMO06d5B6AYaiYBbzAmQJ/rPdyfQ2ppD6zbbqI10Rv/vFL8FkTScuxA17G h7Q3lp8+gThy9WcuWiAG1KwJgpfpzM4mdSbfC8XhGgiyHwsivvJhfvulwOEWRfYyR+u+or +n0KP6yfSUv621b7IKwo7lBaUDCoPJsiSZRKm35B7SeRmEZzgaG2j1vh9x44bifyhPfoLI mgBduOXt/lDx81X+DkKNqxySA1XoctYccEegLTqa9oYp8T6K/MFfvmdEDOducg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700776235; a=rsa-sha256; cv=none; b=YctyWD2UXCQyeoLFQtB1bELI9+cpzqE4FhRYC8XmwR4g4h93wNPrxH6QCq3wiiJWtaJWyK 8iqtDkNxAXv8xxGHvf/C8QRcipoCLVayD4iVJLGEpQucEwNahxJXHNWBka34Nv+S9FLYDN IwVaxZUutHqW1emwReWg5asKOXwuyWT/V1qGmE+1p7yjQ3PZFxIhFwvLibfoT9YsnKXu16 R59sCACddYfOXVmZo2ACyXUMkeWmqlvtftECRTHzxKQgZivNLJaDhPlQcqcUB9vJbkTzEp h6Y3N2K/qNuRuep/Z4iWJJ4HGqg3FTQPJsxe9CDGehLK4rXft8KF46u5O9EjuA== 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 4SbsHH56zWz4Gr; Thu, 23 Nov 2023 21:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ANLoZbm087569; Thu, 23 Nov 2023 21:50:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ANLoZgr087564; Thu, 23 Nov 2023 21:50:35 GMT (envelope-from git) Date: Thu, 23 Nov 2023 21:50:35 GMT Message-Id: <202311232150.3ANLoZgr087564@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: 2ce5d605bd50 - main - www/edbrowse: fix -lopenssl for 12.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ce5d605bd50f0f2e81f7a1ad9bf74bb1fb24c5e Auto-Submitted: auto-generated The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ce5d605bd50f0f2e81f7a1ad9bf74bb1fb24c5e commit 2ce5d605bd50f0f2e81f7a1ad9bf74bb1fb24c5e Author: Alfonso S. Siciliano AuthorDate: 2023-11-23 21:46:19 +0000 Commit: Alfonso S. Siciliano CommitDate: 2023-11-23 21:50:10 +0000 www/edbrowse: fix -lopenssl for 12.4 Fix CI https://pkg-status.freebsd.org/package19/data/124amd64-default-build-as-user/ea297437c894/logs/edbrowse-3.8.7_1.log PR: 275153 Approved by: fernape --- www/edbrowse/Makefile | 7 +++++++ www/edbrowse/files/extra-patch-openssl | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/www/edbrowse/Makefile b/www/edbrowse/Makefile index c8274684bdb0..c65a59d355f8 100644 --- a/www/edbrowse/Makefile +++ b/www/edbrowse/Makefile @@ -31,6 +31,13 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS +.include + +# Skip openssl.pc while using OpenSSL from base system on older FreeBSD versions which does not skip this file +.if ${SSL_DEFAULT} == base && !exists(/usr/libdata/pkgconfig/openssl.pc) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl +.endif + do-install: ${INSTALL_MAN} ${WRKSRC}/doc/man-edbrowse-freebsd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1 ${INSTALL_PROGRAM} ${WRKSRC}/src/edbrowse ${STAGEDIR}${PREFIX}/bin diff --git a/www/edbrowse/files/extra-patch-openssl b/www/edbrowse/files/extra-patch-openssl new file mode 100644 index 000000000000..97786da57ebf --- /dev/null +++ b/www/edbrowse/files/extra-patch-openssl @@ -0,0 +1,11 @@ +--- src/makefile.orig 2023-11-17 18:00:41.589174000 +0100 ++++ src/makefile 2023-11-17 18:01:13.273125000 +0100 +@@ -9,7 +9,7 @@ + CFLAGS += $(PLATFORM_CFLAGS) + + # determine includes and linker flags +-DEPENDENCIES = libcurl:curl odbc libpcre2-8:pcre2-8 readline openssl ++DEPENDENCIES = libcurl:curl odbc libpcre2-8:pcre2-8 readline + INCLUDES = $(shell ./make-helper.sh pkg-config-includes $(DEPENDENCIES)) + LINKER_LIBS = $(shell ./make-helper.sh pkg-config-libs $(DEPENDENCIES)) + CFLAGS += $(INCLUDES)