summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2007-10-28 13:06:30 +0000
committeradrianp <adrianp@pkgsrc.org>2007-10-28 13:06:30 +0000
commit43315eb9b7731b856752baccfe157ab69e25131e (patch)
treeeab02582ab69da2655bbb61f4815cd31f14c168c
parentaae088df957817bc47ab02d881c3aa28479d3f62 (diff)
downloadpkgsrc-43315eb9b7731b856752baccfe157ab69e25131e.tar.gz
Backport a patch from irssi SVN which unbreaks irssi-icb
-rw-r--r--chat/irssi-icb/Makefile4
-rw-r--r--chat/irssi/Makefile3
-rw-r--r--chat/irssi/distinfo3
-rw-r--r--chat/irssi/patches/patch-ac13
4 files changed, 19 insertions, 4 deletions
diff --git a/chat/irssi-icb/Makefile b/chat/irssi-icb/Makefile
index 233a9bf56ff..7e9dc9af7c8 100644
--- a/chat/irssi-icb/Makefile
+++ b/chat/irssi-icb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2007/10/16 05:38:17 bjs Exp $
+# $NetBSD: Makefile,v 1.24 2007/10/28 13:06:30 adrianp Exp $
#
DISTNAME= irssi-icb-0.14
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= chat
MASTER_SITES= http://www.irssi.org/files/plugins/icb/
DISTFILES= ${DISTNAME}.tar.gz ${IRSSI_DISTFILE}
diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile
index 3ac2f56c986..81ba7f025e7 100644
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2007/02/22 19:26:12 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2007/10/28 13:06:30 adrianp Exp $
DISTNAME= ${IRSSI_DISTNAME}
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= http://www.irssi.org/files/
EXTRACT_SUFX= ${IRSSI_EXTRACT_SUFX}
diff --git a/chat/irssi/distinfo b/chat/irssi/distinfo
index cd2ac68600e..1da9c986633 100644
--- a/chat/irssi/distinfo
+++ b/chat/irssi/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.26 2007/10/13 16:27:14 adrianp Exp $
+$NetBSD: distinfo,v 1.27 2007/10/28 13:06:30 adrianp Exp $
SHA1 (irssi-0.8.12.tar.bz2) = 00ecca04766c51feef057b2327f67166be473fa3
RMD160 (irssi-0.8.12.tar.bz2) = 0588e6c2df0425c4f36bd84c1621d9ad170b6a81
Size (irssi-0.8.12.tar.bz2) = 935918 bytes
SHA1 (patch-aa) = 3333b23ae2b2c3f8f3ef246502badf1b263103c6
SHA1 (patch-ab) = 287fd013349b3b6761d08f69ff8aeb8820d65b8c
+SHA1 (patch-ac) = c1bb6ae10be8b52a844f3d7c1c725cd4cc6db246
SHA1 (patch-ae) = 975777ae62374aa50ad76e83ed857927e8f3cbe8
SHA1 (patch-af) = 47b399f9549ef9772f40bd5e7d27344bffe1cebe
SHA1 (patch-ag) = 4716b80fa1db0edb3e68b527396fcce03de06f47
diff --git a/chat/irssi/patches/patch-ac b/chat/irssi/patches/patch-ac
new file mode 100644
index 00000000000..3ed8059cc7d
--- /dev/null
+++ b/chat/irssi/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.8 2007/10/28 13:06:30 adrianp Exp $
+
+--- src/fe-common/irc/fe-irc-messages.c.orig 2007-10-06 10:40:39.000000000 +0100
++++ src/fe-common/irc/fe-irc-messages.c
+@@ -44,7 +44,7 @@ static const char *skip_target(IRC_SERVE
+ const char *val, *chars;
+
+ /* Quick check */
+- if (server->prefix[(int)(unsigned char)*target] == 0)
++ if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
+ return target;
+
+ /* Hack: for bahamut 1.4 which sends neither STATUSMSG nor