From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 10 22:10:01 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1ADC16A41A for ; Wed, 10 Oct 2007 22:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9B93613C458 for ; Wed, 10 Oct 2007 22:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l9AMA18H070595 for ; Wed, 10 Oct 2007 22:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l9AMA1Ys070594; Wed, 10 Oct 2007 22:10:01 GMT (envelope-from gnats) Resent-Date: Wed, 10 Oct 2007 22:10:01 GMT Resent-Message-Id: <200710102210.l9AMA1Ys070594@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andris Raugulis Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED59316A419 for ; Wed, 10 Oct 2007 22:00:52 +0000 (UTC) (envelope-from ar@null.lv) Received: from mail.null.lv (238-99.btv.lv [217.198.238.99]) by mx1.freebsd.org (Postfix) with ESMTP id 5F69013C459 for ; Wed, 10 Oct 2007 22:00:51 +0000 (UTC) (envelope-from ar@null.lv) Received: by mail.viss.lv (Postfix, from userid 2907) id 5860978C3D; Thu, 11 Oct 2007 01:02:36 +0300 (EEST) Message-Id: <20071010220236.GA908@felikss.viss.lv> Date: Thu, 11 Oct 2007 01:02:36 +0300 From: Andris Raugulis To: FreeBSD-gnats-submit@FreeBSD.org Cc: vanilla@FreeBSD.org Subject: ports/117087: [PATCH] irc/irssi: update to 0.8.12 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Oct 2007 22:10:01 -0000 >Number: 117087 >Category: ports >Synopsis: [PATCH] irc/irssi: update to 0.8.12 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Oct 10 22:10:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Andris Raugulis >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: >Description: - Update to 0.8.12 CC'ed to port maintainer (vanilla@FreeBSD.org). >How-To-Repeat: >Fix: --- freebsd.ports.irc.irssi-0.8.11_1.to.irc.irssi-0.8.12.patch begins here --- diff -ruN irssi.original/Makefile irssi/Makefile --- irssi.original/Makefile 2007-10-10 22:48:09.000000000 +0300 +++ irssi/Makefile 2007-10-11 00:45:03.000000000 +0300 @@ -6,8 +6,7 @@ # PORTNAME= irssi -PORTVERSION= 0.8.11 -PORTREVISION?= 1 +PORTVERSION= 0.8.12 CATEGORIES?= irc MASTER_SITES= http://mirror.irssi.org/ @@ -19,7 +18,7 @@ USE_BZIP2= yes USE_GNOME= glib20 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-module +USE_GMAKE= yes WANT_PERL= yes MAN1= irssi.1 @@ -42,7 +41,7 @@ # Process options. -.if defined(WITH_PERL) +.if !defined(WITHOUT_PERL) USE_PERL5= yes CONFIGURE_ARGS+= --with-perl-lib=site PLIST_SUB+= WITH_PERL="" @@ -62,7 +61,7 @@ CONFIGURE_ARGS+= --with-socks .endif -.if defined(WITH_IPV6) +.if !defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --enable-ipv6 CATEGORIES+= ipv6 .endif diff -ruN irssi.original/distinfo irssi/distinfo --- irssi.original/distinfo 2007-10-10 22:48:09.000000000 +0300 +++ irssi/distinfo 2007-10-10 22:49:37.000000000 +0300 @@ -1,3 +1,3 @@ -MD5 (irssi-0.8.11.tar.bz2) = b62417fb3dba9e36eaebea0410a67cd3 -SHA256 (irssi-0.8.11.tar.bz2) = 425cf24f13bfda05c6a468523cd2874d05675ea1bc4e37a8c284f2f78c2dd6b2 -SIZE (irssi-0.8.11.tar.bz2) = 933075 +MD5 (irssi-0.8.12.tar.bz2) = e407b557b3cfc7c91ce4de2571dd79cb +SHA256 (irssi-0.8.12.tar.bz2) = 462d634bb509cc2bdd550ee5c7b269495f3173721b7404f162ad1f69b49bfff0 +SIZE (irssi-0.8.12.tar.bz2) = 935918 diff -ruN irssi.original/files/patch-aa irssi/files/patch-aa --- irssi.original/files/patch-aa 2007-10-10 22:48:09.000000000 +0300 +++ irssi/files/patch-aa 1970-01-01 03:00:00.000000000 +0300 @@ -1,20 +0,0 @@ ---- src/irc/core/irc.c.orig Fri Oct 10 17:30:03 2003 -+++ src/irc/core/irc.c Sat Dec 27 22:20:56 2003 -@@ -108,9 +108,14 @@ - int send_now; - - g_get_current_time(&now); -- send_now = g_timeval_cmp(&now, &server->wait_cmd) >= 0 && -- (server->cmdcount < server->max_cmds_at_once || -- server->cmd_queue_speed <= 0); -+ -+ if (getenv("IRSSI_NOTHROTTLE")) { -+ send_now = TRUE; -+ } else { -+ send_now = g_timeval_cmp(&now, &server->wait_cmd) >= 0 && -+ (server->cmdcount < server->max_cmds_at_once || -+ server->cmd_queue_speed <= 0); -+ } - - irc_send_cmd_full(server, cmd, send_now, FALSE, FALSE); - } diff -ruN irssi.original/files/patch-src-core-log.c irssi/files/patch-src-core-log.c --- irssi.original/files/patch-src-core-log.c 2007-10-10 22:48:09.000000000 +0300 +++ irssi/files/patch-src-core-log.c 1970-01-01 03:00:00.000000000 +0300 @@ -1,15 +0,0 @@ -Index: src/core/log.c -=================================================================== ---- src/core/log.c (revision 4490) -+++ src/core/log.c (revision 4491) -@@ -299,9 +299,7 @@ - if ((level & rec->level) == 0) - continue; - -- if (item == NULL) { -- if (rec->temp == 0) log_write_rec(rec, str, level); -- } else if (rec->items == NULL) -+ if (rec->items == NULL) - fallbacks = g_slist_append(fallbacks, rec); - else if (log_item_find(rec, LOG_ITEM_TARGET, item, - server_tag) != NULL) diff -ruN irssi.original/pkg-plist irssi/pkg-plist --- irssi.original/pkg-plist 2007-10-10 22:48:09.000000000 +0300 +++ irssi/pkg-plist 2007-10-11 00:21:31.000000000 +0300 @@ -70,7 +70,6 @@ include/irssi/src/fe-common/core/printtext.h include/irssi/src/fe-common/core/themes.h include/irssi/src/fe-common/core/translation.h -include/irssi/src/fe-common/core/utf8.h include/irssi/src/fe-common/core/window-activity.h include/irssi/src/fe-common/core/window-items.h include/irssi/src/fe-common/core/windows-layout.h @@ -150,6 +149,7 @@ %%DOCSDIR%%/signals.txt %%DOCSDIR%%/special_vars.txt %%DOCSDIR%%/startup-HOWTO.html +%%DATADIR%%/help/accept %%DATADIR%%/help/action %%DATADIR%%/help/admin %%DATADIR%%/help/alias @@ -258,8 +258,8 @@ %%DATADIR%%/help/unsilence %%DATADIR%%/help/upgrade %%DATADIR%%/help/uping -%%DATADIR%%/help/ver %%DATADIR%%/help/userhost +%%DATADIR%%/help/ver %%DATADIR%%/help/version %%DATADIR%%/help/voice %%DATADIR%%/help/wait @@ -294,13 +294,13 @@ %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Irssi -@dirrm lib/irssi/modules -@dirrm lib/irssi -@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/themes @dirrm %%DATADIR%%/scripts @dirrm %%DATADIR%%/help @dirrm %%DATADIR%% +@dirrm %%DOCSDIR%% +@dirrm lib/irssi/modules +@dirrm lib/irssi @dirrm include/irssi/src/lib-popt @dirrm include/irssi/src/lib-config @dirrm include/irssi/src/irc/notifylist --- freebsd.ports.irc.irssi-0.8.11_1.to.irc.irssi-0.8.12.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: