aboutsummaryrefslogtreecommitdiff
path: root/chinese/irssi
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>2002-12-03 08:56:09 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>2002-12-03 08:56:09 +0000
commit4eceac612e5d533a631e5c7cb8ccc9223856202c (patch)
tree2fe62a01ca3b9507783281ed4e3b8421c384ecb0 /chinese/irssi
parent26b2e342201b25aa71438d1ce380fb9167e3f6c3 (diff)
downloadports-4eceac612e5d533a631e5c7cb8ccc9223856202c.tar.gz
ports-4eceac612e5d533a631e5c7cb8ccc9223856202c.zip
Notes
Diffstat (limited to 'chinese/irssi')
-rw-r--r--chinese/irssi/Makefile2
-rw-r--r--chinese/irssi/files/patch-irssi.conf74
-rw-r--r--chinese/irssi/files/patch-src::fe-text::gui-entry.c14
-rw-r--r--chinese/irssi/files/patch-src::fe-text::gui-entry.h4
-rw-r--r--chinese/irssi/files/patch-src::fe-text::term-terminfo.c6
-rw-r--r--chinese/irssi/files/patch-src::fe-text::textbuffer-view.c68
-rw-r--r--chinese/irssi/files/patch-src::fe-text::utf8.h10
7 files changed, 109 insertions, 69 deletions
diff --git a/chinese/irssi/Makefile b/chinese/irssi/Makefile
index 28bb23c53be3..d7a0cc15c4b2 100644
--- a/chinese/irssi/Makefile
+++ b/chinese/irssi/Makefile
@@ -18,8 +18,6 @@ CATEGORIES= chinese
MAINTAINER= vanilla@FreeBSD.org
-BROKEN= "Need to upgrade patch files"
-
.include "${MASTERDIR}/Makefile"
PKGNAMEPREFIX:= ${PKGNAMEPREFIX}tw-
diff --git a/chinese/irssi/files/patch-irssi.conf b/chinese/irssi/files/patch-irssi.conf
index 21fa22215ed0..b32f416adafd 100644
--- a/chinese/irssi/files/patch-irssi.conf
+++ b/chinese/irssi/files/patch-irssi.conf
@@ -1,8 +1,8 @@
---- irssi.conf.orig Sun Mar 10 22:10:01 2002
-+++ irssi.conf Wed Mar 13 19:45:27 2002
-@@ -1,65 +1,17 @@
+--- irssi.conf.orig Thu Sep 12 07:00:08 2002
++++ irssi.conf Sat Nov 23 18:28:25 2002
+@@ -1,115 +1,17 @@
servers = (
-- { address = "irc.stealth.net"; chatnet = "IRCNet"; port = "6668"; },
+- { address = "irc.stealth.net"; chatnet = "IRCnet"; port = "6668"; },
- { address = "irc.efnet.net"; chatnet = "EFNet"; port = "6667"; },
- {
- address = "irc.undernet.org";
@@ -10,9 +10,21 @@
- port = "6667";
- },
- { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
-- { address = "irc.openprojects.net"; chatnet = "OPN"; port = "6667"; },
+- { address = "irc.freenode.net"; chatnet = "freenode"; port = "6667"; },
- { address = "irc.gnome.org"; chatnet = "GIMPNet"; port = "6667"; },
- { address = "irc.ptlink.net"; chatnet = "PTlink"; port = "6667"; },
+- {
+- address = "irc.sorcery.net";
+- chatnet = "SorceryNet";
+- port = "6667";
+- },
+- {
+- address = "irc.hashmark.net";
+- chatnet = "Hashmark";
+- port = "6667";
+- },
+- { address = "irc.ptnet.org"; chatnet = "PTnet"; port = "6667"; },
+- { address = "irc.azzurra.org"; chatnet = "AzzurraNET"; port = "6667"; },
- { address = "silc.pspt.fi"; chatnet = "SILC"; port = "706"; }
+ { address = "irc.hinet.net"; chatnet = "Hinet"; port = "6667"; },
+ { address = "irc.seed.net.tw"; chatnet = "BSDChat"; port = "6667"; },
@@ -21,7 +33,7 @@
);
chatnets = {
-- IRCNet = {
+- IRCnet = {
- type = "IRC";
- max_kicks = "4";
- max_modes = "3";
@@ -29,36 +41,74 @@
- max_whois = "4";
- max_query_chans = "5";
- };
-- EFNet = {
+- EFNet = {
- type = "IRC";
- max_kicks = "4";
- max_modes = "4";
- max_msgs = "3";
+- max_whois = "1";
- };
- Undernet = {
- type = "IRC";
- max_kicks = "4";
- max_modes = "3";
- max_msgs = "3";
+- max_whois = "30";
- };
-- DALNet = {
+- DALnet = {
- type = "IRC";
- max_kicks = "4";
- max_modes = "6";
- max_msgs = "3";
+- max_whois = "30";
+- };
+- freenode = {
+- type = "IRC";
+- max_kicks = "4";
+- max_modes = "4";
+- max_msgs = "1";
+- max_whois = "1";
- };
-- OPN = { type = "IRC"; max_kicks = "4"; max_modes = "4"; max_msgs = "1"; };
- GIMPNet = {
- type = "IRC";
- max_kicks = "4";
- max_modes = "4";
- max_msgs = "3";
+- max_whois = "1";
- };
-- PTLink = {
+- PTlink = {
- type = "IRC";
- max_kicks = "1";
- max_modes = "6";
-- max_msgs = "100";
+- max_msgs = "30";
+- max_whois = "1";
+- };
+- SorceryNet = {
+- type = "IRC";
+- max_kicks = "30";
+- max_modes = "6";
+- max_msgs = "30";
+- max_whois = "30";
+- };
+- Hashmark = {
+- type = "IRC";
+- max_kicks = "4";
+- max_modes = "3";
+- max_msgs = "3";
+- max_whois = "30";
+- };
+- PTnet = {
+- type = "IRC";
+- max_kicks = "30";
+- max_modes = "13";
+- max_msgs = "10";
+- max_whois = "30";
+- };
+- AzzurraNET = {
+- type = "IRC";
+- max_kicks = "4";
+- max_modes = "6";
+- max_msgs = "3";
- };
- SILC = { type = "SILC"; };
+ Hinet = { type = "IRC"; max_kicks = "3"; max_modes = "3"; max_msgs = "3"; };
@@ -67,7 +117,7 @@
channels = (
- { name = "#irssi"; chatnet = "ircnet"; autojoin = "No"; },
-- { name = "#irssi"; chatnet = "opn"; autojoin = "No"; },
+- { name = "#irssi"; chatnet = "freenode"; autojoin = "No"; },
- { name = "#silc"; chatnet = "silc"; autojoin = "No"; }
+ { name = "#bsdchat"; chatnet = "BSDChat"; autojoin = "No"; }
);
diff --git a/chinese/irssi/files/patch-src::fe-text::gui-entry.c b/chinese/irssi/files/patch-src::fe-text::gui-entry.c
index 5722772b29b8..246cf32f46e5 100644
--- a/chinese/irssi/files/patch-src::fe-text::gui-entry.c
+++ b/chinese/irssi/files/patch-src::fe-text::gui-entry.c
@@ -1,5 +1,5 @@
---- src/fe-text/gui-entry.c.orig Tue Feb 26 02:10:10 2002
-+++ src/fe-text/gui-entry.c Wed Mar 13 19:48:56 2002
+--- src/fe-text/gui-entry.c.orig Tue Oct 15 02:45:08 2002
++++ src/fe-text/gui-entry.c Sat Nov 23 17:28:31 2002
@@ -68,6 +68,27 @@
g_free(entry);
}
@@ -37,7 +37,7 @@
if (old_scrstart != entry->scrstart)
entry->redraw_needed_from = 0;
}
-@@ -196,7 +219,7 @@
+@@ -200,7 +223,7 @@
}
}
@@ -46,7 +46,7 @@
{
int oldlen;
-@@ -232,7 +255,7 @@
+@@ -236,7 +259,7 @@
entry->utf8 = utf8;
}
@@ -55,7 +55,7 @@
{
g_return_if_fail(entry != NULL);
g_return_if_fail(str != NULL);
-@@ -261,7 +284,7 @@
+@@ -265,7 +288,7 @@
return buf;
}
@@ -64,7 +64,7 @@
{
unichar chr;
int i, len;
-@@ -339,11 +362,18 @@
+@@ -343,11 +366,18 @@
void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer)
{
@@ -83,7 +83,7 @@
if (update_cutbuffer) {
/* put erased text to cutbuffer */
if (entry->cutbuffer == NULL || entry->cutbuffer_len < size) {
-@@ -467,10 +497,24 @@
+@@ -471,10 +501,24 @@
void gui_entry_move_pos(GUI_ENTRY_REC *entry, int pos)
{
diff --git a/chinese/irssi/files/patch-src::fe-text::gui-entry.h b/chinese/irssi/files/patch-src::fe-text::gui-entry.h
index def901ce56b7..2a3fe9476661 100644
--- a/chinese/irssi/files/patch-src::fe-text::gui-entry.h
+++ b/chinese/irssi/files/patch-src::fe-text::gui-entry.h
@@ -1,5 +1,5 @@
---- src/fe-text/gui-entry.h.orig Sat Mar 9 00:22:21 2002
-+++ src/fe-text/gui-entry.h Sat Mar 9 00:22:48 2002
+--- src/fe-text/gui-entry.h.orig Wed Feb 20 20:46:45 2002
++++ src/fe-text/gui-entry.h Sat Nov 23 17:28:32 2002
@@ -28,14 +28,14 @@
void gui_entry_move(GUI_ENTRY_REC *entry, int xpos, int ypos, int width);
void gui_entry_set_active(GUI_ENTRY_REC *entry);
diff --git a/chinese/irssi/files/patch-src::fe-text::term-terminfo.c b/chinese/irssi/files/patch-src::fe-text::term-terminfo.c
index 485beb0f848a..ccb9b26e98f6 100644
--- a/chinese/irssi/files/patch-src::fe-text::term-terminfo.c
+++ b/chinese/irssi/files/patch-src::fe-text::term-terminfo.c
@@ -1,6 +1,6 @@
---- src/fe-text/term-terminfo.c.orig Sun Feb 17 23:48:32 2002
-+++ src/fe-text/term-terminfo.c Sun Mar 3 10:10:42 2002
-@@ -549,12 +549,6 @@
+--- src/fe-text/term-terminfo.c.orig Sun May 12 22:48:11 2002
++++ src/fe-text/term-terminfo.c Sat Nov 23 17:28:36 2002
+@@ -564,12 +564,6 @@
}
}
diff --git a/chinese/irssi/files/patch-src::fe-text::textbuffer-view.c b/chinese/irssi/files/patch-src::fe-text::textbuffer-view.c
index 4221fe58c76f..f53f3d9811c2 100644
--- a/chinese/irssi/files/patch-src::fe-text::textbuffer-view.c
+++ b/chinese/irssi/files/patch-src::fe-text::textbuffer-view.c
@@ -1,45 +1,35 @@
---- src/fe-text/textbuffer-view.c.orig Fri Feb 15 22:10:10 2002
-+++ src/fe-text/textbuffer-view.c Sun Mar 3 10:10:42 2002
-@@ -194,7 +194,7 @@
- continue;
+--- src/fe-text/textbuffer-view.c.orig Tue Oct 15 02:45:08 2002
++++ src/fe-text/textbuffer-view.c Sat Nov 23 18:04:04 2002
+@@ -199,8 +199,14 @@
}
-- if (xpos == view->width && sub != NULL &&
-+ if (xpos >= view->width && sub != NULL &&
- (last_space <= indent_pos || last_space <= 10) &&
- view->longword_noindent) {
- /* long word, remove the indentation from this line */
-@@ -202,7 +202,7 @@
- sub->indent = 0;
+ if (!view->utf8) {
+- next_ptr = ptr+1;
++ /* MH */
+ char_len = 1;
++ if(ptr[1] != '\0' && is_big5(ptr[0], ptr[1]))
++ {
++ char_len = 2;
++ }
++ next_ptr = ptr+char_len;
++ /* */
+ } else {
+ char_len = 1;
+ while (ptr[char_len] != '\0' && char_len < 6)
+@@ -251,7 +257,15 @@
+ continue;
}
-- if (xpos == view->width) {
-+ if (xpos >= view->width) {
- xpos = indent_func == NULL ? indent_pos :
- indent_func(view, line, -1);
-
-@@ -233,12 +233,21 @@
- if (view->utf8)
- get_utf8_char(&ptr, 6);
-
-- xpos++;
-- if (*ptr++ == ' ') {
-+ /* set line-wrap data with big5 charset */
-+ xpos ++;
-+ if (ptr[1] != '\0' && is_big5(ptr[0], ptr[1])) {
- last_space = xpos-1;
-+ xpos ++;
-+ if (xpos < view->width)
-+ ptr += 2;
+- if (*ptr == ' ') {
++ /* MH */
++ if (!view->utf8 && char_len > 1)
++ {
++ last_space = xpos;
++ last_space_ptr = next_ptr;
++ last_color = color;
++ }
++ /* */
++ else if (*ptr == ' ') {
+ last_space = xpos;
last_space_ptr = ptr;
last_color = color;
-- }
-+ } else if (*ptr == ' ') {
-+ last_space = xpos-1;
-+ last_space_ptr = ++ptr;
-+ last_color = color;
-+ } else
-+ ptr++;
- }
-
- rec = g_malloc(sizeof(LINE_CACHE_REC)-sizeof(LINE_CACHE_SUB_REC) +
diff --git a/chinese/irssi/files/patch-src::fe-text::utf8.h b/chinese/irssi/files/patch-src::fe-text::utf8.h
index 63d6f6d11aae..7be123511e7c 100644
--- a/chinese/irssi/files/patch-src::fe-text::utf8.h
+++ b/chinese/irssi/files/patch-src::fe-text::utf8.h
@@ -1,6 +1,6 @@
---- src/fe-text/utf8.h.orig Sun Feb 17 23:10:09 2002
-+++ src/fe-text/utf8.h Sun Mar 3 10:10:42 2002
-@@ -18,4 +18,11 @@
+--- src/fe-text/utf8.h.orig Tue Oct 15 02:45:08 2002
++++ src/fe-text/utf8.h Sat Nov 23 17:28:38 2002
+@@ -18,6 +18,13 @@
Make sure out is at least 6 x length of str. */
void utf16_to_utf8(const unichar *str, char *out);
@@ -11,4 +11,6 @@
+#define is_big5_hi(hi) (0x81 <= (hi) && (hi) <= 0xFE)
+#define is_big5(hi,lo) (is_big5_hi(hi) && is_big5_lo(lo))
+
- #endif
+ /* Returns width for character (0-2). */
+ int utf8_width(unichar c);
+