summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MOVED1
-rw-r--r--chinese/Makefile1
-rw-r--r--chinese/irssi/Makefile15
-rw-r--r--chinese/irssi/files/patch-irssi.conf130
-rw-r--r--chinese/irssi/files/patch-utf8_break11
-rw-r--r--irc/irssi/Makefile6
6 files changed, 3 insertions, 161 deletions
diff --git a/MOVED b/MOVED
index a9e81e1..490818f 100644
--- a/MOVED
+++ b/MOVED
@@ -9141,3 +9141,4 @@ devel/py-setuptools35|devel/py35-setuptools|2017-03-16|Renamed to better match o
devel/py-setuptools36|devel/py36-setuptools|2017-03-16|Renamed to better match other python ports
devel/rubygem-devise-rails4||2017-03-16|Has expired: Please use devel/rubygem-devise instead
textproc/rubygem-github-markdown||2017-03-16|Has expired: This gem is not maintained and not supported by upstream
+chinese/irssi|irc/irssi|2017-03-17|Use irc/irssi, which can handle Chinese locales
diff --git a/chinese/Makefile b/chinese/Makefile
index 08b1cb8..cf0e594 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -57,7 +57,6 @@
SUBDIR += ibus-libpinyin
SUBDIR += ibus-pinyin
SUBDIR += ibus-table-chinese
- SUBDIR += irssi
SUBDIR += jis2gb
SUBDIR += kcfonts
SUBDIR += kde4-l10n-zh_CN
diff --git a/chinese/irssi/Makefile b/chinese/irssi/Makefile
deleted file mode 100644
index 8863f27..0000000
--- a/chinese/irssi/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created by: vanilla
-# $FreeBSD$
-
-PORTREVISION= 0
-CATEGORIES= chinese
-
-MAINTAINER= vanilla@FreeBSD.org
-COMMENT= zh-tw cursor movement friendly, wrapping clean irssi
-
-CONFLICTS?= irssi-*
-MASTERDIR= ${.CURDIR}/../../irc/irssi
-
-EXTRA_PATCHES= ${.CURDIR}/files/patch-utf8_break
-
-.include "${MASTERDIR}/Makefile"
diff --git a/chinese/irssi/files/patch-irssi.conf b/chinese/irssi/files/patch-irssi.conf
deleted file mode 100644
index aa8c245..0000000
--- a/chinese/irssi/files/patch-irssi.conf
+++ /dev/null
@@ -1,130 +0,0 @@
---- irssi.conf.orig 2014-10-11 16:42:36.000000000 +0800
-+++ irssi.conf 2014-10-16 14:23:58.950709874 +0800
-@@ -1,108 +1,14 @@
- servers = (
-- { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
-- { address = "irc.efnet.org"; chatnet = "EFNet"; port = "6667"; },
-- { address = "irc.esper.net"; chatnet = "EsperNet"; port = "6667"; },
-- { address = "chat.freenode.net"; chatnet = "Freenode"; port = "6667"; },
-- { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
-- { address = "eu.irc6.net"; chatnet = "IRCnet"; port = "6667"; },
-- { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; },
-- { address = "irc.ircsource.net"; chatnet = "IRCSource"; port = "6667"; },
-- { address = "irc.netfuze.net"; chatnet = "NetFuze"; port = "6667"; },
-- { address = "irc.oftc.net"; chatnet = "OFTC"; port = "6667"; },
-- { address = "irc.quakenet.org"; chatnet = "QuakeNet"; port = "6667"; },
-- { address = "irc.rizon.net"; chatnet = "Rizon"; port = "6667"; },
-- { address = "silc.silcnet.org"; chatnet = "SILC"; port = "706"; },
-- { address = "irc.undernet.org"; chatnet = "Undernet"; port = "6667"; }
-+ { address = "chat.ap.freenode.net"; chatnet = "BSDChat"; port = "6667"; },
-+ { address = "chat.us.freenode.net"; chatnet = "BSDChat"; port = "6667"; }
- );
-
- chatnets = {
-- DALnet = {
-- type = "IRC";
-- max_kicks = "4";
-- max_msgs = "20";
-- max_whois = "30";
-- };
-- EFNet = {
-- type = "IRC";
-- max_kicks = "1";
-- max_msgs = "4";
-- max_whois = "1";
-- };
-- EsperNet = {
-- type = "IRC";
-- max_kicks = "1";
-- max_msgs = "4";
-- max_whois = "1";
-- };
-- Freenode = {
-- type = "IRC";
-- max_kicks = "1";
-- max_msgs = "4";
-- max_whois = "1";
-- };
-- GameSurge = {
-- type = "IRC";
-- max_kicks = "1";
-- max_msgs = "1";
-- max_whois = "1";
-- };
-- IRCnet = {
-- type = "IRC";
-- max_kicks = "1";
-- max_msgs = "1";
-- max_whois = "1";
-- };
-- IRCSource = {
-- type = "IRC";
-- max_kicks = "1";
-- max_msgs = "4";
-- max_whois = "1";
-- };
-- NetFuze = {
-- type = "IRC";
-- max_kicks = "1";
-- max_msgs = "1";
-- max_whois = "1";
-- };
-- OFTC = {
-- type = "IRC";
-- max_kicks = "1";
-- max_msgs = "1";
-- max_whois = "1";
-- };
-- QuakeNet = {
-- type = "IRC";
-- max_kicks = "1";
-- max_msgs = "1";
-- max_whois = "1";
-- };
-- Rizon = {
-- type = "IRC";
-- max_kicks = "1";
-- max_msgs = "1";
-- max_whois = "1";
-- };
-- SILC = {
-- type = "SILC";
-- };
-- Undernet = {
-- type = "IRC";
-- max_kicks = "1";
-- max_msgs = "1";
-- max_whois = "1";
-- };
-+ BSDChat = { type = "IRC"; max_kicks = 4; max_modes = 6; max_msgs = 3; };
- };
-
- channels = (
-- { name = "#lobby"; chatnet = "EsperNet"; autojoin = "No"; },
-- { name = "#freenode"; chatnet = "Freenode"; autojoin = "No"; },
-- { name = "#irssi"; chatnet = "Freenode"; autojoin = "No"; },
-- { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
-- { name = "#irssi"; chatnet = "IRCNet"; autojoin = "No"; },
-- { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },
-- { name = "#netfuze"; chatnet = "NetFuze"; autojoin = "No"; },
-- { name = "#oftc"; chatnet = "OFTC"; autojoin = "No"; },
-- { name = "silc"; chatnet = "SILC"; autojoin = "No"; }
-+ { name = "#bsdchat"; chatnet = "BSDChat"; autojoin = "No"; }
- );
-
- aliases = {
-@@ -357,3 +263,14 @@ statusbar = {
- };
- };
- };
-+
-+settings = {
-+ core = {
-+ recode_fallback = "UTF-8";
-+ recode_out_default_charset = "UTF-8";
-+ recode_transliterate = "yes";
-+ };
-+ "fe-common/core" = {
-+ term_charset = "UTF-8";
-+ };
-+};
diff --git a/chinese/irssi/files/patch-utf8_break b/chinese/irssi/files/patch-utf8_break
deleted file mode 100644
index c946e76..0000000
--- a/chinese/irssi/files/patch-utf8_break
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fe-text/textbuffer-view.c.orig 2009-04-01 05:02:51.000000000 +0800
-+++ src/fe-text/textbuffer-view.c 2009-04-02 11:36:37.000000000 +0800
-@@ -257,7 +257,7 @@
- continue;
- }
-
-- if (!view->utf8 && char_width > 1) {
-+ if (char_width > 1) {
- last_space = xpos;
- last_space_ptr = next_ptr;
- last_color = color;
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index f3e24e1..6517ac3 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -6,13 +6,11 @@ PORTEPOCH= 1
CATEGORIES?= irc
MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/
-MAINTAINER?= dor.bsd@xm0.uk
-COMMENT?= Modular IRC client with many features
+MAINTAINER= dor.bsd@xm0.uk
+COMMENT= Modular IRC client with many features
LICENSE= GPLv2
-CONFLICTS= irssi-devel-[0-9]* zh-irssi-[0-9]*
-
USES= cpe gettext-runtime gmake libtool ncurses pkgconfig tar:xz
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
OpenPOWER on IntegriCloud