Update from version 2.0p4 to 3.0. This is a Wnn6 full supported version.

This commit is contained in:
Satoshi Taoka 1999-06-06 13:20:08 +00:00
parent c7472aaf1a
commit 30b28e77c4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=19227
34 changed files with 72 additions and 148 deletions

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-canna+sj3+wnn4
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/12/01 03:05:59 asami Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:18 taoka Exp $
#
PKGNAME= ja-kinput2-canna+sj3+wnn4-2.0.4
CANNA= yes
SJ3= yes
WNN4= yes

View File

@ -11,10 +11,5 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-canna+wnn4
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/12/01 03:06:00 asami Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:25 taoka Exp $
#
PKGNAME= ja-kinput2-canna+wnn4-2.0.4
CANNA= yes
WNN4= yes

View File

@ -11,10 +11,5 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-canna+sj3+wnn6
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/12/01 03:06:00 asami Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:21 taoka Exp $
#
PKGNAME= ja-kinput2-canna+sj3+wnn6-2.0.4
CANNA= yes
SJ3= yes
WNN6= yes

View File

@ -11,10 +11,5 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-canna+sj3+wnn6
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/12/01 03:06:00 asami Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:21 taoka Exp $
#
PKGNAME= ja-kinput2-canna+sj3+wnn6-2.0.4
CANNA= yes
SJ3= yes
WNN6= yes

View File

@ -11,10 +11,5 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-canna+sj3
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.5 1998/12/01 03:05:59 asami Exp $
# $Id: Makefile,v 1.6 1999/05/01 04:01:16 taoka Exp $
#
PKGNAME= ja-kinput2-canna+sj3-2.0.4
CANNA= yes
SJ3= yes

View File

@ -8,8 +8,3 @@ client.
The port was done by Hidekazu Kuroki (hidekazu@cs.titech.ac.jp).
It supports Canna and SJ3.
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-canna+wnn6
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/12/01 03:06:01 asami Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:29 taoka Exp $
#
PKGNAME= ja-kinput2-canna+wnn6-2.0.4
CANNA= yes
WNN6= yes

View File

@ -11,10 +11,5 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-canna+wnn6
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/12/01 03:06:01 asami Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:29 taoka Exp $
#
PKGNAME= ja-kinput2-canna+wnn6-2.0.4
CANNA= yes
WNN6= yes

View File

@ -11,10 +11,5 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-canna
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.7 1998/12/01 03:05:59 asami Exp $
# $Id: Makefile,v 1.8 1999/05/01 04:01:14 taoka Exp $
#
PKGNAME= ja-kinput2-canna-2.0.4
CANNA= yes
MASTERDIR= ${.CURDIR}/../kinput2-wnn4/

View File

@ -8,8 +8,3 @@ client.
The port was done by NIIMI Satoshi (sa2c@and.or.jp). It supports
Canna.
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-sj3+wnn4
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/12/01 03:06:04 asami Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:35 taoka Exp $
#
PKGNAME= ja-kinput2-sj3+wnn4-2.0.4
SJ3= yes
WNN4= yes

View File

@ -11,10 +11,5 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>

View File

@ -1,13 +1,13 @@
# New ports collection makefile for: kinput2-wnn4
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/09/21 22:33:24 steve Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:42 taoka Exp $
#
DISTNAME= kinput2-v2-fix4
PKGNAME?= ja-kinput2-wnn4-2.0.4
DISTNAME= kinput2-v3
PKGNAME= ja-kinput2${INPUT_METHOD}-3.0
CATEGORIES= japanese x11
MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/
@ -18,7 +18,6 @@ BUILD_DEPENDS= ${BUILD_INPUT_METHOD}
PATCHDIR= ${.CURDIR}/../kinput2-wnn4/patches
FILESDIR= ${.CURDIR}/../kinput2-wnn4/files
NO_WRKSUBDIR= yes
USE_IMAKE= yes
.if !defined(CANNA) && !defined(SJ3) && !defined(WNN4) && !defined(WNN6)
@ -30,22 +29,26 @@ WNN4= yes
# LIB_DEPENDS, etc.
.if defined(CANNA)
INPUT_METHOD+= canna
LIB_INPUT_METHOD+= canna.1:${PORTSDIR}/japanese/Canna
KINPUT2_DEF+= -DUseCanna
LIB_INPUT_METHOD+= canna16.1:${PORTSDIR}/japanese/Canna
KINPUT2_DEF+= -DUseCanna -Dport_CANNASRC=${LOCALBASE}/include \
-Dport_CANNALIB="-L${LOCALBASE}/lib -lcanna16"
.endif
.if defined(SJ3)
INPUT_METHOD+= sj3
BUILD_INPUT_METHOD+= sj3serv:${PORTSDIR}/japanese/sj3
KINPUT2_DEF+= -DUseSj3
KINPUT2_DEF+= -DUseSj3 -Dport_SJ3SRC=${LOCALBASE}/include \
-Dport_SJ3LIB="-L${LOCALBASE}/lib -lsj3lib"
.endif
.if defined(WNN4)
INPUT_METHOD+= wnn4
BUILD_INPUT_METHOD+= ${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
KINPUT2_DEF+= -DUseWnn
BUILD_INPUT_METHOD+= ${X11BASE}/lib/libwnn.a:${PORTSDIR}/japanese/Wnn
KINPUT2_DEF+= -DUseWnn -Dport_WNNINCDIR=$(X11BASE)/include/wnn \
-Dport_WNNLIB="-L$(X11BASE)/lib -lwnn -lcrypt"
.elif defined(WNN6)
INPUT_METHOD+= wnn6
BUILD_INPUT_METHOD+= ${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
KINPUT2_DEF+= -DUseWnn -DWnnLibDir=${LOCALBASE}/lib/wnn6
LIB_INPUT_METHOD+= wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
KINPUT2_DEF+= -DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn \
-Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn6 -lcrypt"
.endif
#
# Make a value of INPUT_METHOD
@ -56,6 +59,12 @@ INPUT_METHOD!= echo ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g'
# Redefine $(IMAKE_CMD) with $(PORT_IMAKE_DEFINES) in ${WRKSRC}/Kinput2.conf
MAKE_ENV+= PORT_IMAKE_DEFINES='${KINPUT2_DEF}'
pre-configure:
if [ -f ${WRKSRC}/Kinput2.conf ]; then \
${MV} -f ${WRKSRC}/Kinput2.conf ${WRKSRC}/Kinput2.conf.org; \
fi
${CP} ${FILESDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf
do-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}

View File

@ -1 +1 @@
MD5 (kinput2-v2-fix4.tar.gz) = cbee9108f6915b2d9609c380b3ca3720
MD5 (kinput2-v3.tar.gz) = 3b3b6470879b5071c651bcdc84d52f3e

View File

@ -11,11 +11,6 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-sj3+wnn6
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/12/01 03:06:04 asami Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:38 taoka Exp $
#
PKGNAME= ja-kinput2-sj3+wnn6-2.0.4
SJ3= yes
WNN6= yes

View File

@ -11,10 +11,5 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-sj3+wnn6
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/12/01 03:06:04 asami Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:38 taoka Exp $
#
PKGNAME= ja-kinput2-sj3+wnn6-2.0.4
SJ3= yes
WNN6= yes

View File

@ -11,10 +11,5 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-sj3
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.5 1998/12/01 03:06:03 asami Exp $
# $Id: Makefile,v 1.6 1999/05/01 04:01:33 taoka Exp $
#
PKGNAME= ja-kinput2-sj3-2.0.4
SJ3= yes
MASTERDIR= ${.CURDIR}/../kinput2-wnn4/

View File

@ -8,8 +8,3 @@ client.
The port was done by Hidekazu Kuroki (hidekazu@cs.titech.ac.jp).
It supports SJ3.
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-wnn6
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/12/01 03:06:05 asami Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:46 taoka Exp $
#
PKGNAME= ja-kinput2-wnn6-2.0.4
WNN6= yes
MASTERDIR= ${.CURDIR}/../kinput2-wnn4/

View File

@ -11,10 +11,5 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>

View File

@ -1,12 +1,11 @@
# New ports collection makefile for: kinput2-wnn6
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/12/01 03:06:05 asami Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:46 taoka Exp $
#
PKGNAME= ja-kinput2-wnn6-2.0.4
WNN6= yes
MASTERDIR= ${.CURDIR}/../kinput2-wnn4/

View File

@ -11,10 +11,5 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>

View File

@ -1,13 +1,13 @@
# New ports collection makefile for: kinput2-wnn4
# Version required: 2.0p4
# Version required: 3.0
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $Id: Makefile,v 1.2 1998/09/21 22:33:24 steve Exp $
# $Id: Makefile,v 1.3 1999/05/01 04:01:42 taoka Exp $
#
DISTNAME= kinput2-v2-fix4
PKGNAME?= ja-kinput2-wnn4-2.0.4
DISTNAME= kinput2-v3
PKGNAME= ja-kinput2${INPUT_METHOD}-3.0
CATEGORIES= japanese x11
MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/
@ -18,7 +18,6 @@ BUILD_DEPENDS= ${BUILD_INPUT_METHOD}
PATCHDIR= ${.CURDIR}/../kinput2-wnn4/patches
FILESDIR= ${.CURDIR}/../kinput2-wnn4/files
NO_WRKSUBDIR= yes
USE_IMAKE= yes
.if !defined(CANNA) && !defined(SJ3) && !defined(WNN4) && !defined(WNN6)
@ -30,22 +29,26 @@ WNN4= yes
# LIB_DEPENDS, etc.
.if defined(CANNA)
INPUT_METHOD+= canna
LIB_INPUT_METHOD+= canna.1:${PORTSDIR}/japanese/Canna
KINPUT2_DEF+= -DUseCanna
LIB_INPUT_METHOD+= canna16.1:${PORTSDIR}/japanese/Canna
KINPUT2_DEF+= -DUseCanna -Dport_CANNASRC=${LOCALBASE}/include \
-Dport_CANNALIB="-L${LOCALBASE}/lib -lcanna16"
.endif
.if defined(SJ3)
INPUT_METHOD+= sj3
BUILD_INPUT_METHOD+= sj3serv:${PORTSDIR}/japanese/sj3
KINPUT2_DEF+= -DUseSj3
KINPUT2_DEF+= -DUseSj3 -Dport_SJ3SRC=${LOCALBASE}/include \
-Dport_SJ3LIB="-L${LOCALBASE}/lib -lsj3lib"
.endif
.if defined(WNN4)
INPUT_METHOD+= wnn4
BUILD_INPUT_METHOD+= ${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
KINPUT2_DEF+= -DUseWnn
BUILD_INPUT_METHOD+= ${X11BASE}/lib/libwnn.a:${PORTSDIR}/japanese/Wnn
KINPUT2_DEF+= -DUseWnn -Dport_WNNINCDIR=$(X11BASE)/include/wnn \
-Dport_WNNLIB="-L$(X11BASE)/lib -lwnn -lcrypt"
.elif defined(WNN6)
INPUT_METHOD+= wnn6
BUILD_INPUT_METHOD+= ${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
KINPUT2_DEF+= -DUseWnn -DWnnLibDir=${LOCALBASE}/lib/wnn6
LIB_INPUT_METHOD+= wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
KINPUT2_DEF+= -DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn \
-Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn6 -lcrypt"
.endif
#
# Make a value of INPUT_METHOD
@ -56,6 +59,12 @@ INPUT_METHOD!= echo ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g'
# Redefine $(IMAKE_CMD) with $(PORT_IMAKE_DEFINES) in ${WRKSRC}/Kinput2.conf
MAKE_ENV+= PORT_IMAKE_DEFINES='${KINPUT2_DEF}'
pre-configure:
if [ -f ${WRKSRC}/Kinput2.conf ]; then \
${MV} -f ${WRKSRC}/Kinput2.conf ${WRKSRC}/Kinput2.conf.org; \
fi
${CP} ${FILESDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf
do-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}

View File

@ -1 +1 @@
MD5 (kinput2-v2-fix4.tar.gz) = cbee9108f6915b2d9609c380b3ca3720
MD5 (kinput2-v3.tar.gz) = 3b3b6470879b5071c651bcdc84d52f3e

View File

@ -11,11 +11,6 @@ if you run
kinput2 -ccdef ccdef.kinput2.egg
WARNING: This kinput2 is applied the patch (patch-az in
/usr/ports/japanese/kinput2-wnn4/patches) that is modified by
Mr. Honma <honma@nasu-net.or.jp> to avoid problems of Filter Event
handle of XIM.
-- S. Taoka
<taoka@FreeBSD.org>