pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/inputmethod 1) Update Canna to 3.6p4.
details: https://anonhg.NetBSD.org/pkgsrc/rev/204c28080e77
branches: trunk
changeset: 461908:204c28080e77
user: uebayasi <uebayasi%pkgsrc.org@localhost>
date: Tue Sep 23 15:06:57 2003 +0000
description:
1) Update Canna to 3.6p4.
* Reconstruct sample init files.
* RC-style start script.
* Auto-registration of Kana conversion.
* Abolish fuzokugo.cld.
* More key symbols can be configured with Lisp.
* Server returns more appropriate values at abort.
* TeX document improvements.
* And many bug fixes.
2) Make Canuum use Canna's common make files. From Osamu Oishi in PR 22244.
diffstat:
inputmethod/Makefile | 6 +-
inputmethod/canna-canuum/DESCR | 1 +
inputmethod/canna-canuum/MESSAGE | 8 ++
inputmethod/canna-canuum/Makefile | 38 +++++++++++
inputmethod/canna-canuum/PLIST | 3 +
inputmethod/canna-dict/Makefile | 6 +-
inputmethod/canna-dict/PLIST | 3 +-
inputmethod/canna-lib/PLIST | 4 +-
inputmethod/canna-server-bin/Makefile | 6 +-
inputmethod/canna/Makefile | 6 +-
inputmethod/canna/Makefile.common | 4 +-
inputmethod/canna/Makefile.version | 4 +-
inputmethod/canna/distinfo | 6 +-
inputmethod/canuum/DESCR | 1 -
inputmethod/canuum/Makefile | 53 ---------------
inputmethod/canuum/PLIST | 3 -
inputmethod/canuum/distinfo | 10 ---
inputmethod/canuum/patches/patch-aa | 113 ----------------------------------
inputmethod/canuum/patches/patch-ac | 40 ------------
inputmethod/canuum/patches/patch-ae | 89 --------------------------
inputmethod/canuum/patches/patch-af | 13 ---
21 files changed, 71 insertions(+), 346 deletions(-)
diffs (truncated from 577 to 300 lines):
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/Makefile
--- a/inputmethod/Makefile Tue Sep 23 14:44:43 2003 +0000
+++ b/inputmethod/Makefile Tue Sep 23 15:06:57 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/02 14:20:21 minoura Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/23 15:06:57 uebayasi Exp $
#
COMMENT= Input method tools and libraries
@@ -6,10 +6,10 @@
SUBDIR+= Chinput
SUBDIR+= ami
SUBDIR+= canna
+SUBDIR+= canna-canuum
SUBDIR+= canna-dict
SUBDIR+= canna-lib
-SUBDIR+= canna-server-bin
-SUBDIR+= canuum
+SUBDIR+= canna-server
SUBDIR+= iiimecf
SUBDIR+= ja-freewnn-dict
SUBDIR+= ja-freewnn-lib
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canna-canuum/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/canna-canuum/DESCR Tue Sep 23 15:06:57 2003 +0000
@@ -0,0 +1,1 @@
+Canuum is a Japanese input frontend program from Wnn tty frontend uum.
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canna-canuum/MESSAGE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/canna-canuum/MESSAGE Tue Sep 23 15:06:57 2003 +0000
@@ -0,0 +1,8 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2003/09/23 15:06:58 uebayasi Exp $
+
+You at least should set up key functions in "${HOME}/.canna".
+such as:
+(set-key 'alpha-mode "\C-i" 'japanese-mode)
+(set-key 'empty-mode "\C-i" 'alpha-mode)
+===========================================================================
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canna-canuum/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/canna-canuum/Makefile Tue Sep 23 15:06:57 2003 +0000
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1 2003/09/23 15:06:58 uebayasi Exp $
+#
+.include "../../inputmethod/canna/Makefile.common"
+
+CANNA_MODULE= canuum
+
+MAINTAINER= oishi%ims.ac.jp@localhost
+
+USE_BUILDLINK2= YES
+MAKE_ARGS+= PREFIX=${PREFIX}
+
+do-configure:
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \
+ ${MAKE_PROGRAM} ${MAKE_ARGS} Makefile; \
+ ${MAKE_PROGRAM} ${MAKE_ARGS} cannaconf.h
+ @cd ${WRKSRC}/canuum; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \
+ ${MAKE_PROGRAM} ${MAKE_ARGS} Makefile; \
+ ${MAKE_PROGRAM} ${MAKE_ARGS} includes
+ @${LN} ${WRKSRC}/cannaconf.h ${WRKSRC}/canuum
+ @${LN} ${WRKSRC}/canna/ccompat.h ${WRKSRC}/canuum
+ @cd ${WRKSRC}/canuum; ${MAKE_PROGRAM} ${MAKE_ARGS} depend
+
+do-build:
+ @cd ${WRKSRC}/canuum; ${MAKE_PROGRAM} ${MAKE_ARGS} all
+
+pre-install:
+ @${MKDIR} ${WRKSRC}/canuum/misc
+
+do-install:
+ @cd ${WRKSRC}/canuum; ${MAKE_PROGRAM} ${MAKE_ARGS} install
+
+post-install:
+ @${INSTALL_MAN} ${WRKSRC}/canuum/canuum.jmn \
+ ${PREFIX}/man/ja_JP.EUC/man1/canuum.1
+
+.include "../../devel/nbitools/buildlink2.mk"
+.include "../../inputmethod/canna-lib/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canna-canuum/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/canna-canuum/PLIST Tue Sep 23 15:06:57 2003 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2003/09/23 15:06:59 uebayasi Exp $
+bin/canuum
+man/ja_JP.EUC/man1/canuum.1
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canna-dict/Makefile
--- a/inputmethod/canna-dict/Makefile Tue Sep 23 14:44:43 2003 +0000
+++ b/inputmethod/canna-dict/Makefile Tue Sep 23 15:06:57 2003 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2003/05/31 08:28:33 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/23 15:06:59 uebayasi Exp $
#
.include "../canna/Makefile.common"
CANNA_MODULE= dict
-BUILD_DEPENDS+= Canna-server-bin>=${CANNA_VERSION}:../canna-server-bin
+BUILD_DEPENDS+= Canna-server>=${CANNA_VERSION}:../canna-server
NO_MTREE= yes
OWN_DIRS= ${PREFIX}/canna
-EVAL_PREFIX+= CANNASERVERBINDIR=Canna-server-bin
+EVAL_PREFIX+= CANNASERVERBINDIR=Canna-server
.for cmd in MERGE FORCPP FORSORT SPLITWORD MERGEWORD CRXGRAM CRXDIC CRFREQ KPDIC
CANNA_CMD_SED_SCRIPT+=-e 's|\(${cmd} = \).*/\(.*\)|\1${CANNASERVERBINDIR}/bin/\2|'
.endfor
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canna-dict/PLIST
--- a/inputmethod/canna-dict/PLIST Tue Sep 23 14:44:43 2003 +0000
+++ b/inputmethod/canna-dict/PLIST Tue Sep 23 15:06:57 2003 +0000
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/10 09:05:09 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/23 15:06:59 uebayasi Exp $
canna/canna/bushu.cld
canna/canna/chimei.ctd
canna/canna/dics.dir
canna/canna/fuzokugo.cbd
-canna/canna/fuzokugo.cld
canna/canna/hojomwd.ctd
canna/canna/hojoswd.ctd
canna/canna/iroha.cbd
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canna-lib/PLIST
--- a/inputmethod/canna-lib/PLIST Tue Sep 23 14:44:43 2003 +0000
+++ b/inputmethod/canna-lib/PLIST Tue Sep 23 15:06:57 2003 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/05/31 08:28:34 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/09/23 15:06:59 uebayasi Exp $
include/canna/RK.h
include/canna/jrkanji.h
include/canna/keydef.h
@@ -142,10 +142,10 @@
share/canna/sample/modes.canna
share/canna/sample/sample.canna
share/canna/sample/skk.canna
-share/canna/sample/src/Makefile
share/canna/sample/src/is.c
share/canna/sample/tut.canna
share/canna/sample/unix.canna
+share/canna/sample/verbose.canna
share/canna/sample/vje.canna
share/canna/sample/wx2+.canna
@dirrm share/canna/sample/src
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canna-server-bin/Makefile
--- a/inputmethod/canna-server-bin/Makefile Tue Sep 23 14:44:43 2003 +0000
+++ b/inputmethod/canna-server-bin/Makefile Tue Sep 23 15:06:57 2003 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:18 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/23 15:07:00 uebayasi Exp $
#
.include "../canna/Makefile.common"
-PKGREVISION= 1
-
-CANNA_MODULE= server-bin
+CANNA_MODULE= server
USE_BUILDLINK2= # defined
INSTALL_TARGET= instserver
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canna/Makefile
--- a/inputmethod/canna/Makefile Tue Sep 23 14:44:43 2003 +0000
+++ b/inputmethod/canna/Makefile Tue Sep 23 15:06:57 2003 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2003/05/31 07:24:38 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2003/09/23 15:06:57 uebayasi Exp $
#
.include "Makefile.common"
-CANNA_MODULE= server
+PKGNAME:= Canna-${CANNA_VERSION}
-DEPENDS+= Canna-server-bin>=${CANNA_VERSION}:../canna-server-bin
+DEPENDS+= Canna-server>=${CANNA_VERSION}:../canna-server
DEPENDS+= Canna-dict>=${CANNA_VERSION}:../canna-dict
EXTRACT_ONLY= # empty
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canna/Makefile.common
--- a/inputmethod/canna/Makefile.common Tue Sep 23 14:44:43 2003 +0000
+++ b/inputmethod/canna/Makefile.common Tue Sep 23 15:06:57 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2003/07/31 20:10:22 jmc Exp $
+# $NetBSD: Makefile.common,v 1.7 2003/09/23 15:06:57 uebayasi Exp $
#
# Canna common makefile.
#
@@ -6,7 +6,7 @@
DISTNAME= Canna${CANNA_VERSION:S|.||:S|pl|p|}
PKGNAME= Canna-${CANNA_MODULE}-${CANNA_VERSION}
CATEGORIES= japanese inputmethod
-MASTER_SITES= http://downloads.sourceforge.jp/canna/2181/
+MASTER_SITES= http://downloads.sourceforge.jp/canna/6059/
MAINTAINER= tech-pkg-ja%jp.NetBSD.org@localhost
HOMEPAGE= http://canna.sourceforge.jp/
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canna/Makefile.version
--- a/inputmethod/canna/Makefile.version Tue Sep 23 14:44:43 2003 +0000
+++ b/inputmethod/canna/Makefile.version Tue Sep 23 15:06:57 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.1 2003/07/31 13:04:40 uebayasi Exp $
+# $NetBSD: Makefile.version,v 1.2 2003/09/23 15:06:57 uebayasi Exp $
# "Pkgsrc" version.
-CANNA_VERSION= 3.6pl3
+CANNA_VERSION= 3.6pl4
_CANNA_VERS= \
CANNA_USER=${CANNA_USER} \
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canna/distinfo
--- a/inputmethod/canna/distinfo Tue Sep 23 14:44:43 2003 +0000
+++ b/inputmethod/canna/distinfo Tue Sep 23 15:06:57 2003 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2003/07/31 13:04:40 uebayasi Exp $
+$NetBSD: distinfo,v 1.3 2003/09/23 15:06:57 uebayasi Exp $
-SHA1 (Canna36p3.tar.gz) = 183c4e160babd49d5d8c542fbf06db980e3965da
-Size (Canna36p3.tar.gz) = 1441598 bytes
+SHA1 (Canna36p4.tar.gz) = 4edc22e2e4e5c6db42daa2083fabb53aa1ae8168
+Size (Canna36p4.tar.gz) = 1455672 bytes
SHA1 (patch-aa) = eb21b7beaa66c4d0c5815599dc49b7c0b7eb3a40
SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9
SHA1 (patch-ac) = 8f9f999eb8abd9c8e3d3e5c66cf55150ce700919
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canuum/DESCR
--- a/inputmethod/canuum/DESCR Tue Sep 23 14:44:43 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Canuum is a Japanese input frontend program from Wnn tty frontend uum.
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canuum/Makefile
--- a/inputmethod/canuum/Makefile Tue Sep 23 14:44:43 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/04/19 03:51:24 uebayasi Exp $
-#
-
-DISTNAME= canuum-1.0
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/${CANNA_VER}/canuum
-CATEGORIES= japanese inputmethod
-MASTER_SITES= ftp://ftp.nec.co.jp/pub/Canna/${CANNA_VER}5/
-DISTFILES= Uum${UUM_VER}.tar.gz ${CANNA_VER}.tar.gz
-
-MAINTAINER= oishi%ims.ac.jp@localhost
-HOMEPAGE= http://www.nec.co.jp/japanese/product/computer/soft/canna/
-COMMENT= Japanese input tty frontend for Canna using uum
-
-EXTRACT_ONLY= Uum${UUM_VER}.tar.gz
-
-USE_BUILDLINK2= YES
-MAKE_ARGS= PREFIX=${PREFIX}
-
-MAKE_ENV+= CCOPTIONS="${CPPFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
-
-UUM_VER= 4.109
-CANNA_VER= Canna36p1
-
-post-extract:
- @${GTAR} -xzf ${DISTDIR}/${CANNA_VER}.tar.gz -C ${WRKDIR} \
- ${CANNA_VER}/Canna.conf ${CANNA_VER}/canuum ${CANNA_VER}/canna
- @${MV} ${WRKDIR}/${CANNA_VER}/Canna.conf ${WRKSRC}
- @${CP} ${WRKDIR}/Uum${UUM_VER}/* ${WRKSRC}
- @${CP} ${WRKDIR}/${CANNA_VER}/canna/*.h ${WRKSRC}
-
-pre-patch:
- @(cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < Canuum.patch)
-
-do-configure:
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \
- ${MAKE} ${MAKE_ARGS} Makefile; \
- ${MAKE} ${MAKE_ARGS} cannaconf.h; \
- ${MAKE} ${MAKE_ARGS} depend)
-
-do-build:
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_ARGS} all)
-
-pre-install:
- @${MKDIR} ${WRKSRC}/misc
-
-post-install:
- @${INSTALL_MAN} ${WRKSRC}/canuum.jmn \
- ${PREFIX}/man/ja_JP.EUC/man1/canuum.1
-
-.include "../../devel/nbitools/buildlink2.mk"
-.include "../../inputmethod/canna-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canuum/PLIST
--- a/inputmethod/canuum/PLIST Tue Sep 23 14:44:43 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/10 09:54:59 sakamoto Exp $
-bin/canuum
-man/ja_JP.EUC/man1/canuum.1
diff -r 227ac3d2dc4e -r 204c28080e77 inputmethod/canuum/distinfo
--- a/inputmethod/canuum/distinfo Tue Sep 23 14:44:43 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.3 2003/04/19 03:51:25 uebayasi Exp $
-
-SHA1 (Uum4.109.tar.gz) = 9d57fa67fc321c0b1101970b02154b5d6e42e88e
-Size (Uum4.109.tar.gz) = 43738 bytes
Home |
Main Index |
Thread Index |
Old Index