git: 6f7f91e641a3 - main - news/tin: Fix build with base OpenSSL
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Jan 2023 06:57:01 UTC
The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=6f7f91e641a3701389eb9bb5658b255692e3f1e9 commit 6f7f91e641a3701389eb9bb5658b255692e3f1e9 Author: Kevin Bowling <kbowling@FreeBSD.org> AuthorDate: 2023-01-26 06:56:37 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> 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