From 30b28e77c4743a81479fda7ec9ce8b894b7cba1c Mon Sep 17 00:00:00 2001 From: Satoshi Taoka Date: Sun, 6 Jun 1999 13:20:08 +0000 Subject: Update from version 2.0p4 to 3.0. This is a Wnn6 full supported version. --- japanese/kinput2-canna+freewnn+sj3/Makefile | 5 ++--- japanese/kinput2-canna+freewnn+sj3/pkg-descr | 5 ----- japanese/kinput2-canna+freewnn/Makefile | 5 ++--- japanese/kinput2-canna+freewnn/pkg-descr | 5 ----- japanese/kinput2-canna+sj3+wnn6/Makefile | 5 ++--- japanese/kinput2-canna+sj3+wnn6/pkg-descr | 5 ----- japanese/kinput2-canna+sj3+wnn7/Makefile | 5 ++--- japanese/kinput2-canna+sj3+wnn7/pkg-descr | 5 ----- japanese/kinput2-canna+sj3/Makefile | 5 ++--- japanese/kinput2-canna+sj3/pkg-descr | 5 ----- japanese/kinput2-canna+wnn6/Makefile | 5 ++--- japanese/kinput2-canna+wnn6/pkg-descr | 5 ----- japanese/kinput2-canna+wnn7/Makefile | 5 ++--- japanese/kinput2-canna+wnn7/pkg-descr | 5 ----- japanese/kinput2-canna/Makefile | 5 ++--- japanese/kinput2-canna/pkg-descr | 5 ----- japanese/kinput2-freewnn+sj3/Makefile | 5 ++--- japanese/kinput2-freewnn+sj3/pkg-descr | 5 ----- japanese/kinput2-freewnn/Makefile | 33 ++++++++++++++++++---------- japanese/kinput2-freewnn/distinfo | 2 +- japanese/kinput2-freewnn/pkg-descr | 5 ----- japanese/kinput2-sj3+wnn6/Makefile | 5 ++--- japanese/kinput2-sj3+wnn6/pkg-descr | 5 ----- japanese/kinput2-sj3+wnn7/Makefile | 5 ++--- japanese/kinput2-sj3+wnn7/pkg-descr | 5 ----- japanese/kinput2-sj3/Makefile | 5 ++--- japanese/kinput2-sj3/pkg-descr | 5 ----- japanese/kinput2-wnn6/Makefile | 5 ++--- japanese/kinput2-wnn6/pkg-descr | 5 ----- japanese/kinput2-wnn7/Makefile | 5 ++--- japanese/kinput2-wnn7/pkg-descr | 5 ----- japanese/kinput2/Makefile | 33 ++++++++++++++++++---------- japanese/kinput2/distinfo | 2 +- japanese/kinput2/pkg-descr | 5 ----- 34 files changed, 72 insertions(+), 148 deletions(-) diff --git a/japanese/kinput2-canna+freewnn+sj3/Makefile b/japanese/kinput2-canna+freewnn+sj3/Makefile index e731e1338352..d0d7eab39a24 100644 --- a/japanese/kinput2-canna+freewnn+sj3/Makefile +++ b/japanese/kinput2-canna+freewnn+sj3/Makefile @@ -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 # -# $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 diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-descr b/japanese/kinput2-canna+freewnn+sj3/pkg-descr index feb5793423cf..9f924776ae88 100644 --- a/japanese/kinput2-canna+freewnn+sj3/pkg-descr +++ b/japanese/kinput2-canna+freewnn+sj3/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka diff --git a/japanese/kinput2-canna+freewnn/Makefile b/japanese/kinput2-canna+freewnn/Makefile index 4f83b99b5b3d..e8147c86a47c 100644 --- a/japanese/kinput2-canna+freewnn/Makefile +++ b/japanese/kinput2-canna+freewnn/Makefile @@ -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 # -# $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 diff --git a/japanese/kinput2-canna+freewnn/pkg-descr b/japanese/kinput2-canna+freewnn/pkg-descr index 782a04e3a768..f44aa5546a9c 100644 --- a/japanese/kinput2-canna+freewnn/pkg-descr +++ b/japanese/kinput2-canna+freewnn/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka diff --git a/japanese/kinput2-canna+sj3+wnn6/Makefile b/japanese/kinput2-canna+sj3+wnn6/Makefile index 5f1b0d70e53a..57ac7de220f9 100644 --- a/japanese/kinput2-canna+sj3+wnn6/Makefile +++ b/japanese/kinput2-canna+sj3+wnn6/Makefile @@ -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 # -# $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 diff --git a/japanese/kinput2-canna+sj3+wnn6/pkg-descr b/japanese/kinput2-canna+sj3+wnn6/pkg-descr index e24afc83f954..c936fc0bf0e7 100644 --- a/japanese/kinput2-canna+sj3+wnn6/pkg-descr +++ b/japanese/kinput2-canna+sj3+wnn6/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka diff --git a/japanese/kinput2-canna+sj3+wnn7/Makefile b/japanese/kinput2-canna+sj3+wnn7/Makefile index 5f1b0d70e53a..57ac7de220f9 100644 --- a/japanese/kinput2-canna+sj3+wnn7/Makefile +++ b/japanese/kinput2-canna+sj3+wnn7/Makefile @@ -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 # -# $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 diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-descr b/japanese/kinput2-canna+sj3+wnn7/pkg-descr index e24afc83f954..c936fc0bf0e7 100644 --- a/japanese/kinput2-canna+sj3+wnn7/pkg-descr +++ b/japanese/kinput2-canna+sj3+wnn7/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka diff --git a/japanese/kinput2-canna+sj3/Makefile b/japanese/kinput2-canna+sj3/Makefile index fc06320492fe..940996741b51 100644 --- a/japanese/kinput2-canna+sj3/Makefile +++ b/japanese/kinput2-canna+sj3/Makefile @@ -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 # -# $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 diff --git a/japanese/kinput2-canna+sj3/pkg-descr b/japanese/kinput2-canna+sj3/pkg-descr index adf65a2cb59a..b43e9b69c030 100644 --- a/japanese/kinput2-canna+sj3/pkg-descr +++ b/japanese/kinput2-canna+sj3/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. diff --git a/japanese/kinput2-canna+wnn6/Makefile b/japanese/kinput2-canna+wnn6/Makefile index f39503aef435..07f5aac12c13 100644 --- a/japanese/kinput2-canna+wnn6/Makefile +++ b/japanese/kinput2-canna+wnn6/Makefile @@ -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 # -# $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 diff --git a/japanese/kinput2-canna+wnn6/pkg-descr b/japanese/kinput2-canna+wnn6/pkg-descr index d49ab6991f71..8f1a8a47474b 100644 --- a/japanese/kinput2-canna+wnn6/pkg-descr +++ b/japanese/kinput2-canna+wnn6/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka diff --git a/japanese/kinput2-canna+wnn7/Makefile b/japanese/kinput2-canna+wnn7/Makefile index f39503aef435..07f5aac12c13 100644 --- a/japanese/kinput2-canna+wnn7/Makefile +++ b/japanese/kinput2-canna+wnn7/Makefile @@ -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 # -# $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 diff --git a/japanese/kinput2-canna+wnn7/pkg-descr b/japanese/kinput2-canna+wnn7/pkg-descr index d49ab6991f71..8f1a8a47474b 100644 --- a/japanese/kinput2-canna+wnn7/pkg-descr +++ b/japanese/kinput2-canna+wnn7/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka diff --git a/japanese/kinput2-canna/Makefile b/japanese/kinput2-canna/Makefile index bf4380bef819..2248eded5070 100644 --- a/japanese/kinput2-canna/Makefile +++ b/japanese/kinput2-canna/Makefile @@ -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 # -# $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/ diff --git a/japanese/kinput2-canna/pkg-descr b/japanese/kinput2-canna/pkg-descr index 4ffa896e5b8e..4772ac539b60 100644 --- a/japanese/kinput2-canna/pkg-descr +++ b/japanese/kinput2-canna/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. diff --git a/japanese/kinput2-freewnn+sj3/Makefile b/japanese/kinput2-freewnn+sj3/Makefile index a78473a5c9ab..e8ece6734d90 100644 --- a/japanese/kinput2-freewnn+sj3/Makefile +++ b/japanese/kinput2-freewnn+sj3/Makefile @@ -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 # -# $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 diff --git a/japanese/kinput2-freewnn+sj3/pkg-descr b/japanese/kinput2-freewnn+sj3/pkg-descr index f7fc5698c6f9..382337047b64 100644 --- a/japanese/kinput2-freewnn+sj3/pkg-descr +++ b/japanese/kinput2-freewnn+sj3/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka diff --git a/japanese/kinput2-freewnn/Makefile b/japanese/kinput2-freewnn/Makefile index 3e187f2ac0b5..acfbd4b7243f 100644 --- a/japanese/kinput2-freewnn/Makefile +++ b/japanese/kinput2-freewnn/Makefile @@ -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 # -# $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} diff --git a/japanese/kinput2-freewnn/distinfo b/japanese/kinput2-freewnn/distinfo index 46d611bc72a0..c0ecfd4e19eb 100644 --- a/japanese/kinput2-freewnn/distinfo +++ b/japanese/kinput2-freewnn/distinfo @@ -1 +1 @@ -MD5 (kinput2-v2-fix4.tar.gz) = cbee9108f6915b2d9609c380b3ca3720 +MD5 (kinput2-v3.tar.gz) = 3b3b6470879b5071c651bcdc84d52f3e diff --git a/japanese/kinput2-freewnn/pkg-descr b/japanese/kinput2-freewnn/pkg-descr index 237386a384bc..3fe8cd6ebcc2 100644 --- a/japanese/kinput2-freewnn/pkg-descr +++ b/japanese/kinput2-freewnn/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka diff --git a/japanese/kinput2-sj3+wnn6/Makefile b/japanese/kinput2-sj3+wnn6/Makefile index 5eb81551d106..7da3f1939b1d 100644 --- a/japanese/kinput2-sj3+wnn6/Makefile +++ b/japanese/kinput2-sj3+wnn6/Makefile @@ -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 # -# $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 diff --git a/japanese/kinput2-sj3+wnn6/pkg-descr b/japanese/kinput2-sj3+wnn6/pkg-descr index 9db4a9b7b231..55dce61d0eae 100644 --- a/japanese/kinput2-sj3+wnn6/pkg-descr +++ b/japanese/kinput2-sj3+wnn6/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka diff --git a/japanese/kinput2-sj3+wnn7/Makefile b/japanese/kinput2-sj3+wnn7/Makefile index 5eb81551d106..7da3f1939b1d 100644 --- a/japanese/kinput2-sj3+wnn7/Makefile +++ b/japanese/kinput2-sj3+wnn7/Makefile @@ -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 # -# $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 diff --git a/japanese/kinput2-sj3+wnn7/pkg-descr b/japanese/kinput2-sj3+wnn7/pkg-descr index 9db4a9b7b231..55dce61d0eae 100644 --- a/japanese/kinput2-sj3+wnn7/pkg-descr +++ b/japanese/kinput2-sj3+wnn7/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka diff --git a/japanese/kinput2-sj3/Makefile b/japanese/kinput2-sj3/Makefile index fbe96afef13c..eb3b92d27dbb 100644 --- a/japanese/kinput2-sj3/Makefile +++ b/japanese/kinput2-sj3/Makefile @@ -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 # -# $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/ diff --git a/japanese/kinput2-sj3/pkg-descr b/japanese/kinput2-sj3/pkg-descr index e3832d0d38a2..b101a6e1217f 100644 --- a/japanese/kinput2-sj3/pkg-descr +++ b/japanese/kinput2-sj3/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. diff --git a/japanese/kinput2-wnn6/Makefile b/japanese/kinput2-wnn6/Makefile index 5be8ea667089..1a64a1955212 100644 --- a/japanese/kinput2-wnn6/Makefile +++ b/japanese/kinput2-wnn6/Makefile @@ -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 # -# $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/ diff --git a/japanese/kinput2-wnn6/pkg-descr b/japanese/kinput2-wnn6/pkg-descr index 9ff736150cbd..71c7ca2a09be 100644 --- a/japanese/kinput2-wnn6/pkg-descr +++ b/japanese/kinput2-wnn6/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka diff --git a/japanese/kinput2-wnn7/Makefile b/japanese/kinput2-wnn7/Makefile index 5be8ea667089..1a64a1955212 100644 --- a/japanese/kinput2-wnn7/Makefile +++ b/japanese/kinput2-wnn7/Makefile @@ -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 # -# $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/ diff --git a/japanese/kinput2-wnn7/pkg-descr b/japanese/kinput2-wnn7/pkg-descr index 9ff736150cbd..71c7ca2a09be 100644 --- a/japanese/kinput2-wnn7/pkg-descr +++ b/japanese/kinput2-wnn7/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile index 3e187f2ac0b5..acfbd4b7243f 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -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 # -# $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} diff --git a/japanese/kinput2/distinfo b/japanese/kinput2/distinfo index 46d611bc72a0..c0ecfd4e19eb 100644 --- a/japanese/kinput2/distinfo +++ b/japanese/kinput2/distinfo @@ -1 +1 @@ -MD5 (kinput2-v2-fix4.tar.gz) = cbee9108f6915b2d9609c380b3ca3720 +MD5 (kinput2-v3.tar.gz) = 3b3b6470879b5071c651bcdc84d52f3e diff --git a/japanese/kinput2/pkg-descr b/japanese/kinput2/pkg-descr index 237386a384bc..3fe8cd6ebcc2 100644 --- a/japanese/kinput2/pkg-descr +++ b/japanese/kinput2/pkg-descr @@ -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 to avoid problems of Filter Event -handle of XIM. - -- S. Taoka -- cgit v1.2.3