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)

7 files changed, 66 insertions, 112 deletions

diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 40f57dd7df21..1814f50972cb 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -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
-
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=	--disable-ssl
-.else
-USES+=		ssl
-.endif
+UTF8PROC_MESON_NO=	disable-utf8proc
 
 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>
diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo
index 2d1f117cce34..c141c0cb40a5 100644
--- a/irc/irssi/distinfo
+++ b/irc/irssi/distinfo
@@ -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
diff --git a/irc/irssi/files/patch-Makefile.in b/irc/irssi/files/patch-Makefile.in
deleted file mode 100644
index dce4daddc1ab..000000000000
--- a/irc/irssi/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	2019-02-11 17:35:31 UTC
-+++ Makefile.in
-@@ -421,7 +421,7 @@ BUILT_SOURCES = default-config.h default-theme.h irssi
- CLEANFILES = default-config.h default-theme.h
- SUBDIRS = src tests docs scripts themes utils
- confdir = $(sysconfdir)
--conf_DATA = irssi.conf
-+conf_DATA = irssi.conf.sample
- pkginclude_HEADERS = irssi-config.h irssi-version.h
- EXTRA_DIST = \
- 	ChangeLog \
-@@ -980,8 +980,8 @@ uninstall-am: uninstall-confDATA uninstall-pkgincludeH
- 
- @MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h
- 
--default-config.h: $(srcdir)/irssi.conf
--	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
-+default-config.h: $(srcdir)/irssi.conf.sample
-+	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf.sample default_config > default-config.h
- 
- default-theme.h: $(srcdir)/themes/default.theme
- 	$(srcdir)/utils/file2header.sh $(srcdir)/themes/default.theme default_theme > default-theme.h
diff --git a/irc/irssi/files/patch-configure.ac b/irc/irssi/files/patch-configure.ac
deleted file mode 100644
index 933d33cad86f..000000000000
--- a/irc/irssi/files/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.ac.orig	2019-02-11 17:35:17 UTC
-+++ configure.ac
-@@ -322,7 +322,11 @@ PKG_CHECK_MODULES([OPENSSL], [openssl], [
- 	AC_CHECK_LIB([ssl], [SSL_library_init], [
- 		LIBS="$LIBS -lssl -lcrypto"
- 	], [
--		AC_MSG_ERROR([The OpenSSL library was not found])
-+		AC_CHECK_LIB([ssl], [OPENSSL_init_ssl], [
-+			LIBS="$LIBS -lssl -lcrypto"
-+		], [
-+			AC_MSG_ERROR([The OpenSSL library was not found])
-+		])
- 	])
- ])
- 
diff --git a/irc/irssi/files/patch-meson.build b/irc/irssi/files/patch-meson.build
new file mode 100644
index 000000000000..e0d74ec6ae5b
--- /dev/null
+++ b/irc/irssi/files/patch-meson.build
@@ -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()
diff --git a/irc/irssi/files/patch-perl-Makefile b/irc/irssi/files/patch-perl-Makefile
deleted file mode 100644
index 7979e1cd5451..000000000000
--- a/irc/irssi/files/patch-perl-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/perl/Makefile.am.orig	2019-02-11 17:27:58 UTC
-+++ src/perl/Makefile.am
-@@ -145,7 +145,7 @@ all-local:
- 
- install-exec-local:
- 	for dir in $(perl_dirs); do \
--	  cd $$dir && $(MAKE) install && cd ..; \
-+	  cd $$dir && $(MAKE) pure_install && cd ..; \
- 	done
- 
- clean-generic:
---- src/perl/Makefile.in.orig	2019-02-11 17:35:32 UTC
-+++ src/perl/Makefile.in
-@@ -898,7 +898,7 @@ all-local:
- 
- install-exec-local:
- 	for dir in $(perl_dirs); do \
--	  cd $$dir && $(MAKE) install && cd ..; \
-+	  cd $$dir && $(MAKE) pure_install && cd ..; \
- 	done
- 
- clean-generic:
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index a76b8ac85af4..d25739eacb27 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -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