Version up of jvim3: 1.3d -> 1.3i

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

4 files changed, 32 insertions, 26 deletions

diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index 1c74b71da85b..816043d233ca 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -1,18 +1,17 @@
 # New ports collection makefile for:    jvim3
-# Version required:     3.0-j1.3d
-# Date created:         97/10/30
+# Version required:     3.0-j1.3i
+# Date created:         98/11/17
 # Whom:                 Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.4 1998/10/28 09:27:46 asami Exp $
+# $Id: Makefile,v 1.5 1998/10/31 07:06:01 kuriyama Exp $
 #
 
 DISTNAME=	vim
-PKGNAME?=	ja-jvim-3.0.1.3d
+PKGNAME?=	ja-jvim-3.0.1.3i
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://dutepp0.et.tudelft.nl/pub/Unix/Editors/ \
-		http://www.freebsd.org/~kuriyama/distfiles/ \
-		http://spock.vector.co.jp/authors/VA003457/vim/vim3/1.3d/
-DISTFILES=	vim-3.0.tar.gz jvim.1.3d.tar.gz
+		http://hp.vector.co.jp/authors/VA003457/vim/vim3/1.3i/
+DISTFILES=	vim-3.0.tar.gz ${JPATCH}
 
 MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
@@ -22,15 +21,13 @@ BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
 NO_LATEST_LINK=	YES	# waiting for jgrep, jfold, jcat
 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
+VERSION=	3.0.1.3i
+JPATCH=		jvim.1.3i.tar.gz
 PLIST_SUB=	VERSION=${VERSION}
 PORT_DOCDIR=	${PREFIX}/share/doc/ja-jvim-${VERSION}
 # -DUSE_X11 is the cause of a problem treating Japanese
@@ -92,7 +89,7 @@ FEPOPT+=	-DFEPCTRL
 .endif
 
 post-extract:
-	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/jvim.1.3d.tar.gz
+	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${JPATCH}
 
 pre-patch:
 	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/jvim.diff
@@ -108,11 +105,12 @@ do-install:
 	if [ -e ${PREFIX}/etc/jvim3rc ]; then \
 		${MV} ${PREFIX}/etc/jvim3rc ${PREFIX}/etc/jvim3rc.bak; \
 	fi
-	${ECHO} "set fepctrl" > ${PREFIX}/etc/jvim3rc
+	${INSTALL_PROGRAM} ${WRKSRC}/src/grep/grep ${PREFIX}/bin/jgrep
+	${ECHO} "set fepctrl onewredraw" > ${PREFIX}/etc/jvim3rc
 .if !defined(NOPORTDOCS)
 .if defined(PORT_DOCDIR)
 	${MKDIR} ${PORT_DOCDIR}
-	for file in differen.doc readme.doc uganda.jp \
+	for file in fj.txt differen.doc readme.doc uganda.jp \
 			fepctrl.doc tutor/tutor.j; do \
 		${INSTALL_DATA} ${WRKSRC}/doc.j/$$file ${PORT_DOCDIR}; \
 	done
diff --git a/japanese/jvim3/distinfo b/japanese/jvim3/distinfo
index 27f449ed19ae..a0e6e2df0a95 100644
--- a/japanese/jvim3/distinfo
+++ b/japanese/jvim3/distinfo
@@ -1,2 +1,2 @@
 MD5 (vim-3.0.tar.gz) = ecc99d34ca57bc2d2e3b7e3d9832591d
-MD5 (jvim.1.3d.tar.gz) = 5e1a3026ffbed99813da0a2768008747
+MD5 (jvim.1.3i.tar.gz) = 64680a1b536f0d393b676b7fd66c0076
diff --git a/japanese/jvim3/files/patch-aa b/japanese/jvim3/files/patch-aa
index 3294a6e32486..2d36251e32c4 100644
--- a/japanese/jvim3/files/patch-aa
+++ b/japanese/jvim3/files/patch-aa
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/makjunix.mak.orig	Tue Nov 17 20:55:43 1998
++++ src/makjunix.mak	Tue Nov 17 21:07:34 1998
+@@ -55,14 +55,14 @@
  ### root directory for X11 files (unless overruled in hardware-dependend part)
  ### Unfortunately there is no standard for these, everybody puts them
  ### somewhere else
@@ -11,11 +11,17 @@
  ### for some hpux systems:
  #X11LIBDIR = /usr/lib/X11R5
  #X11INCDIR = /usr/include/X11R5
- 
-+### for FreeBSD with XFree86
+ ###
+-#X11LIBDIR = /usr/X11R6/lib
+-#X11INCDIR = /usr/X11R6/include
 +X11LIBDIR = /usr/X11R6/lib
 +X11INCDIR = /usr/X11R6/include
-+
+ ###
+ #X11LIBDIR = /usr/X386/lib
+ #X11INCDIR = /usr/X386/include
+@@ -72,13 +72,13 @@
+ 
+ 
  ### Prefix for location of files
 -PREFIX = /usr/local
 +PREFIX?= /usr/local
@@ -29,7 +35,7 @@
  
  ### Location of man page
  MANLOC = $(PREFIX)/man/man1
-@@ -90,7 +94,7 @@
+@@ -100,7 +100,7 @@
  
  MANFILE = ../doc/vim.1
  
@@ -38,7 +44,7 @@
  
  #
  # PART 2: various choices
-@@ -158,7 +162,8 @@
+@@ -168,7 +168,8 @@
  
  DEFS = -DDIGRAPHS -DTERMCAP -DSOME_BUILTIN_TCAPS -DNO_FREE_NULL -DVIM_ISSPACE \
  		-DWEBB_COMPLETE -DWEBB_KEYWORD_COMPL \
@@ -48,7 +54,7 @@
  		-DKANJI -DTRACK -DCRMARK -DFEXRC -DUSE_GREP -DUSE_OPT $(FEPOPT)
  
  #
-@@ -430,11 +435,11 @@
+@@ -447,11 +448,11 @@
  	chmod $(BINMOD) $(BINLOC)/$(TARGET)
  	$(STRIP) $(BINLOC)/$(TARGET)
  	-mkdir $(MANLOC)
@@ -64,12 +70,12 @@
  
  clean:
  	-rm -f $(OBJ) mkcmdtab.o version.o core $(TARGET) mkcmdtab cmdtab.h
-@@ -582,7 +587,7 @@
+@@ -599,7 +600,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
++	$(CC) $(CFLAGS) -I${PREFIX}/include fepcanna.c
  
  feponew.o: feponew.c
  	$(CC) $(CFLAGS) feponew.c
diff --git a/japanese/jvim3/pkg-plist b/japanese/jvim3/pkg-plist
index 70db6325d277..a22e8512cffd 100644
--- a/japanese/jvim3/pkg-plist
+++ b/japanese/jvim3/pkg-plist
@@ -1,7 +1,9 @@
 bin/jvim3
+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%%/differen.doc
 share/doc/ja-jvim-%%VERSION%%/readme.doc