From 0a956adf98615a803abdc6e3c9802c1677d93a39 Mon Sep 17 00:00:00 2001 From: espie Date: Thu, 20 Apr 2000 23:32:22 +0000 Subject: [PATCH] Split dictionary into a separate package, using MULTI_PACKAGES. (so that dictionaries install into /var/dict). Note that ja-Wnn and ja-Wnn-dict do not depend on each other. The installation `polish' script in Wnn-data should know how to take care of that. --- japanese/Wnn/Makefile | 16 +++++- .../Wnn/patches/patch-config_Project_tmpl | 52 +++++++++++++++--- japanese/Wnn/pkg/COMMENT | 2 +- japanese/Wnn/pkg/COMMENT-dict | 1 + japanese/Wnn/pkg/DESCR | 43 ++++----------- japanese/Wnn/pkg/DESCR-dict | 3 ++ japanese/Wnn/pkg/PLIST | 53 ++----------------- japanese/Wnn/pkg/PLIST-dict | 41 ++++++++++++++ 8 files changed, 118 insertions(+), 93 deletions(-) create mode 100644 japanese/Wnn/pkg/COMMENT-dict create mode 100644 japanese/Wnn/pkg/DESCR-dict create mode 100644 japanese/Wnn/pkg/PLIST-dict diff --git a/japanese/Wnn/Makefile b/japanese/Wnn/Makefile index 0f0fdf87350..7776e46afb3 100644 --- a/japanese/Wnn/Makefile +++ b/japanese/Wnn/Makefile @@ -1,11 +1,19 @@ # From FreeBSD: Satoshi Taoka # # $FreeBSD: Makefile,v 1.19 1997/09/23 02:17:58 max Exp $ -# $OpenBSD: Makefile,v 1.17 2000/04/16 21:53:26 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2000/04/20 23:32:22 espie Exp $ DISTNAME= Wnn4.2 +MULTI_PACKAGES=-dict +SUBPACKAGE?= +.if ${SUBPACKAGE} == "-dict" +PREFIX=/var/dict +PKGNAME= ja-Wnn-dict-4.2 +.else PKGNAME= ja-Wnn-4.2 -CATEGORIES?= japanese +.endif + +CATEGORIES= japanese NEED_VERSION= 1.210 MASTER_SITES= ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \ ftp://ports.jp.FreeBSD.org/pub/incoming/distfiles/ @@ -27,6 +35,10 @@ DOC_FROM= ${WRKSRC}/Wnn # Will turn into a RUN_DEPENDS when we install non-formatted manpages BUILD_DEPENDS= jgroff::japanese/groff +# Run depends ensure this does not turn into infinite recursion, since +# this is not needed before package build time. +# I'm grateful to having `real' cookies, which means this is possible. +RUN_DEPENDS= ${LOCALBASE}/lib/wnn/install-script::japanese-keep/Wnn-data do-distpatch: cd ${WRKDIR} && tar zxf ${FULLDISTDIR}/Wnn4.2.patch.tar.gz diff --git a/japanese/Wnn/patches/patch-config_Project_tmpl b/japanese/Wnn/patches/patch-config_Project_tmpl index 72cc86f008e..4ed26fa7ea5 100644 --- a/japanese/Wnn/patches/patch-config_Project_tmpl +++ b/japanese/Wnn/patches/patch-config_Project_tmpl @@ -1,6 +1,6 @@ -$OpenBSD: patch-config_Project_tmpl,v 1.1 2000/04/16 21:53:37 espie Exp $ +$OpenBSD: patch-config_Project_tmpl,v 1.2 2000/04/20 23:32:22 espie Exp $ --- config/Project.tmpl.orig Mon Aug 29 10:40:17 1994 -+++ config/Project.tmpl Sun Apr 16 02:10:53 2000 ++++ config/Project.tmpl Fri Apr 21 01:02:08 2000 @@ -14,6 +14,20 @@ XCOMM $XConsortium: Project.tmpl,v 1.242 * * ***************************************************************************/ @@ -79,7 +79,7 @@ $OpenBSD: patch-config_Project_tmpl,v 1.1 2000/04/16 21:53:37 espie Exp $ #endif #if BuildPubdic || BuildWnnConsDic #define BuildWnnDicUtilForCompile YES -@@ -1230,7 +1243,7 @@ install:: list @@\ +@@ -1230,12 +1243,13 @@ install:: list @@\ * as YES. Default is that dictionary isn't installed if it exist already. */ @@ -88,16 +88,56 @@ $OpenBSD: patch-config_Project_tmpl,v 1.1 2000/04/16 21:53:37 espie Exp $ #ifdef UseInstalled IMTOP = $(TOP) #else -@@ -1248,7 +1261,7 @@ install:: list @@\ + IMTOP = $(CONTRIBSRC)/programs/Xsi + #endif ++ WNNDICDIR = /var/dict + WNNWNNDIR = /usr/local/lib/wnn + WNNBINDIR = /usr/local/bin + WNNINCDIR = $(INCROOT) +@@ -1248,9 +1262,9 @@ install:: list @@\ WNNTOP = $(IMTOP)/Wnn JWNNLANG = ja_JP JWNNWNNDIR = $(WNNWNNDIR)/$(JWNNLANG) - JWNNBINDIR = $(WNNBINDIR)/Wnn4 + JWNNBINDIR = $(WNNBINDIR) JWNNINCDIR = $(WNNINCDIR)/wnn - JWNNDICDIR = $(JWNNWNNDIR)/dic +- JWNNDICDIR = $(JWNNWNNDIR)/dic ++ JWNNDICDIR = $(WNNDICDIR)/$(JWNNLANG) JWNNPUBDICDIR = $(JWNNDICDIR)/pubdic -@@ -1363,3 +1376,44 @@ XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m + JWNNWNNCONSDICDIR = $(JWNNDICDIR)/wnncons + JWNNFZKSRCDIR = $(JWNNDICDIR)/src +@@ -1278,8 +1292,8 @@ WNNWNNCONSDICSRC = $(WNNWNNCONSSRC)/dic + CWNNLANG = zh_CN + CWNNWNNDIR = $(WNNWNNDIR)/$(CWNNLANG) + CWNNINCDIR = $(WNNINCDIR)/cwnn +- CWNNBINDIR = $(WNNBINDIR)/cWnn4 +- CWNNDICDIR = $(CWNNWNNDIR)/dic ++ CWNNBINDIR = $(WNNBINDIR) ++ CWNNDICDIR = $(WNNDICDIR)/$(CWWNLANG) + CWNNSYSDICDIR = $(CWNNDICDIR)/sys + CWNNCDSRC = $(CWNNTOP)/cd + CWNNCDICSRC = $(CWNNTOP)/cdic +@@ -1301,8 +1315,8 @@ WNNWNNCONSDICSRC = $(WNNWNNCONSSRC)/dic + KWNNLANG = ko_KR + KWNNWNNDIR = $(WNNWNNDIR)/$(KWNNLANG) + KWNNINCDIR = $(WNNINCDIR)/kwnn +- KWNNBINDIR = $(WNNBINDIR)/kWnn4 +- KWNNDICDIR = $(KWNNWNNDIR)/dic ++ KWNNBINDIR = $(WNNBINDIR) ++ KWNNDICDIR = $(WNNDICDIR)/$(KWNNLANG) + KWNNSYSDICDIR = $(KWNNDICDIR)/sys + KWNNKDSRC = $(KWNNTOP)/kd + KWNNKDICSRC = $(KWNNTOP)/kdic +@@ -1322,7 +1336,7 @@ WNNWNNCONSDICSRC = $(WNNWNNCONSSRC)/dic + + TWNNLANG = zh_TW + TWNNWNNDIR = $(WNNWNNDIR)/$(TWNNLANG) +- TWNNDICDIR = $(TWNNWNNDIR)/dic ++ TWNNDICDIR = $(WNNDICDIR)/$(TWNNLANG) + TWNNSYSDICDIR = $(TWNNDICDIR)/sys + TWNNTDSRC = $(CWNNTOP)/td + TWNNTDICSRC = $(CWNNTOP)/tdic +@@ -1363,3 +1377,44 @@ XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m #else IMAKE_CMD = $(IMAKE) -I$(IMIRULESRC) -I$(IRULESRC) $(IMAKE_DEFINES) #endif diff --git a/japanese/Wnn/pkg/COMMENT b/japanese/Wnn/pkg/COMMENT index 812915ff33e..0439d74e97b 100644 --- a/japanese/Wnn/pkg/COMMENT +++ b/japanese/Wnn/pkg/COMMENT @@ -1 +1 @@ -Japanese/Chinese/Korean input method (built only Japanese) +Japanese input method diff --git a/japanese/Wnn/pkg/COMMENT-dict b/japanese/Wnn/pkg/COMMENT-dict new file mode 100644 index 00000000000..60da035a0be --- /dev/null +++ b/japanese/Wnn/pkg/COMMENT-dict @@ -0,0 +1 @@ +dictionaries for Japanese Wnn diff --git a/japanese/Wnn/pkg/DESCR b/japanese/Wnn/pkg/DESCR index 96e4fc921bd..6355879f60d 100644 --- a/japanese/Wnn/pkg/DESCR +++ b/japanese/Wnn/pkg/DESCR @@ -1,37 +1,12 @@ -This is Wnn4.2, a Japanese/Chinese/Korean input method. It is -included primarily so that we can compile mule-2.1, a multilingual -emacs. +Wnn4.2 is a Japanese/Chinese/Korean input method. +This is the Japanese version. -Only the Japanese version is build for this port. +This is originally based on the FreeBSD port, with contributions by -Note that binaries and libraries go to /usr/local, while man pages and -includes go to /usr/X11R6. That's the way it was designed, I don't -know why. +Satoshi (asami@cs.berkeley.edu) +Hidekazu Kuroki (hidekazu@cs.titech.ac.jp) +Yoshio KATAYAMA +S. Taoka -- Satoshi -(asami@cs.berkeley.edu) - -------------------------------------------------------------------- - -This also include some patches for FreeBSD or bugfix. -If use this patches, you can compile Wnn-4.2 under XFree86 3.1.2E - or later(X11Release6.1). -If there are any problem in this patches, please know me via E-mail. - -Hidekazu Kuroki -(hidekazu@cs.titech.ac.jp) - -------------------------------------------------------------------- - -Mr. Yoshio KATAYAMA fixed many bugs for Wnn4.2. -Patches for those are in 'Wnn4.2.patch.tar.gz' and are applied in this -port. - -[Notice] -When compiling by this ports, if $LOCALBASE is not '/usr/local' and/or -$X11BASE is not '/usr/X11R6' then you should properly change two lines -'@cwd /usr/local' and '@cwd /usr/X11R6' in -$PORTSDIR/japanese/Wnn/pkg/PLIST. - --- S. Taoka - +The OpenBSD port separates the dictionaries into a separate package +(ja-Wnn-dict-4.2) that installs under /var/dict. diff --git a/japanese/Wnn/pkg/DESCR-dict b/japanese/Wnn/pkg/DESCR-dict new file mode 100644 index 00000000000..017829652d5 --- /dev/null +++ b/japanese/Wnn/pkg/DESCR-dict @@ -0,0 +1,3 @@ +Kana-kanji conversion dictionaries for japanese Wnn-4.2. +Provided as a separate package so it installs under /var/dict +instead of /usr/local. diff --git a/japanese/Wnn/pkg/PLIST b/japanese/Wnn/pkg/PLIST index f3cd046d930..25f5a8eb2d3 100644 --- a/japanese/Wnn/pkg/PLIST +++ b/japanese/Wnn/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2000/04/20 23:13:50 espie Exp $ +@comment $OpenBSD: PLIST,v 1.7 2000/04/20 23:32:22 espie Exp $ bin/atod bin/atof bin/dtoa @@ -25,50 +25,6 @@ include/wnn/rk_spclval.h include/wnn/wnnerror.h lib/libjd.a lib/libwnn.a -lib/wnn/cvt_key_empty -lib/wnn/cvt_key_tbl -lib/wnn/cvt_key_tbl.ST -lib/wnn/cvt_key_tbl.gm -lib/wnn/cvt_key_tbl.kt -lib/wnn/cvt_key_tbl.mv -lib/wnn/cvt_key_tbl.vt -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/bio.dic -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/chimei.dic -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/computer.dic -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/full.fzk -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/jinmei.dic -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/kihon.dic -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/kougo.fzk -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/koyuu.dic -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/setsuji.dic -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/special.dic -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/std.fzk -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/symbol.dic -@comment no checksum -lib/wnn/ja_JP/dic/pubdic/tankan.dic -lib/wnn/ja_JP/dic/src/fzk.attr -lib/wnn/ja_JP/dic/src/fzk.con -lib/wnn/ja_JP/dic/src/fzk.fzkattr -lib/wnn/ja_JP/dic/src/fzk.jirattr -lib/wnn/ja_JP/dic/src/fzk.jircon -lib/wnn/ja_JP/dic/src/fzk.master -lib/wnn/ja_JP/dic/src/fzk.shuutan -@comment no checksum -lib/wnn/ja_JP/dic/wnncons/tankan2.dic -@comment no checksum -lib/wnn/ja_JP/dic/wnncons/tankan3.dic lib/wnn/ja_JP/hinsi.data lib/wnn/ja_JP/jserverrc lib/wnn/ja_JP/libwnn.msg @@ -537,8 +493,7 @@ share/doc/ja-Wnn/manual/6.jutil/wnntouch share/doc/ja-Wnn/manual/7.Protocol/KKTP share/doc/ja-Wnn/manual/intro share/doc/ja-Wnn/manual/v3tov4/v3tov4 -lib/wnn/install-script -@exec PREFIX=%D %D/%F +@exec /usr/local/lib/wnn/install-script @dirrm share/doc/ja-Wnn/manual/v3tov4 @dirrm share/doc/ja-Wnn/manual/7.Protocol @dirrm share/doc/ja-Wnn/manual/6.jutil @@ -566,7 +521,5 @@ lib/wnn/install-script @dirrm lib/wnn/lt_LN @dirrm lib/wnn/ja_JP/rk.vi @dirrm lib/wnn/ja_JP/rk -@dirrm lib/wnn/ja_JP/dic/src +@dirrm lib/wnn/ja_JP @dirrm include/wnn -@unexec echo "Don't forget to remove user wnn" -@unexec echo " and directory %D/lib/wnn manually" diff --git a/japanese/Wnn/pkg/PLIST-dict b/japanese/Wnn/pkg/PLIST-dict new file mode 100644 index 00000000000..a36f3f58365 --- /dev/null +++ b/japanese/Wnn/pkg/PLIST-dict @@ -0,0 +1,41 @@ +@comment $OpenBSD: PLIST-dict,v 1.1 2000/04/20 23:32:22 espie Exp $ +@comment no checksum +ja_JP/pubdic/bio.dic +@comment no checksum +ja_JP/pubdic/chimei.dic +@comment no checksum +ja_JP/pubdic/computer.dic +@comment no checksum +ja_JP/pubdic/full.fzk +@comment no checksum +ja_JP/pubdic/jinmei.dic +@comment no checksum +ja_JP/pubdic/kihon.dic +@comment no checksum +ja_JP/pubdic/kougo.fzk +@comment no checksum +ja_JP/pubdic/koyuu.dic +@comment no checksum +ja_JP/pubdic/setsuji.dic +@comment no checksum +ja_JP/pubdic/special.dic +@comment no checksum +ja_JP/pubdic/std.fzk +@comment no checksum +ja_JP/pubdic/symbol.dic +@comment no checksum +ja_JP/pubdic/tankan.dic +ja_JP/src/fzk.attr +ja_JP/src/fzk.con +ja_JP/src/fzk.fzkattr +ja_JP/src/fzk.jirattr +ja_JP/src/fzk.jircon +ja_JP/src/fzk.master +ja_JP/src/fzk.shuutan +@comment no checksum +ja_JP/wnncons/tankan2.dic +@comment no checksum +ja_JP/wnncons/tankan3.dic +@exec /usr/local/lib/wnn/install-script +@unexec echo "finish removing %D/ja_JP manually" +@unexec echo "Don't forget to remove directory %D/ja_JP manually"