7 files changed, 29 insertions, 28 deletions

diff --git a/japanese/cmigemo/Makefile b/japanese/cmigemo/Makefile
index 46bb534f652b..b84905d43ee9 100644
--- a/japanese/cmigemo/Makefile
+++ b/japanese/cmigemo/Makefile
@@ -6,10 +6,6 @@ PORTVERSION=	20141220
 CATEGORIES=	japanese
 DIST_SUBDIR=	cmigemo
 
-USE_GITHUB= yes
-GH_ACCOUNT= koron
-GH_TAGNAME= 6a1c438
-
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	C implementation of Migemo Japanese incremental search tool
 
@@ -26,15 +22,20 @@ INSTALL_TARGET=	gcc-install
 
 DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
 PORTDOCS=	README_j.txt
-
 .endif
 
-OPTIONS_DEFINE+=DOCS
-USES+=		gmake
 BUILD_DEPENDS=	${LOCALBASE}/bin/nkf:japanese/nkf
 
+USES+=		gmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	koron
+GH_TAGNAME=	6a1c438
+
+OPTIONS_DEFINE+=DOCS
+
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${STAGEDIR}${PREFIX}
+MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.options.mk>
 
diff --git a/japanese/cmigemo/files/patch-Makefile b/japanese/cmigemo/files/patch-Makefile
index c13fc890b66b..5e4243f36f22 100644
--- a/japanese/cmigemo/files/patch-Makefile
+++ b/japanese/cmigemo/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2011-02-27 19:45:40.000000000 +0900
-+++ Makefile	2011-08-21 14:21:53.000000000 +0900
-@@ -52,8 +52,14 @@
+--- Makefile.orig	2014-12-20 04:39:02 UTC
++++ Makefile
+@@ -69,8 +69,14 @@ gcc-rel:
  	$(MAKE) -f compile/Make_gcc.mak
  gcc-dict:
  	$(MAKE) -f compile/Make_gcc.mak dictionary
diff --git a/japanese/cmigemo/files/patch-compile_Make_gcc.mak b/japanese/cmigemo/files/patch-compile_Make_gcc.mak
index 789ca2035fcc..efd04d71526a 100644
--- a/japanese/cmigemo/files/patch-compile_Make_gcc.mak
+++ b/japanese/cmigemo/files/patch-compile_Make_gcc.mak
@@ -1,6 +1,6 @@
---- compile/Make_gcc.mak.orig	2011-08-17 00:54:29.000000000 +0900
-+++ compile/Make_gcc.mak	2011-08-17 00:56:14.000000000 +0900
-@@ -44,4 +44,7 @@
+--- compile/Make_gcc.mak.orig	2014-12-20 04:39:02 UTC
++++ compile/Make_gcc.mak
+@@ -44,4 +44,7 @@ uninstall-lib:
  	$(RM) $(libdir)/$(libmigemo)
  
  dictionary:
diff --git a/japanese/cmigemo/files/patch-compile_config.mk.in b/japanese/cmigemo/files/patch-compile_config.mk.in
index 0144044751cf..4dad74133a83 100644
--- a/japanese/cmigemo/files/patch-compile_config.mk.in
+++ b/japanese/cmigemo/files/patch-compile_config.mk.in
@@ -1,6 +1,6 @@
---- compile/config.mk.in.orig	2011-02-27 19:45:40.000000000 +0900
-+++ compile/config.mk.in	2014-06-17 21:59:03.000000000 +0900
-@@ -18,8 +18,8 @@
+--- compile/config.mk.in.orig	2014-12-20 04:39:02 UTC
++++ compile/config.mk.in
+@@ -18,8 +18,8 @@ libdir		= $(prefix)/lib
  incdir		= $(prefix)/include
  # WARNING: Directories $(dictdir) and $(docdir) will be deleted whole the
  # directory when unintall.
@@ -11,7 +11,7 @@
  
  ##############################################################################
  # Commands
-@@ -33,9 +33,9 @@
+@@ -33,9 +33,9 @@ HTTP		= ${PROGRAM_HTTP}
  PERL		= perl
  BUNZIP2		= bzip2 -d
  GUNZIP		= gzip -d
diff --git a/japanese/cmigemo/files/patch-compile_unix.mak b/japanese/cmigemo/files/patch-compile_unix.mak
index eac0234fcf28..f042c8bdc489 100644
--- a/japanese/cmigemo/files/patch-compile_unix.mak
+++ b/japanese/cmigemo/files/patch-compile_unix.mak
@@ -1,6 +1,6 @@
---- compile/unix.mak.orig	2011-02-27 19:45:40.000000000 +0900
-+++ compile/unix.mak	2011-08-21 14:23:10.000000000 +0900
-@@ -39,36 +39,48 @@
+--- compile/unix.mak.orig	2014-12-20 04:39:02 UTC
++++ compile/unix.mak
+@@ -39,36 +39,48 @@ install-mkdir:
  	$(MKDIR) $(bindir)
  	$(MKDIR) $(libdir)
  	$(MKDIR) $(incdir)
diff --git a/japanese/cmigemo/files/patch-configure b/japanese/cmigemo/files/patch-configure
index 33197d4ffb57..caa2153d3687 100644
--- a/japanese/cmigemo/files/patch-configure
+++ b/japanese/cmigemo/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2011-08-27 20:52:18.000000000 +0900
-+++ configure	2011-08-27 20:53:47.000000000 +0900
-@@ -40,16 +40,6 @@
+--- configure.orig	2014-12-20 04:39:02 UTC
++++ configure
+@@ -40,16 +40,6 @@ else
    exit 1
  fi
  
diff --git a/japanese/cmigemo/files/patch-dict_dict.mak b/japanese/cmigemo/files/patch-dict_dict.mak
index 5330cd8bbea5..09e3c148d3e3 100644
--- a/japanese/cmigemo/files/patch-dict_dict.mak
+++ b/japanese/cmigemo/files/patch-dict_dict.mak
@@ -1,6 +1,6 @@
---- dict/dict.mak.orig	2014-12-20 13:39:02.000000000 +0900
-+++ dict/dict.mak	2014-12-21 22:31:28.000000000 +0900
-@@ -15,7 +15,7 @@
+--- dict/dict.mak.orig	2014-12-20 04:39:02 UTC
++++ dict/dict.mak
+@@ -15,7 +15,7 @@ UTF8_DIR	= utf-8.d
  # Dictionary
  #
  $(DICT): $(DICT_BASE)
@@ -9,7 +9,7 @@
  $(DICT_BASE): $(SKKDIC_FILE) ../tools/skk2migemo.pl ../tools/optimize-dict.pl
  	$(PERL) ../tools/skk2migemo.pl < $(SKKDIC_FILE) > dict.tmp
  	$(PERL) ../tools/optimize-dict.pl < dict.tmp > $@
-@@ -32,42 +32,42 @@
+@@ -32,42 +32,42 @@ cp932:		$(DICT)
  ##############################################################################
  # Dictionary in euc-jp
  #
@@ -70,7 +70,7 @@
  
  ##############################################################################
  # for Microsoft Visual C
-@@ -92,7 +92,8 @@
+@@ -92,7 +92,8 @@ mingw:		cp932 utf-8
  ##############################################################################
  # for GNU/gcc(Linux‘¼)
  #