6 files changed, 46 insertions, 30 deletions

diff --git a/chinese/scim-tables/Makefile b/chinese/scim-tables/Makefile
index bfd187c70dd9..a207f211ffda 100644
--- a/chinese/scim-tables/Makefile
+++ b/chinese/scim-tables/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scim-tables
-PORTVERSION=	0.4.3
-PORTREVISION=	1
+PORTVERSION=	0.5.1
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -15,7 +14,7 @@ MASTER_SITE_SUBDIR=scim
 MAINTAINER=	gaoj@cpsc.ucalgary.ca
 COMMENT=	SCIM table based Chinese input methods
 
-BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
+BUILD_DEPENDS=	scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_X_PREFIX=	yes
@@ -25,7 +24,7 @@ GNU_CONFIGURE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500035
-BROKEN=		scim-make-table is not available for 4.x
+BROKEN=		No working scim-make-table command on 4.x. Install textproc/scim-table-imengine for details
 .endif
 
 post-install:
diff --git a/chinese/scim-tables/distinfo b/chinese/scim-tables/distinfo
index b294f62852f6..66a76343b203 100644
--- a/chinese/scim-tables/distinfo
+++ b/chinese/scim-tables/distinfo
@@ -1,2 +1,2 @@
-MD5 (scim-tables-0.4.3.tar.gz) = c9983d6fdb459dc9d755f1e06fa0849c
-SIZE (scim-tables-0.4.3.tar.gz) = 3789831
+MD5 (scim-tables-0.5.1.tar.gz) = 3249d0fbdb731c2003bea093dc43f19c
+SIZE (scim-tables-0.5.1.tar.gz) = 4718906
diff --git a/chinese/scim-tables/files/patch-Makefile.in b/chinese/scim-tables/files/patch-Makefile.in
index c884704f5933..49673a87426b 100644
--- a/chinese/scim-tables/files/patch-Makefile.in
+++ b/chinese/scim-tables/files/patch-Makefile.in
@@ -2,10 +2,10 @@
 +++ Makefile.in	Fri Jul  2 05:49:47 2004
 @@ -138,7 +138,7 @@
  
- EXTRA_DIST = bootstrap scim-tables.spec
+ EXTRA_DIST = config.rpath mkinstalldirs bootstrap scim-tables.spec
  AUTOMAKE_OPTIONS = gnu
--SUBDIRS = zh ja ko additional icons
+-SUBDIRS = intl m4 src zh ja ko additional icons po
 +SUBDIRS = zh icons
  MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST)
  CLEANFILES = *.bak 
- all: all-recursive
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/chinese/scim-tables/files/patch-icons-Makefile.in b/chinese/scim-tables/files/patch-icons-Makefile.in
index 4b9d0d1249cb..6b3ef23a0ed7 100644
--- a/chinese/scim-tables/files/patch-icons-Makefile.in
+++ b/chinese/scim-tables/files/patch-icons-Makefile.in
@@ -1,31 +1,31 @@
---- icons/Makefile.in.orig	Sun Jun 20 20:50:51 2004
-+++ icons/Makefile.in	Fri Jul  2 05:58:56 2004
-@@ -109,25 +109,18 @@
+--- icons/Makefile.in.orig	Tue Mar  1 14:46:46 2005
++++ icons/Makefile.in	Tue Mar  1 14:50:55 2005
+@@ -222,10 +222,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  MAINTAINERCLEANFILES = Makefile.in
--INST_ICONS = Amharic.png   \
+-INST_ICONS = table.png	\
+-			  Amharic.png   \
+-			  Arabic.png    \
 -			  Array30.png   \
-+INST_ICONS = Array30.png   \
++INST_ICONS =		  Array30.png   \
  			  CangJie.png   \
+ 			  CangJie3.png   \
  			  Cantonese.png \
- 			  Dayi.png      \
--			  Erbi.png      \
+@@ -236,16 +233,9 @@
+ 			  Erbi.png      \
  			  Erbi-QS.png   \
-+			  Erbi.png      \
  			  EZ.png        \
- 			  Jyutping.png  \
- 			  Simplex.png   \
- 			  Wubi.png      \
- 			  Ziranma.png   \
--			  ZhuYin.png    \
+-			  Hangul.png    \
+-			  Hanja.png     \
 -			  HIRAGANA.png  \
+ 			  Jyutping.png  \
 -			  KATAKANA.png  \
 -			  Nippon.png    \
--			  Hangul.png    \
--			  Hanja.png     \
--			  Yawerty.png
-+			  ZhuYin.png
+ 			  Simplex.png   \
+-			  Viqr.png      \
+ 			  Wubi.png      \
+-			  Yawerty.png   \
+ 			  ZhuYin.png    \
+ 			  Ziranma.png
  
- EXTRA_DIST = $(INST_ICONS)
- icondir = $(SCIM_ICONDIR)
diff --git a/chinese/scim-tables/files/patch-zh-Makefile.in b/chinese/scim-tables/files/patch-zh-Makefile.in
new file mode 100644
index 000000000000..007213183a5d
--- /dev/null
+++ b/chinese/scim-tables/files/patch-zh-Makefile.in
@@ -0,0 +1,11 @@
+--- zh/Makefile.in.orig	Tue Mar  1 14:59:32 2005
++++ zh/Makefile.in	Tue Mar  1 14:59:50 2005
+@@ -232,7 +232,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SCIM_MAKE_TABLE = $(top_builddir)/src/scim-make-table
++SCIM_MAKE_TABLE = scim-make-table
+ scim_tables_source = \
+ 		Array30.txt.in		\
+ 		CangJie.txt.in		\
diff --git a/chinese/scim-tables/pkg-plist b/chinese/scim-tables/pkg-plist
index 34af28753af8..811b1b76a40f 100644
--- a/chinese/scim-tables/pkg-plist
+++ b/chinese/scim-tables/pkg-plist
@@ -6,20 +6,26 @@ share/scim/tables/EZ.bin
 share/scim/tables/Erbi-QS.bin
 share/scim/tables/Erbi.bin
 share/scim/tables/Jyutping.bin
+share/scim/tables/Quick.bin
 share/scim/tables/Simplex.bin
+share/scim/tables/Stroke5.bin
 share/scim/tables/Wubi.bin
 share/scim/tables/ZhuYin.bin
 share/scim/tables/Ziranma.bin
 share/scim/icons/Array30.png
 share/scim/icons/CangJie.png
+share/scim/icons/CangJie3.png
+share/scim/icons/CantonHK.png
 share/scim/icons/Cantonese.png
 share/scim/icons/Dayi.png
+share/scim/icons/EZ.png
 share/scim/icons/Erbi-QS.png
 share/scim/icons/Erbi.png
-share/scim/icons/EZ.png
 share/scim/icons/Jyutping.png
+share/scim/icons/Quick.png
 share/scim/icons/Simplex.png
+share/scim/icons/Stroke5.png
 share/scim/icons/Wubi.png
-share/scim/icons/Ziranma.png
 share/scim/icons/ZhuYin.png
+share/scim/icons/Ziranma.png
 @unexec rmdir %D/share/scim/tables 2>/dev/null || true