Update to 0.2.2.

12 files changed, 66 insertions, 22 deletions

diff --git a/japanese/uim/Makefile b/japanese/uim/Makefile
index 27ab01b994c0..fbe9781157fa 100644
--- a/japanese/uim/Makefile
+++ b/japanese/uim/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	uim
-PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTVERSION=	0.2.2
 CATEGORIES=	japanese x11
-MASTER_SITES=	http://freedesktop.org/Software/uim/
+MASTER_SITES=	http://freedesktop.org/Software/UimDownload/
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Input method library
@@ -18,6 +17,7 @@ LIB_DEPENDS=	anthy.0:${PORTSDIR}/japanese/anthy \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
+USE_PERL5_BUILD=yes
 INSTALLS_SHLIB=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget glib20
diff --git a/japanese/uim/distinfo b/japanese/uim/distinfo
index 2afbf4510ba6..fee2260b034f 100644
--- a/japanese/uim/distinfo
+++ b/japanese/uim/distinfo
@@ -1 +1 @@
-MD5 (uim-0.2.0.tar.gz) = 72d5ae116e983cff0535933faadc0f82
+MD5 (uim-0.2.2.tar.gz) = 9488999a4fad36547e27baed61270a9d
diff --git a/japanese/uim/files/patch-configure b/japanese/uim/files/patch-configure
index f4fa7ee6522b..8797a60d41af 100644
--- a/japanese/uim/files/patch-configure
+++ b/japanese/uim/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Dec  8 21:20:21 2003
-+++ configure	Sun Dec 21 01:34:43 2003
-@@ -19073,6 +19073,7 @@
+--- configure.orig	Wed Dec 31 01:26:36 2003
++++ configure	Wed Dec 31 23:56:57 2003
+@@ -19085,6 +19085,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,15 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -19223,11 +19224,6 @@
+ if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+    { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+ echo "$as_me: error: perl 5.x required for intltool" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-if ! `perl -e "require XML::Parser" 2>/dev/null`; then
+-   { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
diff --git a/japanese/uim/files/patch-helper:Makefile.in b/japanese/uim/files/patch-helper:Makefile.in
index 9016821fca08..a3c6c7c0e612 100644
--- a/japanese/uim/files/patch-helper:Makefile.in
+++ b/japanese/uim/files/patch-helper:Makefile.in
@@ -1,6 +1,6 @@
---- helper/Makefile.in.orig	Mon Dec  8 21:20:55 2003
-+++ helper/Makefile.in	Sun Dec 21 01:36:26 2003
-@@ -180,8 +180,9 @@
+--- helper/Makefile.in.orig	Wed Dec 31 01:27:22 2003
++++ helper/Makefile.in	Thu Jan  1 03:27:05 2004
+@@ -187,8 +187,9 @@
  
  EXTRA_DIST = GNOME_UimApplet.server.in.in 
  
diff --git a/japanese/uim/pkg-descr b/japanese/uim/pkg-descr
index c8883e615ad2..142fbd907a9a 100644
--- a/japanese/uim/pkg-descr
+++ b/japanese/uim/pkg-descr
@@ -8,4 +8,4 @@ And currently it supports following input methods.
   Vietnamese: VIQR
   Other:      IPA
 
-WWW: http://anthy.sourceforge.jp/
+WWW: http://anthy.sourceforge.jp/uim/
diff --git a/japanese/uim/pkg-plist b/japanese/uim/pkg-plist
index f1c340f4e50a..c99710c9fe7b 100644
--- a/japanese/uim/pkg-plist
+++ b/japanese/uim/pkg-plist
@@ -1,6 +1,7 @@
 bin/uim-helper-server
 %%GTK%%bin/uim-helper-candwin-gtk
 %%GTK%%bin/uim-helper-toolbar-gtk
+%%GTK%%bin/uim-helper-toolbar-gtk-systray
 bin/uim-xim
 include/uim/uim-helper.h
 include/uim/uim.h
@@ -23,6 +24,7 @@ share/uim/generic.scm
 share/uim/hangul.scm
 share/uim/hangul2.scm
 share/uim/hangul3.scm
+share/uim/hk.scm
 share/uim/im.scm
 share/uim/ipa.scm
 share/uim/japanese.scm
@@ -34,6 +36,13 @@ share/uim/rk.scm
 share/uim/skk-editor.scm
 share/uim/skk.scm
 share/uim/spellcheck.scm
+share/uim/tables/japanese-azik.table
+share/uim/tables/japanese-kana.table
+share/uim/tables/japanese-roma.table
+share/uim/tables/japanese-tcode.table
+share/uim/tables/japanese-tutcode.table
+share/uim/tables/korean-hangul2.table
+share/uim/tables/korean-hangul3.table
 share/uim/tcode.scm
 share/uim/tutcode.scm
 share/uim/util.scm
@@ -41,6 +50,7 @@ share/uim/viqr.scm
 @dirrm include/uim
 %%PORTDOCS%%@dirrm %%DOCSDIR_JA%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/uim/tables
 @dirrm share/uim
 %%GTK%%@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 %%GTK%%@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 27ab01b994c0..fbe9781157fa 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	uim
-PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTVERSION=	0.2.2
 CATEGORIES=	japanese x11
-MASTER_SITES=	http://freedesktop.org/Software/uim/
+MASTER_SITES=	http://freedesktop.org/Software/UimDownload/
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Input method library
@@ -18,6 +17,7 @@ LIB_DEPENDS=	anthy.0:${PORTSDIR}/japanese/anthy \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
+USE_PERL5_BUILD=yes
 INSTALLS_SHLIB=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget glib20
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 2afbf4510ba6..fee2260b034f 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1 +1 @@
-MD5 (uim-0.2.0.tar.gz) = 72d5ae116e983cff0535933faadc0f82
+MD5 (uim-0.2.2.tar.gz) = 9488999a4fad36547e27baed61270a9d
diff --git a/textproc/uim/files/patch-configure b/textproc/uim/files/patch-configure
index f4fa7ee6522b..8797a60d41af 100644
--- a/textproc/uim/files/patch-configure
+++ b/textproc/uim/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Dec  8 21:20:21 2003
-+++ configure	Sun Dec 21 01:34:43 2003
-@@ -19073,6 +19073,7 @@
+--- configure.orig	Wed Dec 31 01:26:36 2003
++++ configure	Wed Dec 31 23:56:57 2003
+@@ -19085,6 +19085,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,15 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -19223,11 +19224,6 @@
+ if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+    { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+ echo "$as_me: error: perl 5.x required for intltool" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-if ! `perl -e "require XML::Parser" 2>/dev/null`; then
+-   { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
diff --git a/textproc/uim/files/patch-helper:Makefile.in b/textproc/uim/files/patch-helper:Makefile.in
index 9016821fca08..a3c6c7c0e612 100644
--- a/textproc/uim/files/patch-helper:Makefile.in
+++ b/textproc/uim/files/patch-helper:Makefile.in
@@ -1,6 +1,6 @@
---- helper/Makefile.in.orig	Mon Dec  8 21:20:55 2003
-+++ helper/Makefile.in	Sun Dec 21 01:36:26 2003
-@@ -180,8 +180,9 @@
+--- helper/Makefile.in.orig	Wed Dec 31 01:27:22 2003
++++ helper/Makefile.in	Thu Jan  1 03:27:05 2004
+@@ -187,8 +187,9 @@
  
  EXTRA_DIST = GNOME_UimApplet.server.in.in 
  
diff --git a/textproc/uim/pkg-descr b/textproc/uim/pkg-descr
index c8883e615ad2..142fbd907a9a 100644
--- a/textproc/uim/pkg-descr
+++ b/textproc/uim/pkg-descr
@@ -8,4 +8,4 @@ And currently it supports following input methods.
   Vietnamese: VIQR
   Other:      IPA
 
-WWW: http://anthy.sourceforge.jp/
+WWW: http://anthy.sourceforge.jp/uim/
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index f1c340f4e50a..c99710c9fe7b 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -1,6 +1,7 @@
 bin/uim-helper-server
 %%GTK%%bin/uim-helper-candwin-gtk
 %%GTK%%bin/uim-helper-toolbar-gtk
+%%GTK%%bin/uim-helper-toolbar-gtk-systray
 bin/uim-xim
 include/uim/uim-helper.h
 include/uim/uim.h
@@ -23,6 +24,7 @@ share/uim/generic.scm
 share/uim/hangul.scm
 share/uim/hangul2.scm
 share/uim/hangul3.scm
+share/uim/hk.scm
 share/uim/im.scm
 share/uim/ipa.scm
 share/uim/japanese.scm
@@ -34,6 +36,13 @@ share/uim/rk.scm
 share/uim/skk-editor.scm
 share/uim/skk.scm
 share/uim/spellcheck.scm
+share/uim/tables/japanese-azik.table
+share/uim/tables/japanese-kana.table
+share/uim/tables/japanese-roma.table
+share/uim/tables/japanese-tcode.table
+share/uim/tables/japanese-tutcode.table
+share/uim/tables/korean-hangul2.table
+share/uim/tables/korean-hangul3.table
 share/uim/tcode.scm
 share/uim/tutcode.scm
 share/uim/util.scm
@@ -41,6 +50,7 @@ share/uim/viqr.scm
 @dirrm include/uim
 %%PORTDOCS%%@dirrm %%DOCSDIR_JA%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/uim/tables
 @dirrm share/uim
 %%GTK%%@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 %%GTK%%@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules