[Midnightbsd-cvs] mports [23176] trunk/irc/irssi: update irssi

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Apr 8 16:16:51 EDT 2018 

Revision: 23176
          http://svnweb.midnightbsd.org/mports/?rev=23176
Author:   laffer1
Date:     2018-04-08 16:16:50 -0400 (Sun, 08 Apr 2018)
Log Message:
-----------
update irssi

Modified Paths:
--------------
    trunk/irc/irssi/Makefile
    trunk/irc/irssi/distinfo
    trunk/irc/irssi/files/patch-Makefile.in
    trunk/irc/irssi/files/patch-perl-Makefile
    trunk/irc/irssi/files/patch-src_core_network-openssl.c
    trunk/irc/irssi/pkg-plist

Removed Paths:
-------------
    trunk/irc/irssi/files/patch-configure

Modified: trunk/irc/irssi/Makefile
===================================================================
--- trunk/irc/irssi/Makefile	2018-04-08 20:08:18 UTC (rev 23175)
+++ trunk/irc/irssi/Makefile	2018-04-08 20:16:50 UTC (rev 23176)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	irssi
-PORTVERSION=	0.8.21
+PORTVERSION=	1.1.1
 PORTREVISION=	0
 CATEGORIES?=	irc
 MASTER_SITES=	https://github.com/irssi/irssi/releases/download/${PORTVERSION}/

Modified: trunk/irc/irssi/distinfo
===================================================================
--- trunk/irc/irssi/distinfo	2018-04-08 20:08:18 UTC (rev 23175)
+++ trunk/irc/irssi/distinfo	2018-04-08 20:16:50 UTC (rev 23176)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483807627
-SHA256 (irssi-0.8.21.tar.xz) = e433063b8714dcf17438126902c9a9d5c97944b3185ecd0fc5ae25c4959bf35a
-SIZE (irssi-0.8.21.tar.xz) = 1007524
+TIMESTAMP = 1523218241
+SHA256 (irssi-1.1.1.tar.xz) = 784807e7a1ba25212347f03e4287cff9d0659f076edfb2c6b20928021d75a1bf
+SIZE (irssi-1.1.1.tar.xz) = 1080992

Modified: trunk/irc/irssi/files/patch-Makefile.in
===================================================================
--- trunk/irc/irssi/files/patch-Makefile.in	2018-04-08 20:08:18 UTC (rev 23175)
+++ trunk/irc/irssi/files/patch-Makefile.in	2018-04-08 20:16:50 UTC (rev 23176)
@@ -1,22 +1,22 @@
---- Makefile.in.orig	2017-01-03 13:25:17 UTC
-+++ Makefile.in
-@@ -408,7 +408,7 @@ BUILT_SOURCES = default-config.h default
+--- 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 @@
  CLEANFILES = default-config.h default-theme.h
- SUBDIRS = src docs scripts
+ SUBDIRS = src tests docs scripts themes utils
  confdir = $(sysconfdir)
 -conf_DATA = irssi.conf
 +conf_DATA = irssi.conf.sample
- themedir = $(datadir)/irssi/themes
- theme_DATA = default.theme colorless.theme
  pkginclude_HEADERS = irssi-config.h irssi-version.h
-@@ -994,8 +994,8 @@ uninstall-am: uninstall-confDATA uninsta
+ EXTRA_DIST = \
+ 	ChangeLog \
+@@ -965,8 +965,8 @@
  
- @MAINTAINER_MODE_TRUE at .PHONY: irssi-version.h
+ #.PHONY: irssi-version.h
  
 -default-config.h: $(srcdir)/irssi.conf
--	$(srcdir)/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
+-	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h
 +default-config.h: $(srcdir)/irssi.conf.sample
-+	$(srcdir)/file2header.sh $(srcdir)/irssi.conf.sample default_config > default-config.h
++	$(srcdir)/utils/file2header.sh $(srcdir)/irssi.conf.sample default_config > default-config.h
  
- default-theme.h: $(srcdir)/default.theme
- 	$(srcdir)/file2header.sh $(srcdir)/default.theme default_theme > default-theme.h
+ default-theme.h: $(srcdir)/themes/default.theme
+ 	$(srcdir)/utils/file2header.sh $(srcdir)/themes/default.theme default_theme > default-theme.h

Deleted: trunk/irc/irssi/files/patch-configure
===================================================================
--- trunk/irc/irssi/files/patch-configure	2018-04-08 20:08:18 UTC (rev 23175)
+++ trunk/irc/irssi/files/patch-configure	2018-04-08 20:16:50 UTC (rev 23176)
@@ -1,19 +0,0 @@
---- configure.orig	2017-01-07 16:47:51 UTC
-+++ configure
-@@ -13849,12 +13849,12 @@ if test "${with_ncurses+set}" = set; the
- 
-     if $search_ncurses
-     then
--        if test -f $withval/include/ncurses.h
-+        if test -f $withval/include/ncurses/ncurses.h
- 	then
--	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found ncurses on $withval/include/ncurses.h" >&5
--$as_echo "Found ncurses on $withval/include/ncurses.h" >&6; }
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found ncurses on $withval/include/ncurses/ncurses.h" >&5
-+$as_echo "Found ncurses on $withval/include/ncurses/ncurses.h" >&6; }
- 
--	    CURSES_LIBS="-L$withval/lib -lncurses"
-+	    CURSES_LIBS="-L$withval/lib -lncurses -ltinfo"
- 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
- $as_echo_n "checking for initscr in -lncurses... " >&6; }
- if ${ac_cv_lib_ncurses_initscr+:} false; then :

Modified: trunk/irc/irssi/files/patch-perl-Makefile
===================================================================
--- trunk/irc/irssi/files/patch-perl-Makefile	2018-04-08 20:08:18 UTC (rev 23175)
+++ trunk/irc/irssi/files/patch-perl-Makefile	2018-04-08 20:16:50 UTC (rev 23176)
@@ -1,6 +1,6 @@
---- src/perl/Makefile.am.orig	2017-01-03 12:47:47 UTC
+--- src/perl/Makefile.am.orig	2017-03-04 20:30:38 UTC
 +++ src/perl/Makefile.am
-@@ -135,7 +135,7 @@ all-local:
+@@ -145,7 +145,7 @@ all-local:
  
  install-exec-local:
  	for dir in $(perl_dirs); do \
@@ -9,9 +9,9 @@
  	done
  
  clean-generic:
---- src/perl/Makefile.in.orig	2017-01-03 13:25:18 UTC
+--- src/perl/Makefile.in.orig	2017-03-10 16:43:21 UTC
 +++ src/perl/Makefile.in
-@@ -848,7 +848,7 @@ all-local:
+@@ -853,7 +853,7 @@ all-local:
  
  install-exec-local:
  	for dir in $(perl_dirs); do \

Modified: trunk/irc/irssi/files/patch-src_core_network-openssl.c
===================================================================
--- trunk/irc/irssi/files/patch-src_core_network-openssl.c	2018-04-08 20:08:18 UTC (rev 23175)
+++ trunk/irc/irssi/files/patch-src_core_network-openssl.c	2018-04-08 20:16:50 UTC (rev 23176)
@@ -1,6 +1,16 @@
---- src/core/network-openssl.c.orig	2017-01-03 12:47:47 UTC
+--- src/core/network-openssl.c.orig	2018-02-14 23:53:44 UTC
 +++ src/core/network-openssl.c
-@@ -486,6 +486,7 @@ static GIOChannel *irssi_ssl_get_iochann
+@@ -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");
  	}

Modified: trunk/irc/irssi/pkg-plist
===================================================================
--- trunk/irc/irssi/pkg-plist	2018-04-08 20:08:18 UTC (rev 23175)
+++ trunk/irc/irssi/pkg-plist	2018-04-08 20:16:50 UTC (rev 23176)
@@ -16,6 +16,7 @@
 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
@@ -27,6 +28,7 @@
 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
@@ -46,6 +48,8 @@
 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
@@ -59,6 +63,8 @@
 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
@@ -136,6 +142,7 @@
 %%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
@@ -214,11 +221,11 @@
 %%DATADIR%%/help/rmreconns
 %%DATADIR%%/help/rmrejoins
 %%DATADIR%%/help/save
-%%DATADIR%%/help/servlist
 %%DATADIR%%/help/sconnect
 %%DATADIR%%/help/script
 %%DATADIR%%/help/scrollback
 %%DATADIR%%/help/server
+%%DATADIR%%/help/servlist
 %%DATADIR%%/help/set
 %%DATADIR%%/help/silence
 %%DATADIR%%/help/squery

More information about the Midnightbsd-cvs mailing list