Index: head/japanese/cmigemo/Makefile =================================================================== --- head/japanese/cmigemo/Makefile (revision 504344) +++ head/japanese/cmigemo/Makefile (revision 504345) @@ -1,48 +1,49 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ PORTNAME= cmigemo 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 .if !defined(PKGNAMESUFFIX) LICENSE= MIT LICENSE_FILE= ${WRKSRC}/doc/LICENSE_MIT.txt RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/cp932/migemo-dict:japanese/cmigemo-dict USE_LDCONFIG= yes ALL_TARGET= gcc-rel gcc-dat 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 .if !defined(PKGNAMESUFFIX) && ${PORT_OPTIONS:MDOCS} INSTALL_TARGET+=gcc-install-doc .endif post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/compile/config.mk.in .include Index: head/japanese/cmigemo/files/patch-Makefile =================================================================== --- head/japanese/cmigemo/files/patch-Makefile (revision 504344) +++ head/japanese/cmigemo/files/patch-Makefile (revision 504345) @@ -1,18 +1,18 @@ ---- 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 -gcc-install: gcc-all +gcc-dat: + $(MAKE) -f compile/Make_gcc.mak dat +gcc-install: gcc-rel gcc-dat $(MAKE) -f compile/Make_gcc.mak install +gcc-install-dict: gcc-dict + $(MAKE) -f compile/Make_gcc.mak install-dict +gcc-install-doc: + $(MAKE) -f compile/Make_gcc.mak install-doc gcc-uninstall: $(MAKE) -f compile/Make_gcc.mak uninstall gcc-clean: Index: head/japanese/cmigemo/files/patch-compile_Make_gcc.mak =================================================================== --- head/japanese/cmigemo/files/patch-compile_Make_gcc.mak (revision 504344) +++ head/japanese/cmigemo/files/patch-compile_Make_gcc.mak (revision 504345) @@ -1,11 +1,11 @@ ---- 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: - cd dict && $(MAKE) gcc + cd dict && $(MAKE) gcc-dict + +dat: + cd dict && $(MAKE) gcc-dat Index: head/japanese/cmigemo/files/patch-compile_config.mk.in =================================================================== --- head/japanese/cmigemo/files/patch-compile_config.mk.in (revision 504344) +++ head/japanese/cmigemo/files/patch-compile_config.mk.in (revision 504345) @@ -1,26 +1,26 @@ ---- 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. -dictdir = $(prefix)/share/migemo -docdir = $(prefix)/doc/migemo +dictdir = $(prefix)/share/cmigemo +docdir = $(prefix)/share/doc/ja/cmigemo ############################################################################## # Commands -@@ -33,9 +33,9 @@ +@@ -33,9 +33,9 @@ HTTP = ${PROGRAM_HTTP} PERL = perl BUNZIP2 = bzip2 -d GUNZIP = gzip -d -FILTER_CP932 = ${PROGRAM_ENCODEFILTER} -s -FILTER_EUCJP = ${PROGRAM_ENCODEFILTER} -e -FILTER_UTF8 = iconv -t utf-8 -f cp932 +ICONV_EUCJP_TO_CP932 = %%LOCALBASE%%/bin/nkf --ic=eucJP-ms --oc=CP932 +ICONV_CP932_TO_EUCJP = %%LOCALBASE%%/bin/nkf --ic=CP932 --oc=eucJP-ms +ICONV_CP932_TO_UTF8 = %%LOCALBASE%%/bin/nkf --ic=CP932 --oc=UTF-8 INSTALL = ${PROGRAM_INSTALL} -c INSTALL_PROGRAM = $(INSTALL) -m 755 INSTALL_DATA = $(INSTALL) -m 644 Index: head/japanese/cmigemo/files/patch-compile_unix.mak =================================================================== --- head/japanese/cmigemo/files/patch-compile_unix.mak (revision 504344) +++ head/japanese/cmigemo/files/patch-compile_unix.mak (revision 504345) @@ -1,57 +1,57 @@ ---- 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) - $(MKDIR) $(docdir) + +install-mkdir-dict: $(MKDIR) $(dictdir) $(MKDIR) $(dictdir)/cp932 $(MKDIR) $(dictdir)/euc-jp $(MKDIR) $(dictdir)/utf-8 -install-dict: +install-mkdir-doc: + $(MKDIR) $(docdir) + +install-dict: install-mkdir-dict $(INSTALL_DATA) dict/migemo-dict $(dictdir)/cp932 + if [ -d dict/euc-jp.d ]; then \ + $(INSTALL_DATA) dict/euc-jp.d/migemo-dict $(dictdir)/euc-jp; \ + fi + if [ -d dict/utf-8.d ]; then \ + $(INSTALL_DATA) dict/utf-8.d/migemo-dict $(dictdir)/utf-8; \ + fi + +install-dat: install-mkdir-dict $(INSTALL_DATA) dict/han2zen.dat $(dictdir)/cp932 $(INSTALL_DATA) dict/hira2kata.dat $(dictdir)/cp932 $(INSTALL_DATA) dict/roma2hira.dat $(dictdir)/cp932 $(INSTALL_DATA) dict/zen2han.dat $(dictdir)/cp932 if [ -d dict/euc-jp.d ]; then \ - $(INSTALL_DATA) dict/euc-jp.d/migemo-dict $(dictdir)/euc-jp; \ $(INSTALL_DATA) dict/euc-jp.d/han2zen.dat $(dictdir)/euc-jp; \ $(INSTALL_DATA) dict/euc-jp.d/hira2kata.dat $(dictdir)/euc-jp; \ $(INSTALL_DATA) dict/euc-jp.d/roma2hira.dat $(dictdir)/euc-jp; \ $(INSTALL_DATA) dict/euc-jp.d/zen2han.dat $(dictdir)/euc-jp; \ fi if [ -d dict/utf-8.d ]; then \ - $(INSTALL_DATA) dict/utf-8.d/migemo-dict $(dictdir)/utf-8; \ $(INSTALL_DATA) dict/utf-8.d/han2zen.dat $(dictdir)/utf-8; \ $(INSTALL_DATA) dict/utf-8.d/hira2kata.dat $(dictdir)/utf-8; \ $(INSTALL_DATA) dict/utf-8.d/roma2hira.dat $(dictdir)/utf-8; \ $(INSTALL_DATA) dict/utf-8.d/zen2han.dat $(dictdir)/utf-8; \ fi -install: $(outdir)cmigemo$(EXEEXT) $(libmigemo_DSO) install-mkdir install-dict install-lib - $(INSTALL_DATA) $(srcdir)migemo.h $(incdir) +install-doc: install-mkdir-doc $(INSTALL_DATA) doc/README_j.txt $(docdir) + +install: $(outdir)cmigemo$(EXEEXT) $(libmigemo_DSO) install-mkdir install-dat install-lib + $(INSTALL_DATA) $(srcdir)migemo.h $(incdir) $(INSTALL_PROGRAM) $(outdir)cmigemo$(EXEEXT) $(bindir) ############################################################################## Index: head/japanese/cmigemo/files/patch-configure =================================================================== --- head/japanese/cmigemo/files/patch-configure (revision 504344) +++ head/japanese/cmigemo/files/patch-configure (revision 504345) @@ -1,19 +1,19 @@ ---- 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 -# Check encoding filter -if CHECK_COMMAND qkc ; then - PROGRAM_ENCODEFILTER="qkc -q -u" -elif CHECK_COMMAND nkf ; then - PROGRAM_ENCODEFILTER="nkf -x" -else - echo "ERROR: Require qkc or nkf installed for encode filter." - exit 1 -fi - # Check install program if test -x /usr/ucb/install ; then PROGRAM_INSTALL="/usr/ucb/install" Index: head/japanese/cmigemo/files/patch-dict_dict.mak =================================================================== --- head/japanese/cmigemo/files/patch-dict_dict.mak (revision 504344) +++ head/japanese/cmigemo/files/patch-dict_dict.mak (revision 504345) @@ -1,82 +1,82 @@ ---- 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) - $(FILTER_CP932) < $(DICT_BASE) > $@ + $(ICONV_EUCJP_TO_CP932) < $(DICT_BASE) > $@ $(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 # -euc-jp: cp932 euc-jp-files -euc-jp-files: $(EUCJP_DIR) $(EUCJP_DIR)/migemo-dict \ - $(EUCJP_DIR)/zen2han.dat $(EUCJP_DIR)/han2zen.dat \ - $(EUCJP_DIR)/hira2kata.dat $(EUCJP_DIR)/roma2hira.dat +euc-jp-dict: cp932 $(EUCJP_DIR) $(EUCJP_DIR)/migemo-dict +euc-jp-dat: $(EUCJP_DIR) $(EUCJP_DIR)/zen2han.dat \ + $(EUCJP_DIR)/han2zen.dat $(EUCJP_DIR)/hira2kata.dat \ + $(EUCJP_DIR)/roma2hira.dat $(EUCJP_DIR): $(MKDIR) $(EUCJP_DIR) $(EUCJP_DIR)/migemo-dict: migemo-dict - $(FILTER_EUCJP) < migemo-dict > $@ + $(ICONV_CP932_TO_EUCJP) < migemo-dict > $@ $(EUCJP_DIR)/zen2han.dat: zen2han.dat - $(FILTER_EUCJP) < zen2han.dat > $@ + $(ICONV_CP932_TO_EUCJP) < zen2han.dat > $@ $(EUCJP_DIR)/han2zen.dat: han2zen.dat - $(FILTER_EUCJP) < han2zen.dat > $@ + $(ICONV_CP932_TO_EUCJP) < han2zen.dat > $@ $(EUCJP_DIR)/hira2kata.dat: hira2kata.dat - $(FILTER_EUCJP) < hira2kata.dat > $@ + $(ICONV_CP932_TO_EUCJP) < hira2kata.dat > $@ $(EUCJP_DIR)/roma2hira.dat: roma2hira.dat - $(FILTER_EUCJP) < roma2hira.dat > $@ + $(ICONV_CP932_TO_EUCJP) < roma2hira.dat > $@ ############################################################################## # Dictionary in utf-8 # -utf-8: cp932 utf-8-files -utf-8-files: $(UTF8_DIR) $(UTF8_DIR)/migemo-dict \ - $(UTF8_DIR)/zen2han.dat $(UTF8_DIR)/han2zen.dat \ - $(UTF8_DIR)/hira2kata.dat $(UTF8_DIR)/roma2hira.dat +utf-8-dict: cp932 $(UTF8_DIR) $(UTF8_DIR)/migemo-dict +utf-8-dat: $(UTF8_DIR) $(UTF8_DIR)/zen2han.dat \ + $(UTF8_DIR)/han2zen.dat $(UTF8_DIR)/hira2kata.dat \ + $(UTF8_DIR)/roma2hira.dat $(UTF8_DIR): $(MKDIR) $(UTF8_DIR) $(UTF8_DIR)/migemo-dict: migemo-dict - $(FILTER_UTF8) < migemo-dict > $@ + $(ICONV_CP932_TO_UTF8) < migemo-dict > $@ $(UTF8_DIR)/zen2han.dat: zen2han.dat - $(FILTER_UTF8) < zen2han.dat > $@ + $(ICONV_CP932_TO_UTF8) < zen2han.dat > $@ $(UTF8_DIR)/han2zen.dat: han2zen.dat - $(FILTER_UTF8) < han2zen.dat > $@ + $(ICONV_CP932_TO_UTF8) < han2zen.dat > $@ $(UTF8_DIR)/hira2kata.dat: hira2kata.dat - $(FILTER_UTF8) < hira2kata.dat > $@ + $(ICONV_CP932_TO_UTF8) < hira2kata.dat > $@ $(UTF8_DIR)/roma2hira.dat: roma2hira.dat - $(FILTER_UTF8) < roma2hira.dat > $@ + $(ICONV_CP932_TO_UTF8) < roma2hira.dat > $@ ############################################################################## # for Microsoft Visual C -@@ -92,7 +92,8 @@ +@@ -92,7 +92,8 @@ mingw: cp932 utf-8 ############################################################################## # for GNU/gcc(Linux‘¼) # -gcc: euc-jp utf-8 +gcc-dict: euc-jp-dict utf-8-dict +gcc-dat: euc-jp-dat utf-8-dat ############################################################################## # for MacOS X