From ec04db7b67379fd7b70331d42f169c48bfc52b73 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Fri, 14 Mar 2014 14:38:50 +0000
Subject: - Fix build. - Integrate FREEWNN and CANNA into one option. -
 STAGEDIR support. - Bump PORTREVISION due to the option change.

---
 japanese/jvim3/files/patch-src-makjunix.mak | 17 +++++++++++------
 japanese/jvim3/files/patch-src-unix.h       | 11 +++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 japanese/jvim3/files/patch-src-unix.h

(limited to 'japanese/jvim3/files')

diff --git a/japanese/jvim3/files/patch-src-makjunix.mak b/japanese/jvim3/files/patch-src-makjunix.mak
index 6b4473df0e9a..04b60f200fda 100644
--- a/japanese/jvim3/files/patch-src-makjunix.mak
+++ b/japanese/jvim3/files/patch-src-makjunix.mak
@@ -1,6 +1,6 @@
---- src/makjunix.mak.orig	2013-05-04 03:51:13.000000000 +0900
-+++ src/makjunix.mak	2013-05-04 03:52:09.000000000 +0900
-@@ -72,16 +72,17 @@
+--- src/makjunix.mak.orig	2014-03-14 23:13:33.000000000 +0900
++++ src/makjunix.mak	2014-03-14 23:20:30.000000000 +0900
+@@ -72,19 +72,20 @@
  
  
  ### Prefix for location of files
@@ -8,7 +8,8 @@
 +PREFIX?= /usr/local
  
  ### Location of binary
- BINLOC = $(PREFIX)/bin
+-BINLOC = $(PREFIX)/bin
++BINLOC = $(DESTDIR)$(PREFIX)/bin
  
  ### Name of target
 -TARGET = vim
@@ -17,10 +18,14 @@
  ### Location of man page
 -MANLOC = $(PREFIX)/man/man1
 +MAN1PREFIX?=	${PREFIX}
-+MANLOC = $(MAN1PREFIX)/man/man1
++MANLOC = $(DESTDIR)$(MAN1PREFIX)/man/man1
  
  ### Location of help file
- HELPLOC = $(PREFIX)/lib
+-HELPLOC = $(PREFIX)/lib
++HELPLOC = $(DESTDIR)$(PREFIX)/lib
+ 
+ ### Program to run on installed binary
+ STRIP = strip
 @@ -100,7 +101,7 @@
  
  MANFILE = ../doc/vim.1
diff --git a/japanese/jvim3/files/patch-src-unix.h b/japanese/jvim3/files/patch-src-unix.h
new file mode 100644
index 000000000000..6dccd0ee3a14
--- /dev/null
+++ b/japanese/jvim3/files/patch-src-unix.h
@@ -0,0 +1,11 @@
+--- src/unix.h.orig	2013-09-05 04:16:52.000000000 +0900
++++ src/unix.h	2013-09-05 04:18:11.000000000 +0900
+@@ -104,7 +104,7 @@
+ # define strrchr(ptr, c)		rindex((ptr), (c))
+ #endif
+ 
+-#if defined(BSD_UNIX) && !defined(__bsdi__) && !defined(linux) && !defined(__GNU__)
++#if defined(BSD_UNIX) && !defined(__FreeBSD__) && !defined(__bsdi__) && !defined(linux) && !defined(__GNU__)
+ # define memset(ptr, c, size)	bsdmemset((ptr), (c), (size))
+ char *bsdmemset __ARGS((char *, int, long));
+ #endif
-- 
cgit v1.2.3