Index: head/irc/irssi/Makefile =================================================================== --- head/irc/irssi/Makefile (revision 494232) +++ head/irc/irssi/Makefile (revision 494233) @@ -1,57 +1,70 @@ # $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}/ MAINTAINER= dor.bsd@xm0.uk COMMENT= Modular IRC client with many features 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 .else USES+= ssl .endif post-patch: @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e 's|/etc|${PREFIX}&|' \ ${WRKSRC}/docs/irssi.1 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 ${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 .include Index: head/irc/irssi/distinfo =================================================================== --- head/irc/irssi/distinfo (revision 494232) +++ head/irc/irssi/distinfo (revision 494233) @@ -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: head/irc/irssi/files/patch-src_core_network-openssl.c =================================================================== --- head/irc/irssi/files/patch-src_core_network-openssl.c (revision 494232) +++ head/irc/irssi/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: head/irc/irssi/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: head/irc/irssi/files/patch-Makefile.in =================================================================== --- head/irc/irssi/files/patch-Makefile.in (revision 494232) +++ head/irc/irssi/files/patch-Makefile.in (revision 494233) @@ -1,22 +1,22 @@ ---- 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) -conf_DATA = irssi.conf +conf_DATA = irssi.conf.sample 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 +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 Index: head/irc/irssi/files/patch-configure.ac =================================================================== --- head/irc/irssi/files/patch-configure.ac (revision 494232) +++ head/irc/irssi/files/patch-configure.ac (revision 494233) @@ -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: head/irc/irssi/files/patch-perl-Makefile =================================================================== --- head/irc/irssi/files/patch-perl-Makefile (revision 494232) +++ head/irc/irssi/files/patch-perl-Makefile (revision 494233) @@ -1,22 +1,22 @@ ---- 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: 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 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 \ - cd $$dir && $(MAKE) install && cd ..; \ + cd $$dir && $(MAKE) pure_install && cd ..; \ done clean-generic: Index: head/irc/irssi/pkg-plist =================================================================== --- head/irc/irssi/pkg-plist (revision 494232) +++ head/irc/irssi/pkg-plist (revision 494233) @@ -1,278 +1,290 @@ %%BOT%%bin/botti bin/irssi @sample etc/irssi.conf.sample include/irssi/irssi-config.h include/irssi/irssi-version.h include/irssi/src/common.h include/irssi/src/core/args.h %%CAPSICUM%%include/irssi/src/core/capsicum.h include/irssi/src/core/channel-rec.h include/irssi/src/core/channel-setup-rec.h include/irssi/src/core/channels-setup.h include/irssi/src/core/channels.h include/irssi/src/core/chat-protocols.h include/irssi/src/core/chatnet-rec.h include/irssi/src/core/chatnets.h include/irssi/src/core/commands.h include/irssi/src/core/core.h include/irssi/src/core/expandos.h include/irssi/src/core/ignore.h include/irssi/src/core/iregex.h include/irssi/src/core/levels.h include/irssi/src/core/line-split.h include/irssi/src/core/log.h include/irssi/src/core/masks.h include/irssi/src/core/misc.h include/irssi/src/core/module.h include/irssi/src/core/modules-load.h include/irssi/src/core/modules.h include/irssi/src/core/net-disconnect.h include/irssi/src/core/net-nonblock.h include/irssi/src/core/net-sendbuffer.h include/irssi/src/core/network-openssl.h include/irssi/src/core/network.h include/irssi/src/core/nick-rec.h include/irssi/src/core/nicklist.h include/irssi/src/core/nickmatch-cache.h include/irssi/src/core/pidwait.h 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/server-connect-rec.h include/irssi/src/core/server-rec.h include/irssi/src/core/server-setup-rec.h include/irssi/src/core/servers-reconnect.h include/irssi/src/core/servers-setup.h include/irssi/src/core/servers.h include/irssi/src/core/session.h include/irssi/src/core/settings.h include/irssi/src/core/signals.h include/irssi/src/core/special-vars.h include/irssi/src/core/tls.h include/irssi/src/core/utf8.h include/irssi/src/core/window-item-def.h include/irssi/src/core/window-item-rec.h include/irssi/src/core/write-buffer.h include/irssi/src/fe-common/core/chat-completion.h include/irssi/src/fe-common/core/command-history.h include/irssi/src/fe-common/core/completion.h %%CAPSICUM%%include/irssi/src/fe-common/core/fe-capsicum.h include/irssi/src/fe-common/core/fe-channels.h include/irssi/src/fe-common/core/fe-common-core.h include/irssi/src/fe-common/core/fe-core-commands.h include/irssi/src/fe-common/core/fe-exec.h include/irssi/src/fe-common/core/fe-messages.h include/irssi/src/fe-common/core/fe-queries.h include/irssi/src/fe-common/core/fe-recode.h include/irssi/src/fe-common/core/fe-settings.h include/irssi/src/fe-common/core/fe-tls.h include/irssi/src/fe-common/core/fe-windows.h include/irssi/src/fe-common/core/formats.h include/irssi/src/fe-common/core/hilight-text.h include/irssi/src/fe-common/core/keyboard.h include/irssi/src/fe-common/core/module-formats.h include/irssi/src/fe-common/core/module.h include/irssi/src/fe-common/core/printtext.h include/irssi/src/fe-common/core/themes.h include/irssi/src/fe-common/core/window-activity.h include/irssi/src/fe-common/core/window-items.h include/irssi/src/fe-common/core/windows-layout.h include/irssi/src/fe-common/irc/dcc/fe-dcc.h include/irssi/src/fe-common/irc/dcc/module-formats.h include/irssi/src/fe-common/irc/dcc/module.h include/irssi/src/fe-common/irc/fe-irc-channels.h include/irssi/src/fe-common/irc/fe-irc-server.h include/irssi/src/fe-common/irc/module-formats.h 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 include/irssi/src/irc/core/irc-channels.h include/irssi/src/irc/core/irc-chatnets.h include/irssi/src/irc/core/irc-commands.h include/irssi/src/irc/core/irc-masks.h include/irssi/src/irc/core/irc-nicklist.h include/irssi/src/irc/core/irc-queries.h include/irssi/src/irc/core/irc-servers-setup.h include/irssi/src/irc/core/irc-servers.h include/irssi/src/irc/core/irc.h include/irssi/src/irc/core/mode-lists.h include/irssi/src/irc/core/modes.h include/irssi/src/irc/core/module.h include/irssi/src/irc/core/netsplit.h include/irssi/src/irc/core/sasl.h include/irssi/src/irc/core/servers-idle.h include/irssi/src/irc/core/servers-redirect.h include/irssi/src/irc/dcc/dcc-chat.h include/irssi/src/irc/dcc/dcc-file-rec.h include/irssi/src/irc/dcc/dcc-file.h include/irssi/src/irc/dcc/dcc-get.h include/irssi/src/irc/dcc/dcc-queue.h include/irssi/src/irc/dcc/dcc-rec.h include/irssi/src/irc/dcc/dcc-send.h include/irssi/src/irc/dcc/dcc-server.h include/irssi/src/irc/dcc/dcc.h include/irssi/src/irc/dcc/module.h include/irssi/src/irc/flood/module.h include/irssi/src/irc/notifylist/module.h 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 %%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 %%PERL%%%%SITE_ARCH%%/Irssi/UI.pm %%PERL%%%%SITE_ARCH%%/auto/Irssi/Irc/Irc.so %%PERL%%%%SITE_ARCH%%/auto/Irssi/Irssi.so %%PERL%%%%SITE_ARCH%%/auto/Irssi/TextUI/TextUI.so %%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 %%PORTDOCS%%%%DOCSDIR%%/formats.txt %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/perl.txt %%PORTDOCS%%%%DOCSDIR%%/signals.txt %%PORTDOCS%%%%DOCSDIR%%/special_vars.txt %%PORTDOCS%%%%DOCSDIR%%/startup-HOWTO.html %%PORTDOCS%%%%DOCSDIR%%/startup-HOWTO.txt %%DATADIR%%/help/accept %%DATADIR%%/help/action %%DATADIR%%/help/admin %%DATADIR%%/help/alias %%DATADIR%%/help/away %%DATADIR%%/help/ban %%DATADIR%%/help/beep %%DATADIR%%/help/bind %%DATADIR%%/help/cat %%DATADIR%%/help/cd %%DATADIR%%/help/channel %%DATADIR%%/help/clear %%DATADIR%%/help/completion %%DATADIR%%/help/connect %%DATADIR%%/help/ctcp %%DATADIR%%/help/cycle %%DATADIR%%/help/dcc %%DATADIR%%/help/dehilight %%DATADIR%%/help/deop %%DATADIR%%/help/devoice %%DATADIR%%/help/die %%DATADIR%%/help/disconnect %%DATADIR%%/help/echo %%DATADIR%%/help/eval %%DATADIR%%/help/exec %%DATADIR%%/help/flushbuffer %%DATADIR%%/help/format %%DATADIR%%/help/hash %%DATADIR%%/help/help %%DATADIR%%/help/hilight %%DATADIR%%/help/ignore %%DATADIR%%/help/info %%DATADIR%%/help/invite %%DATADIR%%/help/irssiproxy %%DATADIR%%/help/ison %%DATADIR%%/help/join %%DATADIR%%/help/kick %%DATADIR%%/help/kickban %%DATADIR%%/help/kill %%DATADIR%%/help/knock %%DATADIR%%/help/knockout %%DATADIR%%/help/lastlog %%DATADIR%%/help/layout %%DATADIR%%/help/levels %%DATADIR%%/help/links %%DATADIR%%/help/list %%DATADIR%%/help/load %%DATADIR%%/help/log %%DATADIR%%/help/lusers %%DATADIR%%/help/map %%DATADIR%%/help/me %%DATADIR%%/help/mircdcc %%DATADIR%%/help/mode %%DATADIR%%/help/motd %%DATADIR%%/help/msg %%DATADIR%%/help/names %%DATADIR%%/help/nctcp %%DATADIR%%/help/netsplit %%DATADIR%%/help/network %%DATADIR%%/help/nick %%DATADIR%%/help/notice %%DATADIR%%/help/notify %%DATADIR%%/help/op %%DATADIR%%/help/oper +%%DATADIR%%/help/otr %%DATADIR%%/help/part %%DATADIR%%/help/ping %%DATADIR%%/help/query %%DATADIR%%/help/quit %%DATADIR%%/help/quote %%DATADIR%%/help/rawlog %%DATADIR%%/help/recode %%DATADIR%%/help/reconnect %%DATADIR%%/help/rehash %%DATADIR%%/help/reload %%DATADIR%%/help/restart %%DATADIR%%/help/rmreconns %%DATADIR%%/help/rmrejoins %%DATADIR%%/help/save %%DATADIR%%/help/sconnect %%DATADIR%%/help/script %%DATADIR%%/help/scrollback %%DATADIR%%/help/server %%DATADIR%%/help/servlist %%DATADIR%%/help/set %%DATADIR%%/help/silence %%DATADIR%%/help/squery %%DATADIR%%/help/squit %%DATADIR%%/help/stats %%DATADIR%%/help/statusbar %%DATADIR%%/help/time %%DATADIR%%/help/toggle %%DATADIR%%/help/topic %%DATADIR%%/help/trace %%DATADIR%%/help/ts %%DATADIR%%/help/unalias %%DATADIR%%/help/unban %%DATADIR%%/help/unignore %%DATADIR%%/help/unload %%DATADIR%%/help/unnotify %%DATADIR%%/help/unquery %%DATADIR%%/help/unsilence %%DATADIR%%/help/upgrade %%DATADIR%%/help/uptime %%DATADIR%%/help/userhost %%DATADIR%%/help/ver %%DATADIR%%/help/version %%DATADIR%%/help/voice %%DATADIR%%/help/wait %%DATADIR%%/help/wall %%DATADIR%%/help/wallops %%DATADIR%%/help/who %%DATADIR%%/help/whois %%DATADIR%%/help/whowas %%DATADIR%%/help/window %%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 %%DATADIR%%/themes/default.theme @dir lib/irssi/modules