- Fix build with gcc 4.2

- Pass maintainership to submitter

PR:		118100
Submitted by:	Sunry Chen <sunrychen@gmail.com>
Approved by:	portmgr (pav)

10 files changed, 111 insertions, 42 deletions

diff --git a/chinese/cxterm/Makefile b/chinese/cxterm/Makefile
index 4240afab04db..651bae8ad3cd 100644
--- a/chinese/cxterm/Makefile
+++ b/chinese/cxterm/Makefile
@@ -10,14 +10,17 @@ PORTNAME=	cxterm
 PORTVERSION=	5.0.3
 PORTREVISION=	1
 CATEGORIES=	chinese x11
-MASTER_SITES=	ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/x-win/cxterm/
+MASTER_SITES=	ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/x-win/cxterm/ \
+		http://www.525183.com/freebsd/cxterm/ \
+		http://www.chinatinco.com/freebsd/cxterm/ \
+		http://525183.serverbox.org/freebsd/cxterm/
 DISTNAME=	cxterm5.0.p3
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	cxterm-5.0.p3-color.patch.gz	# cxterm-5.0-hz-patch.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunrychen@gmail.com
 COMMENT=	An xterm that speaks Chinese
 
 BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
@@ -37,11 +40,7 @@ ALL_TARGET=	xrelease Makefiles includes all
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64"
-BROKEN=		"Coredump during build on ia64"
-.endif
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile on GCC 4.2
+BROKEN=		Coredump during build on ia64
 .endif
 
 post-install:
diff --git a/chinese/cxterm/files/cxterm_HZutil.c b/chinese/cxterm/files/cxterm_HZutil.c
new file mode 100644
index 000000000000..45363b243223
--- /dev/null
+++ b/chinese/cxterm/files/cxterm_HZutil.c
@@ -0,0 +1,18 @@
+--- cxterm/HZutil.c.orig	1995-01-17 11:57:30.000000000 +0100
++++ cxterm/HZutil.c	2007-11-22 14:35:04.000000000 +0100
+@@ -31,6 +31,7 @@
+ 
+ #include "HZtable.h"
+ #include <stdio.h>
++#include <string.h>
+ #include <ctype.h>
+ 
+ 
+@@ -153,6 +154,7 @@
+ {
+ 
+ #if !defined(X_NOT_POSIX) || defined(SYSV) || defined(USG)
++# include <stdlib.h>
+ # include <dirent.h>
+ #else
+ # include <sys/dir.h>
diff --git a/chinese/cxterm/files/patch-ad b/chinese/cxterm/files/patch-ad
deleted file mode 100644
index e93b98641461..000000000000
--- a/chinese/cxterm/files/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./cxterm/HZutil.c.org	Tue Jan 17 02:57:30 1995
-+++ ./cxterm/HZutil.c	Wed Apr 23 03:44:24 1997
-@@ -153,6 +153,7 @@
- {
- 
- #if !defined(X_NOT_POSIX) || defined(SYSV) || defined(USG)
-+# include <sys/types.h>
- # include <dirent.h>
- #else
- # include <sys/dir.h>
diff --git a/chinese/cxterm/files/patch-charproc.c b/chinese/cxterm/files/patch-charproc.c
index b4fa4a986dff..fd8e8a5b8ee2 100644
--- a/chinese/cxterm/files/patch-charproc.c
+++ b/chinese/cxterm/files/patch-charproc.c
@@ -1,6 +1,14 @@
---- cxterm/charproc.c.orig	Fri Oct 25 11:49:49 2002
-+++ cxterm/charproc.c	Fri Oct 25 11:52:44 2002
-@@ -108,8 +108,6 @@
+--- cxterm/charproc.c.orig	2007-11-22 14:31:36.000000000 +0100
++++ cxterm/charproc.c	2007-11-22 14:39:45.000000000 +0100
+@@ -77,6 +77,7 @@
+ #include <X11/Xmu/CharSet.h>
+ #include <X11/Xmu/Converters.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include <setjmp.h>
+ #include <ctype.h>
+@@ -108,8 +109,6 @@
  
  extern Widget toplevel;
  extern void exit();
@@ -9,3 +17,12 @@
  
  static void VTallocbuf();
  static int finput();
+@@ -1672,7 +1671,7 @@
+ 	write_mask = ptymask();
+ 	select_timeout.tv_sec = 0;
+ 	select_timeout.tv_usec = 0;
+-	i = select(max_plus1, &select_mask, &write_mask, (int *)NULL,
++	i = select(max_plus1, (fd_set *)&select_mask, (fd_set *)&write_mask, (fd_set *)NULL,
+ 		   QLength(screen->display) ? &select_timeout
+ 		   : (struct timeval *) NULL);
+ 	if (i < 0) {
diff --git a/chinese/cxterm/files/patch-cit2tit.c b/chinese/cxterm/files/patch-cit2tit.c
deleted file mode 100644
index 280f7d5d1d91..000000000000
--- a/chinese/cxterm/files/patch-cit2tit.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/cit2tit.c.orig	Fri Oct 25 11:56:53 2002
-+++ utils/cit2tit.c	Fri Oct 25 11:57:01 2002
-@@ -29,8 +29,6 @@
- #include <ctype.h>
- #include <stdio.h>
- 
--extern char *malloc(), *calloc(), *realloc();
--
- extern char *HZencodeName();	/* from HZutil.c */
- 
- #include "HZtable.h"
diff --git a/chinese/cxterm/files/patch-cxterm_scrollbar.c b/chinese/cxterm/files/patch-cxterm_scrollbar.c
new file mode 100644
index 000000000000..e538e89043a5
--- /dev/null
+++ b/chinese/cxterm/files/patch-cxterm_scrollbar.c
@@ -0,0 +1,18 @@
+--- cxterm/scrollbar.c.orig	2007-11-22 14:47:15.000000000 +0100
++++ cxterm/scrollbar.c	2007-11-22 14:47:49.000000000 +0100
+@@ -37,6 +37,7 @@
+ #include "ptyx.h"		/* gets Xt headers, too */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include <X11/Xatom.h>
+ 
+@@ -323,7 +324,6 @@
+ 	register TScreen *screen = &xw->screen;
+ 	register int border = 2 * screen->border;
+ 	register int i;
+-	Char *realloc(), *calloc();
+ 
+ 	if(screen->scrollbar)
+ 		return;
diff --git a/chinese/cxterm/files/patch-tit2cit.c b/chinese/cxterm/files/patch-tit2cit.c
deleted file mode 100644
index f9c8dbbdcbce..000000000000
--- a/chinese/cxterm/files/patch-tit2cit.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/tit2cit.c.orig	Fri Oct 25 11:54:40 2002
-+++ utils/tit2cit.c	Fri Oct 25 11:54:50 2002
-@@ -54,8 +54,6 @@
- #include <ctype.h>
- #include <stdio.h>
- 
--extern char *malloc(), *calloc(), *realloc();
--
- extern int HZencode();		/* from HZutil.o */
- extern int HZgetprompt();	/* from HZutil.o */
- 
diff --git a/chinese/cxterm/files/patch-utils_cit2tit.c b/chinese/cxterm/files/patch-utils_cit2tit.c
new file mode 100644
index 000000000000..48044ebd2583
--- /dev/null
+++ b/chinese/cxterm/files/patch-utils_cit2tit.c
@@ -0,0 +1,12 @@
+--- utils/cit2tit.c.orig	1995-01-17 11:59:13.000000000 +0100
++++ utils/cit2tit.c	2007-11-22 14:42:32.000000000 +0100
+@@ -28,8 +28,7 @@
+ #include <X11/Xos.h>	/* OS dependent stuff */
+ #include <ctype.h>
+ #include <stdio.h>
+-
+-extern char *malloc(), *calloc(), *realloc();
++#include <stdlib.h>
+ 
+ extern char *HZencodeName();	/* from HZutil.c */
+ 
diff --git a/chinese/cxterm/files/patch-utils_hzimctrl.c b/chinese/cxterm/files/patch-utils_hzimctrl.c
new file mode 100644
index 000000000000..d49d5d80dce4
--- /dev/null
+++ b/chinese/cxterm/files/patch-utils_hzimctrl.c
@@ -0,0 +1,25 @@
+--- utils/hzimctrl.c.orig	2007-11-22 14:25:31.000000000 +0100
++++ utils/hzimctrl.c	2007-11-22 14:25:47.000000000 +0100
+@@ -112,6 +112,11 @@
+ char *setim = "\033]161;%s\007";	/* esc seq for set hz input method */
+ char *setparam = "\033]162;%s\007";	/* esc seq for set input param */
+ 
++#ifdef CANT_OPEN_DEV_TTY
++	extern char *ttyname();
++#endif
++	static void Usage();
++
+ /*
+    set input method 
+  */
+@@ -127,10 +132,6 @@
+ #endif /* USE_SYSV_TERMIO */
+ 	char buf[BUFSIZ];
+ 	char *name_of_tty;
+-#ifdef CANT_OPEN_DEV_TTY
+-	extern char *ttyname();
+-#endif
+-	static void Usage();
+ 
+ 	ptr = strrchr(myname = argv[0], '/');
+ 	if (ptr)
diff --git a/chinese/cxterm/files/patch-utils_tit2cit.c b/chinese/cxterm/files/patch-utils_tit2cit.c
new file mode 100644
index 000000000000..8283d2c2074c
--- /dev/null
+++ b/chinese/cxterm/files/patch-utils_tit2cit.c
@@ -0,0 +1,12 @@
+--- utils/tit2cit.c.orig	1995-02-14 06:53:17.000000000 +0100
++++ utils/tit2cit.c	2007-11-22 14:41:59.000000000 +0100
+@@ -53,8 +53,7 @@
+ #include <X11/Xos.h>	/* OS dependent stuff */
+ #include <ctype.h>
+ #include <stdio.h>
+-
+-extern char *malloc(), *calloc(), *realloc();
++#include <stdlib.h>
+ 
+ extern int HZencode();		/* from HZutil.o */
+ extern int HZgetprompt();	/* from HZutil.o */