12 files changed, 36 insertions, 54 deletions

diff --git a/japanese/jvim3-canna+freewnn/Makefile b/japanese/jvim3-canna+freewnn/Makefile
index 049880de19a2..fb51364e887e 100644
--- a/japanese/jvim3-canna+freewnn/Makefile
+++ b/japanese/jvim3-canna+freewnn/Makefile
@@ -1,13 +1,11 @@
 # New ports collection makefile for:	jvim3 for Canna and Wnn4
-# Version required:	3.0-j1.3j
+# Version required:	3.0-1.7j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-canna+wnn4-3.0.1.3j
-
 CANNA=		yes
 WNN4=		yes
 
diff --git a/japanese/jvim3-canna+wnn6/Makefile b/japanese/jvim3-canna+wnn6/Makefile
index 1d6de8a37261..eed45c209986 100644
--- a/japanese/jvim3-canna+wnn6/Makefile
+++ b/japanese/jvim3-canna+wnn6/Makefile
@@ -1,13 +1,11 @@
 # New ports collection makefile for:	jvim3 for Canna and Wnn6
-# Version required:	3.0-j1.3j
+# Version required:	3.0-1.7j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-canna+wnn6-3.0.1.3j
-
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/jvim3-canna+wnn7/Makefile b/japanese/jvim3-canna+wnn7/Makefile
index 1d6de8a37261..eed45c209986 100644
--- a/japanese/jvim3-canna+wnn7/Makefile
+++ b/japanese/jvim3-canna+wnn7/Makefile
@@ -1,13 +1,11 @@
 # New ports collection makefile for:	jvim3 for Canna and Wnn6
-# Version required:	3.0-j1.3j
+# Version required:	3.0-1.7j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-canna+wnn6-3.0.1.3j
-
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/jvim3-canna/Makefile b/japanese/jvim3-canna/Makefile
index 7c877ac8c58c..9333931166ee 100644
--- a/japanese/jvim3-canna/Makefile
+++ b/japanese/jvim3-canna/Makefile
@@ -1,13 +1,11 @@
 # New ports collection makefile for:	jvim3 for Canna
-# Version required:	3.0-j1.3j
+# Version required:	3.0-1.7j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-canna-3.0.1.3j
-
 CANNA=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim3
diff --git a/japanese/jvim3-direct_canna/Makefile b/japanese/jvim3-direct_canna/Makefile
index 5faa8e04846a..51312aebe032 100644
--- a/japanese/jvim3-direct_canna/Makefile
+++ b/japanese/jvim3-direct_canna/Makefile
@@ -1,13 +1,11 @@
 # New ports collection makefile for:	jvim3 for Canna without ONEW library
-# Version required:	3.0-j1.3j
+# Version required:	3.0-1.7j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-direct_canna-3.0.1.3j
-
 DIRECT_CANNA=	yes
 
 MASTERDIR=	${.CURDIR}/../jvim3
diff --git a/japanese/jvim3-freewnn/Makefile b/japanese/jvim3-freewnn/Makefile
index 0a58d75c370b..c4eb13d0c0a9 100644
--- a/japanese/jvim3-freewnn/Makefile
+++ b/japanese/jvim3-freewnn/Makefile
@@ -1,13 +1,11 @@
 # New ports collection makefile for:	jvim3 for Wnn4
-# Version required:	3.0-j1.3j
+# Version required:	3.0-1.7j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-wnn4-3.0.1.3j
-
 WNN4=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim3
diff --git a/japanese/jvim3-wnn6/Makefile b/japanese/jvim3-wnn6/Makefile
index 0e8fce92f1dc..67d1fb2b9038 100644
--- a/japanese/jvim3-wnn6/Makefile
+++ b/japanese/jvim3-wnn6/Makefile
@@ -1,13 +1,11 @@
 # New ports collection makefile for:	jvim3 for Wnn6
-# Version required:	3.0-j1.3j
+# Version required:	3.0-1.3j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-wnn6-3.0.1.3j
-
 WNN6=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim3
diff --git a/japanese/jvim3-wnn7/Makefile b/japanese/jvim3-wnn7/Makefile
index 0e8fce92f1dc..67d1fb2b9038 100644
--- a/japanese/jvim3-wnn7/Makefile
+++ b/japanese/jvim3-wnn7/Makefile
@@ -1,13 +1,11 @@
 # New ports collection makefile for:	jvim3 for Wnn6
-# Version required:	3.0-j1.3j
+# Version required:	3.0-1.3j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-wnn6-3.0.1.3j
-
 WNN6=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim3
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index 842a21e7d36c..5cd1bf7f6ebe 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    jvim3
-# Version required:     3.0-j1.3j
+# Version required:     3.0-1.7j
 # Date created:         98/11/17
 # Whom:                 Satoshi TAOKA <taoka@FreeBSD.org>
 #
@@ -7,10 +7,10 @@
 #
 
 DISTNAME=	vim
-PKGNAME?=	ja-jvim-3.0.1.3j
+PKGNAME?=	ja-jvim${INPUT_METHOD}-3.0.1.7j
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://dutepp0.et.tudelft.nl/pub/Unix/Editors/ \
-		http://hp.vector.co.jp/authors/VA003457/vim/vim3/1.3j/
+		http://hp.vector.co.jp/authors/VA003457/vim/vim3/1.7/
 DISTFILES=	vim-3.0.tar.gz ${JPATCH}
 
 MAINTAINER=	taoka@FreeBSD.org
@@ -25,8 +25,8 @@ EXTRACT_ONLY=	vim-3.0.tar.gz
 MAKEFILE=	makjunix.mak
 MAN1=		jvim3.1
 
-VERSION=	3.0.1.3j
-JPATCH=		jvim.1.3j.tar.gz
+VERSION=	3.0.1.7j
+JPATCH=		jvim.1.7.tar.gz
 PLIST_SUB=	VERSION=${VERSION}
 PORT_DOCDIR=	${PREFIX}/share/doc/ja-jvim-${VERSION}
 # -DUSE_X11 is the cause of a problem treating Japanese
@@ -40,7 +40,7 @@ FEPOPT=		-DJP_DEF=\"EEE\"
 #  Direct connection to Canna
 #######
 .if defined(DIRECT_CANNA)
-INPUT_METHOD=	direct_canna
+INPUT_METHOD+=	direct_canna
 LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
 FEPOPT+=	-DCANNA
 FEPLIBS=	-lcanna
@@ -65,28 +65,24 @@ 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
+.endif # DIRECT_CANNA
 #
-# Make a value of INPUT_METHOD
 .if defined(INPUT_METHOD)
-# 'echo' and 'sed' cannot replace by '${ECHO}' and '${SED}' in the next line
+# Make a value of INPUT_METHOD
+## 'echo' and 'sed' in the next line cannot replace by '${ECHO}' and '${SED}'
 INPUT_METHOD!=	echo ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g'
-.endif
-#
+FEPOPT+=	-DFEPCTRL
+.if !defined(DIRECT_CANNA)
 # For ONEW library
-.if defined(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
+# If we use ONEW libray, then -lonew-* needs appear
 # before the other libraries in ${FEPLIBS}.
-### 'sed' and echo cannot replace by '${SED}' and ${ECHO} in the next line
+### 'sed' and 'echo' in the next line cannot replace by '${SED}' and ${ECHO}
 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
 .endif
 
 post-extract:
@@ -112,8 +108,8 @@ do-install:
 .if !defined(NOPORTDOCS)
 .if defined(PORT_DOCDIR)
 	${MKDIR} ${PORT_DOCDIR}
-	for file in fj.txt differen.doc readme.doc uganda.jp \
-			fepctrl.doc tutor/tutor.j; do \
+	for file in cygwin.txt differen.doc fepctrl.doc readme.doc \
+		termcap.dos uganda.jp vim-jp.htm vim32.ini tutor/tutor.j ; do \
 		${INSTALL_DATA} ${WRKSRC}/doc.j/$$file ${PORT_DOCDIR}; \
 	done
 
diff --git a/japanese/jvim3/distinfo b/japanese/jvim3/distinfo
index f18822eddd75..72425cf45e5b 100644
--- a/japanese/jvim3/distinfo
+++ b/japanese/jvim3/distinfo
@@ -1,2 +1,2 @@
 MD5 (vim-3.0.tar.gz) = ecc99d34ca57bc2d2e3b7e3d9832591d
-MD5 (jvim.1.3j.tar.gz) = 9b8c012b42cccab818068003165909a0
+MD5 (jvim.1.7.tar.gz) = 718fe91e06862fb4009ae54875862ce9
diff --git a/japanese/jvim3/files/patch-aa b/japanese/jvim3/files/patch-aa
index b42525037960..c97de1bd2131 100644
--- a/japanese/jvim3/files/patch-aa
+++ b/japanese/jvim3/files/patch-aa
@@ -1,6 +1,5 @@
-diff -u src/makjunix.mak.orig src/makjunix.mak
---- src/makjunix.mak.orig	Tue Jan 26 09:17:50 1999
-+++ src/makjunix.mak	Tue Jan 26 09:17:50 1999
+--- src/makjunix.mak.orig	Mon Sep 27 23:22:24 1999
++++ src/makjunix.mak	Mon Sep 27 23:27:05 1999
 @@ -61,8 +61,8 @@
  #X11LIBDIR = /usr/lib/X11R5
  #X11INCDIR = /usr/include/X11R5
@@ -44,10 +43,10 @@ diff -u src/makjunix.mak.orig src/makjunix.mak
 -		-DVIM_HLP=\"$(HELPLOC)/vim.hlp\" \
 +		-DVIM_HLP=\"$(HELPLOC)/jvim3.hlp\" \
 +		-DDEFVIMRC_FILE=\"$(PREFIX)/etc/jvim3rc\" \
- 		-DKANJI -DTRACK -DCRMARK -DFEXRC -DUSE_GREP -DUSE_OPT $(FEPOPT)
+ 		-DKANJI -DUCODE -DTRACK -DCRMARK -DFEXRC -DUSE_GREP -DUSE_OPT $(FEPOPT)
  
  #
-@@ -453,11 +454,11 @@
+@@ -458,11 +459,11 @@
  	chmod $(BINMOD) $(BINLOC)/$(TARGET)
  	$(STRIP) $(BINLOC)/$(TARGET)
  	-mkdir $(MANLOC)
@@ -63,7 +62,7 @@ diff -u src/makjunix.mak.orig src/makjunix.mak
  
  clean:
  	-rm -f $(OBJ) mkcmdtab.o version.o core $(TARGET) mkcmdtab cmdtab.h
-@@ -605,7 +606,7 @@
+@@ -617,7 +618,7 @@
  	$(CC) $(CFLAGS) fepbow.c
  
  fepcanna.o: fepcanna.c
diff --git a/japanese/jvim3/pkg-plist b/japanese/jvim3/pkg-plist
index a22e8512cffd..5e9fc4fea6ee 100644
--- a/japanese/jvim3/pkg-plist
+++ b/japanese/jvim3/pkg-plist
@@ -3,10 +3,13 @@ bin/jgrep
 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%%/fj.txt
-share/doc/ja-jvim-%%VERSION%%/tutor.j
+share/doc/ja-jvim-%%VERSION%%/cygwin.txt
 share/doc/ja-jvim-%%VERSION%%/differen.doc
+share/doc/ja-jvim-%%VERSION%%/fepctrl.doc
 share/doc/ja-jvim-%%VERSION%%/readme.doc
+share/doc/ja-jvim-%%VERSION%%/termcap.dos
+share/doc/ja-jvim-%%VERSION%%/tutor.j
 share/doc/ja-jvim-%%VERSION%%/uganda.jp
-share/doc/ja-jvim-%%VERSION%%/fepctrl.doc
+share/doc/ja-jvim-%%VERSION%%/vim-jp.htm
+share/doc/ja-jvim-%%VERSION%%/vim32.ini
 @dirrm share/doc/ja-jvim-%%VERSION%%