svn commit: r363264 - in head/japanese: Wnn6-lib Wnn6-lib/files Wnn7-lib Wnn7-lib/files ack/files another-htmllint/files csrd/files e2ps e2ps/files esecanna-module-vje30/files esecanna/files gawk/f...

Adam Weinberger adamw at FreeBSD.org
Mon Jul 28 22:14:15 UTC 2014 

Author: adamw
Date: Mon Jul 28 22:14:07 2014
New Revision: 363264
URL: http://svnweb.freebsd.org/changeset/ports/363264
QAT: https://qat.redports.org/buildarchive/r363264/

Log:
  Rename the rather surprising number of japanese/ patch-xy patches
  to reflect the files they modify.

Added:
  head/japanese/Wnn6-lib/files/patch-Wnn_Imakefile
     - copied unchanged from r363257, head/japanese/Wnn6-lib/files/patch-ad
  head/japanese/Wnn6-lib/files/patch-Wnn_jlib_Imakefile
     - copied unchanged from r363257, head/japanese/Wnn6-lib/files/patch-aa
  head/japanese/Wnn6-lib/files/patch-Wnn_romkan_Imakefile
     - copied unchanged from r363257, head/japanese/Wnn6-lib/files/patch-ab
  head/japanese/Wnn6-lib/files/patch-config_X11.tmpl
     - copied unchanged from r363257, head/japanese/Wnn6-lib/files/patch-ac
  head/japanese/Wnn7-lib/files/patch-Wnn_jlib_Imakefile
     - copied unchanged from r363257, head/japanese/Wnn7-lib/files/patch-aa
  head/japanese/Wnn7-lib/files/patch-config_Project.tmpl
     - copied unchanged from r363257, head/japanese/Wnn7-lib/files/patch-ab
  head/japanese/Wnn7-lib/files/patch-config_X11.tmpl
     - copied unchanged from r363257, head/japanese/Wnn7-lib/files/patch-ac
  head/japanese/ack/files/patch-Makefile
     - copied unchanged from r363257, head/japanese/ack/files/patch-aa
  head/japanese/another-htmllint/files/patch-htmllint.cgi
     - copied unchanged from r363257, head/japanese/another-htmllint/files/patch-aa
  head/japanese/another-htmllint/files/patch-htmllintenv
     - copied unchanged from r363257, head/japanese/another-htmllint/files/patch-ab
  head/japanese/csrd/files/patch-makefile.unx
     - copied unchanged from r363257, head/japanese/csrd/files/patch-aa
  head/japanese/e2ps/files/patch-Makefile
     - copied unchanged from r363257, head/japanese/e2ps/files/patch-ac
  head/japanese/esecanna-module-vje30/files/patch-README.jp
     - copied unchanged from r363257, head/japanese/esecanna-module-vje30/files/patch-aa
  head/japanese/esecanna/files/patch-README.jp
     - copied unchanged from r363257, head/japanese/esecanna/files/patch-ad
  head/japanese/esecanna/files/patch-esecannarc
     - copied unchanged from r363257, head/japanese/esecanna/files/patch-ac
  head/japanese/gawk/files/patch-Makefile.in
     - copied unchanged from r363257, head/japanese/gawk/files/patch-ac
  head/japanese/gawk/files/patch-awklib_Makefile.in
     - copied unchanged from r363257, head/japanese/gawk/files/patch-ad
  head/japanese/jed/files/patch-configure
     - copied unchanged from r363257, head/japanese/jed/files/patch-aa
  head/japanese/jed/files/patch-info_jed.info
     - copied unchanged from r363257, head/japanese/jed/files/patch-ad
  head/japanese/jed/files/patch-lib_abbrev.sl
     - copied unchanged from r363257, head/japanese/jed/files/patch-ag
  head/japanese/jed/files/patch-lib_canna.sl
     - copied unchanged from r363257, head/japanese/jed/files/patch-ac
  head/japanese/jed/files/patch-lib_japanese.sl
     - copied unchanged from r363257, head/japanese/jed/files/patch-af
  head/japanese/jed/files/patch-lib_jed.rc
     - copied unchanged from r363257, head/japanese/jed/files/patch-ab
  head/japanese/jed/files/patch-src_Makefile.in
     - copied unchanged from r363257, head/japanese/jed/files/patch-ae
  head/japanese/jmode/files/patch-src_main.cpp
     - copied unchanged from r363257, head/japanese/jmode/files/patch-aa
  head/japanese/kbanner/files/patch-Makefile
     - copied unchanged from r363257, head/japanese/kbanner/files/patch-aa
  head/japanese/kcc/files/patch-Makefile
     - copied unchanged from r363257, head/japanese/kcc/files/patch-aa
  head/japanese/kcc/files/patch-kcc.c
     - copied unchanged from r363257, head/japanese/kcc/files/patch-ab
  head/japanese/kterm/files/patch-Imakefile
     - copied unchanged from r363257, head/japanese/kterm/files/patch-aa
  head/japanese/kterm/files/patch-KTerm.ad
     - copied unchanged from r363257, head/japanese/kterm/files/patch-ab
  head/japanese/kterm/files/patch-VTPrsTbl.c
     - copied unchanged from r363257, head/japanese/kterm/files/patch-ae
  head/japanese/kterm/files/patch-VTparse.h
     - copied unchanged from r363257, head/japanese/kterm/files/patch-af
  head/japanese/kterm/files/patch-charproc.c
     - copied unchanged from r363257, head/japanese/kterm/files/patch-ac
  head/japanese/kterm/files/patch-util.c
     - copied unchanged from r363257, head/japanese/kterm/files/patch-ad
  head/japanese/less/files/patch-Makefile.in
     - copied unchanged from r363257, head/japanese/less/files/patch-aa
  head/japanese/less/files/patch-version.c
     - copied unchanged from r363257, head/japanese/less/files/patch-ac
  head/japanese/lipsf/files/patch-Makefile
     - copied unchanged from r363257, head/japanese/lipsf/files/patch-ab
  head/japanese/lipsf/files/patch-Makefile.in
     - copied unchanged from r363257, head/japanese/lipsf/files/patch-ac
  head/japanese/lookup/files/patch-lisp_lookup-vars.el.in
     - copied unchanged from r363257, head/japanese/lookup/files/patch-ab
  head/japanese/monafonts/files/patch-Makefile
     - copied unchanged from r363257, head/japanese/monafonts/files/patch-aa
  head/japanese/mutt-devel/files/patch-doc_Makefile.am
     - copied unchanged from r363257, head/japanese/mutt-devel/files/patch-02
  head/japanese/onew/files/patch-sys_regex.c
     - copied unchanged from r363257, head/japanese/onew/files/patch-aa
  head/japanese/prn/files/patch-Makefile
     - copied unchanged from r363257, head/japanese/prn/files/patch-aa
  head/japanese/prn/files/patch-cmt.jman
     - copied unchanged from r363257, head/japanese/prn/files/patch-ac
  head/japanese/prn/files/patch-prn.jman
     - copied unchanged from r363257, head/japanese/prn/files/patch-ad
  head/japanese/prn/files/patch-psconv.jman
     - copied unchanged from r363257, head/japanese/prn/files/patch-ae
  head/japanese/skkfep/files/patch-Makefile
     - copied unchanged from r363257, head/japanese/skkfep/files/patch-af
  head/japanese/skkfep/files/patch-config.h
     - copied unchanged from r363257, head/japanese/skkfep/files/patch-aa
  head/japanese/skkfep/files/patch-configs_freebsd.h
     - copied unchanged from r363257, head/japanese/skkfep/files/patch-ad
  head/japanese/skkfep/files/patch-protoMakefile
     - copied unchanged from r363257, head/japanese/skkfep/files/patch-ab
  head/japanese/skkfep/files/patch-skkfep.1
     - copied unchanged from r363257, head/japanese/skkfep/files/patch-ae
  head/japanese/slrn/files/patch-configure
     - copied unchanged from r363257, head/japanese/slrn/files/patch-ab
  head/japanese/slrn/files/patch-src_Makefile.in
     - copied unchanged from r363257, head/japanese/slrn/files/patch-ac
  head/japanese/slrn/files/patch-src_slrnfeat.h
     - copied unchanged from r363257, head/japanese/slrn/files/patch-aa
  head/japanese/texinfo/files/patch-util_texi2dvi
     - copied unchanged from r363257, head/japanese/texinfo/files/patch-ab
  head/japanese/tkhonyaku/files/patch-tkhonyaku
     - copied unchanged from r363257, head/japanese/tkhonyaku/files/patch-aa
  head/japanese/today/files/patch-calendar.c
     - copied unchanged from r363257, head/japanese/today/files/patch-aa
  head/japanese/today/files/patch-cunix.h
     - copied unchanged from r363257, head/japanese/today/files/patch-al
  head/japanese/today/files/patch-main.c
     - copied unchanged from r363257, head/japanese/today/files/patch-ae
  head/japanese/today/files/patch-misc.c
     - copied unchanged from r363257, head/japanese/today/files/patch-ag
  head/japanese/today/files/patch-today.cnf
     - copied unchanged from r363257, head/japanese/today/files/patch-ai
  head/japanese/today/files/patch-version.c
     - copied unchanged from r363257, head/japanese/today/files/patch-aj
  head/japanese/vftool/files/patch-Makefile
     - copied unchanged from r363257, head/japanese/vftool/files/patch-aa
  head/japanese/xjtext/files/patch-Makefile
     - copied unchanged from r363257, head/japanese/xjtext/files/patch-aa
  head/japanese/xjtext/files/patch-xwindow.h
     - copied unchanged from r363257, head/japanese/xjtext/files/patch-ab
Deleted:
  head/japanese/Wnn6-lib/files/patch-aa
  head/japanese/Wnn6-lib/files/patch-ab
  head/japanese/Wnn6-lib/files/patch-ac
  head/japanese/Wnn6-lib/files/patch-ad
  head/japanese/Wnn7-lib/files/patch-aa
  head/japanese/Wnn7-lib/files/patch-ab
  head/japanese/Wnn7-lib/files/patch-ac
  head/japanese/ack/files/patch-aa
  head/japanese/another-htmllint/files/patch-aa
  head/japanese/another-htmllint/files/patch-ab
  head/japanese/csrd/files/patch-aa
  head/japanese/e2ps/files/patch-ac
  head/japanese/esecanna-module-vje30/files/patch-aa
  head/japanese/esecanna/files/patch-ac
  head/japanese/esecanna/files/patch-ad
  head/japanese/gawk/files/patch-ac
  head/japanese/gawk/files/patch-ad
  head/japanese/jed/files/patch-aa
  head/japanese/jed/files/patch-ab
  head/japanese/jed/files/patch-ac
  head/japanese/jed/files/patch-ad
  head/japanese/jed/files/patch-ae
  head/japanese/jed/files/patch-af
  head/japanese/jed/files/patch-ag
  head/japanese/jmode/files/patch-aa
  head/japanese/kbanner/files/patch-aa
  head/japanese/kcc/files/patch-aa
  head/japanese/kcc/files/patch-ab
  head/japanese/kterm/files/patch-aa
  head/japanese/kterm/files/patch-ab
  head/japanese/kterm/files/patch-ac
  head/japanese/kterm/files/patch-ad
  head/japanese/kterm/files/patch-ae
  head/japanese/kterm/files/patch-af
  head/japanese/less/files/patch-aa
  head/japanese/less/files/patch-ac
  head/japanese/lipsf/files/patch-ab
  head/japanese/lipsf/files/patch-ac
  head/japanese/lookup/files/patch-ab
  head/japanese/monafonts/files/patch-aa
  head/japanese/mutt-devel/files/patch-02
  head/japanese/onew/files/patch-aa
  head/japanese/prn/files/patch-aa
  head/japanese/prn/files/patch-ac
  head/japanese/prn/files/patch-ad
  head/japanese/prn/files/patch-ae
  head/japanese/skkfep/files/patch-aa
  head/japanese/skkfep/files/patch-ab
  head/japanese/skkfep/files/patch-ad
  head/japanese/skkfep/files/patch-ae
  head/japanese/skkfep/files/patch-af
  head/japanese/slrn/files/patch-aa
  head/japanese/slrn/files/patch-ab
  head/japanese/slrn/files/patch-ac
  head/japanese/texinfo/files/patch-ab
  head/japanese/tkhonyaku/files/patch-aa
  head/japanese/today/files/patch-aa
  head/japanese/today/files/patch-ae
  head/japanese/today/files/patch-ag
  head/japanese/today/files/patch-ai
  head/japanese/today/files/patch-aj
  head/japanese/today/files/patch-al
  head/japanese/vftool/files/patch-aa
  head/japanese/xjtext/files/patch-aa
  head/japanese/xjtext/files/patch-ab
Modified:
  head/japanese/Wnn6-lib/Makefile
  head/japanese/Wnn7-lib/Makefile
  head/japanese/e2ps/Makefile
  head/japanese/kbanner/Makefile

Modified: head/japanese/Wnn6-lib/Makefile
==============================================================================
--- head/japanese/Wnn6-lib/Makefile	Mon Jul 28 22:00:17 2014	(r363263)
+++ head/japanese/Wnn6-lib/Makefile	Mon Jul 28 22:14:07 2014	(r363264)
@@ -25,13 +25,13 @@ post-patch:
 		${WRKSRC}/Makefile.ini
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}  make World -f Makefile.ini
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}  make World -f Makefile.ini)
 
 post-install:
 	${LN} -sf libwnn6_fromsrc.a ${STAGEDIR}${PREFIX}/lib/libwnn6.a
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/wnn6/wnn
 	${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${STAGEDIR}${PREFIX}/include/wnn6/wnn
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Copied: head/japanese/Wnn6-lib/files/patch-Wnn_Imakefile (from r363257, head/japanese/Wnn6-lib/files/patch-ad)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/Wnn6-lib/files/patch-Wnn_Imakefile	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/Wnn6-lib/files/patch-ad)
@@ -0,0 +1,19 @@
+--- Wnn/Imakefile.orig	2000-09-01 18:58:55.000000000 +0900
++++ Wnn/Imakefile	2009-01-03 08:02:08.000000000 +0900
+@@ -14,10 +14,14 @@
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
+ 
++#if InstallOnlyJlib
++install::
++#else
+ install:: mkwnndir
++#endif
+ 
+-MakeDirectory(mkwnndir, $(DESTDIR)$(WNNWNNDIR))
+-MakeDirectory(mkwnndir, $(DESTDIR)$(JWNNWNNDIR))
++MakeDirectories(mkwnndir, $(DESTDIR)$(WNNWNNDIR))
++MakeDirectories(mkwnndir, $(DESTDIR)$(JWNNWNNDIR))
+ 
+ checkwnnid::
+ 	@A=`egrep "^$(WNNOWNER):" /etc/passwd | cat` ;\

Copied: head/japanese/Wnn6-lib/files/patch-Wnn_jlib_Imakefile (from r363257, head/japanese/Wnn6-lib/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/Wnn6-lib/files/patch-Wnn_jlib_Imakefile	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/Wnn6-lib/files/patch-aa)
@@ -0,0 +1,60 @@
+--- Wnn/jlib/Imakefile.orig	Fri Sep  1 18:58:55 2000
++++ Wnn/jlib/Imakefile	Tue Oct 29 08:32:34 2002
+@@ -4,7 +4,7 @@
+ 
+ #ifdef NEED_DEFINE_LIB
+ #define DoNormalLib YES
+-#define DoSharedLib NO
++#define DoSharedLib YES
+ #define DoDebugLib NO
+ #define DoProfileLib NO
+ #endif
+@@ -56,14 +56,27 @@
+ 	$(WNNROMKANSRC)/rk_multi.o
+ 
+ 
++UNSHARED_LOCAL_RKOBJS= $(WNNROMKANSRC)/unshared/rk_bltinfn.o \
++	$(WNNROMKANSRC)/unshared/rk_main.o \
++	$(WNNROMKANSRC)/unshared/rk_modread.o \
++	$(WNNROMKANSRC)/unshared/rk_read.o \
++	$(WNNROMKANSRC)/unshared/rk_vars.o \
++	$(WNNROMKANSRC)/unshared/rk_multi.o
++
+ LOCAL_ETCSRCS = $(SRC3) $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8)
+ LOCAL_ETCOBJS = $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJ8)
+ SRCS= $(SRC1) $(LOCAL_ETCSRCS)
+ OBJS= $(OBJ1) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS)
++UNSHAREDOBJS= $(OBJ1) $(LOCAL_ETCOBJS) $(UNSHARED_LOCAL_RKOBJS)
+ 
++SOWNN6LIBREV=2.0
+ 
+ LibraryObjectRule()
++#if DoSharedLib
++AllTarget($(OBJS) libwnn6_fromsrc.a libwnn6.so.$(SOWNN6LIBREV))
++#else
+ AllTarget($(OBJS) libwnn6_fromsrc.a)
++#endif
+ 
+ 
+ js.o : js.c \
+@@ -74,10 +87,19 @@
+ 
+ SingleProgramTarget(kankana,kankana.o,$(WNNJLIB),)
+ 
+-NormalLibraryTarget(wnn6_fromsrc,$(OBJS))
++
++#if DoSharedLib
++SharedLibraryTarget(wnn6,$(SOWNN6LIBREV),$(OBJS),.,.)
++#endif
++
++UnsharedLibraryTarget(wnn6_fromsrc,$(UNSHAREDOBJS),unshared,..)
+ LintLibraryTarget(wnn6_fromsrc,$(SRCS))
+ 
+ instlib:: install
++
++#if DoSharedLib
++InstallSharedLibrary(wnn6,$(SOWNN6LIBREV),$(WNNLIBDIR))
++#endif
+ 
+ 
+ InstallLibrary(wnn6_fromsrc,$(WNNLIBDIR))

Copied: head/japanese/Wnn6-lib/files/patch-Wnn_romkan_Imakefile (from r363257, head/japanese/Wnn6-lib/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/Wnn6-lib/files/patch-Wnn_romkan_Imakefile	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/Wnn6-lib/files/patch-ab)
@@ -0,0 +1,12 @@
+diff -ur src.orig/contrib/im/Xsi/Wnn/romkan/Imakefile src/contrib/im/Xsi/Wnn/romkan/Imakefile
+--- src.orig/contrib/im/Xsi/Wnn/romkan/Imakefile	Wed Oct 28 13:36:32 1998
++++ Wnn/romkan/Imakefile	Fri Oct 30 03:25:47 1998
+@@ -4,7 +4,7 @@
+ 
+ #ifdef NEED_DEFINE_LIB
+ #define DoNormalLib YES
+-#define DoSharedLib NO
++#define DoSharedLib YES
+ #define DoDebugLib NO
+ #define DoProfileLib NO
+ #endif

Copied: head/japanese/Wnn6-lib/files/patch-config_X11.tmpl (from r363257, head/japanese/Wnn6-lib/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/Wnn6-lib/files/patch-config_X11.tmpl	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/Wnn6-lib/files/patch-ac)
@@ -0,0 +1,31 @@
+--- config/X11.tmpl.orig	Wed Oct 28 13:36:37 1998
++++ config/X11.tmpl	Sun Nov 22 01:24:46 1998
+@@ -417,7 +417,8 @@
+ 
+ #define	WnnSpecialObjectRule(obj, depends, direct, define)	@@\
+ obj : depends							@@\
+-	$(CC) -c $(CFLAGS) define direct/`basename $@ .o`.c	@@\
++	(cd unshared ; $(CC) -c $(CFLAGS) define direct/`basename $@ .o`.c)	@@\
++	$(CC) -c $(CFLAGS) define $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) direct/`basename $@ .o`.c	@@\
+ 
+ #ifdef	MakeDir
+ #undef MakeDir
+@@ -520,7 +521,9 @@
+ #endif
+ 
+ #ifndef WnnLibDir
+-#define WnnLibDir	$(USRLIBDIR)
++#undef UsrLibDirPath
++#define UsrLibDirPath	/usr/local/lib
++#define WnnLibDir	/usr/local/lib
+ #endif
+ 
+        WNNOWNER = WnnOwner
+@@ -660,6 +663,7 @@
+ XCOMM for SDK
+ #define BuildWnn	YES
+ #define BuildJlib	YES
++#define InstallOnlyJlib	YES
+ 
+  EXTRA_INCLUDES =
+   EXTRA_DEFINES =

Modified: head/japanese/Wnn7-lib/Makefile
==============================================================================
--- head/japanese/Wnn7-lib/Makefile	Mon Jul 28 22:00:17 2014	(r363263)
+++ head/japanese/Wnn7-lib/Makefile	Mon Jul 28 22:14:07 2014	(r363264)
@@ -29,12 +29,12 @@ post-patch:
 
 # Warning: we cannot use USE_IMAKE.
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} make World -f Makefile.ini
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} make World -f Makefile.ini)
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/wnn7/wnn
 	${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${STAGEDIR}${PREFIX}/include/wnn7/wnn
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Copied: head/japanese/Wnn7-lib/files/patch-Wnn_jlib_Imakefile (from r363257, head/japanese/Wnn7-lib/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/Wnn7-lib/files/patch-Wnn_jlib_Imakefile	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/Wnn7-lib/files/patch-aa)
@@ -0,0 +1,45 @@
+--- work/src/Wnn/jlib/Imakefile	Wed Oct 17 10:37:17 2001
++++ Wnn/jlib/Imakefile	Sat Oct 19 17:15:25 2002
+@@ -60,9 +60,9 @@
+ 
+ LibraryObjectRule()
+ #if DoSharedLib
+-AllTarget($(OBJS) libwnn.a libwnn.so.$(SOWNN7LIBREV))
++AllTarget($(OBJS) libwnn7.a libwnn7.so.$(SOWNN7LIBREV))
+ #else
+-AllTarget($(OBJS) libwnn.a)
++AllTarget($(OBJS) libwnn7.a)
+ #endif
+ 
+ 
+@@ -75,23 +75,23 @@
+ SingleProgramTarget(kankana,kankana.o,$(WNNJLIB),)
+ 
+ #if DoSharedLib
+-SharedLibraryTarget(wnn,$(SOWNN7LIBREV),$(OBJS),.,.)
++SharedLibraryTarget(wnn7,$(SOWNN7LIBREV),$(OBJS),.,.)
+ #endif
+-UnsharedLibraryTarget(wnn,$(UNSHAREDOBJS),unshared,..)
+-LintLibraryTarget(wnn,$(SRCS))
++UnsharedLibraryTarget(wnn7,$(UNSHAREDOBJS),unshared,..)
++LintLibraryTarget(wnn7,$(SRCS))
+ 
+ 
+ 
+ instlib:: install
+ 
+ #if DoSharedLib
+-InstallSharedLibrary(wnn,$(SOWNN7LIBREV),$(WNNLIBDIR))
++InstallSharedLibrary(wnn7,$(SOWNN7LIBREV),$(WNNLIBDIR))
+ #endif
+-InstallLibrary(wnn,$(WNNLIBDIR))
++InstallLibrary(wnn7,$(WNNLIBDIR))
+ 
+ #if ProfileLibJlib
+-ProfiledLibraryTarget(wnn,$(OBJS))
+-InstallLibrary(wnn_p,$(WNNLIBDIR))
++ProfiledLibraryTarget(wnn7,$(OBJS))
++InstallLibrary(wnn7_p,$(WNNLIBDIR))
+ #endif
+ 
+ #if DoSharedLib

Copied: head/japanese/Wnn7-lib/files/patch-config_Project.tmpl (from r363257, head/japanese/Wnn7-lib/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/Wnn7-lib/files/patch-config_Project.tmpl	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/Wnn7-lib/files/patch-ab)
@@ -0,0 +1,43 @@
+--- work/src/config/Project.tmpl.orig	Wed Oct 17 10:37:18 2001
++++ config/Project.tmpl	Sat Oct 19 18:04:30 2002
+@@ -510,7 +510,7 @@
+ #endif
+ 
+ #ifndef WnnWnnDir
+-#define WnnWnnDir	/usr/lib/wnn7
++#define WnnWnnDir	/usr/local/lib/wnn7
+ #endif
+ 
+ #ifndef WnnEtcDir
+@@ -522,11 +522,11 @@
+ #endif
+ 
+ #ifndef WnnIncDir
+-#define WnnIncDir	$(INCROOT)
++#define WnnIncDir	/usr/local/include/wnn7
+ #endif
+ 
+ #ifndef WnnLibDir
+-#define WnnLibDir	$(USRLIBDIR)
++#define WnnLibDir	/usr/local/lib
+ #endif
+ 
+ #ifndef WnnVarDir
+@@ -534,7 +534,7 @@
+ #endif
+ 
+ #ifndef WnnShareDir
+-#define WnnShareDir	/usr/share/wnn7
++#define WnnShareDir	/usr/local/share/wnn7
+ #endif
+ 
+        WNNOWNER = WnnOwner
+@@ -599,7 +599,7 @@
+      XWNMOJDSRC = $(XWNMOTOP)/jd
+ XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m
+   XWNMOINCLUDES = -I$(XWNMOROMKANMSRC) -I$(WNNINCLUDESRC)
+-      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn_m.a
++      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn7_m.a
+  XWNMOLIBRARIES = $(XWNMOJLIB)
+       XWNMODEFS = $(XVERSION) -DUSING_BUSHU
+      XCOMMONDIR = $(IMTOP)/XClient/Common/src

Copied: head/japanese/Wnn7-lib/files/patch-config_X11.tmpl (from r363257, head/japanese/Wnn7-lib/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/Wnn7-lib/files/patch-config_X11.tmpl	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/Wnn7-lib/files/patch-ac)
@@ -0,0 +1,43 @@
+--- work/src/config/X11.tmpl~	Wed Oct 17 10:37:18 2001
++++ config/X11.tmpl	Sat Oct 19 18:08:32 2002
+@@ -510,7 +510,7 @@
+ #endif
+ 
+ #ifndef WnnWnnDir
+-#define WnnWnnDir	/usr/lib/wnn7
++#define WnnWnnDir	/usr/local/lib/wnn7
+ #endif
+ 
+ #ifndef WnnEtcDir
+@@ -522,11 +522,11 @@
+ #endif
+ 
+ #ifndef WnnIncDir
+-#define WnnIncDir	$(INCROOT)
++#define WnnIncDir	/usr/local/include/wnn7
+ #endif
+ 
+ #ifndef WnnLibDir
+-#define WnnLibDir	$(USRLIBDIR)
++#define WnnLibDir	/usr/local/lib
+ #endif
+ 
+ #ifndef WnnVarDir
+@@ -534,7 +534,7 @@
+ #endif
+ 
+ #ifndef WnnShareDir
+-#define WnnShareDir	/usr/share/wnn7
++#define WnnShareDir	/usr/local/share/wnn7
+ #endif
+ 
+        WNNOWNER = WnnOwner
+@@ -599,7 +599,7 @@
+      XWNMOJDSRC = $(XWNMOTOP)/jd
+ XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m
+   XWNMOINCLUDES = -I$(XWNMOROMKANMSRC) -I$(WNNINCLUDESRC)
+-      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn_m.a
++      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn7_m.a
+  XWNMOLIBRARIES = $(XWNMOJLIB)
+       XWNMODEFS = $(XVERSION) -DUSING_BUSHU
+      XCOMMONDIR = $(IMTOP)/XClient/Common/src

Copied: head/japanese/ack/files/patch-Makefile (from r363257, head/japanese/ack/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/ack/files/patch-Makefile	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/ack/files/patch-aa)
@@ -0,0 +1,34 @@
+--- Makefile.orig	Tue Jul 26 18:29:53 1994
++++ Makefile	Sun Dec 26 12:00:15 1999
+@@ -1,14 +1,15 @@
+ #### ack 1993,94 H.Ogasawara (COR.)
+ ####
+ #### -- install directory
+-BINARY	= /usr/local/bin
+-MANUAL	= /usr/local/man/man1
++PREFIX	?= /usr/local
++BINARY	= ${PREFIX}/bin
++MANUAL	= ${PREFIX}/man/ja/man1
+ 
+ ####
+ #### -- UNIX
+-CC	= cc
+-CFLAGS	= -O -DDEFCODE=2 -DDEFJIS=2 -DENVACK=1
+-#CFLAGS	= -O -DDEFCODE=1 -DDEFJIS=2 -DENVACK=1 -DLANGCHK=1 -DJCONVSW=1
++CC	?= cc
++#CFLAGS	= -O -DDEFCODE=2 -DDEFJIS=2 -DENVACK=1
++CFLAGS	+= -DDEFCODE=1 -DDEFJIS=2 -DENVACK=1 -DLANGCHK=1 -DJCONVSW=1
+ ####
+ #### -- Human68k
+ #CC	= gcc
+@@ -34,8 +35,8 @@
+ 	$(CC) $(LDFLAGS) $(OBJ) -o $@
+ 
+ install: $(PROG)
+-	install -s -c $(PROG) $(BINARY)
+-	install -c ack.1 $(MANUAL)
++	${BSD_INSTALL_PROGRAM} $(PROG) $(BINARY)
++	${BSD_INSTALL_MAN} ack.1 $(MANUAL)
+ 
+ codetosjis.o:	codetosjis.c kanjicode.h
+ codetoeuc.o:	codetoeuc.c kanjicode.h

Copied: head/japanese/another-htmllint/files/patch-htmllint.cgi (from r363257, head/japanese/another-htmllint/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/another-htmllint/files/patch-htmllint.cgi	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/another-htmllint/files/patch-aa)
@@ -0,0 +1,17 @@
+--- htmllint.cgi.orig	Wed Aug 23 19:19:28 2000
++++ htmllint.cgi	Fri Sep 29 14:41:55 2000
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ # CGI script for Another HTML-lint gateway ###################
+ 
+@@ -26,6 +26,8 @@
+ #$OS2 = UNSUPPORTED;
+ $UNIX = !($WIN || $MAC || $OS2);
+ 
++use lib '%PREFIX%/share/htmllint';
++use lib '%PREFIX%/share/htmllint/rule';
+ require 'htmllint.env';
+ require $LINT_NAME;
+ 

Copied: head/japanese/another-htmllint/files/patch-htmllintenv (from r363257, head/japanese/another-htmllint/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/another-htmllint/files/patch-htmllintenv	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/another-htmllint/files/patch-ab)
@@ -0,0 +1,22 @@
+--- htmllintenv.orig	Tue May 22 17:33:22 2001
++++ htmllintenv	Wed Sep 12 19:37:32 2001
+@@ -5,15 +5,15 @@
+ #   ¥¢¥¯¥»¥¹¸¢¤ò¤¦¤Þ¤¯¹©Éפ·¤Æ¡¢Â¾¿Í¤«¤é¸«¤¨¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+ 
+ # CGI Íѥǥ£¥ì¥¯¥È¥ê (ÀäÂХѥ¹¤«CGIÁêÂХѥ¹¤Ç»ØÄê¡¢¤Ê¤ë¤Ù¤¯ÀäÂХѥ¹¤Ë¤·¤Æ¤¯¤À¤µ¤¤)
+-$RULEDIR  = './';        # µ¬Â§¥Õ¥¡¥¤¥ë¤Î¾ì½ê
+-#$LOGSDIR = './logs/';   # ¥í¥°¥Õ¥¡¥¤¥ë¤Î¾ì½ê (ÉÔÍפʤ饳¥á¥ó¥È¥¢¥¦¥È)
++$RULEDIR  = '%PREFIX%/share/htmllint/rule/';        # µ¬Â§¥Õ¥¡¥¤¥ë¤Î¾ì½ê
++#$LOGSDIR = '%PREFIX%/share/htmllint/logs/';   # ¥í¥°¥Õ¥¡¥¤¥ë¤Î¾ì½ê (ÉÔÍפʤ饳¥á¥ó¥È¥¢¥¦¥È)
+ $TMPDIR   = '/tmp/';     # ¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë¤Î¾ì½ê
+-$IMGDIR   = './';        # ¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¾ì½ê
++$IMGDIR   = '%PREFIX%/share/htmllint/html/';        # ¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¾ì½ê
+ $TAGSLIST = '';          # ¥¿¥°°ìÍ÷¥­¥ã¥Ã¥·¥åÍѤξì½ê (¶õ¤Ê¤é¥­¥ã¥Ã¥·¥å¤·¤Ê¤¤)
+                          # ÀßÄꤹ¤ë¤È¤­¤Ï¥¢¥¯¥»¥¹¸¢¤òŬÅö¤ËÍ¿¤¨¤Æ¤ª¤¯¤³¤È
+ 
+ # HTML Íѥǥ£¥ì¥¯¥È¥ê (CGI ¤¬½ÐÎϤ¹¤ë HTML Ãæ¤Ç»È¤¦)
+-$HTMLDIR    = './';                     # HTML¥Õ¥¡¥¤¥ë¤Î¾ì½ê
++$HTMLDIR    = '';                     # HTML¥Õ¥¡¥¤¥ë¤Î¾ì½ê
+ $GATEWAYURL = $HTMLDIR.'htmllint.html'; # ¥²¥¤¥È¥¦¥§¥¤¥µ¡¼¥ô¥£¥¹ HTML
+ $EXPLAIN    = $HTMLDIR.'explain.html';  # ²òÀâÍÑ HTML (HTMLÍÑ)
+ $CGIROOT    = $HTMLDIR;                 # CGI¤Î¾ì½ê

Copied: head/japanese/csrd/files/patch-makefile.unx (from r363257, head/japanese/csrd/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/csrd/files/patch-makefile.unx	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/csrd/files/patch-aa)
@@ -0,0 +1,10 @@
+--- makefile.unx.~1~	Mon Jul 19 02:15:40 1999
++++ makefile.unx	Wed Aug 18 14:59:32 1999
+@@ -1,6 +1,6 @@
+ # Makefile for CSRD
+ 
+-RCPATH	=
++RCPATH	=-DRC_PATH='"${PREFIX}/etc/csrd.rc"'
+ #RCPATH	= -DRC_PATH='"/usr/local/lib/csrd.rc"'
+ 
+ CC	= gcc

Modified: head/japanese/e2ps/Makefile
==============================================================================
--- head/japanese/e2ps/Makefile	Mon Jul 28 22:00:17 2014	(r363263)
+++ head/japanese/e2ps/Makefile	Mon Jul 28 22:14:07 2014	(r363264)
@@ -18,9 +18,7 @@ PORTDOCS=	README.euc README.english
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-		cd ${WRKSRC} && \
-		mv ps-font.c ps-font.c.orig && \
-		${SED} -e '/Times-Roman$$/,/^Gothic-Medium.Katakana$$/{s,$$,\\,;}' ps-font.c.orig > ps-font.c
+	${REINPLACE_CMD} -e '/Times-Roman$$/,/^Gothic-Medium.Katakana$$/{s,$$,\\,;}' ps-font.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/e2ps ${STAGEDIR}${PREFIX}/bin

Copied: head/japanese/e2ps/files/patch-Makefile (from r363257, head/japanese/e2ps/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/e2ps/files/patch-Makefile	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/e2ps/files/patch-ac)
@@ -0,0 +1,34 @@
+--- Makefile.orig	Mon May 20 11:41:41 2002
++++ Makefile	Mon Oct 25 23:21:09 2004
+@@ -6,7 +6,7 @@
+ 
+ 
+ # Directory to install e2ps
+-E2PS_INST_DIR = /usr/local/bin
++E2PS_INST_DIR = ${PREFIX}/bin
+ 
+ # Tab width
+ TABSTOP = 8
+@@ -52,15 +52,12 @@
+ 
+ 
+ # C and C args
+-CC = gcc
++# CC = gcc
+ CC_ARGS = -Wall
+ # CC_ARGS = -Wall -O2
+ CC_LIB = 
+ 
+-# strip command
+-STRIP = strip
+-
+-CFLAGS = $(CC_ARGS) $(DEFINES) $(CC_LIB)
++CFLAGS += $(CC_ARGS) $(DEFINES) $(CC_LIB)
+ 
+ SRC = e2ps.c ps-font.c wtkf.c
+ OBJ = e2ps.o ps-font.o wtkf.o
+@@ -81,4 +78,3 @@
+ 
+ e2ps:	$(OBJ)
+ 	$(CC) -o $@ $(OBJ) $(CFLAGS)
+-	$(STRIP) $@

Copied: head/japanese/esecanna-module-vje30/files/patch-README.jp (from r363257, head/japanese/esecanna-module-vje30/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/esecanna-module-vje30/files/patch-README.jp	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/esecanna-module-vje30/files/patch-aa)
@@ -0,0 +1,15 @@
+--- README.jp~	Tue Feb 22 01:30:35 2000
++++ README.jp	Thu Feb 24 15:37:23 2000
+@@ -18,9 +18,9 @@
+ 
+  vje25 ¤Ç¤Ï esecannarc ¤Ë»ÈÍѤ¹¤ë¼­½ñ¤òÀßÄꤷ¤Æ¤¤¤Þ¤·¤¿¤¬¡¢vje30 ¤Ç¤Ï¡¢
+ VJE-Delta 3.0 ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤«¤é»ÈÍѤ¹¤ë¼­½ñ¤òÆɤ߽Ф·¤Þ¤¹¡£
+- vje30 ¤òÉáÄ̤˥¤¥ó¥¹¥È¡¼¥ë¤¹¤ì¤Ð¡¢/etc/vje30 ¤Ë vje.cfg ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê
+-¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢VJE-Delta 3.0 ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê¤¬
+-½ñ¤«¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¤Þ¤º¤³¤Î¥Õ¥¡¥¤¥ë¤òÆɤߤÀ¤·¤Þ¤¹¡£
++ vje30 ¤òÉáÄ̤˥¤¥ó¥¹¥È¡¼¥ë¤¹¤ì¤Ð¡¢!!PREFIX!!/etc/vje30 ¤Ë vje.cfg ¤È¤¤¤¦
++¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢VJE-Delta 3.0 ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
++¥Ç¥£¥ì¥¯¥È¥ê¤¬½ñ¤«¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¤Þ¤º¤³¤Î¥Õ¥¡¥¤¥ë¤òÆɤߤÀ¤·¤Þ¤¹¡£
+  ¼¡¤Ë¡¢¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë .vje ¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ë¤«¤òÄ´¤Ù¤Þ¤¹¡£¤â¤·º£
+ ¤Þ¤Ç¤Ë VJE-Delta 3.0 ¤Î vje ¤ò¼Â¹Ô¤·¤¿¤³¤È¤¬¤¢¤ë¤Î¤Ê¤éɬ¤ºÂ¸ºß¤¹¤ë¤Ï¤º¤Ç¤¹¡£¤½
+ ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ÎÃæ¤Ë general.sty ¤È vjed95u.dic ¤È¤¤¤¦Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤Î¤Ç

Copied: head/japanese/esecanna/files/patch-README.jp (from r363257, head/japanese/esecanna/files/patch-ad)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/esecanna/files/patch-README.jp	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/esecanna/files/patch-ad)
@@ -0,0 +1,52 @@
+--- README.jp.orig	Fri Feb 25 02:22:33 2000
++++ README.jp	Fri Feb 25 23:58:43 2000
+@@ -5,7 +5,7 @@
+ 
+ £±) ¤¨¤»¤«¤ó¤Ê¤ÎÀßÄê
+ 
+-/etc/esecannarc ¤Ï¤¨¤»¤«¤ó¤Ê¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤òÄê¤á¤Þ¤¹¡£½ÅÍפʤΤÏ
++!!PREFIX!!/etc/esecannarc ¤Ï¤¨¤»¤«¤ó¤Ê¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤òÄê¤á¤Þ¤¹¡£½ÅÍפʤΤÏ
+ 	IME=xxxx
+ ¤È½ñ¤¤¤Æ¤¢¤ë¹Ô¤Ç¤¹¡£¤³¤Î¹Ô¤Ç¤Ï¡¢¤¨¤»¤«¤ó¤Ê¤¬¥Ç¥Õ¥©¥ë¥È¤ÇÀܳ¤ò»î¤ß¤ë¤«¤Ê´Á»úÊÑ
+ ´¹¥µ¡¼¥Ð¡¼¤ò»ØÄꤷ¤Þ¤¹¡£¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð¡¼¤È¡¢xxxx ¤ÎÂбþ¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£
+@@ -18,18 +18,18 @@
+ 	ATOK12		ATOK
+ 
+ ¼¡¤Ë¥æ¡¼¥¶¡¼¤´¤È¤ÎÀßÄê¤Ç¤¹¡£¥æ¡¼¥¶¡¼¤´¤È¤ÎÀßÄê¤Ï¡¢¤½¤Î¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯
+-¥È¥ê¤Î .esecannarc ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤Ç»ØÄꤷ¤Þ¤¹¡£¤â¤·¤Ê¤±¤ì¤Ð¡¢/etc/esecannarc
+-¤ò¥³¥Ô¡¼¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Î
++¥È¥ê¤Î .esecannarc ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤Ç»ØÄꤷ¤Þ¤¹¡£¤â¤·¤Ê¤±¤ì¤Ð¡¢
++!!PREFIX!!/etc/esecannarc ¤ò¥³¥Ô¡¼¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Î
+ 	IME=xxxx
+ ¤È¤¤¤¦¹Ô¤Ï¡¢¤½¤Î¥æ¡¼¥¶¡¼¤¬Àܳ¤¹¤ëÊÑ´¹¥µ¡¼¥Ð¡¼¤òÄê¤á¤Þ¤¹¡£ÀßÄêÊýË¡¤Ï
+-/etc/esecannarc ¤Î¾ì¹ç¤ÈƱ¤¸¤Ç¤¹¡£
++!!PREFIX!!/etc/esecannarc ¤Î¾ì¹ç¤ÈƱ¤¸¤Ç¤¹¡£
+  ¾¤Ë¤â .esecannarc ¤Ç¤Ï¿§¡¹¤ÈÀßÄê²Äǽ¤Ç¤¹¤¬¡¢¤³¤ì¤Ï³Æ¥â¥¸¥å¡¼¥ë¤Î README.jp
+ ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£
+ 
+ £²) ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÍ¥Àè½ç°Ì
+ 
+- ¤â¤· .esecannarc ¤¬¤¢¤ë¾ì¹ç¤Ï¤½¤Á¤é¤òÍ¥À褷¤Þ¤¹¡£¤Ê¤¤¾ì¹ç /etc/esecannarc ¤ò
+-»ÈÍѤ·¤Þ¤¹¡£
++ ¤â¤· .esecannarc ¤¬¤¢¤ë¾ì¹ç¤Ï¤½¤Á¤é¤òÍ¥À褷¤Þ¤¹¡£¤Ê¤¤¾ì¹ç
++!!PREFIX!!/etc/esecannarc ¤ò»ÈÍѤ·¤Þ¤¹¡£
+ 
+ £³) ¥â¥¸¥å¡¼¥ë¤Ë¤Ä¤¤¤Æ
+ 
+@@ -43,10 +43,7 @@
+ 
+ £´) ¾
+ 
+- µ¯Æ°»þ¤Ë¼«Æ°¤ÇΩ¤Á¾å¤¬¤ë¤è¤¦¤Ë¤·¤¿¤±¤ì¤Ð¡¢/etc/rc.d/rc.local ¤Ê¤É¤Ë
+-esecannaserver
+-¤Î°ì¹Ô¤ò²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡£cannaserver ¤ÈƱ»þ¤Ë»È¤¦¤³¤È¤Ï½ÐÍè¤Ê¤¤¤Î¤ÇÃí°Õ¤·¤Æ¤¯¤À
+-¤µ¤¤¡£
++cannaserver ¤ÈƱ»þ¤Ë»È¤¦¤³¤È¤Ï½ÐÍè¤Ê¤¤¤Î¤ÇÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+ 
+  ¤¨¤»¤«¤ó¤Ê¤Ï /var/log/esecanna.log ¤Ë¥í¥°¤òÅǤ­¤Þ¤¹¡£¤³¤Î¥í¥°¤ò¸«¤Æ¡¢²¿¤¬µ¯¤­
+ ¤Æ¤ë¤Î¤«¡¢¼ê¤¬¤«¤ê¤òÆÀ¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡£
+@@ -58,4 +55,4 @@
+ ÂçºåÂç³Ø°å³ØÉô°å³Ø²Ê ³Ø£² | 
+     Debian JP Project     | take at debian.or.jp
+       LILO, NetFort       | take at netfort.gr.jp
+==========================================================

Copied: head/japanese/esecanna/files/patch-esecannarc (from r363257, head/japanese/esecanna/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/esecanna/files/patch-esecannarc	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/esecanna/files/patch-ac)
@@ -0,0 +1,15 @@
+--- esecannarc.orig	Sat Sep  9 12:39:06 2000
++++ esecannarc	Sat Sep  9 18:58:06 2000
+@@ -1,10 +1,10 @@
+ ## ¤³¤ì¤Ï ¤¨¤»¤«¤ó¤Ê ¤ÎÁí¹çÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤¢¤ê¡¢¤Þ¤¿¡¢
+ ## ¥æ¡¼¥¶¡¼ÊÌÀßÄê¥Õ¥¡¥¤¥ë¤Î¥µ¥ó¥×¥ë¤Ç¤â¤¢¤ê¤Þ¤¹¡£
+-## Áí¹çÀßÄê¥Õ¥¡¥¤¥ë¤È¤·¤Æ¡¢/etc/esecannarc ¤Ë¤Ê¤¤¤Èµ¯Æ°¤·¤Þ¤»¤ó¡£
++## Áí¹çÀßÄê¥Õ¥¡¥¤¥ë¤È¤·¤Æ¡¢!!PREFIX!!/etc/esecannarc ¤Ë¤Ê¤¤¤Èµ¯Æ°¤·¤Þ¤»¤ó¡£
+ 
+ # IME.. VJE/ATOK/WNN ¤É¤ì¤ò¤Ä¤«¤¦¤«¡£
+ # ~/.esecannarc ¤Î¾ì¹ç¤Ï¡¢¤½¤Î¥æ¡¼¥¶¡¼¤¬¤É¤Î IME ¤ò»È¤¦¤«¤ò»ØÄꤹ¤ë¤¬¡¢
+-# /etc/esecannarc ¤Î¾ì¹ç¤Ï¡¢~/.esecannarc ¤¬¤Ê¤¤¾ì¹ç¤Ë¤É¤Î IME ¤ò
++# !!PREFIX!!/etc/esecannarc ¤Î¾ì¹ç¤Ï¡¢~/.esecannarc ¤¬¤Ê¤¤¾ì¹ç¤Ë¤É¤Î IME ¤ò
+ # ¥Ç¥Õ¥©¥ë¥È¤Ç»È¤¦¤«¡¢¤ò»ØÄꤹ¤ë¡£
+ # VJE25:VJE30:ATOK:WNN6 ¤Î¤Ê¤«¤«¤é»ØÄê¡£
+ IME=VJE30

Copied: head/japanese/gawk/files/patch-Makefile.in (from r363257, head/japanese/gawk/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/gawk/files/patch-Makefile.in	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/gawk/files/patch-ac)
@@ -0,0 +1,19 @@
+--- Makefile.in.orig	Mon Jul 16 20:42:58 2001
++++ Makefile.in	Mon Jul 16 20:48:25 2001
+@@ -194,14 +194,8 @@
+ mbc.o: Makefile
+ 
+ install:	gawk info installdirs
+-	-rm -f $(bindir)/gawk
+-	fullname=gawk-$(REL).`./gawk '{print $$3}' $(srcdir)/patchlevel.h`+mb$(MBREL) ; \
+-	$(INSTALL_PROGRAM) gawk $(bindir)/$$fullname ; \
+-	(cd $(bindir); $(LN) $$fullname gawk)
+-	(cd $(bindir); \
+-	if [ ! -f awk ]; \
+-	then	$(LN_S) gawk awk; \
+-	fi; exit 0)
++	$(INSTALL_PROGRAM) gawk \
++		$(bindir)/$(binprefix)gawk$(exec_suffix)
+ 	cd doc && $(MAKE) install
+ 	cd awklib && $(MAKE) install
+ 

Copied: head/japanese/gawk/files/patch-awklib_Makefile.in (from r363257, head/japanese/gawk/files/patch-ad)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/gawk/files/patch-awklib_Makefile.in	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/gawk/files/patch-ad)
@@ -0,0 +1,19 @@
+--- awklib/Makefile.in.orig	Thu Mar  1 05:14:38 2001
++++ awklib/Makefile.in	Thu Mar  1 05:17:02 2001
+@@ -26,6 +26,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+ CC = @CC@
+@@ -75,7 +76,7 @@
+ 	sed 's;/usr/local/libexec/awk;$(libexecdir);' < groupawk.in) > group.awk
+ 
+ install: igawk $(AUXPROGS) $(AUXAWK)
+-	$(INSTALL_PROGRAM) igawk $(bindir)/igawk
++	$(INSTALL_SCRIPT) igawk $(bindir)/igawk
+ 	for i in $(AUXPROGS) ; do \
+ 		$(INSTALL_PROGRAM) $$i $(libexecdir)/$$i ; \
+ 	done

Copied: head/japanese/jed/files/patch-configure (from r363257, head/japanese/jed/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/jed/files/patch-configure	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/jed/files/patch-aa)
@@ -0,0 +1,32 @@
+--- configure.orig	Tue Jul 20 20:22:45 1999
++++ configure	Sat Feb  5 23:49:47 2000
+@@ -2580,7 +2580,8 @@
+ # the other directories may have a better chance of containing a more recent
+ # version.
+ 
+-JD_Search_Dirs="$JD_Search_Dirs \
++JD_Search_Dirs="${prefix}/include/slang,${prefix}/lib \
++                $JD_Search_Dirs \
+                 $includedir,$libdir \
+                 /usr/local/include,/usr/local/lib \
+ 		/usr/include,/usr/lib \
+@@ -3176,12 +3177,17 @@
+ 	cd \$(OBJDIR); \$(COMPILE_CMD) \$(SRCDIR)/vterm.c
+ "
+ 
+-
++if test "$ac_cv_xlocale" = yes; then
+ PROGRAM_OBJECT_RULES="$PROGRAM_OBJECT_RULES
+ \$(OBJDIR)/xterm.o : \$(SRCDIR)/xterm.c \$(DOT_O_DEPS) \$("xterm"_O_DEP)
+ 	cd \$(OBJDIR); \$(COMPILE_CMD) -DX_LOCALE \$(SRCDIR)/xterm.c
+ "
+-
++else
++PROGRAM_OBJECT_RULES="$PROGRAM_OBJECT_RULES
++\$(OBJDIR)/xterm.o : \$(SRCDIR)/xterm.c \$(DOT_O_DEPS) \$("xterm"_O_DEP)
++	cd \$(OBJDIR); \$(COMPILE_CMD) \$(SRCDIR)/xterm.c
++"
++fi
+ 
+ PROGRAM_OBJECT_RULES="$PROGRAM_OBJECT_RULES
+ \$(OBJDIR)/gpmmouse.o : \$(SRCDIR)/gpmmouse.c \$(DOT_O_DEPS) \$("gpmmouse"_O_DEP)

Copied: head/japanese/jed/files/patch-info_jed.info (from r363257, head/japanese/jed/files/patch-ad)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/jed/files/patch-info_jed.info	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/jed/files/patch-ad)
@@ -0,0 +1,13 @@
+--- info/jed.info~	Wed Jul 14 06:01:25 1999
++++ info/jed.info	Fri Feb  4 02:11:19 2000
+@@ -1,6 +1,10 @@
+ This is Info file jed.info, produced by Makeinfo-1.55 from the input
+ file jed.ti.
+ 
++START-INFO-DIR-ENTRY
++* JED: (jed).			JED editor documentation.
++END-INFO-DIR-ENTRY
++
+ 
+ Indirect:
+ jed.1in: 83

Copied: head/japanese/jed/files/patch-lib_abbrev.sl (from r363257, head/japanese/jed/files/patch-ag)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/jed/files/patch-lib_abbrev.sl	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/jed/files/patch-ag)
@@ -0,0 +1,22 @@
+--- lib/abbrev.sl	2000/10/01 17:41:08	1.1
++++ lib/abbrev.sl	2000/10/01 17:41:46
+@@ -32,16 +32,16 @@
+ define set_abbrev_mode (val)
+ {
+    getbuf_info ();
+-   if (val) () | 0x800; else () & ~(0x800);
++   if (val) () | 0x1000; else () & ~(0x1000);
+    setbuf_info(());
+ }
+ 
+ define abbrev_mode ()
+ {
+-   variable flags = getbuf_info() xor 0x800;
++   variable flags = getbuf_info() xor 0x1000;
+    variable msg = "Abbrev mode OFF";
+    setbuf_info(flags);
+-   if (flags & 0x800) msg = "Abbrev mode ON";
++   if (flags & 0x1000) msg = "Abbrev mode ON";
+    message (msg);
+ }
+ 

Copied: head/japanese/jed/files/patch-lib_canna.sl (from r363257, head/japanese/jed/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/jed/files/patch-lib_canna.sl	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/jed/files/patch-ac)
@@ -0,0 +1,17 @@
+--- lib/canna.sl~	Sat Aug 14 13:03:12 1999
++++ lib/canna.sl	Sat Aug 14 13:02:35 1999
+@@ -348,9 +348,10 @@
+ 	 message("Canna can not be used in any more buffer. Sorry...");
+ 	 return -1;
+       }
+-      create_blocal_var("canna_buf_id", 'i');
++%      create_blocal_var("canna_buf_id", 'i');
+       canna_buf_number++;
+-      set_blocal_var(canna_buf_number, "canna_buf_id");
++ %     set_blocal_var(canna_buf_number, "canna_buf_id");
++      define_blocal_var("canna_buf_id", canna_buf_number);
+       return canna_buf_number;
+    }
+    return get_blocal_var("canna_buf_id");
+
+

Copied: head/japanese/jed/files/patch-lib_japanese.sl (from r363257, head/japanese/jed/files/patch-af)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/jed/files/patch-lib_japanese.sl	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/jed/files/patch-af)
@@ -0,0 +1,15 @@
+--- lib/japanese.sl~	Tue Feb  8 16:17:10 2000
++++ lib/japanese.sl	Tue Feb  8 16:17:49 2000
+@@ -5,8 +5,10 @@
+ %
+ 
+ 
+-define	TRUE()	{ -1;}
+-define	FALSE()	{ 0;}
++!if (is_defined("TRUE")) {
++	eval("define	TRUE()	{ -1;}");
++	eval("define	FALSE()	{ 0;}");
++}
+ 
+ % If your slang-j's version in jed-j is after 0.3.2,
+ % you can use KANJI function name.

Copied: head/japanese/jed/files/patch-lib_jed.rc (from r363257, head/japanese/jed/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/jed/files/patch-lib_jed.rc	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/jed/files/patch-ab)
@@ -0,0 +1,22 @@
+--- lib/jed.rc~	Tue Jul 20 20:22:46 1999
++++ lib/jed.rc	Thu Feb  3 19:15:23 2000
+@@ -166,6 +166,19 @@
+                         % that are continued onto the next line.
+ %---------------------------------------------------------------------------
+ 
++%---------------------------------------------------------------------------
++% Ruby-mode
++%---------------------------------------------------------------------------
++
++% amount of space to indent within block.
++variable ruby_indent_level = 2;
++
++% Load ruby mode when openning .rb' files.
++autoload("ruby_mode", "ruby");
++add_mode_for_extension ("ruby", "rb");
++
++%---------------------------------------------------------------------------
++
+ #ifdef MSDOS XWINDOWS MSWINDOWS
+ % Alt-key handling.  Setting this variable controls how the
+ % Alt key is handled.  By default it is set to 27 (Ascii ESCAPE).  This means

Copied: head/japanese/jed/files/patch-src_Makefile.in (from r363257, head/japanese/jed/files/patch-ae)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/jed/files/patch-src_Makefile.in	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/jed/files/patch-ae)
@@ -0,0 +1,29 @@
+--- src/Makefile.in.orig	Tue Jul 20 20:55:47 1999
++++ src/Makefile.in	Sun Feb  6 00:02:49 2000
+@@ -104,7 +104,7 @@
+ all: jed rgrep
+ 
+ 
+-jed: $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/jed
++jed: $(OBJDIR) $(CONFIG_H) $(OBJDIR)/jed
+ 	@echo jed created in $(OBJDIR)
+ $(OBJDIR)/jed: $(OBJS) $(OBJDIR)/display.o $(OBJGPMMOUSEO)
+ 	cd $(OBJDIR); $(CC) $(OFILES) display.o $(GPMMOUSEO) \
+@@ -132,7 +132,7 @@
+ $(SRCDIR)/syntax.c: $(SRCDIR)/dfasyntx.c
+ 	touch $(SRCDIR)/syntax.c
+ #
+-xjed : $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/xjed
++xjed : $(OBJDIR) $(CONFIG_H) $(OBJDIR)/xjed
+ 	@echo xjed created in $(OBJDIR)
+ $(OBJDIR)/xjed : $(OBJS) $(OBJDIR)/xterm.o $(OBJDIR)/vterm.o
+ 	cd $(OBJDIR); \
+@@ -142,7 +142,7 @@
+ rgrep: $(OBJDIR)/rgrep
+ 	@echo rgrep created in $(OBJDIR)
+ $(OBJDIR)/rgrep: $(OBJDIR)/vfile.o $(OBJDIR)/rgrep.o
+-	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB) -lslang -lm
++	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB) -lslang -lcurses -lm
+ #
+ getmail: $(OBJDIR)/getmail
+ 	@echo getmail created in $(OBJDIR)

Copied: head/japanese/jmode/files/patch-src_main.cpp (from r363257, head/japanese/jmode/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/jmode/files/patch-src_main.cpp	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/jmode/files/patch-aa)
@@ -0,0 +1,11 @@
+--- src/main.cpp.orig	Sat May  3 18:46:15 2003
++++ src/main.cpp	Sat Jul 12 03:40:03 2003
+@@ -27,7 +27,7 @@
+ 
+ //ʸ»úÎó
+ #ifdef __FreeBSD__
+-#define LANG "ja_JP.EUC"
++#define LANG "ja_JP.eucJP"
+ #else
+ #define LANG "ja_JP"
+ #endif

Modified: head/japanese/kbanner/Makefile
==============================================================================
--- head/japanese/kbanner/Makefile	Mon Jul 28 22:00:17 2014	(r363263)
+++ head/japanese/kbanner/Makefile	Mon Jul 28 22:14:07 2014	(r363264)
@@ -7,11 +7,11 @@ PORTREVISION=	5
 CATEGORIES=	japanese
 MASTER_SITES=	http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/program/
 DISTNAME=	${PORTNAME}2
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Displays large Japanese letters on the standard output
 
+USES=		tar:Z
 ALL_TARGET=	kbanner
 CFLAGS+=	-Wno-error=return-type
 PLIST_FILES=	bin/kbanner man/man1/kbanner.1.gz

Copied: head/japanese/kbanner/files/patch-Makefile (from r363257, head/japanese/kbanner/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/kbanner/files/patch-Makefile	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/kbanner/files/patch-aa)
@@ -0,0 +1,30 @@
+--- Makefile.orig	Tue Jul 13 02:06:57 2004
++++ Makefile	Thu Apr 14 18:01:24 2005
+@@ -1,21 +1,20 @@
+ SHELL = /bin/sh
+-DESTDIR = /usr/local/bin
+-MANUAL = /usr/local/man/man1/kbanner.1
+-CFLAGS = -O
++DESTDIR = 
++MANUAL = ${PREFIX}/man/man1/kbanner.1
+ OBJ = kbanner.o font1.o font2.o font3.o
+ 
+ .SUFFIXES: .c .o
+ 
+ .c.o:
+-	cc -c $(CFLAGS) $<
++	${CC} -c $(CFLAGS) $<
+ 
+ kbanner: $(OBJ)
+-	cc $(OBJ) -o kbanner
++	${CC} $(OBJ) -o kbanner
+ 	strip kbanner
+ 
+ clean:
+ 	rm -f *.o core
+ 
+ install: kbanner
+-	cp kbanner $(DESTDIR)/
+-	cp kbanner.1 $(MANUAL)
++	${BSD_INSTALL_PROGRAM} kbanner $(DESTDIR)/$(PREFIX)/bin
++	${BSD_INSTALL_MAN} kbanner.1 $(DESTDIR)$(MANUAL)

Copied: head/japanese/kcc/files/patch-Makefile (from r363257, head/japanese/kcc/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/kcc/files/patch-Makefile	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/kcc/files/patch-aa)
@@ -0,0 +1,31 @@
+--- Makefile.orig	1994-03-28 13:05:28.000000000 +0200
++++ Makefile	2014-05-09 21:13:14.000000000 +0200
+@@ -7,10 +7,11 @@
+ 
+ #	@(#)Makefile 2.3 (Y.Tonooka) 3/28/94
+ 
+-          BINPATH = /usr/local/bin
+-          MANPATH = /usr/local/man
+-          JMANDIR = japanese
+-           CFLAGS = -O
++          PREFIX?= /usr/local
++          BINPATH = ${PREFIX}/bin
++          MANPATH = ${PREFIX}/man
++          JMANDIR = ja
++           CFLAGS?= -O
+ 
+             SHELL = /bin/sh
+                CP = cp
+@@ -34,10 +35,10 @@
+ 
+ $(BINPATH)/kcc: kcc.c
+ 	$(MAKE) kcc
+-	$(INSTALL) -s kcc $(BINPATH)
++	$(BSD_INSTALL_PROGRAM) kcc $(DESTDIR)$(BINPATH)
+ 
+ $(MANPATH)/$(JMANDIR)/man1/kcc.1: kcc.jman
+-	$(INSTALL) -m 644 kcc.jman $@
++	$(BSD_INSTALL_MAN) kcc.jman $(DESTDIR)$(MANPATH)/$(JMANDIR)/man1/kcc.1
+ 
+ clean:
+ 	rm -f $(CMDS) $(OBJS) mon.out gmon.out make.log

Copied: head/japanese/kcc/files/patch-kcc.c (from r363257, head/japanese/kcc/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/kcc/files/patch-kcc.c	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/kcc/files/patch-ab)
@@ -0,0 +1,36 @@
+--- kcc.c.dist	Mon Mar 28 20:00:12 1994
++++ kcc.c	Wed Jan 21 06:01:11 2004
+@@ -134,7 +134,7 @@
+ extern unsigned short hiragana[];
+ unsigned short *kanatbl = katakana;
+ 
+-void error();
++void error(char* fmt, ...);
+ 
+ /**********************************************************************
+  *                                                                    *
+@@ -364,18 +364,17 @@
+     NAME
+ 	error - print formatted error message on stderr and die
+  ---------------------------------------------------------------------*/
+-#include <varargs.h>
++#include <stdarg.h>
+ 
+-void error(va_alist)
+-    va_dcl
++void error(char *fmt, ...)
+ {
+-    va_list args;
++    va_list ap;
+ 
+-    va_start(args);
++    va_start(ap, fmt);
+     fprintf(stderr, "%s: ", progname);
+-    vfprintf(stderr, va_arg(args, char *), args);
++    vfprintf(stderr, fmt, ap);
+     putc('\n', stderr);
+-    va_end(args);
++    va_end(ap);
+     exit(1);
+ }
+ 

Copied: head/japanese/kterm/files/patch-Imakefile (from r363257, head/japanese/kterm/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/kterm/files/patch-Imakefile	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/kterm/files/patch-aa)
@@ -0,0 +1,43 @@
+--- Imakefile.orig	2010-01-25 00:56:38.287976000 +0900
++++ Imakefile	2010-01-25 00:59:31.955886193 +0900
+@@ -13,6 +13,17 @@
+       XPOLL_DEF = -DNO_XPOLL_H
+ #endif
+ 
++#ifdef USE_XAW3DLIB
++#undef XawClientLibs
++#define XawClientLibs	-lXaw3d $(XMULIB) $(XTOOLLIB) $(XLIB)
++#endif
++
++#ifdef USE_NEXTAWLIB
++#undef XawClientLibs
++#define XawClientLibs	-lneXtaw $(XMULIB) $(XTOOLLIB) $(XLIB)
++#endif
++
++
+ /*
+  * add -DWTMP and -DLASTLOG if you want them.
+  */
+@@ -27,9 +38,12 @@
+  OSMAJORVERSION = OSMajorVersion
+  OSMINORVERSION = OSMinorVersion
+ 
+-   MAIN_DEFINES = -DUTMP $(TTYGROUPDEF) $(PUCCPTYDDEF) \
++   MAIN_DEFINES = $(TTYGROUPDEF) $(PUCCPTYDDEF) \
+ 		  -DOSMAJORVERSION=$(OSMAJORVERSION) \
+ 		  -DOSMINORVERSION=$(OSMINORVERSION)
++#if defined(OSRelVersion) && OSRelVersion < 900007
++   MAIN_DEFINES+= -DUTMP
++#endif
+    MISC_DEFINES = /* -DALLOWLOGFILEEXEC */ 
+     XKB_DEFINES = XkbClientDefines
+         DEFINES = $(XKB_DEFINES) $(XPOLL_DEF) -DKTERM -DSTATUSLINE -DKEEPALIVE -DWALLPAPER
+@@ -72,7 +86,7 @@
+ #endif
+ #endif
+ 
+-     TERMCAPLIB = TermcapLibrary
++     TERMCAPLIB = TermcapLibrary -lutil
+ 
+ AllTarget($(PROGRAMS))
+ 

Copied: head/japanese/kterm/files/patch-KTerm.ad (from r363257, head/japanese/kterm/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/kterm/files/patch-KTerm.ad	Mon Jul 28 22:14:07 2014	(r363264, copy of r363257, head/japanese/kterm/files/patch-ab)
@@ -0,0 +1,92 @@
+--- KTerm.ad.old	Tue Feb  5 02:02:39 2002
++++ KTerm.ad	Mon Feb  4 21:54:16 2002
+@@ -51,37 +51,43 @@
+ 
+ *fontMenu.Label:  VT Fonts
+ *fontMenu*fontdefault*Label:	Default
+-*VT100*fontList:	-*-fixed-medium-r-normal--14-*,\
+-			-*-gothic-medium-r-normal--14-*,\
+-			-*-mincho-medium-r-normal--14-*
+-!*VT100*boldFontList:	-*-fixed-bold-r-normal--14-*,\
+-!			-*-gothic-bold-r-normal--14-*,\
+-!			-*-mincho-bold-r-normal--14-*
++*VT100*fontList:	-alias-fixed-medium-r-normal--14-*-*-*-c-*-*-*,\
++			-*-fixed-medium-r-normal--14-*-*-*-c-*-*-*,\
++			-*-gothic-medium-r-normal--14-*-*-*-c-*-*-*,\
++			-*-mincho-medium-r-normal--14-*-*-*-c-*-*-*
++!*VT100*boldFontList:	-*-fixed-bold-r-normal--14-*-c-*,\
++!			-*-gothic-bold-r-normal--14-*-c-*,\
++!			-*-mincho-bold-r-normal--14-*-c-*
+ *fontMenu*font1*Label:	Unreadable
+-*VT100*fontList1:	-*-fixed-medium-r-normal--2-*,\
+-			-*-gothic-medium-r-normal--2-*,\
+-			-*-mincho-medium-r-normal--2-*
+-*VT100*font1:		-misc-nil-medium-r-normal--2-*-misc-fontspecific
++*VT100*fontList1:	-*-fixed-medium-r-normal--2-*-c-*,\
++			-*-gothic-medium-r-normal--2-*-c-*,\
++			-*-mincho-medium-r-normal--2-*-c-*
++*VT100*font1:		-misc-nil-medium-r-normal--2-*-c-*-misc-fontspecific
+ *fontMenu*font2*Label:	Tiny
+-*VT100*fontList2:	-*-fixed-medium-r-normal--14-*,\
+-			-*-gothic-medium-r-normal--14-*,\
+-			-*-mincho-medium-r-normal--14-*
++*VT100*fontList2:	-alias-fixed-medium-r-normal--8-*-*-*-c-*-*-*,\
++			-*-fixed-medium-r-normal--8-*-*-*-c-*-*-*,\
++			-*-gothic-medium-r-normal--8-*-*-*-c-*-*-*,\
++			-*-mincho-medium-r-normal--8-*-*-*-c-*-*-*
+ *fontMenu*font3*Label:	Small
+-*VT100*fontList3:	-*-fixed-medium-r-normal--16-*,\
+-			-*-gothic-medium-r-normal--16-*,\
+-			-*-mincho-medium-r-normal--16-*
++*VT100*fontList3:	-alias-fixed-medium-r-normal--12-*-*-*-c-*-*-*,\
++			-*-fixed-medium-r-normal--12-*-*-*-c-*-*-*,\
++			-*-gothic-medium-r-normal--12-*-*-*-c-*-*-*,\
++			-*-mincho-medium-r-normal--12-*-*-*-c-*-*-*
+ *fontMenu*font4*Label:	Medium
+-*VT100*fontList4:	-*-fixed-medium-r-normal--18-*,\
+-			-*-gothic-medium-r-normal--18-*,\
+-			-*-mincho-medium-r-normal--18-*
++*VT100*fontList4:	-alias-fixed-medium-r-normal--16-*-*-*-c-*-*-*,\
++			-*-fixed-medium-r-normal--16-*-*-*-c-*-*-*,\
++			-*-gothic-medium-r-normal--16-*-*-*-c-*-*-*,\
++			-*-mincho-medium-r-normal--16-*-*-*-c-*-*-*
+ *fontMenu*font5*Label:	Large
+-*VT100*fontList5:	-*-fixed-medium-r-normal--24-*,\
+-			-*-gothic-medium-r-normal--24-*,\
+-			-*-mincho-medium-r-normal--24-*

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-head mailing list