Update irssi-icb to version 0.15. Requested during the freeze by agc, as the version number accidentally went backwards in the last irssi update. This release mainly incorporates most of the pkgsrc patches into the upstream tarball, so the only real change of note is that /beep output has been fixed.diff -r1.37 -r1.38 pkgsrc/chat/irssi-icb/Makefile
(jperkin)
@@ -1,22 +1,22 @@ | @@ -1,22 +1,22 @@ | |||
1 | # $NetBSD: Makefile,v 1.37 2014/06/07 23:49:47 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.38 2014/09/30 08:59:58 jperkin Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= irssi-icb-0.14 | 4 | DISTNAME= irssi-icb-0.15 | |
5 | CATEGORIES= chat | 5 | CATEGORIES= chat | |
6 | MASTER_SITES= http://www.irssi.org/files/plugins/icb/ | 6 | MASTER_SITES= https://github.com/downloads/jperkin/irssi-icb/ | |
7 | DISTFILES= ${DISTNAME}.tar.gz ${IRSSI_DISTFILE} | 7 | DISTFILES= ${DISTNAME}.tar.gz ${IRSSI_DISTFILE} | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= jperkin@joyent.com | |
10 | HOMEPAGE= http://www.irssi.org/ | 10 | HOMEPAGE= http://www.irssi.org/ | |
11 | COMMENT= Irssi plugin to access ICB networks | 11 | COMMENT= Irssi plugin to access ICB networks | |
12 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
13 | 13 | |||
14 | .include "../../mk/bsd.prefs.mk" | 14 | .include "../../mk/bsd.prefs.mk" | |
15 | .include "../../chat/irssi/Makefile.common" | 15 | .include "../../chat/irssi/Makefile.common" | |
16 | 16 | |||
17 | WRKSRC= ${WRKDIR}/${IRSSI_DISTNAME}/${DISTNAME} | 17 | WRKSRC= ${WRKDIR}/${IRSSI_DISTNAME}/${DISTNAME} | |
18 | 18 | |||
19 | DEPENDS+= irssi>=${IRSSI_VERSION}:../../chat/irssi | 19 | DEPENDS+= irssi>=${IRSSI_VERSION}:../../chat/irssi | |
20 | 20 | |||
21 | GNU_CONFIGURE= yes | 21 | GNU_CONFIGURE= yes | |
22 | 22 |
@@ -1,21 +1,12 @@ | @@ -1,21 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.19 2014/06/07 23:49:47 ryoon Exp $ | 1 | $NetBSD: distinfo,v 1.20 2014/09/30 08:59:58 jperkin Exp $ | |
2 | 2 | |||
3 | SHA1 (irssi-0.8.16.tar.bz2) = 631dd70b6d3872c5f81c1a46a6872fef5bd65ffb | 3 | SHA1 (irssi-0.8.16.tar.bz2) = 631dd70b6d3872c5f81c1a46a6872fef5bd65ffb | |
4 | RMD160 (irssi-0.8.16.tar.bz2) = 2d4caefc9d713b0ff4b26ceaa63430f1bb346caa | 4 | RMD160 (irssi-0.8.16.tar.bz2) = 2d4caefc9d713b0ff4b26ceaa63430f1bb346caa | |
5 | Size (irssi-0.8.16.tar.bz2) = 986129 bytes | 5 | Size (irssi-0.8.16.tar.bz2) = 986129 bytes | |
6 | SHA1 (irssi-icb-0.14.tar.gz) = 31d7a5d04a896e0e19db44b4d76b7ac85af1a5d4 | 6 | SHA1 (irssi-icb-0.15.tar.gz) = c5a739960eb98e6686a94f6d4662cfab5a95d447 | |
7 | RMD160 (irssi-icb-0.14.tar.gz) = dd104925ece6eabd0112b86b9eb6898846ba8f52 | 7 | RMD160 (irssi-icb-0.15.tar.gz) = b947a341e1fc2f6d42bee3cb7b738bfdbb0a031d | |
8 | Size (irssi-icb-0.14.tar.gz) = 172647 bytes | 8 | Size (irssi-icb-0.15.tar.gz) = 306973 bytes | |
9 | SHA1 (patch-aa) = b94bae58a59f4d96a107ad123a6abe7ac0ca375a | 9 | SHA1 (patch-am) = 3bd9e38d0fde6d99d9b6a6ad67268bd63a8a92e2 | |
10 | SHA1 (patch-ab) = 6ca4512785b91e7a05cccd8806dbcab969e91cca | 10 | SHA1 (patch-an) = bca7fff754b60b49a6322bd5595a4a7f4003a828 | |
11 | SHA1 (patch-ac) = 68409b392f3212a8da9a79c2dfcc4dc265504d98 | 11 | SHA1 (patch-src_core_Makefile.in) = d052d78b4f084da51498f1df934ca16412b8e5a0 | |
12 | SHA1 (patch-ad) = f5cf3b9294a1a8a450f8c380ff41bbaafd425337 | 12 | SHA1 (patch-src_fe-common_module-formats.c) = 5af701e6919051c834c52e6932e0028324362b9f | |
13 | SHA1 (patch-ae) = ee3ed714e2f1d136562b87cfd82bc4b58b7d80df | |||
14 | SHA1 (patch-af) = 169f32783892241133df73b25817c562531c69c9 | |||
15 | SHA1 (patch-ag) = 2823b763c76c37e4f382cc09456cccb56f1007fc | |||
16 | SHA1 (patch-ah) = 097bab1ebd959372a0266fa5d9a99c78c3a2c1fe | |||
17 | SHA1 (patch-ai) = 42ce6c309957c3e46c638e2599b932b6ea4065ee | |||
18 | SHA1 (patch-aj) = 3a46a61b0bd5763f78e85d6a0bff1d1223e8da39 | |||
19 | SHA1 (patch-al) = 2a190b803f00beb83c123bc3416e23ec7c7edc69 | |||
20 | SHA1 (patch-am) = 832aa40a84afbfff303e6080bf420ca2ceec289f | |||
21 | SHA1 (patch-an) = 0a936cbdb49f9a1bf65d5e92da5d37de65238d27 |
@@ -1,14 +1,16 @@ | @@ -1,14 +1,16 @@ | |||
1 | $NetBSD: patch-am,v 1.1 2010/08/10 20:26:36 sketch Exp $ | 1 | $NetBSD: patch-am,v 1.2 2014/09/30 08:59:58 jperkin Exp $ | |
2 | ||||
3 | Support nicklists. | |||
2 | 4 | |||
3 | --- /dev/null 2009-11-03 03:54:19.098165668 +0100 | 5 | --- /dev/null 2009-11-03 03:54:19.098165668 +0100 | |
4 | +++ src/core/icb-nicklist.c 2010-05-21 13:03:14.227283420 +0200 | 6 | +++ src/core/icb-nicklist.c 2010-05-21 13:03:14.227283420 +0200 | |
5 | @@ -0,0 +1,44 @@ | 7 | @@ -0,0 +1,44 @@ | |
6 | +/* | 8 | +/* | |
7 | + icb-nicklist.c : irssi | 9 | + icb-nicklist.c : irssi | |
8 | + | 10 | + | |
9 | + Copyright (C) 2010 Jonathan Perkin | 11 | + Copyright (C) 2010 Jonathan Perkin | |
10 | + | 12 | + | |
11 | + This program is free software; you can redistribute it and/or modify | 13 | + This program is free software; you can redistribute it and/or modify | |
12 | + it under the terms of the GNU General Public License as published by | 14 | + it under the terms of the GNU General Public License as published by | |
13 | + the Free Software Foundation; either version 2 of the License, or | 15 | + the Free Software Foundation; either version 2 of the License, or | |
14 | + (at your option) any later version. | 16 | + (at your option) any later version. |
@@ -1,14 +1,16 @@ | @@ -1,14 +1,16 @@ | |||
1 | $NetBSD: patch-an,v 1.1 2010/08/10 20:26:36 sketch Exp $ | 1 | $NetBSD: patch-an,v 1.2 2014/09/30 08:59:58 jperkin Exp $ | |
2 | ||||
3 | Support nicklists. | |||
2 | 4 | |||
3 | --- /dev/null 2009-11-03 03:54:19.098165668 +0100 | 5 | --- /dev/null 2009-11-03 03:54:19.098165668 +0100 | |
4 | +++ src/core/icb-nicklist.h 2010-05-21 13:03:14.236221682 +0200 | 6 | +++ src/core/icb-nicklist.h 2010-05-21 13:03:14.236221682 +0200 | |
5 | @@ -0,0 +1,33 @@ | 7 | @@ -0,0 +1,33 @@ | |
6 | +/* | 8 | +/* | |
7 | + icb-nicklist.h : irssi | 9 | + icb-nicklist.h : irssi | |
8 | + | 10 | + | |
9 | + Copyright (C) 2010 Jonathan Perkin | 11 | + Copyright (C) 2010 Jonathan Perkin | |
10 | + | 12 | + | |
11 | + This program is free software; you can redistribute it and/or modify | 13 | + This program is free software; you can redistribute it and/or modify | |
12 | + it under the terms of the GNU General Public License as published by | 14 | + it under the terms of the GNU General Public License as published by | |
13 | + the Free Software Foundation; either version 2 of the License, or | 15 | + the Free Software Foundation; either version 2 of the License, or | |
14 | + (at your option) any later version. | 16 | + (at your option) any later version. |
$NetBSD: patch-src_core_Makefile.in,v 1.1 2014/09/30 08:59:58 jperkin Exp $
Add nicklist files.
--- src/core/Makefile.in.orig 2011-06-13 23:18:30.000000000 +0000
+++ src/core/Makefile.in
@@ -72,7 +72,7 @@ LTLIBRARIES = $(module_LTLIBRARIES)
libicb_core_la_LIBADD =
am_libicb_core_la_OBJECTS = icb-channels.lo icb-commands.lo \
icb-core.lo icb-queries.lo icb-servers-reconnect.lo \
- icb-protocol.lo icb-servers.lo icb-session.lo
+ icb-nicklist.lo icb-protocol.lo icb-servers.lo icb-session.lo
libicb_core_la_OBJECTS = $(am_libicb_core_la_OBJECTS)
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -246,6 +246,7 @@ libicb_core_la_SOURCES = \
icb-core.c \
icb-queries.c \
icb-servers-reconnect.c \
+ icb-nicklist.c \
icb-protocol.c \
icb-servers.c \
icb-session.c
@@ -254,6 +255,7 @@ noinst_HEADERS = \
icb.h \
icb-channels.h \
icb-commands.h \
+ icb-nicklist.h \
icb-protocol.h \
icb-queries.h \
icb-servers.h \
@@ -336,6 +338,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb-channels.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb-commands.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb-nicklist.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb-protocol.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb-queries.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icb-servers-reconnect.Plo@am__quote@
$NetBSD: patch-src_fe-common_module-formats.c,v 1.1 2014/09/30 08:59:58 jperkin Exp $
Fix /beep output.
--- src/fe-common/module-formats.c.orig 2011-06-13 18:10:41.000000000 +0000
+++ src/fe-common/module-formats.c
@@ -30,7 +30,7 @@ FORMAT_REC fecommon_icb_formats[] = {
{ "status", "[$0] $1", 2, { 0, 0 } },
{ "important", "[$0!] $1", 2, { 0, 0 } },
{ "status", "{error [Error]} $0", 1, { 0 } },
- { "beep", "[Beep] $1 beeps you", 1, { 0 } },
+ { "beep", "[Beep] $0 beeps you", 1, { 0 } },
{ NULL, NULL, 0 }
};