Install unformatted UTF-8 manpages instead of preformatted EUC-JP.

As a result, remove the build dependency on jgroff.
Add some PLIST tweaks suggested by schwarze@.

Discussed with schwarze@ espie@ yasuoka@
This commit is contained in:
bentley 2018-04-16 09:53:28 +00:00
parent fe3ac71d52
commit eb4c14835e
5 changed files with 169 additions and 192 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.39 2017/05/14 19:53:58 schwarze Exp $
# $OpenBSD: Makefile,v 1.40 2018/04/16 09:53:28 bentley Exp $
COMMENT-main= canna (kana-kanji converter) libraries
COMMENT-dict= canna (kana-kanji converter) dictionaries
@ -10,9 +10,9 @@ PKGNAME-main= cannalib-3.5b2
PKGNAME-dict= cannadict-3.5b2
PKGNAME-server= cannaserver-3.5b2
REVISION-main = 5
REVISION-dict = 0
REVISION-server = 7
REVISION-main = 6
REVISION-dict = 1
REVISION-server = 8
SHARED_LIBS= RKC 1.0 \
RKC16 1.0 \
@ -30,9 +30,6 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= Marc Espie <espie@openbsd.org>
BUILD_DEPENDS= japanese/groff \
textproc/groff
HOMEPAGE = http://www.nec.co.jp/canna/
PERMIT_PACKAGE_FTP= Yes
@ -40,6 +37,8 @@ PERMIT_PACKAGE_CDROM= No Fee
MULTI_PACKAGES=-main -dict -server
BUILD_DEPENDS= japanese/nkf
PREFIX-dict= ${VARBASE}/dict
LIB_DEPENDS-server= japanese/canna
WANTLIB-server= c canna

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-Canna_conf,v 1.4 2008/08/29 15:01:29 espie Exp $
--- Canna.conf.orig Thu Nov 28 11:27:01 1996
+++ Canna.conf Fri Aug 29 16:52:05 2008
$OpenBSD: patch-Canna_conf,v 1.5 2018/04/16 09:53:28 bentley Exp $
Index: Canna.conf
--- Canna.conf.orig
+++ Canna.conf
@@ -129,19 +129,19 @@
*/
@ -78,71 +79,47 @@ $OpenBSD: patch-Canna_conf,v 1.4 2008/08/29 15:01:29 espie Exp $
+ DEPCANNALIB16 = $(CANNASRC)/libcanna16.so.$(LIBcanna16_VERSION)
# else
DEPCANNALIB16 = $(CANNASRC)/libcanna16.a
@@ -323,15 +328,34 @@ clean:: @@\
#endif
+#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
+
#ifdef InstallManPageLong
#undef InstallManPageLong
@@ -327,11 +332,15 @@ clean:: @@\
#endif
#define InstallManPageLong(file,destdir,dest) @@\
-ConvertPathName(file.tmp,file.$(MANSRCSUFF)) @@\
-install.man:: file.tmp @@\
- MakeDir($(DESTDIR)destdir/man$(MANSUFFIX)) @@\
- $(INSTALL) -c $(INSTMANFLAGS) file.tmp $(DESTDIR)destdir/man$(MANSUFFIX)/dest.$(MANSUFFIX) @@\
- $(RM) file.tmp @@\
+ConvertPathName(file.jtmp,file.jmn) @@\
+ConvertPathName(file.tmp,file.man) @@\
+install.man:: file.tmp file.jtmp @@\
+ MakeDir($(DESTDIR)destdir/ja_JP.EUC/cat$(MANSUFFIX)) @@\
+ MakeDir($(DESTDIR)destdir/cat$(MANSUFFIX)) @@\
+ cat file.tmp | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > file.0; \ @@\
+ $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/cat$(MANSUFFIX)/dest.0 @@\
+ cat file.jtmp | $(JNEQN) | $(JTBL) | $(JNROFF) $(MANMACROS) | $(JCOL) > file.j0; \ @@\
+ $(INSTALL) -c $(INSTMANFLAGS) file.j0 $(DESTDIR)destdir/ja_JP.EUC/cat$(MANSUFFIX)/dest.0 @@\
+ $(RM) file.tmp file.jtmp file.0 file.j0 @@\
+ MakeDir($(DESTDIR)destdir/ja/man$(MANSUFFIX)) @@\
MakeDir($(DESTDIR)destdir/man$(MANSUFFIX)) @@\
$(INSTALL) -c $(INSTMANFLAGS) file.tmp $(DESTDIR)destdir/man$(MANSUFFIX)/dest.$(MANSUFFIX) @@\
- $(RM) file.tmp @@\
+ nkf -w file.jtmp > file.j$(MANSUFFIX); \ @@\
+ $(INSTALL) -c $(INSTMANFLAGS) file.j$(MANSUFFIX) $(DESTDIR)destdir/ja/man$(MANSUFFIX)/dest.$(MANSUFFIX) @@\
+ $(RM) file.tmp file.jtmp file.j$(MANSUFFIX) @@\
clean:: @@\
- $(RM) file.tmp
+ $(RM) file.tmp file.jtmp file.0 file.j0
+ $(RM) file.tmp file.jtmp file.j$(MANSUFFIX)
#ifdef InstallManPage
@@ -345,11 +369,16 @@ InstallManPageLong(file,destdir,file)
@@ -345,11 +354,15 @@ InstallManPageLong(file,destdir,file)
#endif
#define InstallLibManPageLong(file,destdir,dest) @@\
-ConvertPathName(file.tmp,file.$(MANSRCSUFF)) @@\
-install.man:: file.tmp @@\
- MakeDir($(DESTDIR)destdir/man$(LIBMANSUFFIX)) @@\
- $(INSTALL) -c $(INSTMANFLAGS) file.tmp $(DESTDIR)destdir/man$(LIBMANSUFFIX)/dest.$(LIBMANSUFFIX) @@\
- $(RM) file.tmp @@\
+ConvertPathName(file.jtmp,file.jmn) @@\
+ConvertPathName(file.tmp,file.man) @@\
+install.man:: file.tmp file.jtmp @@\
+ MakeDir($(DESTDIR)destdir/ja_JP.EUC/cat$(LIBMANSUFFIX)) @@\
+ MakeDir($(DESTDIR)destdir/cat$(LIBMANSUFFIX)) @@\
+ cat file.tmp | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > file.0; \ @@\
+ $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/cat$(LIBMANSUFFIX)/dest.0 @@\
+ cat file.jtmp | $(JNEQN) | $(JTBL) | $(JNROFF) $(MANMACROS) | $(JCOL) > file.j0; \ @@\
+ $(INSTALL) -c $(INSTMANFLAGS) file.j0 $(DESTDIR)destdir/ja_JP.EUC/cat$(LIBMANSUFFIX)/dest.0 @@\
+ $(RM) file.tmp file.jtmp file.0 file.j0 @@\
+ MakeDir($(DESTDIR)destdir/ja/man$(LIBMANSUFFIX)) @@\
MakeDir($(DESTDIR)destdir/man$(LIBMANSUFFIX)) @@\
$(INSTALL) -c $(INSTMANFLAGS) file.tmp $(DESTDIR)destdir/man$(LIBMANSUFFIX)/dest.$(LIBMANSUFFIX) @@\
- $(RM) file.tmp @@\
+ nkf -w file.jtmp > file.j$(LIBMANSUFFIX); \ @@\
+ $(INSTALL) -c $(INSTMANFLAGS) file.j$(LIBMANSUFFIX) $(DESTDIR)destdir/ja/man$(LIBMANSUFFIX)/dest.$(LIBMANSUFFIX) @@\
+ $(RM) file.tmp file.jtmp file.j$(LIBMANSUFFIX) @@\
clean:: @@\
- $(RM) file.tmp
+ $(RM) file.tmp file.jtmp file.0 file.j0
+ $(RM) file.tmp file.jtmp file.j$(LIBMANSUFFIX)
#ifdef InstallLibManPage
@@ -364,11 +393,14 @@ InstallLibManPageLong(file,destdir,file)
@@ -364,11 +377,14 @@ InstallLibManPageLong(file,destdir,file)
#define InstallLibManPageAliases(file,destdir,aliases) @@\
install.man:: @@\
- @(TMP=/tmp/tmp.$$$$; \ @@\
@ -152,19 +129,19 @@ $OpenBSD: patch-Canna_conf,v 1.4 2008/08/29 15:01:29 espie Exp $
- $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
- done; \ @@\
- $(RM) $${TMP})
+ cd $(DESTDIR)/destdir/cat$(LIBMANSUFFIX); \ @@\
+ cd $(DESTDIR)/destdir/man$(LIBMANSUFFIX); \ @@\
+ for i in aliases; do \ @@\
+ $(RM) $$i.0; \ @@\
+ $(LN) file.0 $$i.0; \ @@\
+ $(RM) $$i.$(LIBMANSUFFIX); \ @@\
+ $(LN) file.$(LIBMANSUFFIX) $$i.$(LIBMANSUFFIX); \ @@\
+ done; \ @@\
+ cd $(DESTDIR)/destdir/ja_JP.EUC/cat$(LIBMANSUFFIX); \ @@\
+ cd $(DESTDIR)/destdir/ja/man$(LIBMANSUFFIX); \ @@\
+ for i in aliases; do \ @@\
+ $(RM) $$i.0; \ @@\
+ $(LN) file.0 $$i.0; \ @@\
+ $(RM) $$i.$(LIBMANSUFFIX); \ @@\
+ $(LN) file.$(LIBMANSUFFIX) $$i.$(LIBMANSUFFIX); \ @@\
+ done
#ifndef MakeDirectoriesLong
#define MakeDirectoriesLong(step,dirs,owner,group) @@\
@@ -456,2 +488,11 @@ dst:: Canna.conf @@\
@@ -456,2 +472,11 @@ dst:: Canna.conf @@\
echo "#endif") > $@
#endif
+

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-dict,v 1.4 2004/09/15 00:54:51 espie Exp $
@comment $OpenBSD: PLIST-dict,v 1.5 2018/04/16 09:53:28 bentley Exp $
@mode 0755
@owner daemon
@group daemon
@ -34,6 +34,4 @@ canna/canna/necgaiji.ctd
canna/canna/number.ctd
canna/canna/software.ctd
canna/canna/suffix.ctd
canna/group/
canna/user/
@unexec echo "Remove /var/spool/canna manually"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2015/03/19 20:25:26 naddy Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2018/04/16 09:53:28 bentley Exp $
@pkgpath japanese/canna
include/canna/
include/canna/RK.h
@ -63,87 +63,89 @@ lib/sample/tut.canna
lib/sample/unix.canna
lib/sample/vje.canna
lib/sample/wx2+.canna
@man man/cat3/RkCloseRoma.0
@man man/cat3/RkCvtEuc.0
@man man/cat3/RkCvtHan.0
@man man/cat3/RkCvtHira.0
@man man/cat3/RkCvtKana.0
@man man/cat3/RkCvtRoma.0
@man man/cat3/RkCvtZen.0
@man man/cat3/RkDefineDic.0
@man man/cat3/RkDeleteDic.0
@man man/cat3/RkEndBun.0
@man man/cat3/RkEnlarge.0
@man man/cat3/RkFinalize.0
@man man/cat3/RkGetDicList.0
@man man/cat3/RkGetKanji.0
@man man/cat3/RkGetLex.0
@man man/cat3/RkGetStat.0
@man man/cat3/RkGetYomi.0
@man man/cat3/RkGoto.0
@man man/cat3/RkInitialize.0
@man man/cat3/RkIntro.0
@man man/cat3/RkLeft.0
@man man/cat3/RkMapPhonogram.0
@man man/cat3/RkMapRoma.0
@man man/cat3/RkMountD.0
@man man/cat3/RkNext.0
@man man/cat3/RkNfer.0
@man man/cat3/RkOpenRoma.0
@man man/cat3/RkPrev.0
@man man/cat3/RkRemountDic.0
@man man/cat3/RkResize.0
@man man/cat3/RkRgnBun.0
@man man/cat3/RkRight.0
@man man/cat3/RkShorten.0
@man man/cat3/RkStoreYomi.0
@man man/cat3/RkUnmountDic.0
@man man/cat3/RkXfer.0
@man man/cat3/XKanjiControl.0
@man man/cat3/XLookupKanjiString.0
@man man/cat3/cannalib.0
@man man/cat3/jrKanjiControl.0
@man man/cat3/jrKanjiString.0
@man man/cat3/uilib.0
@man man/ja_JP.EUC/cat3/RkCloseRoma.0
@man man/ja_JP.EUC/cat3/RkCvtEuc.0
@man man/ja_JP.EUC/cat3/RkCvtHan.0
@man man/ja_JP.EUC/cat3/RkCvtHira.0
@man man/ja_JP.EUC/cat3/RkCvtKana.0
@man man/ja_JP.EUC/cat3/RkCvtRoma.0
@man man/ja_JP.EUC/cat3/RkCvtZen.0
@man man/ja_JP.EUC/cat3/RkDefineDic.0
@man man/ja_JP.EUC/cat3/RkDeleteDic.0
@man man/ja_JP.EUC/cat3/RkEndBun.0
@man man/ja_JP.EUC/cat3/RkEnlarge.0
@man man/ja_JP.EUC/cat3/RkFinalize.0
@man man/ja_JP.EUC/cat3/RkGetDicList.0
@man man/ja_JP.EUC/cat3/RkGetKanji.0
@man man/ja_JP.EUC/cat3/RkGetLex.0
@man man/ja_JP.EUC/cat3/RkGetStat.0
@man man/ja_JP.EUC/cat3/RkGetYomi.0
@man man/ja_JP.EUC/cat3/RkGoto.0
@man man/ja_JP.EUC/cat3/RkInitialize.0
@man man/ja_JP.EUC/cat3/RkIntro.0
@man man/ja_JP.EUC/cat3/RkLeft.0
@man man/ja_JP.EUC/cat3/RkMapPhonogram.0
@man man/ja_JP.EUC/cat3/RkMapRoma.0
@man man/ja_JP.EUC/cat3/RkMountD.0
@man man/ja_JP.EUC/cat3/RkNext.0
@man man/ja_JP.EUC/cat3/RkNfer.0
@man man/ja_JP.EUC/cat3/RkOpenRoma.0
@man man/ja_JP.EUC/cat3/RkPrev.0
@man man/ja_JP.EUC/cat3/RkRemountDic.0
@man man/ja_JP.EUC/cat3/RkResize.0
@man man/ja_JP.EUC/cat3/RkRgnBun.0
@man man/ja_JP.EUC/cat3/RkRight.0
@man man/ja_JP.EUC/cat3/RkShorten.0
@man man/ja_JP.EUC/cat3/RkStoreYomi.0
@man man/ja_JP.EUC/cat3/RkUnmountDic.0
@man man/ja_JP.EUC/cat3/RkXfer.0
@man man/ja_JP.EUC/cat3/XKanjiControl.0
@man man/ja_JP.EUC/cat3/XLookupKanjiString.0
@man man/ja_JP.EUC/cat3/cannalib.0
@man man/ja_JP.EUC/cat3/jrKanjiControl.0
@man man/ja_JP.EUC/cat3/jrKanjiString.0
@man man/ja_JP.EUC/cat3/uilib.0
man/ja/
man/ja/man3/
@man man/ja/man3/RkCloseRoma.3
@man man/ja/man3/RkCvtEuc.3
@man man/ja/man3/RkCvtHan.3
@man man/ja/man3/RkCvtHira.3
@man man/ja/man3/RkCvtKana.3
@man man/ja/man3/RkCvtRoma.3
@man man/ja/man3/RkCvtZen.3
@man man/ja/man3/RkDefineDic.3
@man man/ja/man3/RkDeleteDic.3
@man man/ja/man3/RkEndBun.3
@man man/ja/man3/RkEnlarge.3
@man man/ja/man3/RkFinalize.3
@man man/ja/man3/RkGetDicList.3
@man man/ja/man3/RkGetKanji.3
@man man/ja/man3/RkGetLex.3
@man man/ja/man3/RkGetStat.3
@man man/ja/man3/RkGetYomi.3
@man man/ja/man3/RkGoto.3
@man man/ja/man3/RkInitialize.3
@man man/ja/man3/RkIntro.3
@man man/ja/man3/RkLeft.3
@man man/ja/man3/RkMapPhonogram.3
@man man/ja/man3/RkMapRoma.3
@man man/ja/man3/RkMountD.3
@man man/ja/man3/RkNext.3
@man man/ja/man3/RkNfer.3
@man man/ja/man3/RkOpenRoma.3
@man man/ja/man3/RkPrev.3
@man man/ja/man3/RkRemountDic.3
@man man/ja/man3/RkResize.3
@man man/ja/man3/RkRgnBun.3
@man man/ja/man3/RkRight.3
@man man/ja/man3/RkShorten.3
@man man/ja/man3/RkStoreYomi.3
@man man/ja/man3/RkUnmountDic.3
@man man/ja/man3/RkXfer.3
@man man/ja/man3/XKanjiControl.3
@man man/ja/man3/XLookupKanjiString.3
@man man/ja/man3/cannalib.3
@man man/ja/man3/jrKanjiControl.3
@man man/ja/man3/jrKanjiString.3
@man man/ja/man3/uilib.3
@man man/man3/RkCloseRoma.3
@man man/man3/RkCvtEuc.3
@man man/man3/RkCvtHan.3
@man man/man3/RkCvtHira.3
@man man/man3/RkCvtKana.3
@man man/man3/RkCvtRoma.3
@man man/man3/RkCvtZen.3
@man man/man3/RkDefineDic.3
@man man/man3/RkDeleteDic.3
@man man/man3/RkEndBun.3
@man man/man3/RkEnlarge.3
@man man/man3/RkFinalize.3
@man man/man3/RkGetDicList.3
@man man/man3/RkGetKanji.3
@man man/man3/RkGetLex.3
@man man/man3/RkGetStat.3
@man man/man3/RkGetYomi.3
@man man/man3/RkGoto.3
@man man/man3/RkInitialize.3
@man man/man3/RkIntro.3
@man man/man3/RkLeft.3
@man man/man3/RkMapPhonogram.3
@man man/man3/RkMapRoma.3
@man man/man3/RkMountD.3
@man man/man3/RkNext.3
@man man/man3/RkNfer.3
@man man/man3/RkOpenRoma.3
@man man/man3/RkPrev.3
@man man/man3/RkRemountDic.3
@man man/man3/RkResize.3
@man man/man3/RkRgnBun.3
@man man/man3/RkRight.3
@man man/man3/RkShorten.3
@man man/man3/RkStoreYomi.3
@man man/man3/RkUnmountDic.3
@man man/man3/RkXfer.3
@man man/man3/XKanjiControl.3
@man man/man3/XLookupKanjiString.3
@man man/man3/cannalib.3
@man man/man3/jrKanjiControl.3
@man man/man3/jrKanjiString.3
@man man/man3/uilib.3

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.5 2015/03/19 20:25:26 naddy Exp $
@comment $OpenBSD: PLIST-server,v 1.6 2018/04/16 09:53:28 bentley Exp $
bin/addwords
@bin bin/canlisp
@bin bin/cannacheck
@ -6,7 +6,7 @@ bin/cannakill
@mode u+s,g+s
@owner daemon
@group daemon
bin/cannaserver
@bin bin/cannaserver
@mode
@owner
@group
@ -36,48 +36,49 @@ bin/rmdic
@bin bin/splitword
bin/syncdic
@bin bin/wtoc
@man man/cat1/addwords.0
@man man/cat1/cannacheck.0
@man man/cat1/cannakill.0
@man man/cat1/cannaserver.0
@man man/cat1/cannastat.0
@man man/cat1/catdic.0
@man man/cat1/cpdic.0
@man man/cat1/cshost.0
@man man/cat1/ctow.0
@man man/cat1/delwords.0
@man man/cat1/dicar.0
@man man/cat1/dpbindic.0
@man man/cat1/dpromdic.0
@man man/cat1/lsdic.0
@man man/cat1/mkbindic.0
@man man/cat1/mkdic.0
@man man/cat1/mkromdic.0
@man man/cat1/mvdic.0
@man man/cat1/rmdic.0
@man man/cat1/splitword.0
@man man/cat1/wtoc.0
@man man/ja_JP.EUC/cat1/addwords.0
@man man/ja_JP.EUC/cat1/cannacheck.0
@man man/ja_JP.EUC/cat1/cannakill.0
@man man/ja_JP.EUC/cat1/cannaserver.0
@man man/ja_JP.EUC/cat1/cannastat.0
@man man/ja_JP.EUC/cat1/catdic.0
@man man/ja_JP.EUC/cat1/cpdic.0
@man man/ja_JP.EUC/cat1/cshost.0
@man man/ja_JP.EUC/cat1/ctow.0
@man man/ja_JP.EUC/cat1/delwords.0
@man man/ja_JP.EUC/cat1/dicar.0
@man man/ja_JP.EUC/cat1/dpbindic.0
@man man/ja_JP.EUC/cat1/dpromdic.0
@man man/ja_JP.EUC/cat1/lsdic.0
@man man/ja_JP.EUC/cat1/mkbindic.0
@man man/ja_JP.EUC/cat1/mkdic.0
@man man/ja_JP.EUC/cat1/mkromdic.0
@man man/ja_JP.EUC/cat1/mvdic.0
@man man/ja_JP.EUC/cat1/rmdic.0
@man man/ja_JP.EUC/cat1/splitword.0
@man man/ja_JP.EUC/cat1/wtoc.0
man/ja/man1/
@man man/ja/man1/addwords.1
@man man/ja/man1/cannacheck.1
@man man/ja/man1/cannakill.1
@man man/ja/man1/cannaserver.1
@man man/ja/man1/cannastat.1
@man man/ja/man1/catdic.1
@man man/ja/man1/cpdic.1
@man man/ja/man1/cshost.1
@man man/ja/man1/ctow.1
@man man/ja/man1/delwords.1
@man man/ja/man1/dicar.1
@man man/ja/man1/dpbindic.1
@man man/ja/man1/dpromdic.1
@man man/ja/man1/lsdic.1
@man man/ja/man1/mkbindic.1
@man man/ja/man1/mkdic.1
@man man/ja/man1/mkromdic.1
@man man/ja/man1/mvdic.1
@man man/ja/man1/rmdic.1
@man man/ja/man1/splitword.1
@man man/ja/man1/wtoc.1
@man man/man1/addwords.1
@man man/man1/cannacheck.1
@man man/man1/cannakill.1
@man man/man1/cannaserver.1
@man man/man1/cannastat.1
@man man/man1/catdic.1
@man man/man1/cpdic.1
@man man/man1/cshost.1
@man man/man1/ctow.1
@man man/man1/delwords.1
@man man/man1/dicar.1
@man man/man1/dpbindic.1
@man man/man1/dpromdic.1
@man man/man1/lsdic.1
@man man/man1/mkbindic.1
@man man/man1/mkdic.1
@man man/man1/mkromdic.1
@man man/man1/mvdic.1
@man man/man1/rmdic.1
@man man/man1/splitword.1
@man man/man1/wtoc.1
@mode 0775
@owner daemon
@group daemon