From nobody Thu Jan 26 06:57: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 4P2WjB1zc2z3bmVr; Thu, 26 Jan 2023 06:57:02 +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 4P2WjB0LPnz3sN3; Thu, 26 Jan 2023 06:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674716222; 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=Ecpz/AyXDvbd162Cag+eVlDF50rGy2b6W+JGLmXsHcI=; b=IlnOMu6n64kBZP/t0rdyXwmuclsObOOo5rYXFR11h1h0aa2i/HghpNwb0yIpQihSzVTrC/ 5ggPcq49zIS/uDO/uMjYUHyISc7Vd5KUoUjRU/H+hGjaUi7T9ulE2hFTLqF5QcqJVlCMnf tv4bDtADv/Ry4LVWQQ0dtDqW9DaDLIp4MLqq/JI0aHgt9h5ggN2lCmjWGHAyukR9KQDZTc RJIGijYDo8iQ0ZEc4Vdu3aljll7xyQKjWoIcyLCaL8adwdE7l4ay/58GNet8ec0tSMq8ed X0dGsGghWAlxDwhQ7mPxEm321H6hJ12mg4BcHTi83J/gmez0otdtIyQk0yRnyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674716222; 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=Ecpz/AyXDvbd162Cag+eVlDF50rGy2b6W+JGLmXsHcI=; b=m34xW7+Cm5NzBxPnerC/o4IXlC4zF4vqdNUnxjPlmkf9eMBXt/XsA1lUmsN8b1goqBNiaw TL3EY+7f5jcQZmVmMcE1Vk9fv0np0tf7l2R3QWND0AQMPfV1623fdO1DvtfGiwpfmYRqnz 0KZPTRyn+GtqJaf8VkiOxa4GhIqHaI/OQ8E0dQeNuccVUIKfP9wswkNDBc/bX88YpcxxHc Qj+tRW9qOaM/bPBsXyzoKoxYIm1HEUss42gD4Dhsq3mIAp1U3GLFjSSCmWhPKvGw5DVCym rW8h/tjtd3Q9T1AxifChqQjDzlB45/jx5IxH8KTEH931U1OjDvhLKxCZPvWPfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674716222; a=rsa-sha256; cv=none; b=A8wiXrd6++L1x5MHVnchwlAzK/QI0Z30iLud8JNIpl1AvTnTbOlbUIwPOOTLpR8JWwkNLw X4bCaC/euZwht4NxF/mZPSMWR0pK1gRM0BTuWWL6XivASnb2zKa8C+voQB1a0vc4c9/XB5 rMrd8dO4m/xj8gXIdxTuF1GjBBozJx3QVaJpJZ2xW4ZFoXVtQDWAgq6C7QrejUOsaSIZun N/pX0CeN2YD7WnwSmUIsYydwbWjpJ79kQ//8I4ZrGNrMOnlwltHK4ucR4x/UueSoo22AVF Y096JjY1G/+qgAXTLzHL6vrorQv7FP505tI0sg7dQ55qqDY+JgCmmp+Dd2tHzg== 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 4P2Wj96YLTzKkq; Thu, 26 Jan 2023 06:57: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 30Q6v1rB006737; Thu, 26 Jan 2023 06:57:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30Q6v1fG006736; Thu, 26 Jan 2023 06:57:01 GMT (envelope-from git) Date: Thu, 26 Jan 2023 06:57:01 GMT Message-Id: <202301260657.30Q6v1fG006736@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 6f7f91e641a3 - main - news/tin: Fix build with base OpenSSL 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: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f7f91e641a3701389eb9bb5658b255692e3f1e9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=6f7f91e641a3701389eb9bb5658b255692e3f1e9 commit 6f7f91e641a3701389eb9bb5658b255692e3f1e9 Author: Kevin Bowling AuthorDate: 2023-01-26 06:56:37 +0000 Commit: Kevin Bowling CommitDate: 2023-01-26 06:56:37 +0000 news/tin: Fix build with base OpenSSL Work around stupidity where base doesn't ship openssl pkg-config data --- news/tin/Makefile | 2 +- news/tin/files/patch-configure | 22 +++++++++++++++++++++- news/tin/files/patch-include_autoconf.hin | 6 +++--- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/news/tin/Makefile b/news/tin/Makefile index 8ba345e9678e..5a1a312c8efd 100644 --- a/news/tin/Makefile +++ b/news/tin/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v${PORTVERSION:R}/ \ ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/v${PORTVERSION:R}/ \ ftp://ftp.informatik.uni-hamburg.de/pub/soft/news/tin/v${PORTVERSION:R}/ -MAINTAINER= kbowling@FreeBSD.org +MAINTAINER?= kbowling@FreeBSD.org COMMENT= Easy-to-use threaded newsreader with NOV/NNTP support WWW= http://www.tin.org/ diff --git a/news/tin/files/patch-configure b/news/tin/files/patch-configure index d2a70f20232f..9ffb404a5c78 100644 --- a/news/tin/files/patch-configure +++ b/news/tin/files/patch-configure @@ -1,4 +1,4 @@ ---- configure.orig 2023-01-26 00:10:06 UTC +--- configure.orig 2022-12-24 23:00:29 UTC +++ configure @@ -13804,7 +13804,7 @@ case "$host_os" in fi @@ -27,3 +27,23 @@ echo "$as_me:16987: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then +@@ -21363,13 +21363,15 @@ fi + + if test "$enable_nntps" = "yes" && test "$have_libtls" = "no" || test "$enable_nntps" = "openssl"; then + +-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "openssl"; then +- test -n "$verbose" && echo " found package openssl" 1>&6 ++## FreeBSD: Work around stupidity where base doesn't ship openssl pkg-config data ++#if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "openssl"; then ++# test -n "$verbose" && echo " found package openssl" 1>&6 ++if true; then + + echo "${as_me:-configure}:21369: testing found package openssl ..." 1>&5 + +- cf_pkgconfig_incs="`$PKG_CONFIG --cflags "openssl" 2>/dev/null`" +- cf_pkgconfig_libs="`$PKG_CONFIG --libs "openssl" 2>/dev/null`" ++ cf_pkgconfig_incs="" ++ cf_pkgconfig_libs="-lssl -lcrypto" + test -n "$verbose" && echo " package openssl CFLAGS: $cf_pkgconfig_incs" 1>&6 + + echo "${as_me:-configure}:21375: testing package openssl CFLAGS: $cf_pkgconfig_incs ..." 1>&5 diff --git a/news/tin/files/patch-include_autoconf.hin b/news/tin/files/patch-include_autoconf.hin index c5b87df17956..efea776aee4b 100644 --- a/news/tin/files/patch-include_autoconf.hin +++ b/news/tin/files/patch-include_autoconf.hin @@ -1,6 +1,6 @@ ---- include/autoconf.hin.orig 2015-11-22 01:15:52.000000000 +0100 -+++ include/autoconf.hin 2016-01-16 18:09:27.785884000 +0100 -@@ -46,7 +46,6 @@ +--- include/autoconf.hin.orig 2022-12-09 09:03:48 UTC ++++ include/autoconf.hin +@@ -49,7 +49,6 @@ /* compiler, compilerflags, ... */ # undef TIN_CC