Date: Sat, 16 Mar 2024 08:04:32 GMT From: Felix Palmen <zirias@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0a8e5e996fef - main - irc/irssi: Revert build with ssl from ports Message-ID: <202403160804.42G84W7g036267@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a8e5e996fef983dc90ff7960ecaaad2c094c535 commit 0a8e5e996fef983dc90ff7960ecaaad2c094c535 Author: Felix Palmen <zirias@FreeBSD.org> AuthorDate: 2024-03-16 07:26:20 +0000 Commit: Felix Palmen <zirias@FreeBSD.org> CommitDate: 2024-03-16 08:03:57 +0000 irc/irssi: Revert build with ssl from ports This fix was only needed for breakage caused by pkgconf, which has meanwhile been fixed. This reverts commit 71f0f861cedf2a7ddcc0cc4909fc01f630453da8. --- irc/irssi/Makefile | 3 --- irc/irssi/files/patch-meson.build | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 15cc269bf052..e2e8214d1d6b 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -42,9 +42,6 @@ UTF8PROC_MESON_NO= disable-utf8proc PERL_USE_OFF= perl5=build -post-patch: - @${REINPLACE_CMD} 's|%%OPENSSLLIB%%|${OPENSSLLIB}|' ${WRKSRC}/meson.build - post-install-PERL-off: @${RM} -r ${STAGEDIR}${DATADIR}/scripts diff --git a/irc/irssi/files/patch-meson.build b/irc/irssi/files/patch-meson.build deleted file mode 100644 index 722b7a6da6d2..000000000000 --- a/irc/irssi/files/patch-meson.build +++ /dev/null @@ -1,12 +0,0 @@ ---- meson.build.orig 2023-03-28 12:13:26 UTC -+++ meson.build -@@ -284,7 +284,8 @@ if glib_internal and want_static_dependency and want_f - else - openssl_dep = dependency('openssl', static : want_static_dependency, include_type : 'system') - endif --dep += openssl_dep -+dep += cc.find_library('crypto', dirs: '%%OPENSSLLIB%%') -+dep += cc.find_library('ssl', dirs: '%%OPENSSLLIB%%') - - ############ - # utf8proc #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403160804.42G84W7g036267>