3 files changed, 8 insertions, 54 deletions
diff --git a/source/n/irssi/irssi.SlackBuild b/source/n/irssi/irssi.SlackBuild
index 59be8b1e9..067db1564 100755
--- a/source/n/irssi/irssi.SlackBuild
+++ b/source/n/irssi/irssi.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,14 +25,14 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-irssi
 
-VERSION=0.8.15
-DIRCD=0.8.15
-BUILD=${BUILD:-7}
+VERSION=0.8.19
+DIRCD=0.8.19
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -41,8 +41,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -59,7 +59,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf irssi-$VERSION
-tar xvf $CWD/irssi-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/irssi-$VERSION.tar.xz || exit 1
 cd irssi-$DIRCD
 
 chown -R root:root .
@@ -69,12 +69,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Fix an error in the manual page:
-zcat $CWD/irssi.manpage_fix.diff.gz | patch -p1 --verbose || exit 1
-
-# Fix an SSL proxy bug in 0.8.15:
-zcat $CWD/irssi.ssl_proxy.diff.gz | patch -p1 --verbose || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/source/n/irssi/irssi.manpage_fix.diff b/source/n/irssi/irssi.manpage_fix.diff
deleted file mode 100644
index 2219652df..000000000
--- a/source/n/irssi/irssi.manpage_fix.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Gerfried Fuchs <rhonda@debian.at>	vim:ft=diff:
-Description: Fix the hyphens in the synopsis
-
-Index: irssi-0.8.14/docs/irssi.1
-===================================================================
---- irssi-0.8.14.orig/docs/irssi.1
-+++ irssi-0.8.14/docs/irssi.1
-@@ -3,7 +3,7 @@
- Irssi \- a modular IRC client for UNIX
- .SH SYNOPSIS
- .B irssi
--[-dv!?] [-c server] [-p port] [-n nickname] [-w password] [-h hostname]
-+[\-dv!?] [\-c server] [\-p port] [\-n nickname] [\-w password] [\-h hostname]
- .SH DESCRIPTION
- .B Irssi
- is a modular Internet Relay Chat client. It is highly extensible and
diff --git a/source/n/irssi/irssi.ssl_proxy.diff b/source/n/irssi/irssi.ssl_proxy.diff
deleted file mode 100644
index 401e07173..000000000
--- a/source/n/irssi/irssi.ssl_proxy.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: irssi-0.8.14/src/core/servers.c
-===================================================================
---- irssi-0.8.14.orig/src/core/servers.c
-+++ irssi-0.8.14/src/core/servers.c
-@@ -209,6 +209,7 @@
- 	char *errmsg2;
- 	char ipaddr[MAX_IP_LEN];
-         int port;
-+        char *hostname;
- 
- 	g_return_if_fail(ip != NULL || unix_socket != NULL);
- 
-@@ -223,8 +224,10 @@
- 			 server->connrec->own_ip4);
- 		port = server->connrec->proxy != NULL ?
- 			server->connrec->proxy_port : server->connrec->port;
-+		hostname = server->connrec->proxy != NULL ?
-+			server->connrec->proxy : server->connrec->address;
- 		handle = server->connrec->use_ssl ?
--			net_connect_ip_ssl(ip, port, server->connrec->address, own_ip, server->connrec->ssl_cert, server->connrec->ssl_pkey,
-+			net_connect_ip_ssl(ip, port, hostname, own_ip, server->connrec->ssl_cert, server->connrec->ssl_pkey,
- server->connrec->ssl_cafile, server->connrec->ssl_capath, server->connrec->ssl_verify) :
- 			net_connect_ip(ip, port, own_ip);
- 	} else {