6 files changed, 43 insertions, 25 deletions

diff --git a/korean/scim-tables/Makefile b/korean/scim-tables/Makefile
index 62364e7fd9f1..12c8fba94745 100644
--- a/korean/scim-tables/Makefile
+++ b/korean/scim-tables/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scim-tables
-PORTVERSION=	0.4.3
-PORTREVISION=	1
+PORTVERSION=	0.5.1
 CATEGORIES=	korean
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -15,7 +14,7 @@ MASTER_SITE_SUBDIR=scim
 MAINTAINER=	ports@freebsd.org
 COMMENT=	SCIM table based Korean 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/korean/scim-tables/distinfo b/korean/scim-tables/distinfo
index b294f62852f6..66a76343b203 100644
--- a/korean/scim-tables/distinfo
+++ b/korean/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/korean/scim-tables/files/patch-Makefile.in b/korean/scim-tables/files/patch-Makefile.in
index 36824aafaec3..5f78c3f10781 100644
--- a/korean/scim-tables/files/patch-Makefile.in
+++ b/korean/scim-tables/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Jul  2 05:49:42 2004
-+++ Makefile.in	Fri Jul  2 05:49:47 2004
-@@ -138,7 +138,7 @@
+--- Makefile.in.orig	Tue Mar  1 15:15:55 2005
++++ Makefile.in	Tue Mar  1 15:16:18 2005
+@@ -247,7 +247,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 = ko icons
  MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST)
  CLEANFILES = *.bak 
- all: all-recursive
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/korean/scim-tables/files/patch-icons-Makefile.in b/korean/scim-tables/files/patch-icons-Makefile.in
index d4fcaac732ea..5a43ad63189f 100644
--- a/korean/scim-tables/files/patch-icons-Makefile.in
+++ b/korean/scim-tables/files/patch-icons-Makefile.in
@@ -1,29 +1,36 @@
---- icons/Makefile.in.orig	Sun Jun 20 20:50:51 2004
-+++ icons/Makefile.in	Fri Jul  2 06:05:39 2004
-@@ -109,25 +109,8 @@
+--- icons/Makefile.in.orig	Tue Mar  1 15:16:23 2005
++++ icons/Makefile.in	Tue Mar  1 15:16:57 2005
+@@ -222,32 +222,8 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  MAINTAINERCLEANFILES = Makefile.in
--INST_ICONS = Amharic.png   \
+-INST_ICONS = table.png	\
+-			  Amharic.png   \
+-			  Arabic.png    \
 -			  Array30.png   \
 -			  CangJie.png   \
+-			  CangJie3.png   \
 -			  Cantonese.png \
+-			  CantonHK.png \
+-			  Quick.png \
+-			  Stroke5.png \
 -			  Dayi.png      \
 -			  Erbi.png      \
 -			  Erbi-QS.png   \
 -			  EZ.png        \
+-			  Hangul.png    \
+-			  Hanja.png     \
+-			  HIRAGANA.png  \
 -			  Jyutping.png  \
+-			  KATAKANA.png  \
+-			  Nippon.png    \
 -			  Simplex.png   \
+-			  Viqr.png      \
 -			  Wubi.png      \
--			  Ziranma.png   \
+-			  Yawerty.png   \
 -			  ZhuYin.png    \
--			  HIRAGANA.png  \
--			  KATAKANA.png  \
--			  Nippon.png    \
--			  Hangul.png    \
--			  Hanja.png     \
--			  Yawerty.png
-+INST_ICONS = Hangul.png    \
+-			  Ziranma.png
++INST_ICONS = 		  Hangul.png    \
 +			  Hanja.png
  
  EXTRA_DIST = $(INST_ICONS)
diff --git a/korean/scim-tables/files/patch-ko-Makefile.in b/korean/scim-tables/files/patch-ko-Makefile.in
new file mode 100644
index 000000000000..4b2380779631
--- /dev/null
+++ b/korean/scim-tables/files/patch-ko-Makefile.in
@@ -0,0 +1,11 @@
+--- ko/Makefile.in.orig	Sun Feb 27 14:54:19 2005
++++ ko/Makefile.in	Sun Mar  6 15:47:32 2005
+@@ -223,7 +223,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 = Hangul.txt.in HangulRomaja.txt.in Hanja.txt.in
+ scim_tables = Hangul.txt HangulRomaja.txt Hanja.txt
+ scim_tables_bindir = $(SCIM_TABLEDIR)
diff --git a/korean/scim-tables/pkg-plist b/korean/scim-tables/pkg-plist
index 9e19809cd994..0777ce7ddf70 100644
--- a/korean/scim-tables/pkg-plist
+++ b/korean/scim-tables/pkg-plist
@@ -1,5 +1,6 @@
 share/scim/tables/Hangul.bin
+share/scim/tables/HangulRomaja.bin
 share/scim/tables/Hanja.bin
 share/scim/icons/Hangul.png
 share/scim/icons/Hanja.png
-@dirrm share/scim/tables
+@unexec rmdir %D/share/scim/tables 2>/dev/null || true