aboutsummaryrefslogtreecommitdiffstats
path: root/chinese
diff options
context:
space:
mode:
Diffstat (limited to 'chinese')
-rw-r--r--chinese/irssi/Makefile1
-rw-r--r--chinese/irssi/files/patch-irssi.conf8
2 files changed, 5 insertions, 4 deletions
diff --git a/chinese/irssi/Makefile b/chinese/irssi/Makefile
index 3ef75f60c2f5..f71800ac419d 100644
--- a/chinese/irssi/Makefile
+++ b/chinese/irssi/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= chinese
MAINTAINER= vanilla@FreeBSD.org
COMMENT= A zh-tw cursor movement friendly, wrapping clean irssi
+CONFLICTS?= irssi-*
MASTERDIR= ${.CURDIR}/../../irc/irssi
EXTRA_PATCHES= ${.CURDIR}/files/patch-irssi.conf \
diff --git a/chinese/irssi/files/patch-irssi.conf b/chinese/irssi/files/patch-irssi.conf
index b0175770ce30..9819edda94ed 100644
--- a/chinese/irssi/files/patch-irssi.conf
+++ b/chinese/irssi/files/patch-irssi.conf
@@ -1,9 +1,9 @@
---- irssi.conf.orig 2009-04-01 05:02:52.000000000 +0800
-+++ irssi.conf 2009-04-02 11:32:32.000000000 +0800
+--- irssi.conf.orig 2010-04-04 00:19:58.000000000 +0800
++++ irssi.conf 2010-04-07 11:06:17.000000000 +0800
@@ -1,86 +1,14 @@
servers = (
- { address = "eu.irc6.net"; chatnet = "IRCnet"; port = "6667"; },
-- { address = "irc.open-ircnet.net"; chatnet = "IRCnet"; port = "6667"; },
+- { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; },
- { address = "irc.efnet.org"; chatnet = "EFNet"; port = "6667"; },
- { address = "irc.undernet.org"; chatnet = "Undernet"; port = "6667"; },
- { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
@@ -91,7 +91,7 @@
);
aliases = {
-@@ -242,3 +170,14 @@
+@@ -244,3 +172,14 @@ statusbar = {
};
};
};