From owner-svn-ports-head@FreeBSD.ORG Tue Nov 6 03:40:59 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C74D68C2; Tue, 6 Nov 2012 03:40:59 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id ABE338FC08; Tue, 6 Nov 2012 03:40:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA63exAE069273; Tue, 6 Nov 2012 03:40:59 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA63ex8N069270; Tue, 6 Nov 2012 03:40:59 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201211060340.qA63ex8N069270@svn.freebsd.org> From: Adam Weinberger Date: Tue, 6 Nov 2012 03:40:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307050 - in head/chinese/bitchx: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Nov 2012 03:40:59 -0000 Author: adamw Date: Tue Nov 6 03:40:59 2012 New Revision: 307050 URL: http://svnweb.freebsd.org/changeset/ports/307050 Log: Re-roll patch to unbreak build. This is a strange patch and half of the changes seem to be personal preference settings, so I really have no idea if this re-roll makes Chinese support work. But it builds. Feature safe: yes Modified: head/chinese/bitchx/Makefile head/chinese/bitchx/files/patch-include::config.h Modified: head/chinese/bitchx/Makefile ============================================================================== --- head/chinese/bitchx/Makefile Tue Nov 6 03:22:47 2012 (r307049) +++ head/chinese/bitchx/Makefile Tue Nov 6 03:40:59 2012 (r307050) @@ -17,8 +17,6 @@ EXTRA_PATCHES= ${.CURDIR}/files/patch-so ${.CURDIR}/files/patch-include::config.h \ ${.CURDIR}/files/patch-source::screen.c -BROKEN= does not patch - WITH_LATIN= YES # Cursor movement and words wrapping aren't hacked if compiled with gnome. WITHOUT_GNOME= YES Modified: head/chinese/bitchx/files/patch-include::config.h ============================================================================== --- head/chinese/bitchx/files/patch-include::config.h Tue Nov 6 03:22:47 2012 (r307049) +++ head/chinese/bitchx/files/patch-include::config.h Tue Nov 6 03:40:59 2012 (r307050) @@ -1,16 +1,19 @@ ---- include/config.h~ Wed May 1 21:01:56 2002 -+++ include/config.h Wed May 1 21:08:30 2002 -@@ -69,6 +69,9 @@ - "efnet.mit.edu "\ - "efnet.vuurwerk.nl "\ - "[ircnet] "\ -+ "irc.seed.net.tw " \ -+ "irc.tw.freebsd.org " \ -+ "irc.csie.nctu.edu.tw " \ - "irc.webbernet.net "\ - "irc.stealth.net "\ - "irc.funet.fi "\ -@@ -195,7 +198,7 @@ +--- include/config.h.orig2 2012-11-05 22:31:31.000000000 -0500 ++++ include/config.h 2012-11-05 22:31:12.000000000 -0500 +@@ -99,7 +99,11 @@ + "pinky.slashnet.org "\ + "blago.slashnet.org "\ + "moo.slashnet.org "\ +- "coruscant.slashnet.org " ++ "coruscant.slashnet.org "\ ++ "[ircnet] "\ ++ "irc.seed.net.tw "\ ++ "irc.tw.freebsd.org "\ ++ "irc.csie.nctu.edu.tw " + #endif + + /* +@@ -152,7 +156,7 @@ * we define the default network type for server groups. Do not just * undefine this. */ @@ -19,31 +22,7 @@ /* * Below are the IRCII variable defaults. For boolean variables, use 1 for -@@ -241,6 +244,23 @@ - */ - #undef WANT_HEBREW - -+#define WANT_BIG5 -+ -+/* XXX I hope this could be integrated into BX. -+ * XXX Well, this should be done via libc, -+ * but FreeBSD libc support is quite LAME. -+ * Macro below are copied from lynx. -+ * -+ * clive@FreeBSD.org -+ */ -+#ifdef WANT_BIG5 -+/* Encoding range below belongs to Big5+ */ -+#define is_big5_los(lo) (((char)0x40<=lo)&&(lo<=(char)0x7E)) /* standard */ -+#define is_big5_lox(lo) (((char)0x80<=lo)&&(lo<=(char)0xFE)) /* extended */ -+#define is_big5_hi(hi) (((char)0x81<=hi)&&(hi<=(char)0xFE)) -+#define is_big5(hi,lo) is_big5_hi(hi) && (is_big5_los(lo) || is_big5_lox(lo)) -+#endif WANT_BIG5 -+ - /* if you use cidentd the filename is called .authlie instead of .noident. - * as well some modifications to the format of the file were made. So we - * require some pre-knowledge of what to expect. WinNT identd servers will -@@ -342,7 +362,7 @@ +@@ -299,7 +303,7 @@ * when you've defined LATIN1. The problem is that ansi graphics will look * ugly if you use the scroll up feature (PageUp/PageDown) */ @@ -52,7 +31,7 @@ /* If you define REVERSE_WHITE_BLACK, then the format codes for black and * white color are revepsed. (%W, %w is bold black and black, %K, %k is bold -@@ -375,7 +395,7 @@ +@@ -332,7 +336,7 @@ #define DEFAULT_PING_TYPE 1 #define DEFAULT_MSGLOG ON @@ -61,7 +40,7 @@ #define DEFAULT_ALT_CHARSET ON #define DEFAULT_FLOOD_KICK ON #define DEFAULT_FLOOD_PROTECTION ON -@@ -384,9 +404,9 @@ +@@ -341,9 +345,9 @@ #define DEFAULT_LLOOK_DELAY 120 #define DEFAULT_ALWAYS_SPLIT_BIGGEST ON #define DEFAULT_AUTO_UNMARK_AWAY OFF @@ -73,7 +52,7 @@ #define DEFAULT_BEEP_MAX 3 #define DEFAULT_BEEP_WHEN_AWAY OFF #define DEFAULT_BOLD_VIDEO ON -@@ -469,7 +489,7 @@ +@@ -427,7 +431,7 @@ #define DEFAULT_NOTIFY ON #define DEFAULT_QUEUE_SENDS 0 #define DEFAULT_MAX_SERVER_RECONNECT 2 @@ -82,7 +61,7 @@ #define DEFAULT_WINDOW_DESTROY_PART OFF #define DEFAULT_WINDOW_DESTROY_QUERY OFF #define DEFAULT_SUPPRESS_SERVER_MOTD ON -@@ -602,7 +622,7 @@ +@@ -560,7 +564,7 @@ #define DEFAULT_SHELL "/bin/sh" #define DEFAULT_SHELL_FLAGS "-c" #define DEFAULT_USERINFO "" @@ -91,3 +70,28 @@ #define DEFAULT_XTERM_OPTIONS "-bg black -fg white" #define DEFAULT_DCC_DLDIR "~" +@@ -695,6 +699,24 @@ + + #define WANT_CORE + ++ ++#define WANT_BIG5 ++ ++/* XXX I hope this could be integrated into BX. ++ * XXX Well, this should be done via libc, ++ * but FreeBSD libc support is quite LAME. ++ * Macro below are copied from lynx. ++ * ++ * clive@FreeBSD.org ++ */ ++#ifdef WANT_BIG5 ++/* Encoding range below belongs to Big5+ */ ++#define is_big5_los(lo) (((char)0x40<=lo)&&(lo<=(char)0x7E)) /* standard */ ++#define is_big5_lox(lo) (((char)0x80<=lo)&&(lo<=(char)0xFE)) /* extended */ ++#define is_big5_hi(hi) (((char)0x81<=hi)&&(hi<=(char)0xFE)) ++#define is_big5(hi,lo) is_big5_hi(hi) && (is_big5_los(lo) || is_big5_lox(lo)) ++#endif /*WANT_BIG5*/ ++ + #undef OFF + #undef ON +