Date: Sun, 22 Nov 2020 18:33:12 +0000 (UTC) From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556069 - in head/irc/irssi: . files Message-ID: <202011221833.0AMIXCcs056171@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fernape Date: Sun Nov 22 18:33:12 2020 New Revision: 556069 URL: https://svnweb.freebsd.org/changeset/ports/556069 Log: irc/irssi: Update to snapshot 1.3 (20201114) Includes various bug fixes including ones related to Glib and SSL/TLS PR: 249910 Submitted by: daniel.engberg.lists@pyret.net Approved by: dor.bsd@xm0.uk (maintainer) Added: head/irc/irssi/files/patch-meson.build (contents, props changed) Deleted: head/irc/irssi/files/patch-Makefile.in head/irc/irssi/files/patch-configure.ac head/irc/irssi/files/patch-perl-Makefile Modified: head/irc/irssi/Makefile head/irc/irssi/distinfo head/irc/irssi/pkg-plist Modified: head/irc/irssi/Makefile ============================================================================== --- head/irc/irssi/Makefile Sun Nov 22 18:23:25 2020 (r556068) +++ head/irc/irssi/Makefile Sun Nov 22 18:33:12 2020 (r556069) @@ -1,11 +1,10 @@ # $FreeBSD$ PORTNAME= irssi -PORTVERSION= 1.2.2 -PORTREVISION= 1 +DISTVERSION= 1.3-dev-344 +DISTVERSIONSUFFIX= -gf57dcfe9 PORTEPOCH= 1 CATEGORIES?= irc -MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/ MAINTAINER= dor.bsd@xm0.uk COMMENT= Modular IRC client with many features @@ -13,56 +12,48 @@ COMMENT= Modular IRC client with many features LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= autoreconf cpe gettext-runtime gmake gnome libtool localbase \ - ncurses pkgconfig tar:xz +# Until upstream makes a new release disable cpe +USES= gettext-runtime gnome meson localbase:ldflags ncurses \ + pkgconfig ssl USE_GNOME= glib20 +USE_LDCONFIG= yes -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip +USE_GITHUB= yes +GH_TAGNAME= f57dcfe -OPTIONS_DEFINE= BOT CAPSICUM DOCS OTR PERL PROXY SOCKS TRUECOLOR UTF8PROC -OPTIONS_DEFAULT= BOT CAPSICUM PERL PROXY SOCKS TRUECOLOR +MESON_ARGS= -Dinstall-glib=no -Ddisable-gregex=no -Dstatic-dependency=no \ + -Dwith-fuzzer=no -Dwithout-textui=no -OPTIONS_SUB= yes -BOT_DESC= Bot support -BOT_CONFIGURE_WITH= bot -CAPSICUM_DESC= Capsicum support -CAPSICUM_CONFIGURE_WITH= capsicum -OTR_DESC= OTR (off-the-record) support -OTR_CONFIGURE_ON= --with-otr \ - --with-libotr-inc-prefix=${PREFIX}/include -OTR_CONFIGURE_OFF= --with-otr=no -OTR_CONFIGURE_WITH= otr +# Default linker (bfd) in FreeBSD 11 breaks compilation +LDFLAGS_FreeBSD_11= -fuse-ld=lld + +# Force OpenSSL from base +CPPFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl ${LDFLAGS_${OPSYS}_${OSREL:R}} + +OPTIONS_DEFINE= BOT CAPSICUM DOCS OTR PERL PROXY TRUECOLOR UTF8PROC +OPTIONS_DEFAULT= BOT CAPSICUM PERL PROXY TRUECOLOR +OPTIONS_SUB= yes + +BOT_DESC= Bot support +CAPSICUM_DESC= Capsicum support +OTR_DESC= OTR (off-the-record) support +TRUECOLOR_DESC= True color support +UTF8PROC_DESC= utf8proc support + +BOT_MESON_YES= with-bot +CAPSICUM_MESON_YES= with-capsicum OTR_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ - libgpg-error.so:security/libgpg-error \ libotr.so:security/libotr -PERL_USES= perl5 -PERL_CONFIGURE_ON= --with-perl-lib=site -PERL_CONFIGURE_OFF= --with-perl=no -PROXY_CONFIGURE_WITH= proxy -SOCKS_DESC= Socks proxy support -SOCKS_CONFIGURE_WITH= socks -TRUECOLOR_DESC= Truecolor (24bit) support -TRUECOLOR_CONFIGURE_ENABLE= true-color -UTF8PROC_DESC= utf8proc support +OTR_MESON_YES= with-otr +PERL_USES= perl5 +PERL_MESON_YES= with-perl +PROXY_MESON_YES= with-proxy +TRUECOLOR_MESON_YES= enable-true-color UTF8PROC_LIB_DEPENDS= libutf8proc.so:textproc/utf8proc -UTF8PROC_CONFIGURE_ENABLE= utf8proc +UTF8PROC_MESON_NO= disable-utf8proc -.if defined(WITHOUT_SSL) -CONFIGURE_ARGS+= --disable-ssl -.else -USES+= ssl -.endif - post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules - @${MV} ${STAGEDIR}${PREFIX}/etc/irssi.conf \ - ${STAGEDIR}${PREFIX}/etc/irssi.conf.sample - -post-install-PERL-on: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irssi.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/Irc/Irc.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/TextUI/TextUI.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Irssi/UI/UI.so + @${MV} ${WRKSRC}/irssi.conf ${STAGEDIR}${PREFIX}/etc/irssi.conf.sample .include <bsd.port.mk> Modified: head/irc/irssi/distinfo ============================================================================== --- head/irc/irssi/distinfo Sun Nov 22 18:23:25 2020 (r556068) +++ head/irc/irssi/distinfo Sun Nov 22 18:33:12 2020 (r556069) @@ -1,3 +1,3 @@ -TIMESTAMP = 1568194739 -SHA256 (irssi-1.2.2.tar.xz) = 6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578 -SIZE (irssi-1.2.2.tar.xz) = 1140844 +TIMESTAMP = 1605383170 +SHA256 (irssi-irssi-1.3-dev-344-gf57dcfe9-f57dcfe_GH0.tar.gz) = d3aa102674dafdcaf82af214994405492f51ab0695d837ef2f1a2af64bf662d6 +SIZE (irssi-irssi-1.3-dev-344-gf57dcfe9-f57dcfe_GH0.tar.gz) = 794837 Added: head/irc/irssi/files/patch-meson.build ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/irssi/files/patch-meson.build Sun Nov 22 18:33:12 2020 (r556069) @@ -0,0 +1,22 @@ +--- meson.build.orig 2020-09-26 14:51:26 UTC ++++ meson.build +@@ -273,8 +273,8 @@ endif + dep += glib_dep + dep += gmodule_dep + +-openssl_dep = dependency('openssl', static : want_static_dependency) +-dep += openssl_dep ++#openssl_dep = dependency('openssl', static : want_static_dependency) ++#dep += openssl_dep + + ############ + # utf8proc # +@@ -363,7 +363,7 @@ if want_perl + version : perl_version) + + #### +- if not cc.compiles(''' ++ if not cc.links(''' + #include <EXTERN.h> + #include <perl.h> + int main() Modified: head/irc/irssi/pkg-plist ============================================================================== --- head/irc/irssi/pkg-plist Sun Nov 22 18:23:25 2020 (r556068) +++ head/irc/irssi/pkg-plist Sun Nov 22 18:33:12 2020 (r556069) @@ -39,6 +39,7 @@ include/irssi/src/core/queries.h include/irssi/src/core/query-rec.h include/irssi/src/core/rawlog.h include/irssi/src/core/recode.h +include/irssi/src/core/refstrings.h include/irssi/src/core/server-connect-rec.h include/irssi/src/core/server-rec.h include/irssi/src/core/server-setup-rec.h @@ -93,6 +94,7 @@ include/irssi/src/fe-text/mainwindows.h include/irssi/src/fe-text/statusbar.h include/irssi/src/fe-text/statusbar-item.h include/irssi/src/fe-text/term.h +include/irssi/src/fe-text/textbuffer-formats.h include/irssi/src/fe-text/textbuffer-view.h include/irssi/src/fe-text/textbuffer.h include/irssi/src/irc/core/bans.h @@ -132,10 +134,10 @@ include/irssi/src/irc/notifylist/notify-setup.h include/irssi/src/irc/notifylist/notifylist.h include/irssi/src/lib-config/iconfig.h include/irssi/src/lib-config/module.h -%%PROXY%%lib/irssi/modules/libirc_proxy.a +%%PERL%%lib/irssi/modules/libfe_perl.so %%PROXY%%lib/irssi/modules/libirc_proxy.so -%%OTR%%lib/irssi/modules/libotr_core.a %%OTR%%lib/irssi/modules/libotr_core.so +%%PERL%%lib/irssi/modules/libperl_core.so %%PERL%%%%SITE_ARCH%%/Irssi.pm %%PERL%%%%SITE_ARCH%%/Irssi/Irc.pm %%PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm @@ -144,6 +146,7 @@ include/irssi/src/lib-config/module.h %%PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so %%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so %%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so +libdata/pkgconfig/irssi-1.pc man/man1/irssi.1.gz %%CAPSICUM%%%%PORTDOCS%%%%DOCSDIR%%/capsicum.txt %%PORTDOCS%%%%DOCSDIR%%/design.html @@ -275,14 +278,11 @@ man/man1/irssi.1.gz %%DATADIR%%/scripts/autoop.pl %%DATADIR%%/scripts/autorejoin.pl %%DATADIR%%/scripts/buf.pl -%%DATADIR%%/scripts/command.pl %%DATADIR%%/scripts/dns.pl %%DATADIR%%/scripts/kills.pl %%DATADIR%%/scripts/mail.pl %%DATADIR%%/scripts/mlock.pl -%%DATADIR%%/scripts/msg-event.pl %%DATADIR%%/scripts/quitmsg.pl -%%DATADIR%%/scripts/redirect.pl %%DATADIR%%/scripts/scriptassist.pl %%DATADIR%%/scripts/usercount.pl %%DATADIR%%/themes/colorless.theme
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011221833.0AMIXCcs056171>