From ab57723dbdaa916cac6784ec391b570f2580ddf0 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 24 Nov 2002 13:40:47 +0000 Subject: Fetch patch for "/ME" for "xchat" site instead of duplication it in the package sources. --- chat/xchat/Makefile.common | 6 +++++- chat/xchat/distinfo | 5 +++-- chat/xchat/patches/patch-aa | 37 ------------------------------------- 3 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 chat/xchat/patches/patch-aa (limited to 'chat/xchat') diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common index da7e7fcd759..43645301024 100644 --- a/chat/xchat/Makefile.common +++ b/chat/xchat/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2002/11/24 13:20:45 tron Exp $ +# $NetBSD: Makefile.common,v 1.7 2002/11/24 13:40:47 tron Exp $ DISTNAME= xchat-1.8.10 PKGREVISION= 1 @@ -10,6 +10,10 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://xchat.org/ COMMENT= X11 (X Window System) IRC client, using the GTK+ toolkit +PATCH_SITES= ${HOMEPAGE}files/source/1.8/patches/ +PATCHFILES= xc1810fixme3.diff +PATCH_DIST_STRIP= -p1 + DISTINFO_FILE= ${.CURDIR}/../xchat/distinfo FILESDIR= ${.CURDIR}/../xchat/files PATCHDIR= ${.CURDIR}/../xchat/patches diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo index d97947a1d2b..354931b1bd5 100644 --- a/chat/xchat/distinfo +++ b/chat/xchat/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.17 2002/11/24 13:20:45 tron Exp $ +$NetBSD: distinfo,v 1.18 2002/11/24 13:40:47 tron Exp $ SHA1 (xchat-1.8.10.tar.bz2) = 10c85bd23faa58f2f962eec6a96364e9743ac91c Size (xchat-1.8.10.tar.bz2) = 824407 bytes -SHA1 (patch-aa) = 0d2082f5f9f15f403b75e07a4f91c97bfb785c30 +SHA1 (xc1810fixme3.diff) = de114fe9eaa0e53dab8023c9d11a44583eae9170 +Size (xc1810fixme3.diff) = 1025 bytes SHA1 (patch-ac) = 10dce1c565b8d95fd6b4941ddb1fbf7bb82e52ed SHA1 (patch-ad) = 7453ab165db9c166dae6221f80884de8de7511a7 SHA1 (patch-ae) = baee878728bb33317258e43919ccabfcf3fd2f4a diff --git a/chat/xchat/patches/patch-aa b/chat/xchat/patches/patch-aa deleted file mode 100644 index bf5f1fcfd91..00000000000 --- a/chat/xchat/patches/patch-aa +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2002/11/24 13:20:45 tron Exp $ - ---- src/common/inbound.c.orig Wed Aug 7 12:15:59 2002 -+++ src/common/inbound.c -@@ -243,19 +243,21 @@ channel_action (session *sess, char *tbu - if (EMIT_SIGNAL (XP_CHANACTION, sess, chan, from, text, NULL, fromme) == 1) - return; - -- if (is_channel (serv, chan) || fromme) -+ if (!fromme) - { -- sess = find_channel (chan, serv); -- if (!fromme && sess) -- if (fe_is_beep (sess) || prefs.beepchans) -+ if (is_channel (serv, chan)) -+ { -+ sess = find_channel (chan, serv); -+ if (sess) -+ if (fe_is_beep (sess) || prefs.beepchans) -+ fe_beep (); -+ } else -+ { -+ /* it's a private action! */ -+ sess = find_dialog (serv, from); -+ if (((sess) && fe_is_beep (sess)) || prefs.beepmsg) - fe_beep (); -- } -- else -- { -- /* it's a private action! */ -- sess = find_dialog (serv, from); -- if (((sess) && fe_is_beep (sess)) || prefs.beepmsg) -- fe_beep (); -+ } - } - - if (!sess && !is_channel (serv, chan) && prefs.autodialog) -- cgit v1.2.3