7 files changed, 31 insertions, 24 deletions

diff --git a/chinese/scim-tables/Makefile b/chinese/scim-tables/Makefile
index 4fe97f9b1b38..34d4fa8af6cc 100644
--- a/chinese/scim-tables/Makefile
+++ b/chinese/scim-tables/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	scim-tables
-PORTVERSION=	0.5.4
-PORTREVISION=	3
+PORTVERSION=	0.5.7
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lx@FreeBSD.org
 COMMENT=	SCIM table based Chinese input methods
 
 BUILD_DEPENDS=	scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
@@ -23,9 +22,12 @@ 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
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
+		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
+		SCIM_DATADIR=${PREFIX}/share/scim \
+		SCIM_ICONDIR=${PREFIX}/share/scim/icons
+
+CONFIGURE_ARGS+=	--disable-skim-support
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/chinese/scim-tables/distinfo b/chinese/scim-tables/distinfo
index d2e41de89c63..81da83f7141b 100644
--- a/chinese/scim-tables/distinfo
+++ b/chinese/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/chinese/scim-tables/files/patch-Makefile.in b/chinese/scim-tables/files/patch-Makefile.in
index 1917380b46e7..9a368d827cfb 100644
--- a/chinese/scim-tables/files/patch-Makefile.in
+++ b/chinese/scim-tables/files/patch-Makefile.in
@@ -1,10 +1,10 @@
---- Makefile.in.orig	Sun Oct 30 06:07:39 2005
-+++ Makefile.in	Wed Nov  2 21:45:04 2005
+--- Makefile.in.orig	Sat Dec  2 20:13:42 2006
++++ Makefile.in	Sat Dec  2 20:13:57 2006
 @@ -75,7 +75,7 @@
  	uninstall-recursive
  ETAGS = etags
  CTAGS = ctags
--DIST_SUBDIRS = intl icons m4 po src tables skim
+-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)
@@ -13,8 +13,8 @@
  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 = icons tables 
+-SUBDIRS = docs intl icons m4 po src tables $(SKIM_SUBDIR)
++SUBDIRS = icons tables
  MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST)
  CLEANFILES = *.bak 
  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 cfee3ca475ca..2fbdbb4444be 100644
--- a/chinese/scim-tables/files/patch-icons-Makefile.in
+++ b/chinese/scim-tables/files/patch-icons-Makefile.in
@@ -1,5 +1,5 @@
---- icons/Makefile.in.orig	Sun Oct 30 06:07:35 2005
-+++ icons/Makefile.in	Mon Nov  7 22:02:59 2005
+--- icons/Makefile.in.orig	Mon Apr 30 09:52:23 2007
++++ icons/Makefile.in	Mon Apr 30 09:54:19 2007
 @@ -234,12 +234,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -10,11 +10,11 @@
 -			  Array30.png   \
 -			  Bengali-inscript.png	\
 -			  Bengali-probhat.png	\
-+INST_ICONS =		  Array30.png   \
++INST_ICONS = Array30.png   \
  			  CangJie.png	\
  			  CangJie3.png	\
  			  Cantonese.png \
-@@ -250,36 +245,12 @@
+@@ -251,37 +246,12 @@
  			  Erbi.png      \
  			  Erbi-QS.png   \
  			  EZ.png        \
@@ -39,6 +39,7 @@
  			  Simplex.png   \
 -			  Tamil-inscript.png	\
 -			  Tamil-phonetic.png	\
+-			  Tamil-remington.png   \
 -			  Telugu-inscript.png	\
 -			  Thai.png	\
 -			  Viqr.png      \
diff --git a/chinese/scim-tables/files/patch-tables-Makefile.in b/chinese/scim-tables/files/patch-tables-Makefile.in
index c4d1f630e9a3..4f15efcdc4e7 100644
--- a/chinese/scim-tables/files/patch-tables-Makefile.in
+++ b/chinese/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:25:14 2005
+--- tables/Makefile.in.orig	Mon Apr 30 09:55:09 2007
++++ tables/Makefile.in	Mon Apr 30 09:55:31 2007
 @@ -234,7 +234,7 @@
  target_alias = @target_alias@
  MAINTAINERCLEANFILES = Makefile.in
diff --git a/chinese/scim-tables/files/patch-tables-zh-Makefile.in b/chinese/scim-tables/files/patch-tables-zh-Makefile.in
index d6d3a63c0904..9c23ba16c8f0 100644
--- a/chinese/scim-tables/files/patch-tables-zh-Makefile.in
+++ b/chinese/scim-tables/files/patch-tables-zh-Makefile.in
@@ -1,6 +1,6 @@
---- tables/zh/Makefile.in.orig	Sun Oct 30 22:07:39 2005
-+++ tables/zh/Makefile.in	Tue Nov  1 23:26:26 2005
-@@ -245,7 +245,7 @@
+--- tables/zh/Makefile.in.old	Mon Apr 30 09:56:00 2007
++++ tables/zh/Makefile.in	Mon Apr 30 09:56:30 2007
+@@ -247,7 +247,7 @@
  subdirs = @subdirs@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
diff --git a/chinese/scim-tables/pkg-plist b/chinese/scim-tables/pkg-plist
index da4b4d5ddbaa..cb6b1bce844d 100644
--- a/chinese/scim-tables/pkg-plist
+++ b/chinese/scim-tables/pkg-plist
@@ -1,10 +1,12 @@
 share/scim/tables/Array30.bin
 share/scim/tables/CangJie.bin
 share/scim/tables/CangJie3.bin
+share/scim/tables/CangJie5.bin
 share/scim/tables/CantonHK.bin
 share/scim/tables/Cantonese.bin
+share/scim/tables/CNS11643.bin
 share/scim/tables/Dayi3.bin
-share/scim/tables/EZ.bin
+share/scim/tables/EZ-Big.bin
 share/scim/tables/Erbi-QS.bin
 share/scim/tables/Erbi.bin
 share/scim/tables/Jyutping.bin
@@ -14,12 +16,14 @@ share/scim/tables/Stroke5.bin
 share/scim/tables/Wu.bin
 share/scim/tables/Wubi.bin
 share/scim/tables/ZhuYin.bin
+share/scim/tables/ZhuYin-Big.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/CNS11643.png
 share/scim/icons/Dayi.png
 share/scim/icons/EZ.png
 share/scim/icons/Erbi-QS.png