diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index d29f5cc445a1..443248dcf511 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -1,106 +1,105 @@
 # Created by: Satoshi TAOKA <taoka@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	jvim
 PORTVERSION=	3.0.j2.1b
 PORTREVISION=	1
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://ftp.vim.org/pub/vim/unix/ \
 		http://hp.vector.co.jp/authors/VA003457/vim/vim3/2.1b/
 DISTFILES=	vim-3.0.tar.gz jvim.2.1b.tar.gz
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Japanized Vim-3.0
 
 EXTRA_PATCHES=	${WRKDIR}/${PORTNAME}.diff
 WRKSRC=		${WRKDIR}/vim
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${WRKSRC}/src
 MAKEFILE=	makjunix.mak
 ALL_TARGET=	# empty
 PLIST_SUB=	VERSION=${PORTVERSION}
 MAKE_ARGS=	FEPOPT='${FEPOPT}' \
 		FEPLIBS="${FEPLIBS}" \
 		FEPOBJS="${FEPOBJS}" \
 		LIBS="${LIBS}"
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11 FREEWNN_CANNA
 OPTIONS_RADIO=	FEP
 OPTIONS_RADIO_FEP=	FREEWNN_CANNA DIRECT_CANNA WNN6 WNN7
 FEP_DESC=	Japanese FrontEnd Processor
 DIRECT_CANNA_DESC=	Canna support (direct)
 DIRECT_CANNA_LIB_DEPENDS=	libcanna.so:${PORTSDIR}/japanese/canna-lib
 FREEWNN_CANNA_DESC=	Canna and FreeWnn support (via ONEW library)
 FREEWNN_CANNA_LIB_DEPENDS=	libjd.so:${PORTSDIR}/japanese/FreeWnn-lib \
 				libcanna.so:${PORTSDIR}/japanese/canna-lib
 FREEWNN_CANNA_BUILD_DEPENDS=	${LOCALBASE}/lib/libonew-canna+freewnn.a:${PORTSDIR}/japanese/onew
 WNN6_DESC=	Wnn6 support
 WNN6_LIB_DEPENDS=	libjd.so:${PORTSDIR}/japanese/FreeWnn-lib
 WNN6_BUILD_DEPENDS=	${LOCALBASE}/lib/libonew-wnn6.a:${PORTSDIR}/japanese/onew
 WNN7_DESC=	Wnn7 support
 WNN7_LIB_DEPENDS=	libjd.so:${PORTSDIR}/japanese/FreeWnn-lib
 WNN7_BUILD_DEPENDS=	${LOCALBASE}/lib/libonew-wnn7.a:${PORTSDIR}/japanese/onew
 
 PORTDOCS=	cygwin.txt differen.doc fepctrl.doc readme.doc \
 		termcap.dos uganda.jp vim-jp.htm vim32.ini tutor.j
 
 CPPFLAGS+=	-DBSD_UNIX -DUSE_LOCALE
 LIBS+=		-ltermlib -L${LOCALBASE}/lib
 
 X11_USE=	XORG=x11
 X11_CPPFLAGS=	-DUSE_X11 -I${LOCALBASE}/include
 X11_LIBS=	-lX11 -L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDIRECT_CANNA} || \
     ${PORT_OPTIONS:MFREEWNN_CANNA} || \
     ${PORT_OPTIONS:MWNN6} || \
     ${PORT_OPTIONS:MWNN7}
 FEPOPT+=	-DJP_DEF=\"EEE\" -DFEPCTRL
 .endif
 
 #  Direct connection to Canna
 .if ${PORT_OPTIONS:MDIRECT_CANNA}
 FEPOPT+=	-DCANNA
 FEPLIBS=	-lcanna -L${LOCALBASE}/lib
 FEPOBJS=	fepcanna.o
 JVIM3RC=	"set fepctrl"
 .endif
 
 .if ${PORT_OPTIONS:MFREEWNN_CANNA} || \
     ${PORT_OPTIONS:MWNN6} || \
     ${PORT_OPTIONS:MWNN7} || \
     ${PORT_OPTIONS:MCANNA}
 FEPOPT+=	-DONEW
 FEPOBJS=	feponew.o
 JVIM3RC=	"set fepctrl onewredraw"
 .endif
 
 # Connection by using ONEW library
 .if ${PORT_OPTIONS:MFREEWNN_CANNA}
 FEPLIBS+=	-lonew-canna+freewnn -lcanna -ljd -lcrypt
 .endif
 
 .if ${PORT_OPTIONS:MWNN6}
 FEPLIBS+=	-lonew-wnn6 -ljd -lcrypt
 .endif
 
 .if ${PORT_OPTIONS:MWNN7}
 FEPLIBS+=	-lonew-wnn7 -ljd -lcrypt
 .endif
 
 post-build:
-	${CP} ${WRKSRC}/doc.j/tutor/tutor.j ${WRKSRC}/doc.j
+	${INSTALL_DATA} ${WRKSRC}/doc.j/tutor/tutor.j ${WRKSRC}/doc.j
+	${ECHO_CMD} "${JVIM3RC}" > ${WRKSRC}/jvim3rc.dist
 
 post-install:
 	${LN} -sf jvim3 ${STAGEDIR}${PREFIX}/bin/jvim
-	${INSTALL_PROGRAM} ${WRKSRC}/src/grep/grep \
-	    ${STAGEDIR}${PREFIX}/bin/jgrep
-	${ECHO_CMD} "${JVIM3RC}" > ${WRKSRC}/jvim3rc.dist
+	${INSTALL_PROGRAM} ${WRKSRC}/src/grep.bin ${STAGEDIR}${PREFIX}/bin/jgrep
 	${INSTALL_DATA} ${WRKSRC}/jvim3rc.dist ${STAGEDIR}${PREFIX}/etc/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc.j && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/jvim3/files/patch-src-makjunix.mak b/japanese/jvim3/files/patch-src-makjunix.mak
index 04b60f200fda..690346cb361b 100644
--- a/japanese/jvim3/files/patch-src-makjunix.mak
+++ b/japanese/jvim3/files/patch-src-makjunix.mak
@@ -1,287 +1,289 @@
---- src/makjunix.mak.orig	2014-03-14 23:13:33.000000000 +0900
-+++ src/makjunix.mak	2014-03-14 23:20:30.000000000 +0900
+--- src/makjunix.mak.orig	2014-08-30 01:12:22.000000000 +0900
++++ src/makjunix.mak	2014-08-30 01:19:58.000000000 +0900
 @@ -72,19 +72,20 @@
  
  
  ### Prefix for location of files
 -PREFIX = /usr/local
 +PREFIX?= /usr/local
  
  ### Location of binary
 -BINLOC = $(PREFIX)/bin
 +BINLOC = $(DESTDIR)$(PREFIX)/bin
  
  ### Name of target
 -TARGET = vim
 +PROG = jvim3
  
  ### Location of man page
 -MANLOC = $(PREFIX)/man/man1
 +MAN1PREFIX?=	${PREFIX}
 +MANLOC = $(DESTDIR)$(MAN1PREFIX)/man/man1
  
  ### Location of help file
 -HELPLOC = $(PREFIX)/lib
 +HELPLOC = $(DESTDIR)$(PREFIX)/lib
  
  ### Program to run on installed binary
  STRIP = strip
 @@ -100,7 +101,7 @@
  
  MANFILE = ../doc/vim.1
  
 -HELPFILE = ../doc/vim.hlp
 +HELPFILE = ../doc.j/vim.hlp
  
  #
  # PART 2: various choices
 @@ -168,7 +169,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 -DUCODE -DTRACK -DCRMARK -DFEXRC -DUSE_GREP -DUSE_TAGEX -DUSE_OPT $(FEPOPT)
  
  #
 @@ -424,7 +426,7 @@
  ##   no changes required below this line      ##
  ################################################
  
 -CFLAGS = -c $(MACHINE) $(DEFS)
 +CFLAGS+=	$(CPPFLAGS) $(DEFS)
  
  INCL = vim.h globals.h param.h keymap.h macros.h ascii.h term.h unix.h structs.h proto.h
  
 @@ -438,36 +440,32 @@
  
  GOBJ = grep.o alloc.o charset.o kanji.o regexp.o regsub.o u2s.o s2u.o
  
 -all: $(TARGET) grep
-+all: $(PROG) grep
++all: $(PROG) grep.bin
  
 -$(TARGET): $(OBJ) version.c
 -	$(CC) $(CFLAGS) version.c
 -	$(CC) -o $(TARGET) $(OBJ) version.o $(LIBS) $(FEPLIBS)
 +$(PROG): $(OBJ) version.c
 +	$(CC) -c $(CFLAGS) version.c
 +	$(CC) -o $(PROG) $(OBJ) version.o $(LIBS) $(FEPLIBS)
  
- grep: $(GOBJ)
- 	$(CC) -o grep/grep $(GOBJ) $(LIBS) $(FEPLIBS)
+-grep: $(GOBJ)
+-	$(CC) -o grep/grep $(GOBJ) $(LIBS) $(FEPLIBS)
++grep.bin: $(GOBJ)
++	$(CC) -o grep.bin $(GOBJ) $(LIBS) $(FEPLIBS)
  
  debug: $(OBJ) version.c
 -	$(CC) $(CFLAGS) version.c
 -	$(CC) -o $(TARGET) -g $(OBJ) version.o $(LIBS)
 +	$(CC) -c $(CFLAGS) version.c
 +	$(CC) -o $(PROG) -g $(OBJ) version.o $(LIBS)
  
  ctags:
  	ctags *.c *.h
  
 -install: $(TARGET)
 -	-mkdir $(BINLOC)
 -	cp $(TARGET) $(BINLOC)
 -	chmod $(BINMOD) $(BINLOC)/$(TARGET)
 -	$(STRIP) $(BINLOC)/$(TARGET)
 -	-mkdir $(MANLOC)
 -	cp $(MANFILE) $(MANLOC)
 -	chmod $(MANMOD) $(MANLOC)/vim.1
 -	-mkdir $(HELPLOC)
 -	cp $(HELPFILE) $(HELPLOC)
 -	chmod $(HELPMOD) $(HELPLOC)/vim.hlp
 +install: $(PROG)
 +	mkdir -p $(BINLOC)
 +	${BSD_INSTALL_PROGRAM} ${PROG} ${BINLOC}
 +	mkdir -p $(MANLOC)
 +	${BSD_INSTALL_MAN} $(MANFILE) $(MANLOC)/jvim3.1
 +	mkdir -p $(HELPLOC)
 +	${BSD_INSTALL_DATA} $(HELPFILE) $(HELPLOC)/jvim3.hlp
  
  clean:
 -	-rm -f $(OBJ) mkcmdtab.o version.o core $(TARGET) mkcmdtab cmdtab.h
 +	-rm -f $(OBJ) mkcmdtab.o version.o core $(PROG) mkcmdtab cmdtab.h
  	-rm -f *.bak
  	-rm -f $(GOBJ)
  #	-rm -f jptab.h jptab
 @@ -490,97 +488,97 @@
  ###########################################################################
  
  alloc.o:	alloc.c  $(INCL)
 -	$(CC) $(CFLAGS) alloc.c
 +	$(CC) -c $(CFLAGS) alloc.c
  
  unix.o:	unix.c  $(INCL)
 -	$(CC) $(CFLAGS) unix.c
 +	$(CC) -c $(CFLAGS) unix.c
  
  buffer.o:	buffer.c  $(INCL)
 -	$(CC) $(CFLAGS) buffer.c
 +	$(CC) -c $(CFLAGS) buffer.c
  
  charset.o:	charset.c  $(INCL)
 -	$(CC) $(CFLAGS) charset.c
 +	$(CC) -c $(CFLAGS) charset.c
  
  cmdcmds.o:	cmdcmds.c  $(INCL)
 -	$(CC) $(CFLAGS) cmdcmds.c
 +	$(CC) -c $(CFLAGS) cmdcmds.c
  
  cmdline.o:	cmdline.c  $(INCL) cmdtab.h ops.h
 -	$(CC) $(CFLAGS) cmdline.c
 +	$(CC) -c $(CFLAGS) cmdline.c
  
  csearch.o:	csearch.c  $(INCL)
 -	$(CC) $(CFLAGS) csearch.c
 +	$(CC) -c $(CFLAGS) csearch.c
  
  digraph.o:	digraph.c  $(INCL)
 -	$(CC) $(CFLAGS) digraph.c
 +	$(CC) -c $(CFLAGS) digraph.c
  
  edit.o:	edit.c  $(INCL) ops.h
 -	$(CC) $(CFLAGS) edit.c
 +	$(CC) -c $(CFLAGS) edit.c
  
  fileio.o:	fileio.c  $(INCL)
 -	$(CC) $(CFLAGS) fileio.c
 +	$(CC) -c $(CFLAGS) fileio.c
  
  getchar.o:	getchar.c  $(INCL)
 -	$(CC) $(CFLAGS) getchar.c
 +	$(CC) -c $(CFLAGS) getchar.c
  
  help.o:	help.c  $(INCL)
 -	$(CC) $(CFLAGS) help.c
 +	$(CC) -c $(CFLAGS) help.c
  
  linefunc.o:	linefunc.c  $(INCL)
 -	$(CC) $(CFLAGS) linefunc.c
 +	$(CC) -c $(CFLAGS) linefunc.c
  
  main.o:	main.c  $(INCL)
 -	$(CC) $(CFLAGS) main.c
 +	$(CC) -c $(CFLAGS) main.c
  
  mark.o:	mark.c  $(INCL)
 -	$(CC) $(CFLAGS) mark.c
 +	$(CC) -c $(CFLAGS) mark.c
  
  memfile.o:	memfile.c  $(INCL)
 -	$(CC) $(CFLAGS) memfile.c
 +	$(CC) -c $(CFLAGS) memfile.c
  
  memline.o:	memline.c  $(INCL)
 -	$(CC) $(CFLAGS) memline.c
 +	$(CC) -c $(CFLAGS) memline.c
  
  message.o:	message.c  $(INCL)
 -	$(CC) $(CFLAGS) message.c
 +	$(CC) -c $(CFLAGS) message.c
  
  misccmds.o:	misccmds.c  $(INCL)
 -	$(CC) $(CFLAGS) misccmds.c
 +	$(CC) -c $(CFLAGS) misccmds.c
  
  normal.o:	normal.c  $(INCL) ops.h
 -	$(CC) $(CFLAGS) normal.c
 +	$(CC) -c $(CFLAGS) normal.c
  
  ops.o:	ops.c  $(INCL) ops.h
 -	$(CC) $(CFLAGS) ops.c
 +	$(CC) -c $(CFLAGS) ops.c
  
  param.o:	param.c  $(INCL)
 -	$(CC) $(CFLAGS) param.c
 +	$(CC) -c $(CFLAGS) param.c
  
  quickfix.o:	quickfix.c  $(INCL)
 -	$(CC) $(CFLAGS) quickfix.c
 +	$(CC) -c $(CFLAGS) quickfix.c
  
  regexp.o:	regexp.c  $(INCL)
 -	$(CC) $(CFLAGS) regexp.c
 +	$(CC) -c $(CFLAGS) regexp.c
  
  regsub.o:	regsub.c  $(INCL)
 -	$(CC) $(CFLAGS) regsub.c
 +	$(CC) -c $(CFLAGS) regsub.c
  
  screen.o:	screen.c  $(INCL)
 -	$(CC) $(CFLAGS) screen.c
 +	$(CC) -c $(CFLAGS) screen.c
  
  search.o:	search.c  $(INCL) ops.h
 -	$(CC) $(CFLAGS) search.c
 +	$(CC) -c $(CFLAGS) search.c
  
  tag.o:	tag.c  $(INCL)
 -	$(CC) $(CFLAGS) tag.c
 +	$(CC) -c $(CFLAGS) tag.c
  
  term.o:	term.c  $(INCL)
 -	$(CC) $(CFLAGS) term.c
 +	$(CC) -c $(CFLAGS) term.c
  
  undo.o:	undo.c  $(INCL)
 -	$(CC) $(CFLAGS) undo.c
 +	$(CC) -c $(CFLAGS) undo.c
  
  window.o:	window.c  $(INCL)
 -	$(CC) $(CFLAGS) window.c
 +	$(CC) -c $(CFLAGS) window.c
  
  cmdtab.h: cmdtab.tab mkcmdtab
  	./mkcmdtab cmdtab.tab cmdtab.h
 @@ -589,19 +587,19 @@
  	$(CC) -o mkcmdtab mkcmdtab.o
  
  mkcmdtab.o: mkcmdtab.c
 -	$(CC) $(CFLAGS) mkcmdtab.c
 +	$(CC) -c $(CFLAGS) mkcmdtab.c
  
  kanji.o: kanji.c $(INCL) jptab.h
 -	$(CC) $(CFLAGS) kanji.c
 +	$(CC) -c $(CFLAGS) kanji.c
  
  s2u.o: s2u.c
 -	$(CC) $(CFLAGS) s2u.c
 +	$(CC) -c $(CFLAGS) s2u.c
  
  u2s.o: u2s.c
 -	$(CC) $(CFLAGS) u2s.c
 +	$(CC) -c $(CFLAGS) u2s.c
  
  track.o: track.c $(INCL) jptab.h
 -	$(CC) $(CFLAGS) track.c
 +	$(CC) -c $(CFLAGS) track.c
  
  #jptab.h: jptab
  #	./jptab > jptab.h
 @@ -610,19 +608,19 @@
  	$(CC) -o jptab jptab.o
  
  jptab.o: jptab.c
 -	$(CC) $(CFLAGS) jptab.c
 +	$(CC) -c $(CFLAGS) jptab.c
  
  fepseq.o: fepseq.c
 -	$(CC) $(CFLAGS) fepseq.c
 +	$(CC) -c $(CFLAGS) fepseq.c
  
  fepbow.o: fepbow.c
 -	$(CC) $(CFLAGS) fepbow.c
 +	$(CC) -c $(CFLAGS) fepbow.c
  
  fepcanna.o: fepcanna.c
 -	$(CC) $(CFLAGS) -I/usr/local/canna/include fepcanna.c
 +	$(CC) -c $(CFLAGS) -I${PREFIX}/include fepcanna.c
  
  feponew.o: feponew.c
 -	$(CC) $(CFLAGS) feponew.c
 +	$(CC) -c $(CFLAGS) feponew.c
  
  grep.o: grep/grep.c
 -	$(CC) $(CFLAGS) -I. grep/grep.c
 +	$(CC) -c $(CFLAGS) -I. grep/grep.c