Japanized Vim-3.0 with {Canna, Canna+Wnn4, Canna+Wnn6, Wnn4, Wnn6 and

direct connection to Canna}.

PKGNAME of japanese/jvim3-direct_canna has 2 dashes like
"ja-jvim--direct_canna-3.0.1.3d", but "-direct_canna" is used for
specifying compiler option automagically.

PR:		ports/8115
Submitted by:	Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>

31 files changed, 443 insertions, 0 deletions

diff --git a/japanese/jvim3-canna+freewnn/Makefile b/japanese/jvim3-canna+freewnn/Makefile
new file mode 100644
index 000000000000..2430fdac02c7
--- /dev/null
+++ b/japanese/jvim3-canna+freewnn/Makefile
@@ -0,0 +1,14 @@
+# New ports collection makefile for:	jvim3 for Canna and Wnn4
+# Version required:	3.0-j1.3d
+# Date created:		97/10/30
+# Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	ja-jvim-canna+wnn4-3.0.1.3d
+
+CANNA=		yes
+WNN4=		yes
+
+.include "${.CURDIR}/../jvim3/Makefile"
diff --git a/japanese/jvim3-canna+freewnn/pkg-comment b/japanese/jvim3-canna+freewnn/pkg-comment
new file mode 100644
index 000000000000..2b0febe09f99
--- /dev/null
+++ b/japanese/jvim3-canna+freewnn/pkg-comment
@@ -0,0 +1 @@
+Japanized Vim-3.0 (with Canna and Wnn4)
diff --git a/japanese/jvim3-canna+freewnn/pkg-descr b/japanese/jvim3-canna+freewnn/pkg-descr
new file mode 100644
index 000000000000..303f69be15e1
--- /dev/null
+++ b/japanese/jvim3-canna+freewnn/pkg-descr
@@ -0,0 +1,12 @@
+JVim 3.0 is a text editor that is upwards compatible to vi. It can be
+used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text.  It is
+especially useful for editing programs.
+
+This package is built with Japanese support, using Canna and Wnn4.
+
+There are a lot of enhancements above vi: multi level undo, command
+line editing, filename completion, on line help, quoting, etc.. Read
+difference.doc for a summary of the differences between vi and Vim.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/jvim3-canna+wnn6/Makefile b/japanese/jvim3-canna+wnn6/Makefile
new file mode 100644
index 000000000000..09a88cdc6460
--- /dev/null
+++ b/japanese/jvim3-canna+wnn6/Makefile
@@ -0,0 +1,14 @@
+# New ports collection makefile for:	jvim3 for Canna and Wnn6
+# Version required:	3.0-j1.3d
+# Date created:		97/10/30
+# Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	ja-jvim-canna+wnn6-3.0.1.3d
+
+CANNA=		yes
+WNN6=		yes
+
+.include "${.CURDIR}/../jvim3/Makefile"
diff --git a/japanese/jvim3-canna+wnn6/pkg-comment b/japanese/jvim3-canna+wnn6/pkg-comment
new file mode 100644
index 000000000000..1f63536f57dd
--- /dev/null
+++ b/japanese/jvim3-canna+wnn6/pkg-comment
@@ -0,0 +1 @@
+Japanized Vim-3.0 (with Canna and Wnn6)
diff --git a/japanese/jvim3-canna+wnn6/pkg-descr b/japanese/jvim3-canna+wnn6/pkg-descr
new file mode 100644
index 000000000000..10ce53cca848
--- /dev/null
+++ b/japanese/jvim3-canna+wnn6/pkg-descr
@@ -0,0 +1,12 @@
+JVim 3.0 is a text editor that is upwards compatible to vi. It can be
+used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text.  It is
+especially useful for editing programs.
+
+This package is built with Japanese support, using Canna and Wnn6.
+
+There are a lot of enhancements above vi: multi level undo, command
+line editing, filename completion, on line help, quoting, etc.. Read
+difference.doc for a summary of the differences between vi and Vim.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/jvim3-canna+wnn7/Makefile b/japanese/jvim3-canna+wnn7/Makefile
new file mode 100644
index 000000000000..09a88cdc6460
--- /dev/null
+++ b/japanese/jvim3-canna+wnn7/Makefile
@@ -0,0 +1,14 @@
+# New ports collection makefile for:	jvim3 for Canna and Wnn6
+# Version required:	3.0-j1.3d
+# Date created:		97/10/30
+# Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	ja-jvim-canna+wnn6-3.0.1.3d
+
+CANNA=		yes
+WNN6=		yes
+
+.include "${.CURDIR}/../jvim3/Makefile"
diff --git a/japanese/jvim3-canna+wnn7/pkg-comment b/japanese/jvim3-canna+wnn7/pkg-comment
new file mode 100644
index 000000000000..1f63536f57dd
--- /dev/null
+++ b/japanese/jvim3-canna+wnn7/pkg-comment
@@ -0,0 +1 @@
+Japanized Vim-3.0 (with Canna and Wnn6)
diff --git a/japanese/jvim3-canna+wnn7/pkg-descr b/japanese/jvim3-canna+wnn7/pkg-descr
new file mode 100644
index 000000000000..10ce53cca848
--- /dev/null
+++ b/japanese/jvim3-canna+wnn7/pkg-descr
@@ -0,0 +1,12 @@
+JVim 3.0 is a text editor that is upwards compatible to vi. It can be
+used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text.  It is
+especially useful for editing programs.
+
+This package is built with Japanese support, using Canna and Wnn6.
+
+There are a lot of enhancements above vi: multi level undo, command
+line editing, filename completion, on line help, quoting, etc.. Read
+difference.doc for a summary of the differences between vi and Vim.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/jvim3-canna/Makefile b/japanese/jvim3-canna/Makefile
new file mode 100644
index 000000000000..c3fe83c78970
--- /dev/null
+++ b/japanese/jvim3-canna/Makefile
@@ -0,0 +1,13 @@
+# New ports collection makefile for:	jvim3 for Canna
+# Version required:	3.0-j1.3d
+# Date created:		97/10/30
+# Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	ja-jvim-canna-3.0.1.3d
+
+CANNA=		yes
+
+.include "${.CURDIR}/../jvim3/Makefile"
diff --git a/japanese/jvim3-canna/pkg-comment b/japanese/jvim3-canna/pkg-comment
new file mode 100644
index 000000000000..2c576bd18bbf
--- /dev/null
+++ b/japanese/jvim3-canna/pkg-comment
@@ -0,0 +1 @@
+Japanized Vim-3.0 (with Canna)
diff --git a/japanese/jvim3-canna/pkg-descr b/japanese/jvim3-canna/pkg-descr
new file mode 100644
index 000000000000..7e4e20da08ac
--- /dev/null
+++ b/japanese/jvim3-canna/pkg-descr
@@ -0,0 +1,12 @@
+JVim 3.0 is a text editor that is upwards compatible to vi. It can be
+used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text.  It is
+especially useful for editing programs.
+
+This package is built with Japanese support, using Canna.
+
+There are a lot of enhancements above vi: multi level undo, command
+line editing, filename completion, on line help, quoting, etc.. Read
+difference.doc for a summary of the differences between vi and Vim.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/jvim3-direct_canna/Makefile b/japanese/jvim3-direct_canna/Makefile
new file mode 100644
index 000000000000..0adbbc548cd0
--- /dev/null
+++ b/japanese/jvim3-direct_canna/Makefile
@@ -0,0 +1,13 @@
+# New ports collection makefile for:	jvim3 for Canna without ONEW library
+# Version required:	3.0-j1.3d
+# Date created:		97/10/30
+# Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	ja-jvim--direct_canna-3.0.1.3d
+
+DIRECT_CANNA=	yes
+
+.include "${.CURDIR}/../jvim3/Makefile"
diff --git a/japanese/jvim3-direct_canna/pkg-comment b/japanese/jvim3-direct_canna/pkg-comment
new file mode 100644
index 000000000000..e212dcfe02df
--- /dev/null
+++ b/japanese/jvim3-direct_canna/pkg-comment
@@ -0,0 +1 @@
+Japanized Vim-3.0 (direct connection to Canna)
diff --git a/japanese/jvim3-direct_canna/pkg-descr b/japanese/jvim3-direct_canna/pkg-descr
new file mode 100644
index 000000000000..8624c7586994
--- /dev/null
+++ b/japanese/jvim3-direct_canna/pkg-descr
@@ -0,0 +1,13 @@
+JVim 3.0 is a text editor that is upwards compatible to vi. It can be
+used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text.  It is
+especially useful for editing programs.
+
+This package is built with Japanese support, using Canna without ONEW
+library (that is, it means this connects to Canna directly).
+
+There are a lot of enhancements above vi: multi level undo, command
+line editing, filename completion, on line help, quoting, etc.. Read
+difference.doc for a summary of the differences between vi and Vim.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/jvim3-freewnn/Makefile b/japanese/jvim3-freewnn/Makefile
new file mode 100644
index 000000000000..3dc81742de52
--- /dev/null
+++ b/japanese/jvim3-freewnn/Makefile
@@ -0,0 +1,13 @@
+# New ports collection makefile for:	jvim3 for Wnn4
+# Version required:	3.0-j1.3d
+# Date created:		97/10/30
+# Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	ja-jvim-wnn4-3.0.1.3d
+
+WNN4=		yes
+
+.include "${.CURDIR}/../jvim3/Makefile"
diff --git a/japanese/jvim3-freewnn/pkg-comment b/japanese/jvim3-freewnn/pkg-comment
new file mode 100644
index 000000000000..0d85af716c46
--- /dev/null
+++ b/japanese/jvim3-freewnn/pkg-comment
@@ -0,0 +1 @@
+Japanized Vim-3.0 (with Wnn4)
diff --git a/japanese/jvim3-freewnn/pkg-descr b/japanese/jvim3-freewnn/pkg-descr
new file mode 100644
index 000000000000..33382f59b9df
--- /dev/null
+++ b/japanese/jvim3-freewnn/pkg-descr
@@ -0,0 +1,12 @@
+JVim 3.0 is a text editor that is upwards compatible to vi. It can be
+used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text.  It is
+especially useful for editing programs.
+
+This package is built with Japanese support, using Wnn4.
+
+There are a lot of enhancements above vi: multi level undo, command
+line editing, filename completion, on line help, quoting, etc.. Read
+difference.doc for a summary of the differences between vi and Vim.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/jvim3-wnn6/Makefile b/japanese/jvim3-wnn6/Makefile
new file mode 100644
index 000000000000..816a8600b28d
--- /dev/null
+++ b/japanese/jvim3-wnn6/Makefile
@@ -0,0 +1,13 @@
+# New ports collection makefile for:	jvim3 for Wnn6
+# Version required:	3.0-j1.3d
+# Date created:		97/10/30
+# Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	ja-jvim-wnn6-3.0.1.3d
+
+WNN6=		yes
+
+.include "${.CURDIR}/../jvim3/Makefile"
diff --git a/japanese/jvim3-wnn6/pkg-comment b/japanese/jvim3-wnn6/pkg-comment
new file mode 100644
index 000000000000..97595d0815e5
--- /dev/null
+++ b/japanese/jvim3-wnn6/pkg-comment
@@ -0,0 +1 @@
+Japanized Vim-3.0 (with Wnn6)
diff --git a/japanese/jvim3-wnn6/pkg-descr b/japanese/jvim3-wnn6/pkg-descr
new file mode 100644
index 000000000000..59e939c2a159
--- /dev/null
+++ b/japanese/jvim3-wnn6/pkg-descr
@@ -0,0 +1,12 @@
+JVim 3.0 is a text editor that is upwards compatible to vi. It can be
+used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text.  It is
+especially useful for editing programs.
+
+This package is built with Japanese support, using Wnn6.
+
+There are a lot of enhancements above vi: multi level undo, command
+line editing, filename completion, on line help, quoting, etc.. Read
+difference.doc for a summary of the differences between vi and Vim.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/jvim3-wnn7/Makefile b/japanese/jvim3-wnn7/Makefile
new file mode 100644
index 000000000000..816a8600b28d
--- /dev/null
+++ b/japanese/jvim3-wnn7/Makefile
@@ -0,0 +1,13 @@
+# New ports collection makefile for:	jvim3 for Wnn6
+# Version required:	3.0-j1.3d
+# Date created:		97/10/30
+# Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	ja-jvim-wnn6-3.0.1.3d
+
+WNN6=		yes
+
+.include "${.CURDIR}/../jvim3/Makefile"
diff --git a/japanese/jvim3-wnn7/pkg-comment b/japanese/jvim3-wnn7/pkg-comment
new file mode 100644
index 000000000000..97595d0815e5
--- /dev/null
+++ b/japanese/jvim3-wnn7/pkg-comment
@@ -0,0 +1 @@
+Japanized Vim-3.0 (with Wnn6)
diff --git a/japanese/jvim3-wnn7/pkg-descr b/japanese/jvim3-wnn7/pkg-descr
new file mode 100644
index 000000000000..59e939c2a159
--- /dev/null
+++ b/japanese/jvim3-wnn7/pkg-descr
@@ -0,0 +1,12 @@
+JVim 3.0 is a text editor that is upwards compatible to vi. It can be
+used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text.  It is
+especially useful for editing programs.
+
+This package is built with Japanese support, using Wnn6.
+
+There are a lot of enhancements above vi: multi level undo, command
+line editing, filename completion, on line help, quoting, etc.. Read
+difference.doc for a summary of the differences between vi and Vim.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
new file mode 100644
index 000000000000..b29f87da1a58
--- /dev/null
+++ b/japanese/jvim3/Makefile
@@ -0,0 +1,121 @@
+# New ports collection makefile for:    jvim3
+# Version required:     3.0-j1.3d
+# Date created:         97/10/30
+# Whom:                 Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+DISTNAME=	vim
+PKGNAME?=	ja-jvim-3.0.1.3d
+CATEGORIES=	japanese editors
+MASTER_SITES=	ftp://dutepp0.et.tudelft.nl/pub/Unix/Editors/ \
+		http://spock.vector.co.jp/authors/VA003457/vim/vim3/1.3d/
+DISTFILES=	vim-3.0.tar.gz jvim.1.3d.tar.gz
+
+MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
+
+LIB_DEPENDS=	${LIB_INPUT_METHOD}
+BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
+
+PATCHDIR=	${.CURDIR}/../jvim3/patches
+FILESDIR=	${.CURDIR}/../jvim3/files
+.if !defined(WNN6)
+## For Wnn6 we use a local PLIST
+PLIST=		${.CURDIR}/../jvim3/pkg/PLIST
+.endif
+EXTRACT_ONLY=	vim-3.0.tar.gz
+MAKEFILE=	makjunix.mak
+MAN1=		jvim3.1
+
+VERSION=	3.0.1.3d
+PLIST_SUB=	VERSION=${VERSION}
+PORT_DOCDIR=	${PREFIX}/share/doc/ja-jvim-${VERSION}
+# -DUSE_X11 is the cause of a problem treating Japanese
+MACHINE=	 -DBSD_UNIX -DUSE_LOCALE -DUSE_X11
+CC=		cc -O -g -Wall -traditional -Dconst= -I${X11BASE}/include
+LIBS=		-ltermlib -lxpg4 -L${PREFIX}/lib -L${X11BASE}/lib -lX11
+# Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS,
+# LIB_DEPENDS, etc.
+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
+.else # DIRECT_CANNA
+#######
+# Connection by using ONEW library
+#######
+.if defined(CANNA)
+INPUT_METHOD+=		canna
+LIB_INPUT_METHOD+=	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
+.elif defined(WNN6)
+INPUT_METHOD+=		wnn6
+BUILD_INPUT_METHOD+=	${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
+FEPLIBS+=		-L${X11BASE}/lib -ljd -lcrypt
+.endif
+#
+# Make a value of INPUT_METHOD
+.if defined(INPUT_METHOD)
+# 'echo' and 'sed' cannot replace by '${ECHO}' and '${SED}' in the next line
+INPUT_METHOD!=	echo ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g'
+.endif
+#
+# For ONEW library
+.if defined(INPUT_METHOD)
+BUILD_INPUT_METHOD+=	${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}.
+### 'sed' and echo cannot replace by '${SED}' and ${ECHO} in the next line
+FEPLIBS!=	echo ${FEPLIBS} | sed 's%^%-lonew${INPUT_METHOD} %'
+FEPOBJS=	feponew.o
+.endif
+.endif # DIRECT_CANNA
+###
+.if defined(FEPOBJS)
+# In the case defining at least one of CANNA, WNN4, WNN6, DIRECT_CANNA
+FEPOPT+=	-DFEPCTRL
+.endif
+
+post-extract:
+	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/jvim.1.3d.tar.gz
+
+pre-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/jvim.diff
+
+do-build:
+	cd ${WRKSRC}/src; \
+	make -f ${MAKEFILE} 'FEPOPT=${FEPOPT}' 'FEPLIBS=${FEPLIBS}' \
+		'FEPOBJS=${FEPOBJS}' 'MACHINE=${MACHINE}' 'CC=${CC}' \
+		'LIBS=${LIBS}'
+
+do-install:
+	cd ${WRKSRC}/src; make -f ${MAKEFILE} install
+	if [ -e ${PREFIX}/etc/jvim3rc ]; then \
+		${MV} ${PREFIX}/etc/jvim3rc ${PREFIX}/etc/jvim3rc.bak; \
+	fi
+	${ECHO} "set fepctrl" > ${PREFIX}/etc/jvim3rc
+.if !defined(NOPORTDOCS)
+.if defined(PORT_DOCDIR)
+	${MKDIR} ${PORT_DOCDIR}
+	for file in differen.doc readme.doc uganda.jp \
+			fepctrl.doc tutor/tutor.j; do \
+		${INSTALL_DATA} ${WRKSRC}/doc.j/$$file ${PORT_DOCDIR}; \
+	done
+
+.endif
+.endif
+
+.include <bsd.port.mk>
diff --git a/japanese/jvim3/distinfo b/japanese/jvim3/distinfo
new file mode 100644
index 000000000000..27f449ed19ae
--- /dev/null
+++ b/japanese/jvim3/distinfo
@@ -0,0 +1,2 @@
+MD5 (vim-3.0.tar.gz) = ecc99d34ca57bc2d2e3b7e3d9832591d
+MD5 (jvim.1.3d.tar.gz) = 5e1a3026ffbed99813da0a2768008747
diff --git a/japanese/jvim3/files/patch-aa b/japanese/jvim3/files/patch-aa
new file mode 100644
index 000000000000..3294a6e32486
--- /dev/null
+++ b/japanese/jvim3/files/patch-aa
@@ -0,0 +1,75 @@
+--- src/makjunix.mak.orig	Fri Sep 11 11:00:13 1998
++++ src/makjunix.mak	Tue Sep 15 16:26:30 1998
+@@ -55,20 +55,24 @@
+ ### root directory for X11 files (unless overruled in hardware-dependend part)
+ ### Unfortunately there is no standard for these, everybody puts them
+ ### somewhere else
+-X11LIBDIR = /usr/openwin/lib
+-X11INCDIR = /usr/openwin/include
++#X11LIBDIR = /usr/openwin/lib
++#X11INCDIR = /usr/openwin/include
+ ### for some hpux systems:
+ #X11LIBDIR = /usr/lib/X11R5
+ #X11INCDIR = /usr/include/X11R5
+ 
++### for FreeBSD with XFree86
++X11LIBDIR = /usr/X11R6/lib
++X11INCDIR = /usr/X11R6/include
++
+ ### Prefix for location of files
+-PREFIX = /usr/local
++PREFIX?= /usr/local
+ 
+ ### Location of binary
+ BINLOC = $(PREFIX)/bin
+ 
+ ### Name of target
+-TARGET = vim
++TARGET = jvim3
+ 
+ ### Location of man page
+ MANLOC = $(PREFIX)/man/man1
+@@ -90,7 +94,7 @@
+ 
+ MANFILE = ../doc/vim.1
+ 
+-HELPFILE = ../doc/vim.hlp
++HELPFILE = ../doc.j/vim.hlp
+ 
+ #
+ # PART 2: various choices
+@@ -158,7 +162,8 @@
+ 
+ DEFS = -DDIGRAPHS -DTERMCAP -DSOME_BUILTIN_TCAPS -DNO_FREE_NULL -DVIM_ISSPACE \
+ 		-DWEBB_COMPLETE -DWEBB_KEYWORD_COMPL \
+-		-DVIM_HLP=\"$(HELPLOC)/vim.hlp\" \
++		-DVIM_HLP=\"$(HELPLOC)/jvim3.hlp\" \
++		-DDEFVIMRC_FILE=\"$(PREFIX)/etc/jvim3rc\" \
+ 		-DKANJI -DTRACK -DCRMARK -DFEXRC -DUSE_GREP -DUSE_OPT $(FEPOPT)
+ 
+ #
+@@ -430,11 +435,11 @@
+ 	chmod $(BINMOD) $(BINLOC)/$(TARGET)
+ 	$(STRIP) $(BINLOC)/$(TARGET)
+ 	-mkdir $(MANLOC)
+-	cp $(MANFILE) $(MANLOC)
+-	chmod $(MANMOD) $(MANLOC)/vim.1
++	cp $(MANFILE) $(MANLOC)/jvim3.1
++	chmod $(MANMOD) $(MANLOC)/jvim3.1
+ 	-mkdir $(HELPLOC)
+-	cp $(HELPFILE) $(HELPLOC)
+-	chmod $(HELPMOD) $(HELPLOC)/vim.hlp
++	cp $(HELPFILE) $(HELPLOC)/jvim3.hlp
++	chmod $(HELPMOD) $(HELPLOC)/jvim3.hlp
+ 
+ clean:
+ 	-rm -f $(OBJ) mkcmdtab.o version.o core $(TARGET) mkcmdtab cmdtab.h
+@@ -582,7 +587,7 @@
+ 	$(CC) $(CFLAGS) fepbow.c
+ 
+ fepcanna.o: fepcanna.c
+-	$(CC) $(CFLAGS) -I/usr/local/canna/include fepcanna.c
++	$(CC) $(CFLAGS) -I/usr/local/canna/include -I${PREFIX}/include fepcanna.c
+ 
+ feponew.o: feponew.c
+ 	$(CC) $(CFLAGS) feponew.c
diff --git a/japanese/jvim3/files/patch-ab b/japanese/jvim3/files/patch-ab
new file mode 100644
index 000000000000..80b26435c0ce
--- /dev/null
+++ b/japanese/jvim3/files/patch-ab
@@ -0,0 +1,12 @@
+--- src/term.c.~1~	Thu Sep 17 11:58:38 1998
++++ src/term.c	Fri Sep 18 09:26:33 1998
+@@ -207,7 +207,9 @@
+ 			T_CDL = TGETSTR("DL", &tp);
+ 			T_CS = TGETSTR("cs", &tp);
+ 			T_ED = TGETSTR("cl", &tp);
++#ifndef __FreeBSD__ /* by Satoshi TAOKA */
+ 			T_CI = TGETSTR("vi", &tp);
++#endif
+ 			T_CV = TGETSTR("ve", &tp);
+ 			T_CVV = TGETSTR("vs", &tp);
+ 			T_TP = TGETSTR("me", &tp);
diff --git a/japanese/jvim3/pkg-comment b/japanese/jvim3/pkg-comment
new file mode 100644
index 000000000000..5cd3f841e2e0
--- /dev/null
+++ b/japanese/jvim3/pkg-comment
@@ -0,0 +1 @@
+Japanized Vim-3.0
diff --git a/japanese/jvim3/pkg-descr b/japanese/jvim3/pkg-descr
new file mode 100644
index 000000000000..eff0dbccfcbe
--- /dev/null
+++ b/japanese/jvim3/pkg-descr
@@ -0,0 +1,10 @@
+JVim 3.0 is a text editor that is upwards compatible to vi. It can be
+used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text.  It is
+especially useful for editing programs.
+
+There are a lot of enhancements above vi: multi level undo, command
+line editing, filename completion, on line help, quoting, etc.. Read
+difference.doc for a summary of the differences between vi and Vim.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/japanese/jvim3/pkg-plist b/japanese/jvim3/pkg-plist
new file mode 100644
index 000000000000..70db6325d277
--- /dev/null
+++ b/japanese/jvim3/pkg-plist
@@ -0,0 +1,10 @@
+bin/jvim3
+lib/jvim3.hlp
+@exec ([ -f %D/etc/jvim3rc ] && mv %D/etc/jvim3rc %D/etc/jvim3rc.bak) || /usr/bin/true
+etc/jvim3rc
+share/doc/ja-jvim-%%VERSION%%/tutor.j
+share/doc/ja-jvim-%%VERSION%%/differen.doc
+share/doc/ja-jvim-%%VERSION%%/readme.doc
+share/doc/ja-jvim-%%VERSION%%/uganda.jp
+share/doc/ja-jvim-%%VERSION%%/fepctrl.doc
+@dirrm share/doc/ja-jvim-%%VERSION%%