6 files changed, 59 insertions, 47 deletions

diff --git a/chinese/scim-tables/Makefile b/chinese/scim-tables/Makefile
index e00e1fb84300..c293e9ce8a90 100644
--- a/chinese/scim-tables/Makefile
+++ b/chinese/scim-tables/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scim-tables
-PORTVERSION=	0.5.7
-PORTREVISION=	5
+PORTVERSION=	0.5.10
 CATEGORIES=	chinese
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION}
 
@@ -15,15 +14,16 @@ MAINTAINER=	lx@FreeBSD.org
 COMMENT=	SCIM table based Chinese input methods
 
 BUILD_DEPENDS=	scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lintl" \
 		SCIM_DATADIR=${PREFIX}/share/scim \
 		SCIM_ICONDIR=${PREFIX}/share/scim/icons
 
diff --git a/chinese/scim-tables/distinfo b/chinese/scim-tables/distinfo
index b3f4ed0236d3..cd1300a4240c 100644
--- a/chinese/scim-tables/distinfo
+++ b/chinese/scim-tables/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scim-tables-0.5.7.tar.gz) = a2d3620fff8fd8964f31bcc4e8b609418d9cbd0a102eaad5e31ff48620d34c14
-SIZE (scim-tables-0.5.7.tar.gz) = 6979417
+SHA256 (scim-tables-0.5.10.tar.gz) = 0931414996585c5433b5492d5e40e3a0d6f322bebc547c6b10914d103aea2aea
+SIZE (scim-tables-0.5.10.tar.gz) = 8101380
diff --git a/chinese/scim-tables/files/patch-icons-Makefile.in b/chinese/scim-tables/files/patch-icons-Makefile.in
index 2fbdbb4444be..c58091eda67a 100644
--- a/chinese/scim-tables/files/patch-icons-Makefile.in
+++ b/chinese/scim-tables/files/patch-icons-Makefile.in
@@ -1,8 +1,8 @@
---- 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@
+--- icons/Makefile.in.orig	2011-05-17 11:57:00.000000000 -0700
++++ icons/Makefile.in	2011-07-19 09:46:30.763917600 -0700
+@@ -273,12 +273,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  MAINTAINERCLEANFILES = Makefile.in
 -INST_ICONS = table.png	\
 -			  Amharic.png   \
@@ -14,7 +14,7 @@
  			  CangJie.png	\
  			  CangJie3.png	\
  			  Cantonese.png \
-@@ -251,37 +246,12 @@
+@@ -288,47 +283,13 @@
  			  Erbi.png      \
  			  Erbi-QS.png   \
  			  EZ.png        \
@@ -24,32 +24,41 @@
 -			  Hanja.png     \
 -			  Hindi-inscript.png	\
 -			  Hindi-phonetic.png	\
+-			  Hindi-remington.png   \
 -			  HIRAGANA.png  \
+-			  IPA-X-SAMPA.png  \
  			  Jyutping.png  \
 -			  KATAKANA.png  \
 -			  Kannada-inscript.png	\
 -			  Kannada-kgp.png	\
 -			  LaTeX.png     \
 -			  Malayalam-inscript.png	\
+-			  Malayalam-phonetic.png	\
+-			  Marathi-remington.png   \
 -			  Nepali.png    \
 -			  Nippon.png    \
 -			  Punjabi-inscript.png	\
 -			  Punjabi-jhelum.png	\
 -			  Punjabi-phonetic.png	\
+-			  Punjabi-remington.png \
+ 			  Quick.png	\
+-			  RussianTraditional.png        \
  			  Simplex.png   \
+ 			  SmartCangJie6.png    \
+ 			  Stroke5.png	\
 -			  Tamil-inscript.png	\
 -			  Tamil-phonetic.png	\
 -			  Tamil-remington.png   \
 -			  Telugu-inscript.png	\
+-			  Tamil-tamil99.png   \
 -			  Thai.png	\
+-			  Translit.png	\
+-			  Ukrainian-Translit.png	\
+-			  Uyghur.png	\
 -			  Viqr.png      \
  			  Wu.png        \
  			  Wubi.png      \
 -			  Yawerty.png   \
  			  ZhuYin.png    \
--			  Ziranma.png	\
--		          IPA-X-SAMPA.png 
-+			  Ziranma.png
+ 			  Ziranma.png
  
- EXTRA_DIST = $(INST_ICONS)
- icondir = $(SCIM_ICONDIR)
diff --git a/chinese/scim-tables/files/patch-tables-Makefile.in b/chinese/scim-tables/files/patch-tables-Makefile.in
index 4f15efcdc4e7..ed50c1a106f8 100644
--- a/chinese/scim-tables/files/patch-tables-Makefile.in
+++ b/chinese/scim-tables/files/patch-tables-Makefile.in
@@ -1,10 +1,10 @@
---- 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@
+--- tables/Makefile.in.orig	2011-05-17 11:57:01.000000000 -0700
++++ tables/Makefile.in	2011-07-19 09:49:34.052939809 -0700
+@@ -290,7 +290,7 @@
+ top_srcdir = @top_srcdir@
  MAINTAINERCLEANFILES = Makefile.in
  CLEANFILES = *.bak 
--SUBDIRS = additional am ar bn gu hi ja kn ko ml ne pa ru ta te th vi zh
+-SUBDIRS = additional am ar bn gr gu he hi ja kn ko ml mr ne pa ru ta te th vi zh ug uk
 +SUBDIRS = zh
  all: all-recursive
  
diff --git a/chinese/scim-tables/files/patch-tables-zh-Makefile.in b/chinese/scim-tables/files/patch-tables-zh-Makefile.in
index 9c23ba16c8f0..ff3803c454b1 100644
--- a/chinese/scim-tables/files/patch-tables-zh-Makefile.in
+++ b/chinese/scim-tables/files/patch-tables-zh-Makefile.in
@@ -1,9 +1,9 @@
---- 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@
+--- tables/zh/Makefile.in.orig	2011-05-17 11:57:03.000000000 -0700
++++ tables/zh/Makefile.in	2011-07-19 09:51:34.062955257 -0700
+@@ -287,7 +287,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -SCIM_MAKE_TABLE = $(top_builddir)/src/scim-make-table
 +SCIM_MAKE_TABLE = scim-make-table
  scim_tables_source = \
diff --git a/chinese/scim-tables/pkg-plist b/chinese/scim-tables/pkg-plist
index cb6b1bce844d..598ec549b25f 100644
--- a/chinese/scim-tables/pkg-plist
+++ b/chinese/scim-tables/pkg-plist
@@ -1,3 +1,22 @@
+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
+share/scim/icons/Erbi.png
+share/scim/icons/Jyutping.png
+share/scim/icons/Quick.png
+share/scim/icons/Simplex.png
+share/scim/icons/SmartCangJie6.png
+share/scim/icons/Stroke5.png
+share/scim/icons/Wu.png
+share/scim/icons/Wubi.png
+share/scim/icons/ZhuYin.png
+share/scim/icons/Ziranma.png
 share/scim/tables/Array30.bin
 share/scim/tables/CangJie.bin
 share/scim/tables/CangJie3.bin
@@ -12,28 +31,12 @@ share/scim/tables/Erbi.bin
 share/scim/tables/Jyutping.bin
 share/scim/tables/Quick.bin
 share/scim/tables/Simplex.bin
+share/scim/tables/SmartCangJie6.bin
 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
-share/scim/icons/Erbi.png
-share/scim/icons/Jyutping.png
-share/scim/icons/Quick.png
-share/scim/icons/Simplex.png
-share/scim/icons/Stroke5.png
-share/scim/icons/Wu.png
-share/scim/icons/Wubi.png
-share/scim/icons/ZhuYin.png
-share/scim/icons/Ziranma.png
+@dirrmtry share/scim/icons
 @dirrmtry share/scim/tables