ports/161390: [maintainer patch] chinese/cxterm broken because does not compile

[Sunry Chen]

>Number:         161390
>Category:       ports
>Synopsis:       [maintainer patch] chinese/cxterm broken because does not compile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 08 02:10:01 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Sunry Chen
>Release:        8.2-RELEASE
>Organization:
SIT
>Environment:
FreeBSD club.helloit.info 8.2-RELEASE FreeBSD 8.2-RELEASE #1: Fri Mar 11 10:08:24 CST 2011     sunrychen at club.helloit.info:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.8.20110926093045/zh-cxterm-5.0.3_3.log

As the error log says:
----------------------------------------------------------------------------
cc -O2 -pipe -fno-strict-aliasing        -I/usr/local/include    -DCSRG_BASED  -DFUNCPROTO=15 -DNARROWPROTO   -DHANZI   -c HZInput.c
In file included from HZinput.h:43,
                 from HZInput.c:61:
HZtable.h:57: error: conflicting types for 'XChar2b'
/usr/local/include/X11/Xlib.h:1075: error: previous declaration of 'XChar2b' was here
*** Error code 1
>How-To-Repeat:
compile it
>Fix:


Patch attached with submission follows:

--- HZtable.orig        2011-10-08 09:45:28.000000000 +0800
+++ HZtable.h   2011-10-08 09:45:50.000000000 +0800
@@ -42,21 +42,11 @@
  *
  */

+#include <X11/Xlib.h>
+
 #ifndef        _HZTABLE_H_
 #define        _HZTABLE_H_

-/*
- * The only imported definition is XChar2b, from <X11/Xlib.h>.
- * To advoid including the tremendous amount of X11 include files,
- * this definition is simply copied here.
- */
-#ifndef        _XLIB_H_
-typedef struct {               /* normal 16 bit characters are two bytes */
-    unsigned char byte1;
-    unsigned char byte2;
-} XChar2b;
-#endif
-
 #define        MAX_PROMPT      24      /* maximum prompt in HZ input erea */
 #define MAX_KEYPROMPT  4       /* maximum bytes to display each input key */
 #define MAX_CHOICE     16      /* maximum number of choices on one screen */

>Release-Note:
>Audit-Trail:
>Unformatted: