Index: Makefile =================================================================== --- Makefile (revision 492781) +++ Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= irssi -PORTVERSION= 1.1.2 +PORTVERSION= 1.2.0 PORTEPOCH= 1 CATEGORIES?= irc MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/ @@ -12,27 +12,39 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= autoreconf cpe gettext-runtime gmake gnome libtool ncurses pkgconfig tar:xz +USES= autoreconf cpe gettext-runtime gmake gnome libtool ncurses \ + pkgconfig tar:xz +USE_GNOME= glib20 + GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USE_GNOME= glib20 -OPTIONS_DEFINE= PERL PROXY SOCKS BOT DOCS TRUECOLOR CAPSICUM -OPTIONS_DEFAULT= PERL CAPSICUM +OPTIONS_DEFINE= BOT CAPSICUM DOCS OTR PERL PROXY SOCKS TRUECOLOR UTF8PROC +OPTIONS_DEFAULT= CAPSICUM PERL OPTIONS_SUB= yes -SOCKS_DESC= Socks proxy support -SOCKS_CONFIGURE_WITH= socks 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 +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 -CAPSICUM_DESC= Capsicum support -CAPSICUM_CONFIGURE_WITH= capsicum +UTF8PROC_DESC= utf8proc support +UTF8PROC_LIB_DEPENDS= libutf8proc.so:textproc/utf8proc .if defined(WITHOUT_SSL) CONFIGURE_ARGS+= --disable-ssl @@ -46,7 +58,8 @@ post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules - @${MV} ${STAGEDIR}${PREFIX}/etc/irssi.conf ${STAGEDIR}${PREFIX}/etc/irssi.conf.sample + @${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 Index: distinfo =================================================================== --- distinfo (revision 492781) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1547071155 -SHA256 (irssi-1.1.2.tar.xz) = 5ccc2b89a394e91bea0aa83a951c3b1d471c76da87b4169ec435530a31bf9732 -SIZE (irssi-1.1.2.tar.xz) = 1084328 +TIMESTAMP = 1549985826 +SHA256 (irssi-1.2.0.tar.xz) = 1643fca1d8b35e5a5d7b715c9c889e1e9cdb7e578e06487901ea959e6ab3ebe5 +SIZE (irssi-1.2.0.tar.xz) = 1138984 Index: files/patch-Makefile.in =================================================================== --- files/patch-Makefile.in (revision 492781) +++ files/patch-Makefile.in (working copy) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2018-01-15 21:35:25.062300000 +0000 -+++ Makefile.in 2018-01-15 21:36:17.578923000 +0000 -@@ -409,7 +409,7 @@ +--- 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) @@ -9,9 +9,9 @@ pkginclude_HEADERS = irssi-config.h irssi-version.h EXTRA_DIST = \ ChangeLog \ -@@ -965,8 +965,8 @@ +@@ -980,8 +980,8 @@ uninstall-am: uninstall-confDATA uninstall-pkgincludeH - #.PHONY: irssi-version.h + @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 Index: files/patch-configure.ac =================================================================== --- files/patch-configure.ac (revision 492781) +++ files/patch-configure.ac (working copy) @@ -1,15 +1,15 @@ ---- configure.ac.orig 2018-10-06 15:40:00 UTC +--- configure.ac.orig 2019-02-11 17:35:17 UTC +++ configure.ac -@@ -307,7 +307,11 @@ PKG_CHECK_MODULES([OPENSSL], [openssl], +@@ -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]) + ]) -- AC_MSG_ERROR([The OpenSSL library was not found]) ]) ]) Index: files/patch-perl-Makefile =================================================================== --- files/patch-perl-Makefile (revision 492781) +++ files/patch-perl-Makefile (working copy) @@ -1,4 +1,4 @@ ---- src/perl/Makefile.am.orig 2017-03-04 20:30:38 UTC +--- src/perl/Makefile.am.orig 2019-02-11 17:27:58 UTC +++ src/perl/Makefile.am @@ -145,7 +145,7 @@ all-local: @@ -9,9 +9,9 @@ done clean-generic: ---- src/perl/Makefile.in.orig 2017-03-10 16:43:21 UTC +--- src/perl/Makefile.in.orig 2019-02-11 17:35:32 UTC +++ src/perl/Makefile.in -@@ -853,7 +853,7 @@ all-local: +@@ -898,7 +898,7 @@ all-local: install-exec-local: for dir in $(perl_dirs); do \ Index: files/patch-src_core_network-openssl.c =================================================================== --- files/patch-src_core_network-openssl.c (revision 492781) +++ files/patch-src_core_network-openssl.c (nonexistent) @@ -1,20 +0,0 @@ ---- src/core/network-openssl.c.orig 2018-02-14 23:53:44 UTC -+++ src/core/network-openssl.c -@@ -47,7 +47,8 @@ - - /* OpenSSL 1.1.0 also introduced some useful additions to the api */ - #if (OPENSSL_VERSION_NUMBER >= 0x10002000L) --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ -+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - static int X509_STORE_up_ref(X509_STORE *vfy) - { - int n; -@@ -476,6 +477,7 @@ static GIOChannel *irssi_ssl_get_iochann - if (SSL_CTX_set_cipher_list(ctx, ciphers) != 1) - g_warning("No valid SSL cipher suite could be selected"); - } -+ SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2); - - if (mycert && *mycert) { - char *scert = NULL, *spkey = NULL; Property changes on: files/patch-src_core_network-openssl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 492781) +++ pkg-plist (working copy) @@ -87,8 +87,16 @@ include/irssi/src/fe-common/irc/module.h include/irssi/src/fe-common/irc/notifylist/module-formats.h include/irssi/src/fe-common/irc/notifylist/module.h +include/irssi/src/fe-text/gui-printtext.h +include/irssi/src/fe-text/gui-windows.h +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-view.h +include/irssi/src/fe-text/textbuffer.h include/irssi/src/irc/core/bans.h +include/irssi/src/irc/core/channel-events.h include/irssi/src/irc/core/channel-rejoin.h include/irssi/src/irc/core/ctcp.h include/irssi/src/irc/core/irc-cap.h @@ -126,6 +134,8 @@ include/irssi/src/lib-config/module.h %%PROXY%%lib/irssi/modules/libirc_proxy.a %%PROXY%%lib/irssi/modules/libirc_proxy.so +%%OTR%%lib/irssi/modules/libotr_core.a +%%OTR%%lib/irssi/modules/libotr_core.so %%PERL%%%%SITE_ARCH%%/Irssi.pm %%PERL%%%%SITE_ARCH%%/Irssi/Irc.pm %%PERL%%%%SITE_ARCH%%/Irssi/TextUI.pm @@ -136,6 +146,7 @@ %%PERL%%%%SITE_ARCH%%/auto/Irssi/UI/UI.so man/man1/irssi.1.gz %%CAPSICUM%%%%PORTDOCS%%%%DOCSDIR%%/capsicum.txt +%%PORTDOCS%%%%DOCSDIR%%/design.html %%PORTDOCS%%%%DOCSDIR%%/design.txt %%PORTDOCS%%%%DOCSDIR%%/faq.html %%PORTDOCS%%%%DOCSDIR%%/faq.txt @@ -210,6 +221,7 @@ %%DATADIR%%/help/notify %%DATADIR%%/help/op %%DATADIR%%/help/oper +%%DATADIR%%/help/otr %%DATADIR%%/help/part %%DATADIR%%/help/ping %%DATADIR%%/help/query