Update to 1.5.5.

PR:		ports/131014
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp>

7 files changed, 101 insertions, 18 deletions

diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 921194d21ec7..f97c0ac19112 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	uim
-PORTVERSION=	1.5.4
+PORTVERSION=	1.5.5
 CATEGORIES?=	textproc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
 .endif
@@ -17,6 +16,7 @@ PKGNAMESUFFIX=	-nox11
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Input method library
 
+USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 WANT_GNOME=	yes
 USE_GNOME+=	gnometarget glib20
@@ -61,6 +61,10 @@ PLIST_SUB+=	X11=""
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
+CONFIGURE_ARGS+=	--enable-storage=fatty
+.endif
+
 .for _x in x xft gtk2 qt anthy canna m17nlib prime scim dict
 .if ${CONFIGURE_ARGS:M--with-${_x}} == ""
 CONFIGURE_ARGS+=--without-${_x}
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 96084be9bf58..76a9d4cefc67 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,3 +1,3 @@
-MD5 (uim-1.5.4.tar.gz) = 0dffa9d8fd7ba4804c8791f66ad0ebdf
-SHA256 (uim-1.5.4.tar.gz) = ef08cafe5b4c313c347d9464792481ad0358250e31d32f05d01fe43183dd2441
-SIZE (uim-1.5.4.tar.gz) = 4308663
+MD5 (uim-1.5.5.tar.bz2) = b7403fa4ae78229f31ca49df283502da
+SHA256 (uim-1.5.5.tar.bz2) = b5be3e3651234a442723d8ae4c15219520dac1cab087c62958d0ba8dd0fff43d
+SIZE (uim-1.5.5.tar.bz2) = 3259238
diff --git a/textproc/uim/files/patch-sigscheme_libgcroots_include_private_gcconfig.h b/textproc/uim/files/patch-sigscheme_libgcroots_include_private_gcconfig.h
deleted file mode 100644
index a15469d616fe..000000000000
--- a/textproc/uim/files/patch-sigscheme_libgcroots_include_private_gcconfig.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- sigscheme/libgcroots/include/private/gcconfig.h.orig	2007-01-06 12:00:59.000000000 +0900
-+++ sigscheme/libgcroots/include/private/gcconfig.h	2007-11-04 18:15:32.000000000 +0900
-@@ -320,6 +320,10 @@
- #   define I386
- #   define mach_type_known
- # endif
-+# if defined(FREEBSD) && (defined(__amd64__))
-+#   define X86_64
-+#   define mach_type_known
-+# endif
- # if defined(__NetBSD__) && (defined(i386) || defined(__i386__))
- #   define I386
- #   define mach_type_known
diff --git a/textproc/uim/files/patch-uim_bsdlook.c b/textproc/uim/files/patch-uim_bsdlook.c
new file mode 100644
index 000000000000..6283851bfe65
--- /dev/null
+++ b/textproc/uim/files/patch-uim_bsdlook.c
@@ -0,0 +1,11 @@
+--- ./uim/bsdlook.c.orig	2009-01-06 15:42:58.000000000 +0900
++++ ./uim/bsdlook.c	2009-01-23 03:01:10.000000000 +0900
+@@ -166,7 +166,7 @@
+ 	if (!ctx)
+ 		return;
+ 
+-	if (ctx->front0 > 0 && munmap(ctx->front0, ctx->len) == -1)
++	if (!ctx->front0 && munmap(ctx->front0, ctx->len) == -1)
+ 		perror("uim_look_finish");
+ 
+ 	if (ctx->fd > 0)
diff --git a/textproc/uim/files/patch-uim_uim.c b/textproc/uim/files/patch-uim_uim.c
new file mode 100644
index 000000000000..60da58bd3278
--- /dev/null
+++ b/textproc/uim/files/patch-uim_uim.c
@@ -0,0 +1,24 @@
+--- uim/uim.c.orig	2008-04-29 10:39:34.000000000 +0900
++++ uim/uim.c	2009-01-24 10:11:56.000000000 +0900
+@@ -90,10 +90,10 @@ fatal_error_hook(void)
+   uim_fatal_error("an unhandled error raised from Scheme interpreter");
+ }
+ 
+-int
++long
+ uim_init(void)
+ {
+-  int ret;
++  long ret;
+   char *sys_load_path;
+ 
+   if (uim_initialized)
+@@ -108,7 +108,7 @@ uim_init(void)
+   uim_scm_init(sys_load_path);
+   uim_scm_set_fatal_error_hook(fatal_error_hook);
+ 
+-  ret = (int)uim_scm_call_with_gc_ready_stack((uim_gc_gate_func_ptr)uim_init_internal, NULL);
++  ret = (long)uim_scm_call_with_gc_ready_stack((uim_gc_gate_func_ptr)uim_init_internal, NULL);
+ 
+   UIM_CATCH_ERROR_END();
+ 
diff --git a/textproc/uim/files/patch-uim_uim.h b/textproc/uim/files/patch-uim_uim.h
new file mode 100644
index 000000000000..d21e789c219f
--- /dev/null
+++ b/textproc/uim/files/patch-uim_uim.h
@@ -0,0 +1,11 @@
+--- uim/uim.h.orig	2008-09-07 23:05:06.000000000 +0900
++++ uim/uim.h	2009-01-24 11:20:11.000000000 +0900
+@@ -431,7 +431,7 @@ struct uim_code_converter {
+  *
+  * @return 0 on success, otherwise -1
+  */
+-int
++long
+ uim_init(void);
+ 
+ /**
diff --git a/textproc/uim/files/patch-xim_convdisp.cpp b/textproc/uim/files/patch-xim_convdisp.cpp
new file mode 100644
index 000000000000..fa4d1d08d4ba
--- /dev/null
+++ b/textproc/uim/files/patch-xim_convdisp.cpp
@@ -0,0 +1,46 @@
+--- ./xim/convdisp.cpp.orig	2009-01-21 11:16:35.000000000 +0900
++++ ./xim/convdisp.cpp	2009-01-23 02:41:58.000000000 +0900
+@@ -87,14 +87,14 @@
+     gXftFont = XftFontOpen(XimServer::gDpy, DefaultScreen(XimServer::gDpy),
+ 		    XFT_FAMILY, XftTypeString, fontname,
+ 		    XFT_PIXEL_SIZE, XftTypeDouble, (double)DEFAULT_FONT_SIZE,
+-		    NULL);
++		    (char *)NULL);
+     gXftFontLocale = strdup(setlocale(LC_CTYPE, NULL));
+     // maybe not needed, but in case it return NULL...
+     if (!gXftFont) {
+ 	gXftFont = XftFontOpen(XimServer::gDpy, DefaultScreen(XimServer::gDpy),
+ 			XFT_FAMILY, XftTypeString, "Sans",
+ 			XFT_PIXEL_SIZE, XftTypeDouble, (double)DEFAULT_FONT_SIZE,
+-			NULL);
++			(char *)NULL);
+     }
+ }
+ 
+@@ -112,7 +112,7 @@
+ 			DefaultScreen(XimServer::gDpy),
+ 			XFT_FAMILY, XftTypeString, fontname,
+ 			XFT_PIXEL_SIZE, XftTypeDouble, (double)DEFAULT_FONT_SIZE,
+-			NULL);
++			(char *)NULL);
+ 	if (xftfont) {
+ 	    if (gXftFont)
+ 		XftFontClose(XimServer::gDpy, gXftFont);
+@@ -387,7 +387,7 @@
+ 			    DefaultScreen(XimServer::gDpy),
+ 			    XFT_FAMILY, XftTypeString, gXftFontName,
+ 			    XFT_PIXEL_SIZE, XftTypeDouble, (double)mXftFontSize,
+-			    NULL);
++			    (char *)NULL);
+ 	}
+ 	mXftDraw = XftDrawCreate(XimServer::gDpy, mPixmap,
+ 			DefaultVisual(XimServer::gDpy, scr_num),
+@@ -557,7 +557,7 @@
+ 			    DefaultScreen(XimServer::gDpy),
+ 			    XFT_FAMILY, XftTypeString, gXftFontName,
+ 			    XFT_PIXEL_SIZE, XftTypeDouble, (double)size,
+-			    NULL);
++			    (char *)NULL);
+ 	    mXftFontSize = size;
+ 	}
+ }