From 985152770ccfd3d322c70fc449de3d5670a08c50 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 19 May 2010 15:04:28 +0000
Subject: [PATCH] update to 0.18.5 from Simon Kuhnle, ok viq (maintainer)

---
 net/irssi/Makefile                               |  5 ++---
 net/irssi/distinfo                               | 10 +++++-----
 .../patches/patch-src_core_network-openssl_c     | 16 ++++++++--------
 .../patches/patch-src_fe-common_core_Makefile_in |  8 ++++----
 net/irssi/patches/patch-src_perl_Makefile_in     |  8 ++++----
 5 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/net/irssi/Makefile b/net/irssi/Makefile
index 49a902521a2..ee92fddb8d0 100644
--- a/net/irssi/Makefile
+++ b/net/irssi/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.43 2009/10/11 15:23:51 okan Exp $
+# $OpenBSD: Makefile,v 1.44 2010/05/19 15:04:28 sthen Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	modular IRC client with many features (ipv6,socks,proxy)
 
-DISTNAME=	irssi-0.8.14
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	irssi-0.8.15
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.irssi.org/
diff --git a/net/irssi/distinfo b/net/irssi/distinfo
index cff30817c6d..aef643843a2 100644
--- a/net/irssi/distinfo
+++ b/net/irssi/distinfo
@@ -1,5 +1,5 @@
-MD5 (irssi-0.8.14.tar.gz) = fZQ39TIJphr0/kycVSj/pw==
-RMD160 (irssi-0.8.14.tar.gz) = MDaiJJ+gBumMjrMSEZiICPXB1DM=
-SHA1 (irssi-0.8.14.tar.gz) = EhxD9KLgBK2cB19+Y/8flXka1cU=
-SHA256 (irssi-0.8.14.tar.gz) = Mo03li7zupGiCm+INLFSsmfWkbiW4KA0cfBpefYm7QI=
-SIZE (irssi-0.8.14.tar.gz) = 1356130
+MD5 (irssi-0.8.15.tar.gz) = hw244xn2QMK/RGww0MJO9g==
+RMD160 (irssi-0.8.15.tar.gz) = 3U7IDntAxNESGxid+4UZ4urevU4=
+SHA1 (irssi-0.8.15.tar.gz) = t83L0DmfrG4d0U1WBMQ1o9Lj6xg=
+SHA256 (irssi-0.8.15.tar.gz) = wVlXzYmMxx7q44m1pxBVaTuVeUZn5jfaMydVNmHkxt4=
+SIZE (irssi-0.8.15.tar.gz) = 1298691
diff --git a/net/irssi/patches/patch-src_core_network-openssl_c b/net/irssi/patches/patch-src_core_network-openssl_c
index 25789feb1e5..2ac4e7c8402 100644
--- a/net/irssi/patches/patch-src_core_network-openssl_c
+++ b/net/irssi/patches/patch-src_core_network-openssl_c
@@ -1,16 +1,16 @@
-$OpenBSD: patch-src_core_network-openssl_c,v 1.2 2009/05/23 17:47:01 martynas Exp $
---- src/core/network-openssl.c.orig	Tue Mar 31 22:50:02 2009
-+++ src/core/network-openssl.c	Sun Apr  5 01:25:29 2009
-@@ -41,6 +41,8 @@ typedef struct
- 	unsigned int verify:1;
+$OpenBSD: patch-src_core_network-openssl_c,v 1.3 2010/05/19 15:04:28 sthen Exp $
+--- src/core/network-openssl.c.orig	Sat Apr  3 18:19:38 2010
++++ src/core/network-openssl.c	Sun Apr  4 16:34:00 2010
+@@ -43,6 +43,8 @@ typedef struct
+ 	const char *hostname;
  } GIOSSLChannel;
  
 +void irssi_redraw(void);
 +
- static SSL_CTX *ssl_ctx = NULL;
+ static int ssl_inited = FALSE;
  
  static void irssi_ssl_free(GIOChannel *handle)
-@@ -225,6 +227,17 @@ static GIOFuncs irssi_ssl_channel_funcs = {
+@@ -374,6 +376,17 @@ static GIOFuncs irssi_ssl_channel_funcs = {
      irssi_ssl_get_flags
  };
  
@@ -28,7 +28,7 @@ $OpenBSD: patch-src_core_network-openssl_c,v 1.2 2009/05/23 17:47:01 martynas Ex
  static gboolean irssi_ssl_init(void)
  {
  	SSL_library_init();
-@@ -266,6 +279,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel 
+@@ -412,6 +425,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel 
  		scert = convert_home(mycert);
  		if (mypkey && *mypkey)
  			spkey = convert_home(mypkey);
diff --git a/net/irssi/patches/patch-src_fe-common_core_Makefile_in b/net/irssi/patches/patch-src_fe-common_core_Makefile_in
index 1f3ca612690..2631e0f996e 100644
--- a/net/irssi/patches/patch-src_fe-common_core_Makefile_in
+++ b/net/irssi/patches/patch-src_fe-common_core_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.4 2009/05/23 17:47:01 martynas Exp $
---- src/fe-common/core/Makefile.in.orig	Tue Mar 31 23:02:13 2009
-+++ src/fe-common/core/Makefile.in	Sun Apr  5 01:22:16 2009
-@@ -235,7 +235,7 @@ INCLUDES = \
+$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.5 2010/05/19 15:04:28 sthen Exp $
+--- src/fe-common/core/Makefile.in.orig	Sat Apr  3 18:21:28 2010
++++ src/fe-common/core/Makefile.in	Sun Apr  4 16:31:38 2010
+@@ -258,7 +258,7 @@ INCLUDES = \
  	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
  	$(GLIB_CFLAGS) \
  	-DHELPDIR=\""$(datadir)/irssi/help"\" \
diff --git a/net/irssi/patches/patch-src_perl_Makefile_in b/net/irssi/patches/patch-src_perl_Makefile_in
index 1527de0bb1a..76e7867de2b 100644
--- a/net/irssi/patches/patch-src_perl_Makefile_in
+++ b/net/irssi/patches/patch-src_perl_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_perl_Makefile_in,v 1.4 2009/05/23 17:47:01 martynas Exp $
---- src/perl/Makefile.in.orig	Tue Mar 31 23:02:14 2009
-+++ src/perl/Makefile.in	Sun Apr  5 01:22:16 2009
-@@ -252,7 +252,7 @@ INCLUDES = \
+$OpenBSD: patch-src_perl_Makefile_in,v 1.5 2010/05/19 15:04:28 sthen Exp $
+--- src/perl/Makefile.in.orig	Sat Apr  3 18:21:29 2010
++++ src/perl/Makefile.in	Sun Apr  4 16:31:38 2010
+@@ -275,7 +275,7 @@ INCLUDES = \
  	-I$(top_srcdir)/src/core \
  	-I$(top_srcdir)/src/fe-common/core \
  	$(GLIB_CFLAGS) \