6 files changed, 38 insertions, 19 deletions

diff --git a/korean/scim-tables/Makefile b/korean/scim-tables/Makefile
index 3d8da8c243c2..84eb29321efd 100644
--- a/korean/scim-tables/Makefile
+++ b/korean/scim-tables/Makefile
@@ -6,13 +6,12 @@
 #    $MCom: ports/korean/scim-tables/Makefile,v 1.1 2006/09/30 03:44:11 ahze Exp $
 
 PORTNAME=	scim-tables
-PORTVERSION=	0.5.4
-PORTREVISION=	2
+PORTVERSION=	0.5.7
 CATEGORIES=	korean
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lx@FreeBSD.org
 COMMENT=	SCIM table based Korean input methods
 
 BUILD_DEPENDS=	scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
@@ -23,10 +22,6 @@ GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500035
-BROKEN=		No working scim-make-table command on 4.x. Install textproc/scim-table-imengine for details
-.endif
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO}
diff --git a/korean/scim-tables/distinfo b/korean/scim-tables/distinfo
index d2e41de89c63..81da83f7141b 100644
--- a/korean/scim-tables/distinfo
+++ b/korean/scim-tables/distinfo
@@ -1,3 +1,3 @@
-MD5 (scim-tables-0.5.4.tar.gz) = 69ce8f1945ba2ab4bf820386e76c2cd9
-SHA256 (scim-tables-0.5.4.tar.gz) = 784cbdecb40a42dee50c2d4ef0614ebd58728c8ee15ac0f2d08acfeef73ec4ad
-SIZE (scim-tables-0.5.4.tar.gz) = 5608023
+MD5 (scim-tables-0.5.7.tar.gz) = 58d7f7dd231d73ef179e072b3124ebac
+SHA256 (scim-tables-0.5.7.tar.gz) = a2d3620fff8fd8964f31bcc4e8b609418d9cbd0a102eaad5e31ff48620d34c14
+SIZE (scim-tables-0.5.7.tar.gz) = 6979417
diff --git a/korean/scim-tables/files/patch-Makefile.in b/korean/scim-tables/files/patch-Makefile.in
index 7ca13932d955..12efb7f92e42 100644
--- a/korean/scim-tables/files/patch-Makefile.in
+++ b/korean/scim-tables/files/patch-Makefile.in
@@ -1,10 +1,19 @@
---- Makefile.in.orig	Sun Oct 30 22:07:39 2005
-+++ Makefile.in	Tue Nov  1 23:10:48 2005
+--- Makefile.in.orig	Sat Apr 28 17:58:52 2007
++++ Makefile.in	Sat Apr 28 18:03:51 2007
+@@ -75,7 +75,7 @@
+ 	uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = docs intl icons m4 po src tables skim
++DIST_SUBDIRS = icons tables
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
 @@ -260,7 +260,7 @@
  EXTRA_DIST = config.rpath mkinstalldirs  bootstrap scim-tables.spec
  AUTOMAKE_OPTIONS = gnu
  @SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR = skim
--SUBDIRS = intl icons m4 po src tables $(SKIM_SUBDIR)
+-SUBDIRS = docs intl icons m4 po src tables $(SKIM_SUBDIR)
 +SUBDIRS = icons tables
  MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST)
  CLEANFILES = *.bak 
diff --git a/korean/scim-tables/files/patch-configure b/korean/scim-tables/files/patch-configure
new file mode 100644
index 000000000000..9d16322833f0
--- /dev/null
+++ b/korean/scim-tables/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	Sat Apr 28 22:37:11 2007
++++ configure	Sat Apr 28 22:37:25 2007
+@@ -30244,10 +30244,6 @@
+   CXXFLAGS="$CXXFLAGS -g"
+ fi
+ 
+-SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim`
+-SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim`
+-SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim`
+-
+ if test "x$SCIM_ICONDIR" = "x"; then
+   SCIM_ICONDIR=${datadir}/scim/icons
+ fi
diff --git a/korean/scim-tables/files/patch-icons-Makefile.in b/korean/scim-tables/files/patch-icons-Makefile.in
index 7a14e26f3ab5..6518eff406f1 100644
--- a/korean/scim-tables/files/patch-icons-Makefile.in
+++ b/korean/scim-tables/files/patch-icons-Makefile.in
@@ -1,6 +1,6 @@
---- icons/Makefile.in.orig	Sun Oct 30 22:07:35 2005
-+++ icons/Makefile.in	Tue Nov  1 23:11:26 2005
-@@ -234,52 +234,8 @@
+--- icons/Makefile.in.orig	Sat Apr 28 18:05:33 2007
++++ icons/Makefile.in	Sat Apr 28 18:06:16 2007
+@@ -234,54 +234,8 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  MAINTAINERCLEANFILES = Makefile.in
@@ -14,6 +14,7 @@
 -			  CangJie3.png	\
 -			  Cantonese.png \
 -			  CantonHK.png	\
+-			  CNS11643.png	\
 -			  Quick.png	\
 -			  Stroke5.png	\
 -			  Dayi.png      \
@@ -41,6 +42,7 @@
 -			  Simplex.png   \
 -			  Tamil-inscript.png	\
 -			  Tamil-phonetic.png	\
+-			  Tamil-remington.png   \
 -			  Telugu-inscript.png	\
 -			  Thai.png	\
 -			  Viqr.png      \
@@ -50,8 +52,8 @@
 -			  ZhuYin.png    \
 -			  Ziranma.png	\
 -		          IPA-X-SAMPA.png 
-+INST_ICONS =		  Hangul.png    \
-+			  Hanja.png
++INST_ICONS = Hangul.png    \
++		  Hanja.png
  
  EXTRA_DIST = $(INST_ICONS)
  icondir = $(SCIM_ICONDIR)
diff --git a/korean/scim-tables/files/patch-tables-Makefile.in b/korean/scim-tables/files/patch-tables-Makefile.in
index 7b4cfbbf8be2..6ddb563c2770 100644
--- a/korean/scim-tables/files/patch-tables-Makefile.in
+++ b/korean/scim-tables/files/patch-tables-Makefile.in
@@ -1,5 +1,5 @@
 --- tables/Makefile.in.orig	Sun Oct 30 22:07:36 2005
-+++ tables/Makefile.in	Tue Nov  1 23:11:44 2005
++++ tables/Makefile.in	Tue Nov  1 22:49:16 2005
 @@ -234,7 +234,7 @@
  target_alias = @target_alias@
  MAINTAINERCLEANFILES = Makefile.in