4 files changed, 59 insertions, 66 deletions

diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile
index a28bfa1e24db..0944fa096fa2 100644
--- a/japanese/jvim/Makefile
+++ b/japanese/jvim/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/09/09 16:07:12 max Exp $
+# $Id: Makefile,v 1.4 1998/09/21 22:33:23 steve Exp $
 #
 
 DISTNAME=	jvim2.0r+onew2.2.10
@@ -14,9 +14,6 @@ MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Japan/onew/ \
 
 MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
-LIB_DEPENDS=	${LIB_INPUT_METHOD}
-BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
-
 PATCHDIR=	${.CURDIR}/../jvim/patches
 FILESDIR=	${.CURDIR}/../jvim/files
 PLIST=		${.CURDIR}/../jvim/pkg/PLIST
@@ -27,20 +24,22 @@ WRKSRC=		${WRKDIR}/jvim2.0r
 # Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS,
 # LIB_DEPENDS, etc.
 .if defined(CANNA)
-INPUT_METHOD+=		canna
-LIB_INPUT_METHOD+=	canna.1:${PORTSDIR}/japanese/Canna
-JPLIB+=			-lcanna
+INPUT_METHOD+=	canna
+LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
+JPLIB+=		-lcanna
 .endif
 .if defined(WNN4)
-INPUT_METHOD+=		wnn4
-BUILD_INPUT_METHOD+=	${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-JPDEF+=			-DWNN_ISDIR
-JPLIB+=			-ljd -lcrypt
+INPUT_METHOD+=	wnn4
+BUILD_DEPENDS+=	${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn
+RUN_DEPENDS+=	${LOCALBASE}/lib/wnn/ja_JP/rk/2B_ROMKANA:${PORTSDIR}/japanese/Wnn
+JPDEF+=		-DWNN_ISDIR
+JPLIB+=		-ljd -lcrypt
 .elif defined(WNN6)
-INPUT_METHOD+=		wnn6
-BUILD_INPUT_METHOD+=	${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-JPDEF+=			-DWNN_ISDIR
-JPLIB+=			-ljd -lcrypt
+INPUT_METHOD+=	wnn6
+BUILD_DEPENDS+=	${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn
+RUN_DEPENDS+=	${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6/2B_ROMKANA:${PORTSDIR}/japanese/onew${INPUT_METHOD}
+JPDEF+=		-DWNN_ISDIR
+JPLIB+=		-ljd -lcrypt
 .endif
 #
 # Make a value of INPUT_METHOD
@@ -50,7 +49,7 @@ INPUT_METHOD!=	${ECHO} ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g'
 #
 # For ONEW library
 .if defined(INPUT_METHOD)
-BUILD_INPUT_METHOD+=	${LOCALBASE}/lib/libonew${INPUT_METHOD}.a:${PORTSDIR}/japanese/onew${INPUT_METHOD}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libonew${INPUT_METHOD}.a:${PORTSDIR}/japanese/onew${INPUT_METHOD}
 JPDEF+=		-DONEW
 # If we use ONEW libray, then -lonew*.a should appear
 # before the other libraries.
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index ed52fcc9ce53..b0e88ab8c73f 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -3,7 +3,7 @@
 # Date created:         98/11/17
 # Whom:                 Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.8 1999/01/26 01:01:52 asami Exp $
+# $Id: Makefile,v 1.9 1999/02/03 11:11:48 asami Exp $
 #
 
 DISTNAME=	vim
@@ -16,8 +16,6 @@ DISTFILES=	vim-3.0.tar.gz ${JPATCH}
 MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
 USE_XLIB=	yes
-LIB_DEPENDS=	${LIB_INPUT_METHOD}
-BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
 
 NO_LATEST_LINK=	YES	# waiting for jgrep, jfold, jcat
 PATCHDIR=	${.CURDIR}/../jvim3/patches
@@ -42,28 +40,30 @@ FEPOPT=		-DJP_DEF=\"EEE\"
 #  Direct connection to Canna
 #######
 .if defined(DIRECT_CANNA)
-INPUT_METHOD=		-direct_canna
-LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
-FEPOPT+=		-DCANNA
-FEPLIBS=		-lcanna
-FEPOBJS=		fepcanna.o
+INPUT_METHOD=	direct_canna
+LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
+FEPOPT+=	-DCANNA
+FEPLIBS=	-lcanna
+FEPOBJS=	fepcanna.o
 .else # DIRECT_CANNA
 #######
 # Connection by using ONEW library
 #######
 .if defined(CANNA)
-INPUT_METHOD+=		canna
-LIB_INPUT_METHOD+=	canna.1:${PORTSDIR}/japanese/Canna
-FEPLIBS+=		-lcanna
+INPUT_METHOD+=	canna
+LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
+FEPLIBS+=	-lcanna
 .endif
 .if defined(WNN4)
-INPUT_METHOD+=		wnn4
-BUILD_INPUT_METHOD+=	${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-FEPLIBS+=		-L${X11BASE}/lib -ljd -lcrypt
+INPUT_METHOD+=	wnn4
+BUILD_DEPENDS+=	${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn
+RUN_DEPENDS+=	${LOCALBASE}/lib/wnn/ja_JP/rk/2B_ROMKANA:${PORTSDIR}/japanese/Wnn
+FEPLIBS+=	-L${X11BASE}/lib -ljd -lcrypt
 .elif defined(WNN6)
-INPUT_METHOD+=		wnn6
-BUILD_INPUT_METHOD+=	${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-FEPLIBS+=		-L${X11BASE}/lib -ljd -lcrypt
+INPUT_METHOD+=	wnn6
+BUILD_DEPENDS+=	${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn
+RUN_DEPENDS+=	${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6/2B_ROMKANA:${PORTSDIR}/japanese/onew${INPUT_METHOD}
+FEPLIBS+=	-L${X11BASE}/lib -ljd -lcrypt
 .endif
 #
 # Make a value of INPUT_METHOD
@@ -74,7 +74,7 @@ INPUT_METHOD!=	echo ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g'
 #
 # For ONEW library
 .if defined(INPUT_METHOD)
-BUILD_INPUT_METHOD+=	${LOCALBASE}/lib/libonew${INPUT_METHOD}.a:${PORTSDIR}/japanese/onew${INPUT_METHOD}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libonew${INPUT_METHOD}.a:${PORTSDIR}/japanese/onew${INPUT_METHOD}
 FEPOPT+=	-DONEW
 # If we use ONEW libray, then -lonew-* need appear
 # before the other libraries in ${FEPLIBS}.
diff --git a/japanese/onew-freewnn/Makefile b/japanese/onew-freewnn/Makefile
index 96c0bbda8d21..aef55c4ee26c 100644
--- a/japanese/onew-freewnn/Makefile
+++ b/japanese/onew-freewnn/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/21 22:33:26 steve Exp $
+# $Id: Makefile,v 1.3 1998/12/02 05:09:13 asami Exp $
 #
 
 DISTNAME=	jvim2.0r+onew2.2.10
@@ -14,34 +14,31 @@ MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Japan/onew/ \
 
 MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
-BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
-LIB_DEPENDS=	${LIB_INPUT_METHOD}
-
 WRKSRC=		${WRKDIR}/onew
 # A value 'all' must not be set to TARGET.
 ALL_TARGET=	
 
 .if !defined(CANNA) && !defined(WNN4) && !defined(WNN6)
 # For this port
-WNN4=			yes
+WNN4=		yes
 .endif
 # Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS,
 # LIB_DEPENDS, etc.
 .if defined(CANNA)
-INPUT_METHOD+=		canna
-LIB_INPUT_METHOD+=	canna.1:${PORTSDIR}/japanese/Canna
-JPLIB+=			-lcanna
+INPUT_METHOD+=	canna
+LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
+JPLIB+=		-lcanna
 .endif
 .if defined(WNN4)
-INPUT_METHOD+=		wnn4
-BUILD_INPUT_METHOD+=	${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-JPDEF+=			-DWNN_ISDIR
-JPLIB+=			-ljd -lcrypt
+INPUT_METHOD+=	wnn4
+BUILD_DEPENDS+=	${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn
+JPLIB+=		-ljd -lcrypt
+JPDEF+=		-DWNN_ISDIR
 .elif defined(WNN6)
-INPUT_METHOD+=		wnn6
-BUILD_INPUT_METHOD+=	${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-JPDEF+=			-DWNN_ISDIR
-JPLIB+=			-ljd -lcrypt
+INPUT_METHOD+=	wnn6
+BUILD_DEPENDS+=	${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn
+JPLIB+=		-ljd -lcrypt
+JPDEF+=		-DWNN_ISDIR
 .endif
 #
 # Make a value of INPUT_METHOD
diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile
index 96c0bbda8d21..aef55c4ee26c 100644
--- a/japanese/onew/Makefile
+++ b/japanese/onew/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/21 22:33:26 steve Exp $
+# $Id: Makefile,v 1.3 1998/12/02 05:09:13 asami Exp $
 #
 
 DISTNAME=	jvim2.0r+onew2.2.10
@@ -14,34 +14,31 @@ MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Japan/onew/ \
 
 MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
-BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
-LIB_DEPENDS=	${LIB_INPUT_METHOD}
-
 WRKSRC=		${WRKDIR}/onew
 # A value 'all' must not be set to TARGET.
 ALL_TARGET=	
 
 .if !defined(CANNA) && !defined(WNN4) && !defined(WNN6)
 # For this port
-WNN4=			yes
+WNN4=		yes
 .endif
 # Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS,
 # LIB_DEPENDS, etc.
 .if defined(CANNA)
-INPUT_METHOD+=		canna
-LIB_INPUT_METHOD+=	canna.1:${PORTSDIR}/japanese/Canna
-JPLIB+=			-lcanna
+INPUT_METHOD+=	canna
+LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
+JPLIB+=		-lcanna
 .endif
 .if defined(WNN4)
-INPUT_METHOD+=		wnn4
-BUILD_INPUT_METHOD+=	${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-JPDEF+=			-DWNN_ISDIR
-JPLIB+=			-ljd -lcrypt
+INPUT_METHOD+=	wnn4
+BUILD_DEPENDS+=	${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn
+JPLIB+=		-ljd -lcrypt
+JPDEF+=		-DWNN_ISDIR
 .elif defined(WNN6)
-INPUT_METHOD+=		wnn6
-BUILD_INPUT_METHOD+=	${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-JPDEF+=			-DWNN_ISDIR
-JPLIB+=			-ljd -lcrypt
+INPUT_METHOD+=	wnn6
+BUILD_DEPENDS+=	${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn
+JPLIB+=		-ljd -lcrypt
+JPDEF+=		-DWNN_ISDIR
 .endif
 #
 # Make a value of INPUT_METHOD