Update to 0.5.4.

Approved by:	Jie Gao <gaoj@cpsc.ucalgary.ca> (maintainer)
Reviewed by:	Jie Gao <gaoj@cpsc.ucalgary.ca> (maintainer)

6 files changed, 65 insertions, 22 deletions

diff --git a/chinese/scim-tables/Makefile b/chinese/scim-tables/Makefile
index 9f76b13a0233..41c51f8156f7 100644
--- a/chinese/scim-tables/Makefile
+++ b/chinese/scim-tables/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	scim-tables
-PORTVERSION=	0.5.1
-PORTREVISION=	4
+PORTVERSION=	0.5.4
+PORTREVISION=	0
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
diff --git a/chinese/scim-tables/distinfo b/chinese/scim-tables/distinfo
index 66a76343b203..bb819c499ac7 100644
--- a/chinese/scim-tables/distinfo
+++ b/chinese/scim-tables/distinfo
@@ -1,2 +1,2 @@
-MD5 (scim-tables-0.5.1.tar.gz) = 3249d0fbdb731c2003bea093dc43f19c
-SIZE (scim-tables-0.5.1.tar.gz) = 4718906
+MD5 (scim-tables-0.5.4.tar.gz) = 69ce8f1945ba2ab4bf820386e76c2cd9
+SIZE (scim-tables-0.5.4.tar.gz) = 5608023
diff --git a/chinese/scim-tables/files/patch-Makefile.in b/chinese/scim-tables/files/patch-Makefile.in
index 49673a87426b..1917380b46e7 100644
--- a/chinese/scim-tables/files/patch-Makefile.in
+++ b/chinese/scim-tables/files/patch-Makefile.in
@@ -1,11 +1,20 @@
---- Makefile.in.orig	Fri Jul  2 05:49:42 2004
-+++ Makefile.in	Fri Jul  2 05:49:47 2004
-@@ -138,7 +138,7 @@
- 
- EXTRA_DIST = config.rpath mkinstalldirs bootstrap scim-tables.spec
+--- Makefile.in.orig	Sun Oct 30 06:07:39 2005
++++ Makefile.in	Wed Nov  2 21:45:04 2005
+@@ -75,7 +75,7 @@
+ 	uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = 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
--SUBDIRS = intl m4 src zh ja ko additional icons po
-+SUBDIRS = zh icons
+ @SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR = skim
+-SUBDIRS = 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 6b3ef23a0ed7..337aaa8dbf88 100644
--- a/chinese/scim-tables/files/patch-icons-Makefile.in
+++ b/chinese/scim-tables/files/patch-icons-Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- icons/Makefile.in.orig	Sun Oct 30 22:07:35 2005
++++ icons/Makefile.in	Tue Nov  1 23:24:17 2005
+@@ -234,12 +234,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  MAINTAINERCLEANFILES = Makefile.in
@@ -8,24 +8,47 @@
 -			  Amharic.png   \
 -			  Arabic.png    \
 -			  Array30.png   \
+-			  Bengali-inscript.png	\
+-			  Bengali-probhat.png	\
 +INST_ICONS =		  Array30.png   \
- 			  CangJie.png   \
- 			  CangJie3.png   \
+ 			  CangJie.png	\
+ 			  CangJie3.png	\
  			  Cantonese.png \
-@@ -236,16 +233,9 @@
+@@ -250,36 +245,11 @@
  			  Erbi.png      \
  			  Erbi-QS.png   \
  			  EZ.png        \
+-			  Gujarati-inscript.png	\
+-			  Gujarati-phonetic.png	\
 -			  Hangul.png    \
 -			  Hanja.png     \
+-			  Hindi-inscript.png	\
+-			  Hindi-phonetic.png	\
 -			  HIRAGANA.png  \
  			  Jyutping.png  \
 -			  KATAKANA.png  \
+-			  Kannada-inscript.png	\
+-			  Kannada-kgp.png	\
+-			  LaTeX.png     \
+-			  Malayalam-inscript.png	\
+-			  Nepali.png    \
 -			  Nippon.png    \
+-			  Punjabi-inscript.png	\
+-			  Punjabi-jhelum.png	\
+-			  Punjabi-phonetic.png	\
  			  Simplex.png   \
+-			  Tamil-inscript.png	\
+-			  Tamil-phonetic.png	\
+-			  Telugu-inscript.png	\
+-			  Thai.png	\
 -			  Viqr.png      \
+-			  Wu.png        \
  			  Wubi.png      \
 -			  Yawerty.png   \
  			  ZhuYin.png    \
- 			  Ziranma.png
+-			  Ziranma.png	\
+-		          IPA-X-SAMPA.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
new file mode 100644
index 000000000000..c4d1f630e9a3
--- /dev/null
+++ b/chinese/scim-tables/files/patch-tables-Makefile.in
@@ -0,0 +1,11 @@
+--- tables/Makefile.in.orig	Sun Oct 30 22:07:36 2005
++++ tables/Makefile.in	Tue Nov  1 23:25:14 2005
+@@ -234,7 +234,7 @@
+ target_alias = @target_alias@
+ 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 = zh
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/chinese/scim-tables/files/patch-zh-Makefile.in b/chinese/scim-tables/files/patch-tables-zh-Makefile.in
index 007213183a5d..d6d3a63c0904 100644
--- a/chinese/scim-tables/files/patch-zh-Makefile.in
+++ b/chinese/scim-tables/files/patch-tables-zh-Makefile.in
@@ -1,7 +1,7 @@
---- 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@
+--- 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 @@
+ subdirs = @subdirs@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
 -SCIM_MAKE_TABLE = $(top_builddir)/src/scim-make-table