Re: japanese/Wnn: remove jgroff dependency
ok yasuoka
I checked some japanese man pages
On Sat, 14 Apr 2018 03:30:30 +0200
Ingo Schwarze 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 - 1.80
> +++ Makefile 14 Apr 2018 01:21:33 -
> @@ -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 -
> +++ patches/patch-Wnn_man_2_env_dic_Imakefile 14 Apr 2018 01:21:33 -
> @@ -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 -
> +++ patches/patch-Wnn_man_2_env_wnn_Imakefile 14 Apr 2018 01:21:33 -
> @@ -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 0
Re: japanese/Wnn: remove jgroff dependency
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
--- Makefile14 May 2017 19:49:29 - 1.80
+++ Makefile14 Apr 2018 01:21:33 -
@@ -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 -
+++ patches/patch-Wnn_man_2_env_dic_Imakefile 14 Apr 2018 01:21:33 -
@@ -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 -
+++ patches/patch-Wnn_man_2_env_wnn_Imakefile 14 Apr 2018 01:21:33 -
@@ -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 -
+++ patches/patch-Wnn_man_3_libwnn_jl_lib_Imakefile 14 Apr 2018 01:21:33
-
@@ -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$(MANSU
Re: japanese/Wnn: remove jgroff dependency
On Thu, Apr 12, 2018 at 10:55:05PM +0900, YASUOKA Masahiko wrote: > Hi, > > > - Somebody please check whether installing EUC is *really* still > >important. As soon as it is confirmed that it is not, stop > >doing so. But don't let that delay this cleanup. > > 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. Ah, cool, I wasn't aware of the jless update. I have no objection left, then.
Re: japanese/Wnn: remove jgroff dependency
Hi,
> - Somebody please check whether installing EUC is *really* still
>important. As soon as it is confirmed that it is not, stop
>doing so. But don't let that delay this cleanup.
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.
On Wed, 11 Apr 2018 15:22:05 +0200
Ingo Schwarze wrote:
> Hi Anthony,
>
> almost identical comments like for canna:
>
> - Somebody please check whether installing EUC is *really* still
>important. As soon as it is confirmed that it is not, stop
>doing so. But don't let that delay this cleanup.
> - In the Makefile, i suggest to prefer "mandoc -Tutf8"
>over "LC_CTYPE=en_US.UTF-8 mandoc".
> - make update-plist tells me that you may want to consider
>something like the patch below, to be applied on top of what
>you already have.
>
> Unless you hear objections, i think you should go ahead.
>
> Yours,
> Ingo
>
>
> --- PLIST-main.orig Wed Apr 11 14:56:29 2018
> +++ PLIST-mainWed Apr 11 15:03:41 2018
> @@ -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,6 +87,8 @@
> lib/wnn/lt_LN/uumkey
> lib/wnn/lt_LN/uumkey_e
> lib/wnn/lt_LN/uumrc
> +man/ja/
> +man/ja/man1/
> @man man/ja/man1/atod.1
> @man man/ja/man1/atof.1
> @man man/ja/man1/dtoa.1
> @@ -98,6 +100,7 @@
> @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
> @@ -256,6 +259,7 @@
> @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
> @@ -269,6 +273,7 @@
> @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
> @man man/ja_JP.EUC/cat1/atod.0
> @@ -708,6 +713,8 @@
> 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
> +@comment share/doc/ja-Wnn/manual/v3tov4/v3tov4.orig
> @exec ${WNNBASE}/lib/wnn/install-script
> --- PLIST-xwnmo.orig Wed Apr 11 14:56:29 2018
> +++ PLIST-xwnmo Wed Apr 11 15:00:20 2018
> @@ -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
> --- PLIST-zh.orig Wed Apr 11 14:56:29 2018
> +++ PLIST-zh Wed Apr 11 15:00:20 2018
> @@ -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
>
Re: japanese/Wnn: remove jgroff dependency
Hi Anthony,
almost identical comments like for canna:
- Somebody please check whether installing EUC is *really* still
important. As soon as it is confirmed that it is not, stop
doing so. But don't let that delay this cleanup.
- In the Makefile, i suggest to prefer "mandoc -Tutf8"
over "LC_CTYPE=en_US.UTF-8 mandoc".
- make update-plist tells me that you may want to consider
something like the patch below, to be applied on top of what
you already have.
Unless you hear objections, i think you should go ahead.
Yours,
Ingo
--- PLIST-main.orig Wed Apr 11 14:56:29 2018
+++ PLIST-main Wed Apr 11 15:03:41 2018
@@ -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,6 +87,8 @@
lib/wnn/lt_LN/uumkey
lib/wnn/lt_LN/uumkey_e
lib/wnn/lt_LN/uumrc
+man/ja/
+man/ja/man1/
@man man/ja/man1/atod.1
@man man/ja/man1/atof.1
@man man/ja/man1/dtoa.1
@@ -98,6 +100,7 @@
@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
@@ -256,6 +259,7 @@
@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
@@ -269,6 +273,7 @@
@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
@man man/ja_JP.EUC/cat1/atod.0
@@ -708,6 +713,8 @@
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
+@comment share/doc/ja-Wnn/manual/v3tov4/v3tov4.orig
@exec ${WNNBASE}/lib/wnn/install-script
--- PLIST-xwnmo.origWed Apr 11 14:56:29 2018
+++ PLIST-xwnmo Wed Apr 11 15:00:20 2018
@@ -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
--- PLIST-zh.orig Wed Apr 11 14:56:29 2018
+++ PLIST-zhWed Apr 11 15:00:20 2018
@@ -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
Re: japanese/Wnn: remove jgroff dependency
Marc Espie writes:
> On Tue, Apr 10, 2018 at 02:35:36AM -0600, Anthony J. Bentley wrote:
> > Hi,
> >
> > Wnn currently generates EUC-JP manuals from EUC-JP source files using
> > jgroff, a patchset against positively ancient groff.
> >
> > This patch modifies the package to install unformatted UTF-8 manuals
> > that can then be viewed with mandoc (man -M /usr/local/man/ja).
> > Several other packages provide UTF-8 Japanese manpages in this
> > directory.
> >
> > ok?
>
> Sounds like a good idea in principle, but I definitely want to check how
> things integrate first.
Here's an updated diff that includes both preformatted EUC-JP manuals in
the original location (EUC source | nkf -w | mandoc | nkf -e) and the
unformatted UTF-8 manuals.
You can view the formatted pages in kterm the same way as before:
PAGER=jless LESSCHARSET=euc man -M /usr/local/man/ja_JP.EUC ...
And the unformatted pages in a UTF-8 xterm with:
man -M /usr/local/man/ja ...
Index: Makefile
===
RCS file: /cvs/ports/japanese/Wnn/Makefile,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile
--- Makefile14 May 2017 19:49:29 - 1.80
+++ Makefile10 Apr 2018 22:51:28 -
@@ -16,11 +16,11 @@ 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
@@ -28,7 +28,7 @@ REVISION-ko = 8
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
@@ -130,6 +127,8 @@ ALL_TARGET =World
INSTALL_TARGET = install install.man
NO_TEST = Yes
+EUCMAN = ${PREFIX}/man/ja_JP.EUC
+
post-install:
${INSTALL_DATA_DIR} ${PORT_JDOCDIR}
@(cd ${JDOC_FROM}; tar cf - manual manual.en | \
@@ -146,5 +145,19 @@ post-install:
${INSTALL_DATA} ${WRKDIST}/Wnn/jd/serverdefs ${PREFIX}/lib/wnn
${INSTALL_SCRIPT} ${FILESDIR}/install-script ${PREFIX}/lib/wnn
chmod u-s ${PREFIX}/bin/*server
+ ${INSTALL_DATA_DIR} \
+ ${EUCMAN}/cat1 ${EUCMAN}/cat3 ${EUCMAN}/cat4 ${EUCMAN}/cat5
+ for manual in ${PREFIX}/man/ja/man1/*.1; do \
+ LC_CTYPE=en_US.UTF-8 mandoc $${manual} | nkf -e >
${EUCMAN}/cat1/$$(basename $${manual} .1).0 ; \
+ done
+ for manual in ${PREFIX}/man/ja/man3/*.3; do \
+ LC_CTYPE=en_US.UTF-8 mandoc $${manual} | nkf -e >
${EUCMAN}/cat3/$$(basename $${manual} .3).0 ; \
+ done
+ for manual in ${PREFIX}/man/ja/man4/*.4; do \
+ LC_CTYPE=en_US.UTF-8 mandoc $${manual} | nkf -e >
${EUCMAN}/cat4/$$(basename $${manual} .4).0 ; \
+ done
+ for manual in ${PREFIX}/man/ja/man5/*.5; do \
+ LC_CTYPE=en_US.UTF-8 mandoc $${manual} | nkf -e >
${EUCMAN}/cat5/$$(basename $${manual} .5).0 ; \
+ done
.include
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 - 1.9
+++ patches/patch-config_Project_tmpl 10 Apr 2018 22:51:28 -
@@ -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.tmplFri 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
-+
Re: japanese/Wnn: remove jgroff dependency
On Tue, Apr 10, 2018 at 02:35:36AM -0600, Anthony J. Bentley wrote: > Hi, > > Wnn currently generates EUC-JP manuals from EUC-JP source files using > jgroff, a patchset against positively ancient groff. > > This patch modifies the package to install unformatted UTF-8 manuals > that can then be viewed with mandoc (man -M /usr/local/man/ja). > Several other packages provide UTF-8 Japanese manpages in this > directory. > > ok? Sounds like a good idea in principle, but I definitely want to check how things integrate first. Most specifically, Wnn dates back from a time where I used it for japanese input on kterms. I'm not sure it works well on UTF-8 terminals... which means that having the EUC manpages might actually be useful. So, I'll have to try... the easiest fix is probably utf-8 groff + nkf, but I have to check whether that's convenient or cumbersome...
japanese/Wnn: remove jgroff dependency
Hi,
Wnn currently generates EUC-JP manuals from EUC-JP source files using
jgroff, a patchset against positively ancient groff.
This patch modifies the package to install unformatted UTF-8 manuals
that can then be viewed with mandoc (man -M /usr/local/man/ja).
Several other packages provide UTF-8 Japanese manpages in this
directory.
ok?
Index: Makefile
===
RCS file: /cvs/ports/japanese/Wnn/Makefile,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile
--- Makefile14 May 2017 19:49:29 - 1.80
+++ Makefile10 Apr 2018 08:21:08 -
@@ -16,11 +16,11 @@ 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
@@ -28,7 +28,7 @@ REVISION-ko = 8
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-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 - 1.9
+++ patches/patch-config_Project_tmpl 10 Apr 2018 08:21:08 -
@@ -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.tmplFri 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
