Update scim-tables ports to 0.5.10. Appease portlint.

3 files changed, 27 insertions, 18 deletions

diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index fe1d0c7017a0..48d330a2c8ac 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scim-table-imengine
-PORTVERSION=	0.5.7
-PORTREVISION=	7
+PORTVERSION=	0.5.10
 CATEGORIES=	textproc
 MASTER_SITES=	SF/scim/scim-tables/${PORTVERSION}
 DISTNAME=	scim-tables-${PORTVERSION}
@@ -16,7 +15,7 @@ MAINTAINER=	lx@FreeBSD.org
 COMMENT=	SCIM table based input method engine
 
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
@@ -28,8 +27,9 @@ MAN1=		scim-make-table.1
 
 .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" \
 		PREFIX="${PREFIX}"
 
 PLIST_SUB=	SKIM="@comment "
diff --git a/textproc/scim-table-imengine/distinfo b/textproc/scim-table-imengine/distinfo
index b3f4ed0236d3..cd1300a4240c 100644
--- a/textproc/scim-table-imengine/distinfo
+++ b/textproc/scim-table-imengine/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/textproc/scim-table-imengine/files/patch-icons-Makefile.in b/textproc/scim-table-imengine/files/patch-icons-Makefile.in
index ed0eff865766..78d41ba3cd79 100644
--- a/textproc/scim-table-imengine/files/patch-icons-Makefile.in
+++ b/textproc/scim-table-imengine/files/patch-icons-Makefile.in
@@ -1,8 +1,8 @@
---- icons/Makefile.in.orig	Wed Oct 11 08:55:05 2006
-+++ icons/Makefile.in	Sat Apr 28 19:12:01 2007
-@@ -234,55 +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:33:14.162816483 -0700
+@@ -273,64 +273,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  MAINTAINERCLEANFILES = Makefile.in
 -INST_ICONS = table.png	\
 -			  Amharic.png   \
@@ -15,8 +15,6 @@
 -			  Cantonese.png \
 -			  CantonHK.png	\
 -			  CNS11643.png	\
--			  Quick.png	\
--			  Stroke5.png	\
 -			  Dayi.png      \
 -			  Erbi.png      \
 -			  Erbi-QS.png   \
@@ -27,33 +25,44 @@
 -			  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
 +INST_ICONS = table.png
+ 
  EXTRA_DIST = $(INST_ICONS)
  icondir = $(SCIM_ICONDIR)
- icon_DATA = $(INST_ICONS)