ok yasuoka
I checked some japanese man pages
On Sat, 14 Apr 2018 03:30:30 +0200
Ingo Schwarze <schwarze@usta.de> wrote:
> 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
>
No comments:
Post a Comment