Date: Tue, 1 Mar 2005 19:14:55 -0700 (MST)
From: Jie Gao <gaoj@cpsc.ucalgary.ca>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: ports/78266: [maintainer] Upgrade {chinese,korean,japanese}/scim-tables to 0.5.1
Message-ID: <200503020214.j222Et0I030067@localhost.cpsc.ucalgary.ca>
Resent-Message-ID: <200503020220.j222KG3f042710@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 78266
>Category: ports
>Synopsis: [maintainer] Upgrade {chinese,korean,japanese}/scim-tables to 0.5.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 02 02:20:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Jie Gao
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD aibsd 5.3-STABLE FreeBSD 5.3-STABLE #3: Sat Jan 15 20:23:09 MST 2005 root@aibsd:/usr/obj/usr/src/sys/AIBSD i386
>Description:
Upgrade the following scim-tables ports to 0.5.1:
chinese/scim-tables
korean/scim-tables
japanese/scim-tables
This PR depends on PR ports/78264 .
>How-To-Repeat:
N/A
>Fix:
Apply the following 3 patches:
--- patch-chinese-scim-tables begins here ---
Index: chinese/scim-tables/Makefile
===================================================================
RCS file: /home/grads/gaoj/repository/ports/chinese/scim-tables/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- chinese/scim-tables/Makefile 19 Jan 2005 22:06:33 -0000 1.8
+++ chinese/scim-tables/Makefile 2 Mar 2005 01:37:08 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= scim-tables
-PORTVERSION= 0.4.3
-PORTREVISION= 1
+PORTVERSION= 0.5.1
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -15,7 +14,7 @@
MAINTAINER= gaoj@cpsc.ucalgary.ca
COMMENT= SCIM table based Chinese input methods
-BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
+BUILD_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_X_PREFIX= yes
@@ -25,7 +24,7 @@
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-BROKEN= scim-make-table is not available for 4.x
+BROKEN= No working scim-make-table command on 4.x. Install textproc/scim-table-imengine for details
.endif
post-install:
Index: chinese/scim-tables/distinfo
===================================================================
RCS file: /home/grads/gaoj/repository/ports/chinese/scim-tables/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- chinese/scim-tables/distinfo 17 Sep 2004 20:07:25 -0000 1.3
+++ chinese/scim-tables/distinfo 2 Mar 2005 01:37:08 -0000
@@ -1,2 +1,2 @@
-MD5 (scim-tables-0.4.3.tar.gz) = c9983d6fdb459dc9d755f1e06fa0849c
-SIZE (scim-tables-0.4.3.tar.gz) = 3789831
+MD5 (scim-tables-0.5.1.tar.gz) = 3249d0fbdb731c2003bea093dc43f19c
+SIZE (scim-tables-0.5.1.tar.gz) = 4718906
Index: chinese/scim-tables/pkg-plist
===================================================================
RCS file: /home/grads/gaoj/repository/ports/chinese/scim-tables/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- chinese/scim-tables/pkg-plist 6 Aug 2004 00:24:33 -0000 1.1
+++ chinese/scim-tables/pkg-plist 2 Mar 2005 01:37:08 -0000
@@ -1,25 +1,33 @@
+@unexec rmdir %D/share/scim/tables 2>/dev/null || true
share/scim/tables/Array30.bin
share/scim/tables/CangJie.bin
+share/scim/tables/CangJie3.bin
+share/scim/tables/CantonHK.bin
share/scim/tables/Cantonese.bin
share/scim/tables/Dayi3.bin
share/scim/tables/EZ.bin
share/scim/tables/Erbi-QS.bin
share/scim/tables/Erbi.bin
share/scim/tables/Jyutping.bin
+share/scim/tables/Quick.bin
share/scim/tables/Simplex.bin
+share/scim/tables/Stroke5.bin
share/scim/tables/Wubi.bin
share/scim/tables/ZhuYin.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/Dayi.png
+share/scim/icons/EZ.png
share/scim/icons/Erbi-QS.png
share/scim/icons/Erbi.png
-share/scim/icons/EZ.png
share/scim/icons/Jyutping.png
+share/scim/icons/Quick.png
share/scim/icons/Simplex.png
+share/scim/icons/Stroke5.png
share/scim/icons/Wubi.png
-share/scim/icons/Ziranma.png
share/scim/icons/ZhuYin.png
-@unexec rmdir %D/share/scim/tables 2>/dev/null || true
+share/scim/icons/Ziranma.png
Index: chinese/scim-tables/files/patch-Makefile.in
===================================================================
RCS file: /home/grads/gaoj/repository/ports/chinese/scim-tables/files/patch-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile.in
--- chinese/scim-tables/files/patch-Makefile.in 6 Aug 2004 00:24:33 -0000 1.1
+++ chinese/scim-tables/files/patch-Makefile.in 2 Mar 2005 01:37:08 -0000
@@ -1,11 +1,11 @@
---- Makefile.in.orig Fri Jul 2 05:49:42 2004
-+++ Makefile.in Fri Jul 2 05:49:47 2004
-@@ -138,7 +138,7 @@
+--- Makefile.in.orig Tue Mar 1 14:34:41 2005
++++ Makefile.in Tue Mar 1 14:43:21 2005
+@@ -247,7 +247,7 @@
- EXTRA_DIST = bootstrap scim-tables.spec
+ EXTRA_DIST = config.rpath mkinstalldirs bootstrap scim-tables.spec
AUTOMAKE_OPTIONS = gnu
--SUBDIRS = zh ja ko additional icons
+-SUBDIRS = intl m4 src zh ja ko additional icons po
+SUBDIRS = zh icons
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST)
CLEANFILES = *.bak
- all: all-recursive
+ ACLOCAL_AMFLAGS = -I m4
Index: chinese/scim-tables/files/patch-icons-Makefile.in
===================================================================
RCS file: /home/grads/gaoj/repository/ports/chinese/scim-tables/files/patch-icons-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-icons-Makefile.in
--- chinese/scim-tables/files/patch-icons-Makefile.in 6 Aug 2004 00:24:33 -0000 1.1
+++ chinese/scim-tables/files/patch-icons-Makefile.in 2 Mar 2005 01:37:08 -0000
@@ -1,31 +1,31 @@
---- icons/Makefile.in.orig Sun Jun 20 20:50:51 2004
-+++ icons/Makefile.in Fri Jul 2 05:58:56 2004
-@@ -109,25 +109,18 @@
+--- 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 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
MAINTAINERCLEANFILES = Makefile.in
--INST_ICONS = Amharic.png \
+-INST_ICONS = table.png \
+- Amharic.png \
+- Arabic.png \
- Array30.png \
-+INST_ICONS = Array30.png \
++INST_ICONS = Array30.png \
CangJie.png \
+ CangJie3.png \
Cantonese.png \
- Dayi.png \
-- Erbi.png \
+@@ -236,16 +233,9 @@
+ Erbi.png \
Erbi-QS.png \
-+ Erbi.png \
EZ.png \
- Jyutping.png \
- Simplex.png \
- Wubi.png \
- Ziranma.png \
-- ZhuYin.png \
+- Hangul.png \
+- Hanja.png \
- HIRAGANA.png \
+ Jyutping.png \
- KATAKANA.png \
- Nippon.png \
-- Hangul.png \
-- Hanja.png \
-- Yawerty.png
-+ ZhuYin.png
+ Simplex.png \
+- Viqr.png \
+ Wubi.png \
+- Yawerty.png \
+ ZhuYin.png \
+ Ziranma.png
- EXTRA_DIST = $(INST_ICONS)
- icondir = $(SCIM_ICONDIR)
Index: chinese/scim-tables/files/patch-zh-Makefile.in
===================================================================
RCS file: chinese/scim-tables/files/patch-zh-Makefile.in
diff -N chinese/scim-tables/files/patch-zh-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ chinese/scim-tables/files/patch-zh-Makefile.in 2 Mar 2005 01:37:08 -0000
@@ -0,0 +1,11 @@
+--- 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@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SCIM_MAKE_TABLE = $(top_builddir)/src/scim-make-table
++SCIM_MAKE_TABLE = scim-make-table
+ scim_tables_source = \
+ Array30.txt.in \
+ CangJie.txt.in \
--- patch-chinese-scim-tables ends here ---
--- patch-korean-scim-tables begins here ---
? korean/scim-tables/files/patch-ko-Makefile.in
Index: korean/scim-tables/Makefile
===================================================================
RCS file: /home/grads/gaoj/repository/ports/korean/scim-tables/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- korean/scim-tables/Makefile 19 Jan 2005 22:07:10 -0000 1.8
+++ korean/scim-tables/Makefile 2 Mar 2005 01:37:26 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= scim-tables
-PORTVERSION= 0.4.3
-PORTREVISION= 1
+PORTVERSION= 0.5.1
CATEGORIES= korean
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -15,7 +14,7 @@
MAINTAINER= ports@freebsd.org
COMMENT= SCIM table based Korean input methods
-BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
+BUILD_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_X_PREFIX= yes
@@ -25,7 +24,7 @@
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-BROKEN= scim-make-table is not available for 4.x
+BROKEN= No working scim-make-table command on 4.x. Install textproc/scim-table-imengine for details
.endif
post-install:
Index: korean/scim-tables/distinfo
===================================================================
RCS file: /home/grads/gaoj/repository/ports/korean/scim-tables/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- korean/scim-tables/distinfo 17 Sep 2004 20:12:28 -0000 1.3
+++ korean/scim-tables/distinfo 2 Mar 2005 01:37:26 -0000
@@ -1,2 +1,2 @@
-MD5 (scim-tables-0.4.3.tar.gz) = c9983d6fdb459dc9d755f1e06fa0849c
-SIZE (scim-tables-0.4.3.tar.gz) = 3789831
+MD5 (scim-tables-0.5.1.tar.gz) = 3249d0fbdb731c2003bea093dc43f19c
+SIZE (scim-tables-0.5.1.tar.gz) = 4718906
Index: korean/scim-tables/pkg-plist
===================================================================
RCS file: /home/grads/gaoj/repository/ports/korean/scim-tables/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- korean/scim-tables/pkg-plist 6 Aug 2004 00:24:36 -0000 1.1
+++ korean/scim-tables/pkg-plist 2 Mar 2005 01:37:26 -0000
@@ -1,4 +1,5 @@
share/scim/tables/Hangul.bin
+share/scim/tables/HangulRomaja.bin
share/scim/tables/Hanja.bin
share/scim/icons/Hangul.png
share/scim/icons/Hanja.png
Index: korean/scim-tables/files/patch-Makefile.in
===================================================================
RCS file: /home/grads/gaoj/repository/ports/korean/scim-tables/files/patch-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile.in
--- korean/scim-tables/files/patch-Makefile.in 6 Aug 2004 00:24:36 -0000 1.1
+++ korean/scim-tables/files/patch-Makefile.in 2 Mar 2005 01:37:26 -0000
@@ -1,11 +1,11 @@
---- Makefile.in.orig Fri Jul 2 05:49:42 2004
-+++ Makefile.in Fri Jul 2 05:49:47 2004
-@@ -138,7 +138,7 @@
+--- Makefile.in.orig Tue Mar 1 15:15:55 2005
++++ Makefile.in Tue Mar 1 15:16:18 2005
+@@ -247,7 +247,7 @@
- EXTRA_DIST = bootstrap scim-tables.spec
+ EXTRA_DIST = config.rpath mkinstalldirs bootstrap scim-tables.spec
AUTOMAKE_OPTIONS = gnu
--SUBDIRS = zh ja ko additional icons
+-SUBDIRS = intl m4 src zh ja ko additional icons po
+SUBDIRS = ko icons
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST)
CLEANFILES = *.bak
- all: all-recursive
+ ACLOCAL_AMFLAGS = -I m4
Index: korean/scim-tables/files/patch-icons-Makefile.in
===================================================================
RCS file: /home/grads/gaoj/repository/ports/korean/scim-tables/files/patch-icons-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-icons-Makefile.in
--- korean/scim-tables/files/patch-icons-Makefile.in 6 Aug 2004 00:24:37 -0000 1.1
+++ korean/scim-tables/files/patch-icons-Makefile.in 2 Mar 2005 01:37:26 -0000
@@ -1,29 +1,36 @@
---- icons/Makefile.in.orig Sun Jun 20 20:50:51 2004
-+++ icons/Makefile.in Fri Jul 2 06:05:39 2004
-@@ -109,25 +109,8 @@
+--- icons/Makefile.in.orig Tue Mar 1 15:16:23 2005
++++ icons/Makefile.in Tue Mar 1 15:16:57 2005
+@@ -222,32 +222,8 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
MAINTAINERCLEANFILES = Makefile.in
--INST_ICONS = Amharic.png \
+-INST_ICONS = table.png \
+- Amharic.png \
+- Arabic.png \
- Array30.png \
- CangJie.png \
+- CangJie3.png \
- Cantonese.png \
+- CantonHK.png \
+- Quick.png \
+- Stroke5.png \
- Dayi.png \
- Erbi.png \
- Erbi-QS.png \
- EZ.png \
+- Hangul.png \
+- Hanja.png \
+- HIRAGANA.png \
- Jyutping.png \
+- KATAKANA.png \
+- Nippon.png \
- Simplex.png \
+- Viqr.png \
- Wubi.png \
-- Ziranma.png \
+- Yawerty.png \
- ZhuYin.png \
-- HIRAGANA.png \
-- KATAKANA.png \
-- Nippon.png \
-- Hangul.png \
-- Hanja.png \
-- Yawerty.png
-+INST_ICONS = Hangul.png \
+- Ziranma.png
++INST_ICONS = Hangul.png \
+ Hanja.png
EXTRA_DIST = $(INST_ICONS)
--- patch-korean-scim-tables ends here ---
--- patch-japanese-scim-tables begins here ---
Index: japanese/scim-tables/Makefile
===================================================================
RCS file: /home/grads/gaoj/repository/ports/japanese/scim-tables/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- japanese/scim-tables/Makefile 19 Jan 2005 22:07:43 -0000 1.8
+++ japanese/scim-tables/Makefile 2 Mar 2005 01:37:40 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= scim-tables
-PORTVERSION= 0.4.3
-PORTREVISION= 1
+PORTVERSION= 0.5.1
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -15,7 +14,7 @@
MAINTAINER= ports@freebsd.org
COMMENT= SCIM table based Japanese input methods
-BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
+BUILD_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_X_PREFIX= yes
@@ -25,7 +24,7 @@
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-BROKEN= scim-make-table is not available for 4.x
+BROKEN= No working scim-make-table command on 4.x. Install textproc/scim-table-imengine for details
.endif
post-install:
Index: japanese/scim-tables/distinfo
===================================================================
RCS file: /home/grads/gaoj/repository/ports/japanese/scim-tables/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- japanese/scim-tables/distinfo 17 Sep 2004 20:10:40 -0000 1.3
+++ japanese/scim-tables/distinfo 2 Mar 2005 01:37:40 -0000
@@ -1,2 +1,2 @@
-MD5 (scim-tables-0.4.3.tar.gz) = c9983d6fdb459dc9d755f1e06fa0849c
-SIZE (scim-tables-0.4.3.tar.gz) = 3789831
+MD5 (scim-tables-0.5.1.tar.gz) = 3249d0fbdb731c2003bea093dc43f19c
+SIZE (scim-tables-0.5.1.tar.gz) = 4718906
Index: japanese/scim-tables/files/patch-Makefile.in
===================================================================
RCS file: /home/grads/gaoj/repository/ports/japanese/scim-tables/files/patch-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile.in
--- japanese/scim-tables/files/patch-Makefile.in 6 Aug 2004 00:24:36 -0000 1.1
+++ japanese/scim-tables/files/patch-Makefile.in 2 Mar 2005 01:37:40 -0000
@@ -1,11 +1,11 @@
---- Makefile.in.orig Fri Jul 2 05:49:42 2004
-+++ Makefile.in Fri Jul 2 05:49:47 2004
-@@ -138,7 +138,7 @@
+--- Makefile.in.orig Tue Mar 1 15:10:13 2005
++++ Makefile.in Tue Mar 1 15:10:33 2005
+@@ -247,7 +247,7 @@
- EXTRA_DIST = bootstrap scim-tables.spec
+ EXTRA_DIST = config.rpath mkinstalldirs bootstrap scim-tables.spec
AUTOMAKE_OPTIONS = gnu
--SUBDIRS = zh ja ko additional icons
+-SUBDIRS = intl m4 src zh ja ko additional icons po
+SUBDIRS = ja icons
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST)
CLEANFILES = *.bak
- all: all-recursive
+ ACLOCAL_AMFLAGS = -I m4
Index: japanese/scim-tables/files/patch-icons-Makefile.in
===================================================================
RCS file: /home/grads/gaoj/repository/ports/japanese/scim-tables/files/patch-icons-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-icons-Makefile.in
--- japanese/scim-tables/files/patch-icons-Makefile.in 6 Aug 2004 00:24:36 -0000 1.1
+++ japanese/scim-tables/files/patch-icons-Makefile.in 2 Mar 2005 01:37:40 -0000
@@ -1,29 +1,36 @@
---- icons/Makefile.in.orig Sun Jun 20 20:50:51 2004
-+++ icons/Makefile.in Fri Jul 2 06:03:56 2004
-@@ -109,25 +109,9 @@
+--- icons/Makefile.in.orig Tue Mar 1 15:10:44 2005
++++ icons/Makefile.in Tue Mar 1 15:11:49 2005
+@@ -222,32 +222,9 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
MAINTAINERCLEANFILES = Makefile.in
--INST_ICONS = Amharic.png \
+-INST_ICONS = table.png \
+- Amharic.png \
+- Arabic.png \
- Array30.png \
- CangJie.png \
+- CangJie3.png \
- Cantonese.png \
+- CantonHK.png \
+- Quick.png \
+- Stroke5.png \
- Dayi.png \
- Erbi.png \
- Erbi-QS.png \
- EZ.png \
+- Hangul.png \
+- Hanja.png \
+- HIRAGANA.png \
- Jyutping.png \
++INST_ICONS = HIRAGANA.png \
+ KATAKANA.png \
+- Nippon.png \
- Simplex.png \
+- Viqr.png \
- Wubi.png \
-- Ziranma.png \
+- Yawerty.png \
- ZhuYin.png \
-- HIRAGANA.png \
-+INST_ICONS = HIRAGANA.png \
- KATAKANA.png \
-- Nippon.png \
-- Hangul.png \
-- Hanja.png \
-- Yawerty.png
+- Ziranma.png
+ Nippon.png
EXTRA_DIST = $(INST_ICONS)
Index: japanese/scim-tables/files/patch-ja-Makefile.in
===================================================================
RCS file: japanese/scim-tables/files/patch-ja-Makefile.in
diff -N japanese/scim-tables/files/patch-ja-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ japanese/scim-tables/files/patch-ja-Makefile.in 2 Mar 2005 01:37:40 -0000
@@ -0,0 +1,11 @@
+--- ja/Makefile.in.orig Tue Mar 1 15:11:58 2005
++++ ja/Makefile.in Tue Mar 1 15:12:12 2005
+@@ -223,7 +223,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SCIM_MAKE_TABLE = $(top_builddir)/src/scim-make-table
++SCIM_MAKE_TABLE = scim-make-table
+ scim_tables_source = HIRAGANA.txt.in KATAKANA.txt.in Nippon.txt.in
+ scim_tables = HIRAGANA.txt KATAKANA.txt Nippon.txt
+ scim_tables_bindir = $(SCIM_TABLEDIR)
--- patch-japanese-scim-tables ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503020214.j222Et0I030067>