Apply the latest fixes from the vendor and some additional patches to

fix build on FreeBSD.

Bump PORTREVISION, of course.

6 files changed, 63 insertions, 30 deletions

diff --git a/japanese/vje30/Makefile b/japanese/vje30/Makefile
index 4552fc17a6d2..dcd9a6b06af5 100644
--- a/japanese/vje30/Makefile
+++ b/japanese/vje30/Makefile
@@ -7,16 +7,16 @@
 
 PORTNAME=	vje
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	file:${MOUNT_PT}/freebsd/ \
-		file:${MOUNT_PT}/source/delta/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	knu
+		file:${MOUNT_PT}/source/delta/:source \
+		${MASTER_SITE_LOCAL:S/$/:update/}
+MASTER_SITE_SUBDIR=	knu/:update
 DISTFILES=	${MAINDIST} \
-		vje-delta-3.0-ELF-update.tgz \
-		delta.tgz \
-		vje-delta-3.0-source-update.tgz
+		delta.tgz:source \
+		vje-delta-3.0-ELF-update-2002.05.28.tgz:update \
+		vje-delta-3.0-source-update-2002.05.28.tgz:update
 DIST_SUBDIR=	vje30
 
 MAINTAINER=	knu@FreeBSD.org
@@ -81,7 +81,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${CP} ${FILESDIR}/vje.sh ${WRKSRC}/etc/rc.d/
 	@${PERL} -i -pe 's,/usr/X11R6,${X11BASE},g' ${BUILD_WRKSRC}/${MAKEFILE}
-	@${PERL} -i -pe 's,^(#include\s*)\<malloc\.h\>,$$1<stdlib.h>,' ${BUILD_WRKSRC}/*.c
 .if defined(NOPORTDOCS)
 	@cd ${WRKSRC}/vje30 && ${RM} -rf doc README FAQ REQUEST
 .endif
diff --git a/japanese/vje30/distinfo b/japanese/vje30/distinfo
index a9cfee94ec98..246b1bbed1a5 100644
--- a/japanese/vje30/distinfo
+++ b/japanese/vje30/distinfo
@@ -1,4 +1,4 @@
 MD5 (vje30/vje-delta-3.0-ELF.tgz) = 04b59e749950032159d7357f7844fadb
-MD5 (vje30/vje-delta-3.0-ELF-update.tgz) = d009e6bb5cd8dbefd3fbf2399ec137e9
 MD5 (vje30/delta.tgz) = c458a80287e3344fff295dd4d7338b8f
-MD5 (vje30/vje-delta-3.0-source-update.tgz) = 67bde42cf0032a6bc0db1c4080b8c8cd
+MD5 (vje30/vje-delta-3.0-ELF-update-2002.05.28.tgz) = 1ef6f3b12085c334677f826edd859620
+MD5 (vje30/vje-delta-3.0-source-update-2002.05.28.tgz) = c24a925418dbb820ef558866fe5e58f8
diff --git a/japanese/vje30/files/patch-xdrawsub.c b/japanese/vje30/files/patch-xdrawsub.c
new file mode 100644
index 000000000000..5ff4e50a7aa2
--- /dev/null
+++ b/japanese/vje30/files/patch-xdrawsub.c
@@ -0,0 +1,31 @@
+--- delta/newFrontend/xdrawsub.c.orig	Fri May 17 14:12:26 2002
++++ delta/newFrontend/xdrawsub.c	Tue May 28 18:50:06 2002
+@@ -3,7 +3,12 @@
+  * グラフィックコンテキストのロード・解放処理
+  * テキスト文字サイズ取得処理
+  */
++#ifdef __FreeBSD__
++#include <stdio.h>
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ #include <errno.h>
+ #include <ctype.h>
+ #include <string.h>
+@@ -770,6 +775,7 @@
+ int FXDefaultIOError( display )
+     Display	*display;
+ {
++#ifndef __FreeBSD__
+ #ifdef linux
+ #if MKLINUX || LIBC6
+     extern const char *const sys_errlist[];
+@@ -784,6 +790,7 @@
+ #endif
+ #endif
+     extern int sys_nerr;
++#endif
+     char *SysErrorMsg;
+     SysErrorMsg = (errno >= 0 && errno < sys_nerr) ?
+ 			(char *)sys_errlist[errno] : (char *)"unknown error";
diff --git a/japanese/vje30/files/patch-ximsub1.c b/japanese/vje30/files/patch-ximsub1.c
deleted file mode 100644
index 7a1678577684..000000000000
--- a/japanese/vje30/files/patch-ximsub1.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- delta/newFrontend/ximsub1.c.orig	Tue Aug  1 03:00:00 2000
-+++ delta/newFrontend/ximsub1.c	Tue Apr 23 06:24:39 2002
-@@ -260,7 +260,7 @@
- 		if (&fxim_table[i].client == xim_client) {
- 		    FreeRecvQueue(fxim_table[i].client.pending);
- #if 1/*991109*/
--		    if (xim_client->v_data) {
-+		    if (1) { /* (xim_client->v_data) { */
- 	 		CloseVJE (xim_client);
- 		    }
- #endif
-@@ -295,7 +295,7 @@
- 	    FreeRecvQueue(fxim_table[i].client.pending);
- #if 1/*991109*/
- 	    xim_client = &fxim_table[i].client;
--	    if (xim_client->v_data) {
-+	    if (1) { /* (xim_client->v_data) { */
- 	 		CloseVJE (xim_client);
- 	    }
- #endif
diff --git a/japanese/vje30/files/patch-ximsub2.c b/japanese/vje30/files/patch-ximsub2.c
new file mode 100644
index 000000000000..7dd79aad4fd4
--- /dev/null
+++ b/japanese/vje30/files/patch-ximsub2.c
@@ -0,0 +1,14 @@
+--- delta/newFrontend/ximsub2.c.orig	Wed May 22 16:26:06 2002
++++ delta/newFrontend/ximsub2.c	Tue May 28 18:52:57 2002
+@@ -126,7 +126,11 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
++#ifdef __FreeBSD__
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ #include "xim.h"
+ #include <X11/Xatom.h>
+ #include <X11/Xutil.h>
diff --git a/japanese/vje30/files/patch-xkoho.c b/japanese/vje30/files/patch-xkoho.c
new file mode 100644
index 000000000000..211737b8488e
--- /dev/null
+++ b/japanese/vje30/files/patch-xkoho.c
@@ -0,0 +1,9 @@
+--- delta/newFrontend/xkoho.c.orig	Fri May 17 14:12:28 2002
++++ delta/newFrontend/xkoho.c	Wed May 29 00:20:49 2002
+@@ -1795,4 +1795,6 @@
+ 	if (!rc) {
+ 		return (FALSE);
+ 	}
++
++	return (TRUE);
+ }