Hi,
Marc Espie wrote on Fri, Apr 13, 2018 at 11:05:22AM +0200:
> On Thu, Apr 12, 2018 at 10:55:05PM +0900, YASUOKA Masahiko wrote:
>> I don't think installing EUC is needed. Even if people is still using
>> EUC terminal, they can use MANPAGER=jless to see the UTF-8 manuals.
>> Since our jless started support both EUC and UTF-8, so both
>>
>> env MANPATH=/usr/local/man/ja MANPAGER=jless
>> env MANPATH=/usr/local/man/ja_JP.EUC MANPAGER=jless
>>
>> will show the same result. Also theoretically there may be conversion
>> problems between EUC and UTF-8, but I think it's no problem if we fix
>> them when we hit such problems.
Thank you very much for having a look!
> Ah, cool, I wasn't aware of the jless update.
> I have no objection left, then.
Great, so here is a patch building on bentley@'s work,
but also removing the EUC files.
Note that this port provides both Japanese and English manual
pages. So it is not possible to coerce everything into man/ja/.
Instead, do the right things in individual directories:
* directory Wnn, subpackage -main:
Install to man/ja/ only.
* directory Xwnmo, subpackage -xwnmo:
Install to man/ja/ *and* English man/.
* directory cWnn, subpackage -zh:
Install to English man/ only.
* subpackage -ko:
No manuals, but bump to add the missing @bin annotations.
OK?
Ingo
Index: Makefile
===================================================================
RCS file: /cvs/ports/japanese/Wnn/Makefile,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile
--- Makefile 14 May 2017 19:49:29 -0000 1.80
+++ Makefile 14 Apr 2018 01:21:33 -0000
@@ -16,19 +16,19 @@ CATEGORIES = japanese
MULTI_PACKAGES = -main -dict -zh -zhdict -ko -kodict -xwnmo -data
PKGNAME-main = ja-Wnn-4.2
-REVISION-main = 14
+REVISION-main = 15
PKGNAME-dict = ja-Wnndict-4.2
REVISION-dict = 0
PKGNAME-zh = zh-Wnn-4.2
-REVISION-zh = 8
+REVISION-zh = 9
PKGNAME-zhdict = zh-Wnndict-4.2
REVISION-zhdict = 0
PKGNAME-ko = ko-Wnn-4.2
-REVISION-ko = 8
+REVISION-ko = 9
PKGNAME-kodict = ko-Wnndict-4.2
REVISION-kodict = 0
PKGNAME-xwnmo = Wnn-xwnmo-4.2
-REVISION-xwnmo = 9
+REVISION-xwnmo = 10
PKGNAME-data = Wnn-data-4.2
WNNDICBASE = /var
@@ -75,11 +75,8 @@ JDOC_FROM = ${WRKSRC}/Wnn
PORT_CDOCDIR = ${PREFIX}/share/doc/zh-cWnn
CDOC_FROM = ${WRKSRC}/cWnn
-# Will turn into a RUN_DEPENDS when we install non-formatted manpages
BUILD_DEPENDS = devel/imake \
- japanese/groff
-# Run depends ensure this does not turn into infinite recursion, since
-# this is not needed before package build time.
+ japanese/nkf
do-distpatch:
cd ${WRKDIR} && tar zxf ${FULLDISTDIR}/Wnn4.2.patch.tar.gz
Index: patches/patch-Wnn_man_2_env_dic_Imakefile
===================================================================
RCS file: patches/patch-Wnn_man_2_env_dic_Imakefile
diff -N patches/patch-Wnn_man_2_env_dic_Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Wnn_man_2_env_dic_Imakefile 14 Apr 2018 01:21:33 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: Wnn/man/2.env/dic/Imakefile
+--- Wnn/man/2.env/dic/Imakefile.orig
++++ Wnn/man/2.env/dic/Imakefile
+@@ -3,6 +3,10 @@ XCOMM $Id: Imakefile,v 1.5 1994/08/17 05:53:05 kuwa Ex
+ XCOMM
+ MANSUFFIX = 5
+
++MANDIR = $(MANPATH)/ja/man$(MANSUFFIX)
++#undef InstallManPage
++#define InstallManPage InstallJManPage
++
+ all::
+
+ depend::
Index: patches/patch-Wnn_man_2_env_wnn_Imakefile
===================================================================
RCS file: patches/patch-Wnn_man_2_env_wnn_Imakefile
diff -N patches/patch-Wnn_man_2_env_wnn_Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Wnn_man_2_env_wnn_Imakefile 14 Apr 2018 01:21:33 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: Wnn/man/2.env/wnn/Imakefile
+--- Wnn/man/2.env/wnn/Imakefile.orig
++++ Wnn/man/2.env/wnn/Imakefile
+@@ -3,6 +3,12 @@ XCOMM $Id: Imakefile,v 1.4 1994/08/17 05:53:13 kuwa Ex
+ XCOMM
+ MANSUFFIX = 4
+
++MANDIR = $(MANPATH)/ja/man$(MANSUFFIX)
++#undef InstallManPage
++#define InstallManPage InstallJManPage
++#undef InstallManPageLong
++#define InstallManPageLong InstallJManPageLong
++
+ all::
+
+ depend::
Index: patches/patch-Wnn_man_3_libwnn_jl_lib_Imakefile
===================================================================
RCS file: patches/patch-Wnn_man_3_libwnn_jl_lib_Imakefile
diff -N patches/patch-Wnn_man_3_libwnn_jl_lib_Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Wnn_man_3_libwnn_jl_lib_Imakefile 14 Apr 2018 01:21:33
-0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: Wnn/man/3.libwnn/jl_lib/Imakefile
+--- Wnn/man/3.libwnn/jl_lib/Imakefile.orig
++++ Wnn/man/3.libwnn/jl_lib/Imakefile
+@@ -4,6 +4,14 @@ XCOMM
+ MANDIR = $(LIBMANDIR)
+ MANSUFFIX = $(LIBMANSUFFIX)
+
++MANDIR = $(MANPATH)/ja/man$(MANSUFFIX)
++#undef InstallManPage
++#define InstallManPage InstallJManPage
++#undef InstallManPageLong
++#define InstallManPageLong InstallJManPageLong
++#undef InstallManPageAliases
++#define InstallManPageAliases InstallJManPageAliases
++
+ all::
+
+ depend::
Index: patches/patch-Wnn_man_3_libwnn_js_lib_Imakefile
===================================================================
RCS file: patches/patch-Wnn_man_3_libwnn_js_lib_Imakefile
diff -N patches/patch-Wnn_man_3_libwnn_js_lib_Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Wnn_man_3_libwnn_js_lib_Imakefile 14 Apr 2018 01:21:33
-0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: Wnn/man/3.libwnn/js_lib/Imakefile
+--- Wnn/man/3.libwnn/js_lib/Imakefile.orig
++++ Wnn/man/3.libwnn/js_lib/Imakefile
+@@ -4,6 +4,14 @@ XCOMM
+ MANDIR = $(LIBMANDIR)
+ MANSUFFIX = $(LIBMANSUFFIX)
+
++MANDIR = $(MANPATH)/ja/man$(MANSUFFIX)
++#undef InstallManPage
++#define InstallManPage InstallJManPage
++#undef InstallManPageLong
++#define InstallManPageLong InstallJManPageLong
++#undef InstallManPageAliases
++#define InstallManPageAliases InstallJManPageAliases
++
+ all::
+
+ depend::
Index: patches/patch-Wnn_man_3_libwnn_misc_lib_Imakefile
===================================================================
RCS file: patches/patch-Wnn_man_3_libwnn_misc_lib_Imakefile
diff -N patches/patch-Wnn_man_3_libwnn_misc_lib_Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Wnn_man_3_libwnn_misc_lib_Imakefile 14 Apr 2018 01:21:33
-0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: Wnn/man/3.libwnn/misc_lib/Imakefile
+--- Wnn/man/3.libwnn/misc_lib/Imakefile.orig
++++ Wnn/man/3.libwnn/misc_lib/Imakefile
+@@ -4,6 +4,12 @@ XCOMM
+ MANDIR = $(LIBMANDIR)
+ MANSUFFIX = $(LIBMANSUFFIX)
+
++MANDIR = $(MANPATH)/ja/man$(MANSUFFIX)
++#undef InstallManPage
++#define InstallManPage InstallJManPage
++#undef InstallManPageLong
++#define InstallManPageLong InstallJManPageLong
++
+ all::
+
+ depend::
Index: patches/patch-Wnn_man_3_libwnn_rk_lib_Imakefile
===================================================================
RCS file: patches/patch-Wnn_man_3_libwnn_rk_lib_Imakefile
diff -N patches/patch-Wnn_man_3_libwnn_rk_lib_Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Wnn_man_3_libwnn_rk_lib_Imakefile 14 Apr 2018 01:21:33
-0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: Wnn/man/3.libwnn/rk_lib/Imakefile
+--- Wnn/man/3.libwnn/rk_lib/Imakefile.orig
++++ Wnn/man/3.libwnn/rk_lib/Imakefile
+@@ -4,6 +4,12 @@ XCOMM
+ MANDIR = $(LIBMANDIR)
+ MANSUFFIX = $(LIBMANSUFFIX)
+
++MANDIR = $(MANPATH)/ja/man$(MANSUFFIX)
++#undef InstallManPage
++#define InstallManPage InstallJManPage
++#undef InstallManPageLong
++#define InstallManPageLong InstallJManPageLong
++
+ all::
+
+ depend::
Index: patches/patch-Wnn_man_4_cmd_Imakefile
===================================================================
RCS file: patches/patch-Wnn_man_4_cmd_Imakefile
diff -N patches/patch-Wnn_man_4_cmd_Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Wnn_man_4_cmd_Imakefile 14 Apr 2018 01:21:33 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: Wnn/man/4.cmd/Imakefile
+--- Wnn/man/4.cmd/Imakefile.orig
++++ Wnn/man/4.cmd/Imakefile
+@@ -3,6 +3,10 @@ XCOMM $Id: Imakefile,v 1.3 1994/08/17 05:53:52 kuwa Ex
+ XCOMM
+ MANSUFFIX = 1
+
++MANDIR = $(MANPATH)/ja/man$(MANSUFFIX)
++#undef InstallManPage
++#define InstallManPage InstallJManPage
++
+ all::
+
+ depend::
Index: patches/patch-Wnn_man_6_jutil_Imakefile
===================================================================
RCS file: patches/patch-Wnn_man_6_jutil_Imakefile
diff -N patches/patch-Wnn_man_6_jutil_Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Wnn_man_6_jutil_Imakefile 14 Apr 2018 01:21:33 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: Wnn/man/6.jutil/Imakefile
+--- Wnn/man/6.jutil/Imakefile.orig
++++ Wnn/man/6.jutil/Imakefile
+@@ -3,6 +3,12 @@ XCOMM $Id: Imakefile,v 1.3 1994/08/17 05:53:57 kuwa Ex
+ XCOMM
+ MANSUFFIX = 1
+
++MANDIR = $(MANPATH)/ja/man$(MANSUFFIX)
++#undef InstallManPage
++#define InstallManPage InstallJManPage
++#undef InstallManPageLong
++#define InstallManPageLong InstallJManPageLong
++
+ all::
+
+ depend::
Index: patches/patch-Xwnmo_xjutil_Imakefile
===================================================================
RCS file: /cvs/ports/japanese/Wnn/patches/patch-Xwnmo_xjutil_Imakefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Xwnmo_xjutil_Imakefile
--- patches/patch-Xwnmo_xjutil_Imakefile 30 Aug 2008 11:17:00 -0000
1.2
+++ patches/patch-Xwnmo_xjutil_Imakefile 14 Apr 2018 01:21:33 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-Xwnmo_xjutil_Imakefile,v 1.2 2008/08/30 11:17:00 espie Exp $
---- Xwnmo/xjutil/Imakefile.orig Thu Aug 25 01:36:51 1994
-+++ Xwnmo/xjutil/Imakefile Sat Aug 30 13:13:01 2008
+Index: Xwnmo/xjutil/Imakefile
+--- Xwnmo/xjutil/Imakefile.orig
++++ Xwnmo/xjutil/Imakefile
@@ -30,7 +30,7 @@ XCOMM CONNECTION WITH THE USE OR PERFORMANCE OF THIS S
XCOMM
@@ -10,3 +11,19 @@ $OpenBSD: patch-Xwnmo_xjutil_Imakefile,v
#ifdef UseInstalled
DEPLIBS = $(XWNMOJLIB)
#else
+@@ -40,6 +40,7 @@ LOCAL_INSTFLAGS = $(INSTBINFLAGS) -o $(WNNOWNER)
+ DEFINES = $(WNNDEFINE) $(ALLLANGDEF) $(LOCAL_DEFINES) $(XWNMODEF)
+ LOCAL_LIBRARIES = $(XWNMOJLIB) $(XLIB)
+ LOCALMAN = man.en
++ JMANDIR = $(MANPATH)/ja/man$(MANSUFFIX)
+
+ LINKS = xjutil.man
+
+@@ -133,6 +134,7 @@ LinkSourceFile(xjutil.man,$(LOCALMAN))
+
+ InstallProgramWithFlags(xjutil,$(BINDIR),$(LOCAL_INSTFLAGS))
+ InstallManPage(xjutil,$(MANDIR))
++InstallJManPageLong(man.ja/xjutil,$(JMANDIR),xjutil)
+
+ WnnSpecialObjectRule($(OBJ2),$(SRC2),$(XWNMOSRC),)
+ WnnSpecialObjectRule($(OBJ3),$(SRC3),$(XWNMOSRC),)
Index: patches/patch-Xwnmo_xwnmo_Imakefile
===================================================================
RCS file: /cvs/ports/japanese/Wnn/patches/patch-Xwnmo_xwnmo_Imakefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Xwnmo_xwnmo_Imakefile
--- patches/patch-Xwnmo_xwnmo_Imakefile 30 Aug 2008 11:17:00 -0000 1.2
+++ patches/patch-Xwnmo_xwnmo_Imakefile 14 Apr 2018 01:21:34 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-Xwnmo_xwnmo_Imakefile,v 1.2 2008/08/30 11:17:00 espie Exp $
---- Xwnmo/xwnmo/Imakefile.orig Thu Aug 25 01:26:16 1994
-+++ Xwnmo/xwnmo/Imakefile Sat Aug 30 13:13:02 2008
+Index: Xwnmo/xwnmo/Imakefile
+--- Xwnmo/xwnmo/Imakefile.orig
++++ Xwnmo/xwnmo/Imakefile
@@ -30,7 +30,7 @@ XCOMM CONNECTION WITH THE USE OR PERFORMANCE OF THIS S
XCOMM
@@ -10,3 +11,30 @@ $OpenBSD: patch-Xwnmo_xwnmo_Imakefile,v
#ifdef UseInstalled
DEPLIBS = $(XWNMOJLIB)
#else
+@@ -46,6 +46,7 @@ XCOMM XJUTILNOTFORKFLAGS = -DNOTFORK_XJUTIL
+ XCOMM ALLOCDEBUGFLAGS = -DALLOC_DEBUG
+ XJUTILFLAGS = $(XJUTILBINDIR) $(XJUTILNOTFORKFLAGS)
+ LOCALMAN = man.en
++ JMANDIR = $(MANPATH)/ja/man$(MANSUFFIX)
+
+ LINKS = cvtfun.man cvtmt.man ximrc.man xwnmo.man killxw.man \
+ ximconf.man cvtxim.man
+@@ -185,11 +186,18 @@ InstallAppDefaults(Xwnmo)
+ InstallManPage(xwnmo,$(MANDIR))
+ InstallManPage(ximrc,$(MANDIR))
+ InstallManPage(ximconf,$(MANDIR))
++InstallJManPageLong(man.ja/xwnmo,$(JMANDIR),xwnmo)
++InstallJManPageLong(man.ja/ximrc,$(JMANDIR),ximrc)
++InstallJManPageLong(man.ja/ximconf,$(JMANDIR),ximconf)
+ #if ExpandManNames
+ InstallManPageLong(cvtfun,$(MANDIR),cvt_fun_tbl)
+ InstallManPageLong(cvtmt,$(MANDIR),cvt_meta_tbl)
+ InstallManPageLong(killxw,$(MANDIR),killxwnmo)
+ InstallManPageLong(cvtxim,$(MANDIR),cvt_xim_tbl)
++InstallJManPageLong(man.ja/cvtfun,$(JMANDIR),cvt_fun_tbl)
++InstallJManPageLong(man.ja/cvtmt,$(JMANDIR),cvt_meta_tbl)
++InstallJManPageLong(man.ja/killxw,$(JMANDIR),killxwnmo)
++InstallJManPageLong(man.ja/cvtxim,$(JMANDIR),cvt_xim_tbl)
+ #else
+ InstallManPage(cvtfun,$(MANDIR))
+ InstallManPage(cvtmt,$(MANDIR))
Index: patches/patch-config_Project_tmpl
===================================================================
RCS file: /cvs/ports/japanese/Wnn/patches/patch-config_Project_tmpl,v
retrieving revision 1.9
diff -u -p -r1.9 patch-config_Project_tmpl
--- patches/patch-config_Project_tmpl 11 Oct 2013 20:36:51 -0000 1.9
+++ patches/patch-config_Project_tmpl 14 Apr 2018 01:21:34 -0000
@@ -1,28 +1,8 @@
$OpenBSD: patch-config_Project_tmpl,v 1.9 2013/10/11 20:36:51 naddy Exp $
---- config/Project.tmpl.orig Mon Aug 29 10:40:17 1994
-+++ config/Project.tmpl Fri Oct 11 21:50:28 2013
-@@ -14,6 +14,20 @@ XCOMM $XConsortium: Project.tmpl,v 1.242 94/04/13 14:5
- * *
- ***************************************************************************/
-
-+#define JNeqnCmd jneqn -Tnippon
-+#define JNroffCmd jnroff -Tnippon
-+#define JEqnCmd jeqn -Tnippon -Tps
-+#define JTroffCmd jgroff -Tnippon -Tps
-+#define JColCmd cat
-+#define JTblCmd jtbl -Tnippon
-+
-+ JTROFF = JTroffCmd
-+ JNROFF = JNroffCmd
-+ JTBL = JTblCmd
-+ JEQN = JEqnCmd
-+ JNEQN = JNeqnCmd
-+ JCOL = JColCmd
-+
- #define ProjectX 6 /* do *not* change this line */
-
- /* The following project-specific rules are defined at the end of this file:
-@@ -70,9 +84,9 @@ XCOMM $XConsortium: Project.tmpl,v 1.242 94/04/13 14:5
+Index: config/Project.tmpl
+--- config/Project.tmpl.orig
++++ config/Project.tmpl
+@@ -70,9 +70,9 @@ XCOMM $XConsortium: Project.tmpl,v 1.242 94/04/13 14:5
#ifndef BuildXKB
#define BuildXKB NO
#endif
@@ -34,7 +14,7 @@ $OpenBSD: patch-config_Project_tmpl,v 1.
#ifndef BuildFresco
#if HasCplusplus && !HasGcc2ForCplusplus
#define BuildFresco YES
-@@ -1081,17 +1095,12 @@ clean::
@@\
+@@ -1081,17 +1081,12 @@ clean::
@@\
$(RM) index.troff index.pageno file.idx.nPS file.idx.PS
#endif
@@ -55,7 +35,7 @@ $OpenBSD: patch-config_Project_tmpl,v 1.
#define WnnSpecialObjectRule(obj, depends, direct, define) @@\
obj : depends @@\
-@@ -1100,7 +1109,7 @@ obj : depends
@@\
+@@ -1100,7 +1095,7 @@ obj : depends
@@\
#ifdef WnnMakeDirectories
#undef WnnMakeDirectories
#endif
@@ -64,7 +44,7 @@ $OpenBSD: patch-config_Project_tmpl,v 1.
step::
@@\
@case '${MFLAGS}' in *[i]*) set +e;; esac; @@\
DirFailPrefix@for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \ @@\
-@@ -1134,6 +1143,10 @@ install:: list
@@\
+@@ -1134,6 +1129,10 @@ install:: list
@@\
$(WNNTOUCH) $(DESTDIR)dest/$$i); fi \ @@\
done
@@ -75,7 +55,7 @@ $OpenBSD: patch-config_Project_tmpl,v 1.
#ifndef BuildWnn
#define BuildWnn YES
#endif
-@@ -1230,14 +1243,14 @@ install:: list
@@\
+@@ -1230,14 +1229,14 @@ install:: list
@@\
* as YES. Default is that dictionary isn't installed if it exist already.
*/
@@ -93,7 +73,7 @@ $OpenBSD: patch-config_Project_tmpl,v 1.
WNNINCDIR = $(INCROOT)
WNNLIBDIR = $(USRLIBDIR)
WNNTERM_LIB = termLibrary
-@@ -1248,9 +1261,9 @@ install:: list
@@\
+@@ -1248,9 +1247,9 @@ install:: list
@@\
WNNTOP = $(IMTOP)/Wnn
JWNNLANG = ja_JP
JWNNWNNDIR = $(WNNWNNDIR)/$(JWNNLANG)
@@ -105,7 +85,7 @@ $OpenBSD: patch-config_Project_tmpl,v 1.
JWNNPUBDICDIR = $(JWNNDICDIR)/pubdic
JWNNWNNCONSDICDIR = $(JWNNDICDIR)/wnncons
JWNNFZKSRCDIR = $(JWNNDICDIR)/src
-@@ -1278,8 +1291,8 @@ WNNWNNCONSDICSRC = $(WNNWNNCONSSRC)/dic
+@@ -1278,8 +1277,8 @@ WNNWNNCONSDICSRC = $(WNNWNNCONSSRC)/dic
CWNNLANG = zh_CN
CWNNWNNDIR = $(WNNWNNDIR)/$(CWNNLANG)
CWNNINCDIR = $(WNNINCDIR)/cwnn
@@ -116,7 +96,7 @@ $OpenBSD: patch-config_Project_tmpl,v 1.
CWNNSYSDICDIR = $(CWNNDICDIR)/sys
CWNNCDSRC = $(CWNNTOP)/cd
CWNNCDICSRC = $(CWNNTOP)/cdic
-@@ -1301,8 +1314,8 @@ WNNWNNCONSDICSRC = $(WNNWNNCONSSRC)/dic
+@@ -1301,8 +1300,8 @@ WNNWNNCONSDICSRC = $(WNNWNNCONSSRC)/dic
KWNNLANG = ko_KR
KWNNWNNDIR = $(WNNWNNDIR)/$(KWNNLANG)
KWNNINCDIR = $(WNNINCDIR)/kwnn
@@ -127,7 +107,7 @@ $OpenBSD: patch-config_Project_tmpl,v 1.
KWNNSYSDICDIR = $(KWNNDICDIR)/sys
KWNNKDSRC = $(KWNNTOP)/kd
KWNNKDICSRC = $(KWNNTOP)/kdic
-@@ -1322,7 +1335,7 @@ WNNWNNCONSDICSRC = $(WNNWNNCONSSRC)/dic
+@@ -1322,7 +1321,7 @@ WNNWNNCONSDICSRC = $(WNNWNNCONSSRC)/dic
TWNNLANG = zh_TW
TWNNWNNDIR = $(WNNWNNDIR)/$(TWNNLANG)
@@ -136,40 +116,40 @@ $OpenBSD: patch-config_Project_tmpl,v 1.
TWNNSYSDICDIR = $(TWNNDICDIR)/sys
TWNNTDSRC = $(CWNNTOP)/td
TWNNTDICSRC = $(CWNNTOP)/tdic
-@@ -1363,3 +1376,56 @@ XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m
+@@ -1363,3 +1362,43 @@ XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m
#else
IMAKE_CMD = $(IMAKE) -I$(IMIRULESRC) -I$(IRULESRC) $(IMAKE_DEFINES)
#endif
+
+/* InstallJManPageLong: specific rules for japanese language manpages */
+#define InstallJManPageLong(file,destdir,dest) @@\
-+all:: file.0 @@\
++all:: file.$(MANSUFFIX)
@@\
+ @@\
-+file.0:: file.man @@\
++file.$(MANSUFFIX):: file.man @@\
+ @if [ -f file.man ]; \ @@\
+ then \ @@\
+ tmp=`mktemp /tmp/man.XXXXXXXX` || exit 2 ; \ @@\
-+ cat file.man | $(JNEQN) | $(JTBL) | $(JNROFF) $(MANMACROS) | $(JCOL) >
$$tmp; \ @@\
-+ cp $$tmp file.0; \ @@\
++ nkf -w file.man > $$tmp; \ @@\
++ cp $$tmp file.$(MANSUFFIX); \ @@\
+ $(RM) $$tmp; \ @@\
+ fi @@\
+ @@\
+install.man:: @@\
+ MakeDir($(DESTDIR)destdir) @@\
-+ -@if [ -f file.0 ]; \ @@\
++ -@if [ -f file.$(MANSUFFIX) ]; \ @@\
+ then \ @@\
-+ $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
++ $(INSTALL) -c $(INSTMANFLAGS) file.$(MANSUFFIX)
$(DESTDIR)destdir/dest.$(MANSUFFIX); \@@\
+ fi @@\
+ @@\
+clean::
@@\
-+ RemoveFile(file.0)
++ RemoveFile(file.$(MANSUFFIX))
+
+#define InstallJManPageAliases(file,destdir,aliases) @@\
+install.man:: @@\
+ for i in aliases; do \ @@\
+ (set -x; \ @@\
-+ $(RM) $(DESTDIR)destdir/$$i.0;\ @@\
-+ (cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ @@\
++ $(RM) $(DESTDIR)destdir/$$i.$(MANSUFFIX);\
@@\
++ (cd $(DESTDIR)/destdir; $(LN) file.$(MANSUFFIX)
$$i.$(MANSUFFIX));\ @@\
+ ); \ @@\
+ done
+
@@ -180,16 +160,3 @@ $OpenBSD: patch-config_Project_tmpl,v 1.
+#define InstallJManPage(file,destdir)
@@\
+InstallJManPageLong(file,destdir,file)
+#endif /* InstallJManPage */
-+
-+
-+/*
-+ * XXX override default rules, since Wnn only has japanese manpages.
-+ */
-+#undef InstallManPage
-+#define InstallManPage InstallJManPage
-+#undef InstallManPageLong
-+#define InstallManPageLong InstallJManPageLong
-+#undef InstallManPageAliases
-+#define InstallManPageAliases InstallJManPageAliases
-+ MANPATH := $(MANPATH)/ja_JP.EUC
-+ MANSOURCEPATH = $(MANPATH)/cat
Index: pkg/PLIST-ko
===================================================================
RCS file: /cvs/ports/japanese/Wnn/pkg/PLIST-ko,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-ko
--- pkg/PLIST-ko 15 Sep 2004 00:53:48 -0000 1.10
+++ pkg/PLIST-ko 14 Apr 2018 01:21:34 -0000
@@ -1,18 +1,18 @@
@comment $OpenBSD: PLIST-ko,v 1.10 2004/09/15 00:53:48 espie Exp $
-bin/katod
-bin/katof
-bin/kdtoa
-bin/kserver
+@bin bin/katod
+@bin bin/katof
+@bin bin/kdtoa
+@bin bin/kserver
@mode u+s
@owner root
-bin/kuum
+@bin bin/kuum
@mode
@owner
-bin/kwddel
-bin/kwdreg
-bin/kwnnkill
-bin/kwnnstat
-bin/kwnntouch
+@bin bin/kwddel
+@bin bin/kwdreg
+@bin bin/kwnnkill
+@bin bin/kwnnstat
+@bin bin/kwnntouch
include/kwnn/
include/kwnn/commonhd.h
include/kwnn/cplib.h
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/japanese/Wnn/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 26 Jan 2012 08:03:56 -0000 1.2
+++ pkg/PLIST-main 14 Apr 2018 01:21:34 -0000
@@ -1,21 +1,21 @@
@comment $OpenBSD: PLIST-main,v 1.2 2012/01/26 08:03:56 ajacoutot Exp $
-@newuser _wnn:517:bin:daemon:Wnn server:/nonexistent:/sbin/nologin
@pkgpath japanese/Wnn
-bin/atod
-bin/atof
-bin/dtoa
-bin/jserver
-bin/oldatonewa
+@newuser _wnn:517:bin:daemon:Wnn server:/nonexistent:/sbin/nologin
+@bin bin/atod
+@bin bin/atof
+@bin bin/dtoa
+@bin bin/jserver
+@bin bin/oldatonewa
@mode u+s
@owner root
-bin/uum
+@bin bin/uum
@mode
@owner
-bin/wddel
-bin/wdreg
-bin/wnnkill
-bin/wnnstat
-bin/wnntouch
+@bin bin/wddel
+@bin bin/wdreg
+@bin bin/wnnkill
+@bin bin/wnnstat
+@bin bin/wnntouch
include/wnn/
include/wnn/commonhd.h
include/wnn/config.h
@@ -87,190 +87,195 @@ lib/wnn/lt_LN/uum.msg
lib/wnn/lt_LN/uumkey
lib/wnn/lt_LN/uumkey_e
lib/wnn/lt_LN/uumrc
-@man man/ja_JP.EUC/cat1/atod.0
-@man man/ja_JP.EUC/cat1/atof.0
-@man man/ja_JP.EUC/cat1/dtoa.0
-@man man/ja_JP.EUC/cat1/jserver.0
-@man man/ja_JP.EUC/cat1/oldatonewa.0
-@man man/ja_JP.EUC/cat1/uum.0
-@man man/ja_JP.EUC/cat1/wddel.0
-@man man/ja_JP.EUC/cat1/wdreg.0
-@man man/ja_JP.EUC/cat1/wnnkill.0
-@man man/ja_JP.EUC/cat1/wnnstat.0
-@man man/ja_JP.EUC/cat1/wnntouch.0
-@man man/ja_JP.EUC/cat3/jl_bun_suu.0
-@man man/ja_JP.EUC/cat3/jl_c_zenkouho.0
-@man man/ja_JP.EUC/cat3/jl_close.0
-@man man/ja_JP.EUC/cat3/jl_connect.0
-@man man/ja_JP.EUC/cat3/jl_connect_lang.0
-@man man/ja_JP.EUC/cat3/jl_dai_top.0
-@man man/ja_JP.EUC/cat3/jl_dic_add.0
-@man man/ja_JP.EUC/cat3/jl_dic_add_e.0
-@man man/ja_JP.EUC/cat3/jl_dic_comment_set.0
-@man man/ja_JP.EUC/cat3/jl_dic_comment_set_e.0
-@man man/ja_JP.EUC/cat3/jl_dic_delete.0
-@man man/ja_JP.EUC/cat3/jl_dic_delete_e.0
-@man man/ja_JP.EUC/cat3/jl_dic_list.0
-@man man/ja_JP.EUC/cat3/jl_dic_list_e.0
-@man man/ja_JP.EUC/cat3/jl_dic_save.0
-@man man/ja_JP.EUC/cat3/jl_dic_save_all.0
-@man man/ja_JP.EUC/cat3/jl_dic_save_all_e.0
-@man man/ja_JP.EUC/cat3/jl_dic_save_e.0
-@man man/ja_JP.EUC/cat3/jl_dic_use.0
-@man man/ja_JP.EUC/cat3/jl_dic_use_e.0
-@man man/ja_JP.EUC/cat3/jl_disconnect.0
-@man man/ja_JP.EUC/cat3/jl_env.0
-@man man/ja_JP.EUC/cat3/jl_env_get.0
-@man man/ja_JP.EUC/cat3/jl_env_set.0
-@man man/ja_JP.EUC/cat3/jl_env_sticky.0
-@man man/ja_JP.EUC/cat3/jl_env_sticky_e.0
-@man man/ja_JP.EUC/cat3/jl_env_un_sticky.0
-@man man/ja_JP.EUC/cat3/jl_env_un_sticky_e.0
-@man man/ja_JP.EUC/cat3/jl_fuzokugo_get.0
-@man man/ja_JP.EUC/cat3/jl_fuzokugo_get_e.0
-@man man/ja_JP.EUC/cat3/jl_fuzokugo_set.0
-@man man/ja_JP.EUC/cat3/jl_fuzokugo_set_e.0
-@man man/ja_JP.EUC/cat3/jl_get_kanji.0
-@man man/ja_JP.EUC/cat3/jl_get_yomi.0
-@man man/ja_JP.EUC/cat3/jl_get_zenkouho_kanji.0
-@man man/ja_JP.EUC/cat3/jl_hinsi_dicts.0
-@man man/ja_JP.EUC/cat3/jl_hinsi_dicts_e.0
-@man man/ja_JP.EUC/cat3/jl_hinsi_list.0
-@man man/ja_JP.EUC/cat3/jl_hinsi_list_e.0
-@man man/ja_JP.EUC/cat3/jl_hinsi_name.0
-@man man/ja_JP.EUC/cat3/jl_hinsi_name_e.0
-@man man/ja_JP.EUC/cat3/jl_hinsi_number.0
-@man man/ja_JP.EUC/cat3/jl_hinsi_number_e.0
-@man man/ja_JP.EUC/cat3/jl_inspect.0
-@man man/ja_JP.EUC/cat3/jl_isconnect.0
-@man man/ja_JP.EUC/cat3/jl_isconnect_e.0
-@man man/ja_JP.EUC/cat3/jl_jiri_len.0
-@man man/ja_JP.EUC/cat3/jl_kanji_len.0
-@man man/ja_JP.EUC/cat3/jl_kill.0
-@man man/ja_JP.EUC/cat3/jl_next.0
-@man man/ja_JP.EUC/cat3/jl_next_dai.0
-@man man/ja_JP.EUC/cat3/jl_nobi_conv.0
-@man man/ja_JP.EUC/cat3/jl_open.0
-@man man/ja_JP.EUC/cat3/jl_open_lang.0
-@man man/ja_JP.EUC/cat3/jl_param_get.0
-@man man/ja_JP.EUC/cat3/jl_param_get_e.0
-@man man/ja_JP.EUC/cat3/jl_param_set.0
-@man man/ja_JP.EUC/cat3/jl_param_set_e.0
-@man man/ja_JP.EUC/cat3/jl_previous.0
-@man man/ja_JP.EUC/cat3/jl_previous_dai.0
-@man man/ja_JP.EUC/cat3/jl_ren_conv.0
-@man man/ja_JP.EUC/cat3/jl_set_env_wnnrc.0
-@man man/ja_JP.EUC/cat3/jl_set_jikouho.0
-@man man/ja_JP.EUC/cat3/jl_set_jikouho_dai.0
-@man man/ja_JP.EUC/cat3/jl_tan_conv.0
-@man man/ja_JP.EUC/cat3/jl_update_hindo.0
-@man man/ja_JP.EUC/cat3/jl_word_add.0
-@man man/ja_JP.EUC/cat3/jl_word_add_e.0
-@man man/ja_JP.EUC/cat3/jl_word_comment_set.0
-@man man/ja_JP.EUC/cat3/jl_word_comment_set_e.0
-@man man/ja_JP.EUC/cat3/jl_word_delete.0
-@man man/ja_JP.EUC/cat3/jl_word_delete_e.0
-@man man/ja_JP.EUC/cat3/jl_word_info.0
-@man man/ja_JP.EUC/cat3/jl_word_info_e.0
-@man man/ja_JP.EUC/cat3/jl_word_search.0
-@man man/ja_JP.EUC/cat3/jl_word_search_by_env.0
-@man man/ja_JP.EUC/cat3/jl_word_search_by_env_e.0
-@man man/ja_JP.EUC/cat3/jl_word_search_e.0
-@man man/ja_JP.EUC/cat3/jl_word_use.0
-@man man/ja_JP.EUC/cat3/jl_word_use_e.0
-@man man/ja_JP.EUC/cat3/jl_yomi_len.0
-@man man/ja_JP.EUC/cat3/jl_zenkouho.0
-@man man/ja_JP.EUC/cat3/jl_zenkouho_bun.0
-@man man/ja_JP.EUC/cat3/jl_zenkouho_dai.0
-@man man/ja_JP.EUC/cat3/jl_zenkouho_daip.0
-@man man/ja_JP.EUC/cat3/jl_zenkouho_suu.0
-@man man/ja_JP.EUC/cat3/js_access.0
-@man man/ja_JP.EUC/cat3/js_close.0
-@man man/ja_JP.EUC/cat3/js_connect.0
-@man man/ja_JP.EUC/cat3/js_dic_add.0
-@man man/ja_JP.EUC/cat3/js_dic_delete.0
-@man man/ja_JP.EUC/cat3/js_dic_file_create.0
-@man man/ja_JP.EUC/cat3/js_dic_file_create_client.0
-@man man/ja_JP.EUC/cat3/js_dic_info.0
-@man man/ja_JP.EUC/cat3/js_dic_list.0
-@man man/ja_JP.EUC/cat3/js_dic_list_all.0
-@man man/ja_JP.EUC/cat3/js_dic_use.0
-@man man/ja_JP.EUC/cat3/js_disconnect.0
-@man man/ja_JP.EUC/cat3/js_env_exist.0
-@man man/ja_JP.EUC/cat3/js_env_list.0
-@man man/ja_JP.EUC/cat3/js_env_sticky.0
-@man man/ja_JP.EUC/cat3/js_env_un_sticky.0
-@man man/ja_JP.EUC/cat3/js_file_comment_set.0
-@man man/ja_JP.EUC/cat3/js_file_discard.0
-@man man/ja_JP.EUC/cat3/js_file_info.0
-@man man/ja_JP.EUC/cat3/js_file_list.0
-@man man/ja_JP.EUC/cat3/js_file_list_all.0
-@man man/ja_JP.EUC/cat3/js_file_loaded.0
-@man man/ja_JP.EUC/cat3/js_file_loaded_local.0
-@man man/ja_JP.EUC/cat3/js_file_password_set.0
-@man man/ja_JP.EUC/cat3/js_file_read.0
-@man man/ja_JP.EUC/cat3/js_file_receive.0
-@man man/ja_JP.EUC/cat3/js_file_remove.0
-@man man/ja_JP.EUC/cat3/js_file_remove_client.0
-@man man/ja_JP.EUC/cat3/js_file_send.0
-@man man/ja_JP.EUC/cat3/js_file_stat.0
-@man man/ja_JP.EUC/cat3/js_file_write.0
-@man man/ja_JP.EUC/cat3/js_fuzokugo_get.0
-@man man/ja_JP.EUC/cat3/js_fuzokugo_set.0
-@man man/ja_JP.EUC/cat3/js_get_lang.0
-@man man/ja_JP.EUC/cat3/js_hindo_file_create.0
-@man man/ja_JP.EUC/cat3/js_hindo_file_create_client.0
-@man man/ja_JP.EUC/cat3/js_hindo_set.0
-@man man/ja_JP.EUC/cat3/js_hinsi_dicts.0
-@man man/ja_JP.EUC/cat3/js_hinsi_list.0
-@man man/ja_JP.EUC/cat3/js_hinsi_name.0
-@man man/ja_JP.EUC/cat3/js_hinsi_number.0
-@man man/ja_JP.EUC/cat3/js_hinsi_table_set.0
-@man man/ja_JP.EUC/cat3/js_isconnect.0
-@man man/ja_JP.EUC/cat3/js_kanren.0
-@man man/ja_JP.EUC/cat3/js_kantan_dai.0
-@man man/ja_JP.EUC/cat3/js_kantan_sho.0
-@man man/ja_JP.EUC/cat3/js_kanzen_dai.0
-@man man/ja_JP.EUC/cat3/js_kanzen_sho.0
-@man man/ja_JP.EUC/cat3/js_kill.0
-@man man/ja_JP.EUC/cat3/js_mkdir.0
-@man man/ja_JP.EUC/cat3/js_open.0
-@man man/ja_JP.EUC/cat3/js_open_lang.0
-@man man/ja_JP.EUC/cat3/js_param_get.0
-@man man/ja_JP.EUC/cat3/js_param_set.0
-@man man/ja_JP.EUC/cat3/js_set_lang.0
-@man man/ja_JP.EUC/cat3/js_version.0
-@man man/ja_JP.EUC/cat3/js_who.0
-@man man/ja_JP.EUC/cat3/js_word_add.0
-@man man/ja_JP.EUC/cat3/js_word_comment_set.0
-@man man/ja_JP.EUC/cat3/js_word_delete.0
-@man man/ja_JP.EUC/cat3/js_word_info.0
-@man man/ja_JP.EUC/cat3/js_word_search.0
-@man man/ja_JP.EUC/cat3/js_word_search_by_env.0
-@man man/ja_JP.EUC/cat3/msg_close.0
-@man man/ja_JP.EUC/cat3/msg_get.0
-@man man/ja_JP.EUC/cat3/msg_open.0
-@man man/ja_JP.EUC/cat3/romkan_clear.0
-@man man/ja_JP.EUC/cat3/romkan_dispmode.0
-@man man/ja_JP.EUC/cat3/romkan_getc.0
-@man man/ja_JP.EUC/cat3/romkan_init.0
-@man man/ja_JP.EUC/cat3/romkan_next.0
-@man man/ja_JP.EUC/cat3/romkan_ungetc.0
-@man man/ja_JP.EUC/cat4/2a_ctrl.0
-@man man/ja_JP.EUC/cat4/2b_romkana.0
-@man man/ja_JP.EUC/cat4/cvt_key_tbl.0
-@man man/ja_JP.EUC/cat4/fzk.data.0
-@man man/ja_JP.EUC/cat4/fzk.u.0
-@man man/ja_JP.EUC/cat4/hinsi_data.0
-@man man/ja_JP.EUC/cat4/jserverrc.0
-@man man/ja_JP.EUC/cat4/mode.0
-@man man/ja_JP.EUC/cat4/serverdefs.0
-@man man/ja_JP.EUC/cat4/ujis_dic.0
-@man man/ja_JP.EUC/cat4/uumkey.0
-@man man/ja_JP.EUC/cat4/uumrc.0
-@man man/ja_JP.EUC/cat4/wnnenvrc.0
-@man man/ja_JP.EUC/cat5/pubdic.0
-@man man/ja_JP.EUC/cat5/usr_dic.0
+@mandir man/ja/
+man/ja/man1/
+@man man/ja/man1/atod.1
+@man man/ja/man1/atof.1
+@man man/ja/man1/dtoa.1
+@man man/ja/man1/jserver.1
+@man man/ja/man1/oldatonewa.1
+@man man/ja/man1/uum.1
+@man man/ja/man1/wddel.1
+@man man/ja/man1/wdreg.1
+@man man/ja/man1/wnnkill.1
+@man man/ja/man1/wnnstat.1
+@man man/ja/man1/wnntouch.1
+man/ja/man3/
+@man man/ja/man3/jl_bun_suu.3
+@man man/ja/man3/jl_c_zenkouho.3
+@man man/ja/man3/jl_close.3
+@man man/ja/man3/jl_connect.3
+@man man/ja/man3/jl_connect_lang.3
+@man man/ja/man3/jl_dai_top.3
+@man man/ja/man3/jl_dic_add.3
+@man man/ja/man3/jl_dic_add_e.3
+@man man/ja/man3/jl_dic_comment_set.3
+@man man/ja/man3/jl_dic_comment_set_e.3
+@man man/ja/man3/jl_dic_delete.3
+@man man/ja/man3/jl_dic_delete_e.3
+@man man/ja/man3/jl_dic_list.3
+@man man/ja/man3/jl_dic_list_e.3
+@man man/ja/man3/jl_dic_save.3
+@man man/ja/man3/jl_dic_save_all.3
+@man man/ja/man3/jl_dic_save_all_e.3
+@man man/ja/man3/jl_dic_save_e.3
+@man man/ja/man3/jl_dic_use.3
+@man man/ja/man3/jl_dic_use_e.3
+@man man/ja/man3/jl_disconnect.3
+@man man/ja/man3/jl_env.3
+@man man/ja/man3/jl_env_get.3
+@man man/ja/man3/jl_env_set.3
+@man man/ja/man3/jl_env_sticky.3
+@man man/ja/man3/jl_env_sticky_e.3
+@man man/ja/man3/jl_env_un_sticky.3
+@man man/ja/man3/jl_env_un_sticky_e.3
+@man man/ja/man3/jl_fuzokugo_get.3
+@man man/ja/man3/jl_fuzokugo_get_e.3
+@man man/ja/man3/jl_fuzokugo_set.3
+@man man/ja/man3/jl_fuzokugo_set_e.3
+@man man/ja/man3/jl_get_kanji.3
+@man man/ja/man3/jl_get_yomi.3
+@man man/ja/man3/jl_get_zenkouho_kanji.3
+@man man/ja/man3/jl_hinsi_dicts.3
+@man man/ja/man3/jl_hinsi_dicts_e.3
+@man man/ja/man3/jl_hinsi_list.3
+@man man/ja/man3/jl_hinsi_list_e.3
+@man man/ja/man3/jl_hinsi_name.3
+@man man/ja/man3/jl_hinsi_name_e.3
+@man man/ja/man3/jl_hinsi_number.3
+@man man/ja/man3/jl_hinsi_number_e.3
+@man man/ja/man3/jl_inspect.3
+@man man/ja/man3/jl_isconnect.3
+@man man/ja/man3/jl_isconnect_e.3
+@man man/ja/man3/jl_jiri_len.3
+@man man/ja/man3/jl_kanji_len.3
+@man man/ja/man3/jl_kill.3
+@man man/ja/man3/jl_next.3
+@man man/ja/man3/jl_next_dai.3
+@man man/ja/man3/jl_nobi_conv.3
+@man man/ja/man3/jl_open.3
+@man man/ja/man3/jl_open_lang.3
+@man man/ja/man3/jl_param_get.3
+@man man/ja/man3/jl_param_get_e.3
+@man man/ja/man3/jl_param_set.3
+@man man/ja/man3/jl_param_set_e.3
+@man man/ja/man3/jl_previous.3
+@man man/ja/man3/jl_previous_dai.3
+@man man/ja/man3/jl_ren_conv.3
+@man man/ja/man3/jl_set_env_wnnrc.3
+@man man/ja/man3/jl_set_jikouho.3
+@man man/ja/man3/jl_set_jikouho_dai.3
+@man man/ja/man3/jl_tan_conv.3
+@man man/ja/man3/jl_update_hindo.3
+@man man/ja/man3/jl_word_add.3
+@man man/ja/man3/jl_word_add_e.3
+@man man/ja/man3/jl_word_comment_set.3
+@man man/ja/man3/jl_word_comment_set_e.3
+@man man/ja/man3/jl_word_delete.3
+@man man/ja/man3/jl_word_delete_e.3
+@man man/ja/man3/jl_word_info.3
+@man man/ja/man3/jl_word_info_e.3
+@man man/ja/man3/jl_word_search.3
+@man man/ja/man3/jl_word_search_by_env.3
+@man man/ja/man3/jl_word_search_by_env_e.3
+@man man/ja/man3/jl_word_search_e.3
+@man man/ja/man3/jl_word_use.3
+@man man/ja/man3/jl_word_use_e.3
+@man man/ja/man3/jl_yomi_len.3
+@man man/ja/man3/jl_zenkouho.3
+@man man/ja/man3/jl_zenkouho_bun.3
+@man man/ja/man3/jl_zenkouho_dai.3
+@man man/ja/man3/jl_zenkouho_daip.3
+@man man/ja/man3/jl_zenkouho_suu.3
+@man man/ja/man3/js_access.3
+@man man/ja/man3/js_close.3
+@man man/ja/man3/js_connect.3
+@man man/ja/man3/js_dic_add.3
+@man man/ja/man3/js_dic_delete.3
+@man man/ja/man3/js_dic_file_create.3
+@man man/ja/man3/js_dic_file_create_client.3
+@man man/ja/man3/js_dic_info.3
+@man man/ja/man3/js_dic_list.3
+@man man/ja/man3/js_dic_list_all.3
+@man man/ja/man3/js_dic_use.3
+@man man/ja/man3/js_disconnect.3
+@man man/ja/man3/js_env_exist.3
+@man man/ja/man3/js_env_list.3
+@man man/ja/man3/js_env_sticky.3
+@man man/ja/man3/js_env_un_sticky.3
+@man man/ja/man3/js_file_comment_set.3
+@man man/ja/man3/js_file_discard.3
+@man man/ja/man3/js_file_info.3
+@man man/ja/man3/js_file_list.3
+@man man/ja/man3/js_file_list_all.3
+@man man/ja/man3/js_file_loaded.3
+@man man/ja/man3/js_file_loaded_local.3
+@man man/ja/man3/js_file_password_set.3
+@man man/ja/man3/js_file_read.3
+@man man/ja/man3/js_file_receive.3
+@man man/ja/man3/js_file_remove.3
+@man man/ja/man3/js_file_remove_client.3
+@man man/ja/man3/js_file_send.3
+@man man/ja/man3/js_file_stat.3
+@man man/ja/man3/js_file_write.3
+@man man/ja/man3/js_fuzokugo_get.3
+@man man/ja/man3/js_fuzokugo_set.3
+@man man/ja/man3/js_get_lang.3
+@man man/ja/man3/js_hindo_file_create.3
+@man man/ja/man3/js_hindo_file_create_client.3
+@man man/ja/man3/js_hindo_set.3
+@man man/ja/man3/js_hinsi_dicts.3
+@man man/ja/man3/js_hinsi_list.3
+@man man/ja/man3/js_hinsi_name.3
+@man man/ja/man3/js_hinsi_number.3
+@man man/ja/man3/js_hinsi_table_set.3
+@man man/ja/man3/js_isconnect.3
+@man man/ja/man3/js_kanren.3
+@man man/ja/man3/js_kantan_dai.3
+@man man/ja/man3/js_kantan_sho.3
+@man man/ja/man3/js_kanzen_dai.3
+@man man/ja/man3/js_kanzen_sho.3
+@man man/ja/man3/js_kill.3
+@man man/ja/man3/js_mkdir.3
+@man man/ja/man3/js_open.3
+@man man/ja/man3/js_open_lang.3
+@man man/ja/man3/js_param_get.3
+@man man/ja/man3/js_param_set.3
+@man man/ja/man3/js_set_lang.3
+@man man/ja/man3/js_version.3
+@man man/ja/man3/js_who.3
+@man man/ja/man3/js_word_add.3
+@man man/ja/man3/js_word_comment_set.3
+@man man/ja/man3/js_word_delete.3
+@man man/ja/man3/js_word_info.3
+@man man/ja/man3/js_word_search.3
+@man man/ja/man3/js_word_search_by_env.3
+@man man/ja/man3/msg_close.3
+@man man/ja/man3/msg_get.3
+@man man/ja/man3/msg_open.3
+@man man/ja/man3/romkan_clear.3
+@man man/ja/man3/romkan_dispmode.3
+@man man/ja/man3/romkan_getc.3
+@man man/ja/man3/romkan_init.3
+@man man/ja/man3/romkan_next.3
+@man man/ja/man3/romkan_ungetc.3
+man/ja/man4/
+@man man/ja/man4/2a_ctrl.4
+@man man/ja/man4/2b_romkana.4
+@man man/ja/man4/cvt_key_tbl.4
+@man man/ja/man4/fzk.data.4
+@man man/ja/man4/fzk.u.4
+@man man/ja/man4/hinsi_data.4
+@man man/ja/man4/jserverrc.4
+@man man/ja/man4/mode.4
+@man man/ja/man4/serverdefs.4
+@man man/ja/man4/ujis_dic.4
+@man man/ja/man4/uumkey.4
+@man man/ja/man4/uumrc.4
+@man man/ja/man4/wnnenvrc.4
+man/ja/man5/
+@man man/ja/man5/pubdic.5
+@man man/ja/man5/usr_dic.5
share/doc/ja-Wnn/
share/doc/ja-Wnn/manual/
share/doc/ja-Wnn/manual.en/
@@ -524,6 +529,8 @@ share/doc/ja-Wnn/manual/6.jutil/wnntouch
share/doc/ja-Wnn/manual/7.Protocol/
share/doc/ja-Wnn/manual/7.Protocol/KKTP
share/doc/ja-Wnn/manual/intro
+@comment share/doc/ja-Wnn/manual/intro.orig
share/doc/ja-Wnn/manual/v3tov4/
share/doc/ja-Wnn/manual/v3tov4/v3tov4
@exec ${WNNBASE}/lib/wnn/install-script
+@comment share/doc/ja-Wnn/manual/v3tov4/v3tov4.orig
Index: pkg/PLIST-xwnmo
===================================================================
RCS file: /cvs/ports/japanese/Wnn/pkg/PLIST-xwnmo,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-xwnmo
--- pkg/PLIST-xwnmo 5 Aug 2004 14:11:10 -0000 1.2
+++ pkg/PLIST-xwnmo 14 Apr 2018 01:21:34 -0000
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST-xwnmo,v 1.2 2004/08/05 14:11:10 espie Exp $
-bin/killxwnmo
-bin/xjutil
-bin/xwnmo
+@bin bin/killxwnmo
+@bin bin/xjutil
+@bin bin/xwnmo
lib/X11/app-defaults/Xwnmo
lib/wnn/cvt_xim_tbl
lib/wnn/ja_JP/uumkey.xim
@@ -36,11 +36,19 @@ lib/wnn/zh_TW/uumrc_p.xim
lib/wnn/zh_TW/uumrc_z.xim
lib/wnn/zh_TW/xim.msg
lib/wnn/zh_TW/xjutil.msg
-@man man/ja_JP.EUC/cat1/cvt_fun_tbl.0
-@man man/ja_JP.EUC/cat1/cvt_meta_tbl.0
-@man man/ja_JP.EUC/cat1/cvt_xim_tbl.0
-@man man/ja_JP.EUC/cat1/killxwnmo.0
-@man man/ja_JP.EUC/cat1/ximconf.0
-@man man/ja_JP.EUC/cat1/ximrc.0
-@man man/ja_JP.EUC/cat1/xjutil.0
-@man man/ja_JP.EUC/cat1/xwnmo.0
+@man man/ja/man1/cvt_fun_tbl.1
+@man man/ja/man1/cvt_meta_tbl.1
+@man man/ja/man1/cvt_xim_tbl.1
+@man man/ja/man1/killxwnmo.1
+@man man/ja/man1/ximconf.1
+@man man/ja/man1/ximrc.1
+@man man/ja/man1/xjutil.1
+@man man/ja/man1/xwnmo.1
+@man man/man1/cvt_fun_tbl.1
+@man man/man1/cvt_meta_tbl.1
+@man man/man1/cvt_xim_tbl.1
+@man man/man1/killxwnmo.1
+@man man/man1/ximconf.1
+@man man/man1/ximrc.1
+@man man/man1/xjutil.1
+@man man/man1/xwnmo.1
Index: pkg/PLIST-zh
===================================================================
RCS file: /cvs/ports/japanese/Wnn/pkg/PLIST-zh,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-zh
--- pkg/PLIST-zh 15 Sep 2004 00:53:48 -0000 1.10
+++ pkg/PLIST-zh 14 Apr 2018 01:21:34 -0000
@@ -1,19 +1,19 @@
@comment $OpenBSD: PLIST-zh,v 1.10 2004/09/15 00:53:48 espie Exp $
-bin/catod
-bin/catof
-bin/cdtoa
-bin/cserver
+@bin bin/catod
+@bin bin/catof
+@bin bin/cdtoa
+@bin bin/cserver
@mode u+s
@owner root
-bin/cuum
+@bin bin/cuum
@mode
@owner
-bin/cwddel
-bin/cwdreg
-bin/cwnnkill
-bin/cwnnstat
-bin/cwnntouch
-bin/tserver
+@bin bin/cwddel
+@bin bin/cwdreg
+@bin bin/cwnnkill
+@bin bin/cwnnstat
+@bin bin/cwnntouch
+@bin bin/tserver
include/cwnn/
include/cwnn/commonhd.h
include/cwnn/cplib.h
@@ -118,20 +118,20 @@ lib/wnn/zh_TW/uumrc_z
lib/wnn/zh_TW/wnnenvrc
lib/wnn/zh_TW/wnnenvrc_R
lib/wnn/zh_TW/wnnstat.msg
-@man man/ja_JP.EUC/cat1/catod.0
-@man man/ja_JP.EUC/cat1/catof.0
-@man man/ja_JP.EUC/cat1/cdicsort.0
-@man man/ja_JP.EUC/cat1/cdtoa.0
-@man man/ja_JP.EUC/cat1/cserver.0
-@man man/ja_JP.EUC/cat1/cuum.0
-@man man/ja_JP.EUC/cat1/cwddel.0
-@man man/ja_JP.EUC/cat1/cwdreg.0
-@man man/ja_JP.EUC/cat1/cwnnkill.0
-@man man/ja_JP.EUC/cat1/cwnnstat.0
-@man man/ja_JP.EUC/cat4/cenv.0
-@man man/ja_JP.EUC/cat4/ckey.0
-@man man/ja_JP.EUC/cat4/cst_end.0
-@man man/ja_JP.EUC/cat4/cwnn.0
+@man man/man1/catod.1
+@man man/man1/catof.1
+@man man/man1/cdicsort.1
+@man man/man1/cdtoa.1
+@man man/man1/cserver.1
+@man man/man1/cuum.1
+@man man/man1/cwddel.1
+@man man/man1/cwdreg.1
+@man man/man1/cwnnkill.1
+@man man/man1/cwnnstat.1
+@man man/man4/cenv.4
+@man man/man4/ckey.4
+@man man/man4/cst_end.4
+@man man/man4/cwnn.4
share/doc/zh-cWnn/
share/doc/zh-cWnn/manual/
share/doc/zh-cWnn/manual.en/
