8 files changed, 23 insertions, 74 deletions

diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 0ac2816d8a42..9a635f3c2a88 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	scim-table-imengine
-PORTVERSION=	0.5.6
-PORTREVISION=	3
+PORTVERSION=	0.5.7
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
 DISTNAME=	scim-tables-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lx@FreeBSD.org
 COMMENT=	SCIM table based input method engine
 
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
@@ -29,12 +28,10 @@ MAN1=		scim-make-table.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500035
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-4-stable-src-Makefile.in
-.endif
-
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
+		SCIM_DATADIR=${PREFIX}/share/scim \
+		SCIM_ICONDIR=${PREFIX}/share/scim/icons
 
 PLIST_SUB=	SKIM="@comment "
 
@@ -63,9 +60,6 @@ post-configure:
 .endif
 
 post-install:
-.if ${OSVERSION} < 500035
-	@${INSTALL_SCRIPT} ${FILESDIR}/scim-make-table.sh ${PREFIX}/bin/scim-make-table
-.endif
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO}
 	@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
diff --git a/textproc/scim-table-imengine/distinfo b/textproc/scim-table-imengine/distinfo
index e89a9a15918b..81da83f7141b 100644
--- a/textproc/scim-table-imengine/distinfo
+++ b/textproc/scim-table-imengine/distinfo
@@ -1,3 +1,3 @@
-MD5 (scim-tables-0.5.6.tar.gz) = ff8d59e8f3dedb7dd7c6d87c8fc408db
-SHA256 (scim-tables-0.5.6.tar.gz) = 408cddeed4f5f9105f61822388fcd8947b1f2ba2d66bdabfa2be4e4f1d9393d0
-SIZE (scim-tables-0.5.6.tar.gz) = 7058913
+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/textproc/scim-table-imengine/files/extrapatch-4-stable-src-Makefile.in b/textproc/scim-table-imengine/files/extrapatch-4-stable-src-Makefile.in
deleted file mode 100644
index e5a98ac222f9..000000000000
--- a/textproc/scim-table-imengine/files/extrapatch-4-stable-src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Sun Feb 27 07:54:20 2005
-+++ src/Makefile.in	Tue Mar  1 16:51:10 2005
-@@ -40,7 +40,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--bin_PROGRAMS = scim-make-table$(EXEEXT)
-+bin_PROGRAMS = 
- subdir = src
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in
diff --git a/textproc/scim-table-imengine/files/patch-Makefile.in b/textproc/scim-table-imengine/files/patch-Makefile.in
index 65c62d05c1b7..e3a326ef27b7 100644
--- a/textproc/scim-table-imengine/files/patch-Makefile.in
+++ b/textproc/scim-table-imengine/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Feb 10 12:04:25 2006
-+++ Makefile.in	Fri Feb 10 12:09:21 2006
+--- Makefile.in.orig	Sun Oct  8 08:57:57 2006
++++ Makefile.in	Sat Apr 28 19:10:40 2007
 @@ -75,7 +75,7 @@
  	uninstall-recursive
  ETAGS = etags
@@ -15,7 +15,7 @@
  AUTOMAKE_OPTIONS = gnu
 -@SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR = skim
 -SUBDIRS = docs intl icons m4 po src tables $(SKIM_SUBDIR)
-+@SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR = 
++@SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR =
 +SUBDIRS = docs intl icons m4 po src $(SKIM_SUBDIR)
  MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST)
  CLEANFILES = *.bak 
diff --git a/textproc/scim-table-imengine/files/patch-icons-Makefile.in b/textproc/scim-table-imengine/files/patch-icons-Makefile.in
index 55e8dca7c47d..ed0eff865766 100644
--- a/textproc/scim-table-imengine/files/patch-icons-Makefile.in
+++ b/textproc/scim-table-imengine/files/patch-icons-Makefile.in
@@ -1,6 +1,6 @@
---- icons/Makefile.in.orig	Thu Jan 12 02:00:26 2006
-+++ icons/Makefile.in	Fri Feb 10 13:34:59 2006
-@@ -234,54 +234,7 @@
+--- 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@
  MAINTAINERCLEANFILES = Makefile.in
@@ -42,6 +42,7 @@
 -			  Simplex.png   \
 -			  Tamil-inscript.png	\
 -			  Tamil-phonetic.png	\
+-			  Tamil-remington.png   \
 -			  Telugu-inscript.png	\
 -			  Thai.png	\
 -			  Viqr.png      \
diff --git a/textproc/scim-table-imengine/files/patch-skim-setupui-generictableui.ui b/textproc/scim-table-imengine/files/patch-skim-setupui-generictableui.ui
deleted file mode 100644
index 7348bd363a2d..000000000000
--- a/textproc/scim-table-imengine/files/patch-skim-setupui-generictableui.ui
+++ /dev/null
@@ -1,19 +0,0 @@
---- skim/setupui/generictableui.ui~	Wed Mar 23 11:53:02 2005
-+++ skim/setupui/generictableui.ui	Fri Feb 10 13:45:14 2006
-@@ -336,16 +336,4 @@
-     </connection>
- </connections>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--</includehints>
- </UI>
diff --git a/textproc/scim-table-imengine/files/scim-make-table.sh b/textproc/scim-table-imengine/files/scim-make-table.sh
deleted file mode 100644
index 5eea729c01b5..000000000000
--- a/textproc/scim-table-imengine/files/scim-make-table.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-cat <<EOF
-************************************************************
-**                        N O T E                         **
-************************************************************
-
-This is NOT a working scim-make-table. Due to the limitation
-on your system, scim-make-table cannot be compiled. So you
-cannot build binary im tables on this system.
-
-However, the scim-tables im engine is available, i.e. You
-still have the chance to use table-based input methods for
-scim. You can let someone build a tgz package for
-{zh,ja,ko}-scim-tables port on a 5.x system and then install
-it on your system.
-EOF
-exit 2
diff --git a/textproc/scim-table-imengine/pkg-plist b/textproc/scim-table-imengine/pkg-plist
index 2c03bf7675a7..38f2a2f2db01 100644
--- a/textproc/scim-table-imengine/pkg-plist
+++ b/textproc/scim-table-imengine/pkg-plist
@@ -1,10 +1,10 @@
 bin/scim-make-table
-lib/scim-1.0/1.4.0/IMEngine/table.a
-lib/scim-1.0/1.4.0/IMEngine/table.la
-lib/scim-1.0/1.4.0/IMEngine/table.so
-lib/scim-1.0/1.4.0/SetupUI/table-imengine-setup.a
-lib/scim-1.0/1.4.0/SetupUI/table-imengine-setup.la
-lib/scim-1.0/1.4.0/SetupUI/table-imengine-setup.so
+lib/scim-1.0/IMEngine/table.a
+lib/scim-1.0/IMEngine/table.la
+lib/scim-1.0/IMEngine/table.so
+lib/scim-1.0/SetupUI/table-imengine-setup.a
+lib/scim-1.0/SetupUI/table-imengine-setup.la
+lib/scim-1.0/SetupUI/table-imengine-setup.so
 share/scim/icons/table.png
 share/locale/zh_CN/LC_MESSAGES/scim-tables.mo
 share/locale/zh_TW/LC_MESSAGES/scim-tables.mo
@@ -39,3 +39,5 @@ share/locale/pa/LC_MESSAGES/scim-tables.mo
 @dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/ko/LC_MESSAGES
 @dirrmtry share/locale/ko
+@dirrmtry lib/scim-1.0/SetupUI
+@dirrmtry lib/scim-1.0/IMEngine