diff options
49 files changed, 117 insertions, 636 deletions
@@ -3637,3 +3637,10 @@ japanese/kinput2-sj3+wnn6|japanese/kinput2|2008-10-26|Integrated into japanese/k japanese/kinput2-sj3+wnn7|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 japanese/kinput2-wnn6|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 japanese/kinput2-wnn7|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/onew-canna|japanese/onew|2008-10-26|Integrated into japanese/onew +japanese/onew-canna+freewnn|japanese/onew|2008-10-26|Integrated into japanese/onew +japanese/onew-canna+wnn6|japanese/onew|2008-10-26|Integrated into japanese/onew +japanese/onew-canna+wnn7|japanese/onew|2008-10-26|Integrated into japanese/onew +japanese/onew-freewnn|japanese/onew|2008-10-26|Integrated into japanese/onew +japanese/onew-wnn6|japanese/onew|2008-10-26|Integrated into japanese/onew +japanese/onew-wnn7|japanese/onew|2008-10-26|Integrated into japanese/onew diff --git a/japanese/Makefile b/japanese/Makefile index 72f8ac51dfcd..b2a107cc2b90 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -219,13 +219,7 @@ SUBDIR += ochusha SUBDIR += okphone SUBDIR += oleo - SUBDIR += onew-canna - SUBDIR += onew-canna+freewnn - SUBDIR += onew-canna+wnn6 - SUBDIR += onew-canna+wnn7 - SUBDIR += onew-freewnn - SUBDIR += onew-wnn6 - SUBDIR += onew-wnn7 + SUBDIR += onew SUBDIR += otojiro-fpw SUBDIR += p5-Acme-Lou SUBDIR += p5-Date-Japanese-Era diff --git a/japanese/onew-canna+freewnn/Makefile b/japanese/onew-canna+freewnn/Makefile deleted file mode 100644 index f37630c894f6..000000000000 --- a/japanese/onew-canna+freewnn/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: ONEW for Canna and FreeWnn -# Date created: 5 Sep 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= A library for Japanese Input Method Canna and FreeWnn - -CANNA= yes -FREEWNN= yes - -MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna+freewnn/pkg-descr b/japanese/onew-canna+freewnn/pkg-descr deleted file mode 100644 index 39acef77a17b..000000000000 --- a/japanese/onew-canna+freewnn/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -ONEW is a library for using Japanese Input Method Canna, FreeWnn or -Wnn6. - -This is for Canna and FreeWnn. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/onew-canna+freewnn/pkg-plist b/japanese/onew-canna+freewnn/pkg-plist deleted file mode 100644 index 57f5cf0c7f56..000000000000 --- a/japanese/onew-canna+freewnn/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/libonew-canna+freewnn.a -%%PORTDOCS%%share/doc/ja-onew-canna+freewnn/README.ONEW -%%PORTDOCS%%@dirrm share/doc/ja-onew-canna+freewnn diff --git a/japanese/onew-canna+wnn6/Makefile b/japanese/onew-canna+wnn6/Makefile deleted file mode 100644 index e9ad95f7e171..000000000000 --- a/japanese/onew-canna+wnn6/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: ONEW for Canna and Wnn6 -# Date created: 5 Sep 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= A library for Japanese Input Method Canna and Wnn6 - -CANNA= yes -WNN6= yes - -MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna+wnn6/pkg-descr b/japanese/onew-canna+wnn6/pkg-descr deleted file mode 100644 index 3f45748ed3a6..000000000000 --- a/japanese/onew-canna+wnn6/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -ONEW is a library for using Japanese Input Method Canna, Wnn4, or -Wnn6. - -This is for Canna and Wnn6. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/onew-canna+wnn6/pkg-plist b/japanese/onew-canna+wnn6/pkg-plist deleted file mode 100644 index f08b0431aa9f..000000000000 --- a/japanese/onew-canna+wnn6/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -lib/libonew-canna+wnn6.a -%%PORTDOCS%%share/doc/ja-onew-canna+wnn6/README.ONEW -%%PORTDOCS%%@dirrm share/doc/ja-onew-canna+wnn6 -lib/wnn/ja_JP/rk.wnn6/1B_TOUPPER -lib/wnn/ja_JP/rk.wnn6/1B_ZENHIRA -lib/wnn/ja_JP/rk.wnn6/1B_ZENKATA -lib/wnn/ja_JP/rk.wnn6/1B_newTOUPPER -lib/wnn/ja_JP/rk.wnn6/2A_CTRL -lib/wnn/ja_JP/rk.wnn6/2B_DAKUTEN -lib/wnn/ja_JP/rk.wnn6/2B_JIS -lib/wnn/ja_JP/rk.wnn6/2B_ROMKANA -lib/wnn/ja_JP/rk.wnn6/2_TCODE -lib/wnn/ja_JP/rk.wnn6/3B_HANKATA -lib/wnn/ja_JP/rk.wnn6/3B_KATAKANA -lib/wnn/ja_JP/rk.wnn6/3B_ZENKAKU -lib/wnn/ja_JP/rk.wnn6/autork -lib/wnn/ja_JP/rk.wnn6/mode -lib/wnn/ja_JP/rk.wnn6/mode.hankata -lib/wnn/ja_JP/rk.wnn6/mode.nohankata -@dirrm lib/wnn/ja_JP/rk.wnn6 -@dirrm lib/wnn/ja_JP -@dirrm lib/wnn diff --git a/japanese/onew-canna+wnn7/Makefile b/japanese/onew-canna+wnn7/Makefile deleted file mode 100644 index 36556b805b87..000000000000 --- a/japanese/onew-canna+wnn7/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: ONEW for Canna and Wnn7 -# Date created: 01/07/18 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= A library for Japanese Input Methods: Canna and Wnn7 - -CANNA= yes -WNN7= yes - -MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna+wnn7/pkg-descr b/japanese/onew-canna+wnn7/pkg-descr deleted file mode 100644 index ea9cff4be92a..000000000000 --- a/japanese/onew-canna+wnn7/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -ONEW is a library for using Japanese Input Methods: Canna, FreeWnn, -Wnn6 or Wnn7. - -This port supports Canna and Wnn7. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/onew-canna+wnn7/pkg-plist b/japanese/onew-canna+wnn7/pkg-plist deleted file mode 100644 index 8588955b97ac..000000000000 --- a/japanese/onew-canna+wnn7/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -lib/libonew-canna+wnn7.a -%%PORTDOCS%%share/doc/ja-onew-canna+wnn7/README.ONEW -%%PORTDOCS%%@dirrm share/doc/ja-onew-canna+wnn7 -lib/wnn/ja_JP/rk.wnn7/1B_TOUPPER -lib/wnn/ja_JP/rk.wnn7/1B_ZENHIRA -lib/wnn/ja_JP/rk.wnn7/1B_ZENKATA -lib/wnn/ja_JP/rk.wnn7/1B_newTOUPPER -lib/wnn/ja_JP/rk.wnn7/2A_CTRL -lib/wnn/ja_JP/rk.wnn7/2B_DAKUTEN -lib/wnn/ja_JP/rk.wnn7/2B_JIS -lib/wnn/ja_JP/rk.wnn7/2B_ROMKANA -lib/wnn/ja_JP/rk.wnn7/2_TCODE -lib/wnn/ja_JP/rk.wnn7/3B_HANKATA -lib/wnn/ja_JP/rk.wnn7/3B_KATAKANA -lib/wnn/ja_JP/rk.wnn7/3B_ZENKAKU -lib/wnn/ja_JP/rk.wnn7/autork -lib/wnn/ja_JP/rk.wnn7/mode -lib/wnn/ja_JP/rk.wnn7/mode.hankata -lib/wnn/ja_JP/rk.wnn7/mode.nohankata -@dirrm lib/wnn/ja_JP/rk.wnn7 -@dirrm lib/wnn/ja_JP -@dirrm lib/wnn diff --git a/japanese/onew-canna/Makefile b/japanese/onew-canna/Makefile deleted file mode 100644 index d53fecfaba32..000000000000 --- a/japanese/onew-canna/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: ONEW for Canna -# Date created: 5 Sep 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= A library for Japanese Input Method Canna - -CANNA= yes - -MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna/pkg-descr b/japanese/onew-canna/pkg-descr deleted file mode 100644 index e04d19691cbb..000000000000 --- a/japanese/onew-canna/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -ONEW is a library for using Japanese Input Method Canna, -Wnn4, or Wnn6. - -This is for Canna. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/onew-canna/pkg-plist b/japanese/onew-canna/pkg-plist deleted file mode 100644 index d3e5b001b2e7..000000000000 --- a/japanese/onew-canna/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/libonew-canna.a -%%PORTDOCS%%share/doc/ja-onew-canna/README.ONEW -%%PORTDOCS%%@dirrm share/doc/ja-onew-canna diff --git a/japanese/onew-freewnn/Makefile b/japanese/onew-freewnn/Makefile deleted file mode 100644 index 90a0043f69e7..000000000000 --- a/japanese/onew-freewnn/Makefile +++ /dev/null @@ -1,92 +0,0 @@ -# New ports collection makefile for: ONEW for FreeWnn -# Date created: 5 Sep 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= onew -PORTVERSION?= 2.2.10 -PORTREVISION= 1 -PKGNAMESUFFIX= ${INPUT_METHOD} -CATEGORIES= japanese -MASTER_SITES= ftp://ftp.lab.kdd.co.jp/Japan/onew/ \ - ftp://ftp.leo.chubu.ac.jp/pub/editor/jvim/ -DISTNAME= jvim2.0r+${PORTNAME}${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT?= A library for a Japanese Input Method: FreeWnn - -WRKSRC= ${WRKDIR}/${PORTNAME} -# A value 'all' must not be set to TARGET. -ALL_TARGET= - -.if !defined(CANNA) && !defined(FREEWNN) && !defined(WNN6) && !defined(WNN7) -# For this port -FREEWNN= yes -.endif -# Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS, -# LIB_DEPENDS, etc. -.if defined(CANNA) -INPUT_METHOD+= canna -LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/Canna -JPLIB+= -lcanna -.endif -.if defined(FREEWNN) -INPUT_METHOD+= freewnn -BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib -JPLIB+= -ljd -lcrypt -JPDEF+= -DWNN_ISDIR -.elif defined(WNN6) -INPUT_METHOD+= wnn6 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib -JPLIB+= -ljd -lcrypt -JPDEF+= -DWNN_ISDIR -RK_DIR= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6 -.elif defined(WNN7) -INPUT_METHOD+= wnn7 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib -JPLIB+= -ljd -lcrypt -JPDEF+= -DWNN_ISDIR -RK_DIR= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn7 -.endif -# -# Make a value of INPUT_METHOD -.if defined(INPUT_METHOD) -INPUT_METHOD!= echo ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g' -.endif -# -ONEW_CONF= ${FILESDIR}/ONEW_CONF-for${INPUT_METHOD} -LIB_NAME= libonew${INPUT_METHOD}.a -PORT_DOCDIR= ${LOCALBASE}/share/doc/ja-onew${INPUT_METHOD} - -.include <bsd.port.pre.mk> - -post-patch: - ${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \ - ${ONEW_CONF} > ${WRKSRC}/ONEW_CONF - -do-install: - ${INSTALL_DATA} ${WRKSRC}/libonew.a ${LOCALBASE}/lib/${LIB_NAME} -.if !defined(NOPORTDOCS) -.if defined(PORT_DOCDIR) - ${MKDIR} ${PORT_DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/README.ONEW ${PORT_DOCDIR} -.endif -.endif -.if defined(WNN6) || defined(WNN7) - ${MKDIR} ${RK_DIR} - for file in 1B_TOUPPER 1B_ZENHIRA 1B_ZENKATA 1B_newTOUPPER \ - 2A_CTRL 2B_DAKUTEN 2B_JIS 2B_ROMKANA 2_TCODE \ - 3B_HANKATA 3B_KATAKANA 3B_ZENKAKU autork \ - mode mode.hankata mode.nohankata; do \ - ${INSTALL_DATA} ${LOCALBASE}/lib/wnn/ja_JP/rk/$${file} \ - ${RK_DIR}; \ - done - @${ECHO} "############################################################" - @${ECHO} "We install all files in ${LOCALBASE}/lib/wnn/ja_JP/rk/" - @${ECHO} " into a new directory ${RK_DIR}" - @${ECHO} "############################################################" -.endif - -.include <bsd.port.post.mk> diff --git a/japanese/onew-freewnn/distinfo b/japanese/onew-freewnn/distinfo deleted file mode 100644 index dda478ca15b4..000000000000 --- a/japanese/onew-freewnn/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (jvim2.0r+onew2.2.10.tar.gz) = 42e04a80f3dbdfca4fbe8b9e634d1380 -SHA256 (jvim2.0r+onew2.2.10.tar.gz) = 8cddd0bd98fa39ef6bda38d5fd5c00f791a42e4d11f75ef2db5fd6b5bd34a9f6 -SIZE (jvim2.0r+onew2.2.10.tar.gz) = 569300 diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-canna b/japanese/onew-freewnn/files/ONEW_CONF-for-canna deleted file mode 100644 index 76379327e7ca..000000000000 --- a/japanese/onew-freewnn/files/ONEW_CONF-for-canna +++ /dev/null @@ -1,8 +0,0 @@ -CANNAINC = -I%LOCALBASE%/include -CANNAOBJ = Canna.o CannaRk.o -CANNALIB = -L%LOCALBASE%/lib -lcanna -CANNA_RKPATH = '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"' -CANNA_RKTAB = '"default.cbp"' -RKKLIBS = $(CANNALIB) -RKKOBJS = $(CANNAOBJ) -ONEW_ENGINE = '"canna/canna"' diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+freewnn b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+freewnn deleted file mode 100644 index d5b91c95e403..000000000000 --- a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+freewnn +++ /dev/null @@ -1,11 +0,0 @@ -WNNINC = -I%LOCALBASE%/include/wnn -WNNLIB = -L%LOCALBASE%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -CANNAINC = -I%LOCALBASE%/include -CANNAOBJ = Canna.o CannaRk.o -CANNALIB = -L%LOCALBASE%/lib -lcanna -CANNA_RKPATH = '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"' -CANNA_RKTAB = '"default.cbp"' -RKKLIBS = $(CANNALIB) $(WNNLIB) -RKKOBJS = $(CANNAOBJ) $(WNNOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn6 b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn6 deleted file mode 100644 index 30466c39e23a..000000000000 --- a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn6 +++ /dev/null @@ -1,13 +0,0 @@ -WNNINC = -I%LOCALBASE%/include/wnn -WNNLIB = -L%LOCALBASE%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' -WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"' -CANNAINC = -I%LOCALBASE%/include -CANNAOBJ = Canna.o CannaRk.o -CANNALIB = -L%LOCALBASE%/lib -lcanna -CANNA_RKPATH = '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"' -CANNA_RKTAB = '"default.cbp"' -RKKLIBS = $(WNNLIB) $(CANNALIB) -RKKOBJS = $(WNNOBJ) $(CANNAOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn7 b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn7 deleted file mode 100644 index fe8d22ad23de..000000000000 --- a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn7 +++ /dev/null @@ -1,13 +0,0 @@ -WNNINC = -I%LOCALBASE%/include/wnn -WNNLIB = -L%LOCALBASE%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn7:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' -WNN_DICDIRS = '"system/%s.dic;usr/$$USER/%s.h"' -CANNAINC = -I%LOCALBASE%/include -CANNAOBJ = Canna.o CannaRk.o -CANNALIB = -L%LOCALBASE%/lib -lcanna -CANNA_RKPATH = '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"' -CANNA_RKTAB = '"default.cbp"' -RKKLIBS = $(WNNLIB) $(CANNALIB) -RKKOBJS = $(WNNOBJ) $(CANNAOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-freewnn b/japanese/onew-freewnn/files/ONEW_CONF-for-freewnn deleted file mode 100644 index ee9b45cb37a2..000000000000 --- a/japanese/onew-freewnn/files/ONEW_CONF-for-freewnn +++ /dev/null @@ -1,6 +0,0 @@ -WNNINC = -I%LOCALBASE%/include/wnn -WNNLIB = -L%LOCALBASE%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -RKKLIBS = $(WNNLIB) -RKKOBJS = $(WNNOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew-freewnn/files/patch-aa b/japanese/onew-freewnn/files/patch-aa deleted file mode 100644 index b6c74d038948..000000000000 --- a/japanese/onew-freewnn/files/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ ---- sys/regex.c.orig Fri Jun 30 13:56:01 1995 -+++ ./sys/regex.c Wed Aug 26 03:14:57 1998 -@@ -41,6 +41,9 @@ - #include <stdio.h> - #include <sys/types.h> - #endif -+#if __FreeBSD__ >= 3 -+#include <sys/types.h> -+#endif - #include <regex.h> - - static regex_t REXP; diff --git a/japanese/onew-freewnn/files/patch-ab b/japanese/onew-freewnn/files/patch-ab deleted file mode 100644 index 0ba76c0afe2c..000000000000 --- a/japanese/onew-freewnn/files/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ ---- conf.c.~1~ Thu Jun 23 11:42:33 1994 -+++ conf.c Mon Sep 14 15:48:41 1998 -@@ -220,7 +220,8 @@ - #define IR(func) (romkan_select() ? func : 0) - #define ONEWromkan_ready(rkpath) IR((*RP->rk_ready)(rkpath)) - #define ONEWromkan_modesw(mode) IR((*RP->rk_modesw)(mode)) --#define ONEWromkan_clear() IR((*RP->rk_gotch)()) -+/*#define ONEWromkan_clear() IR((*RP->rk_gotch)())*/ -+#define ONEWromkan_clear() IR((*RP->rk_clear)()) - #define ONEWromkan_getc() IR((*RP->rk_getc)()) - #define ONEWromkan_next() IR((*RP->rk_next)()) - #define ONEWromkan_dispmode() IR((*RP->rk_dispmode)()) diff --git a/japanese/onew-freewnn/files/patch-gcc42 b/japanese/onew-freewnn/files/patch-gcc42 deleted file mode 100644 index 689f21801f51..000000000000 --- a/japanese/onew-freewnn/files/patch-gcc42 +++ /dev/null @@ -1,50 +0,0 @@ ---- engine.orig/Canna.c 1995-06-28 11:13:26.000000000 -0500 -+++ engine/Canna.c 2007-11-12 21:30:29.000000000 -0500 -@@ -33,6 +33,7 @@ - static int ready; - static int CID; - static int nbunsetsu; -+static disp_kanji_buf(); - int ONEW_CannarcDone; - - static ONEWkanakan_ready() -@@ -102,7 +103,6 @@ - int comch; - int rcode; - char yomibuf[1024]; -- static disp_kanji_buf(); - - Onew_setupYomistr(startch,yomi,yomibuf); - yomi = yomibuf; ---- onewlib.c.orig 1995-07-02 02:55:41.000000000 -0500 -+++ onewlib.c 2007-11-12 21:28:01.000000000 -0500 -@@ -50,6 +50,11 @@ - int ONEW_I_SYNC_CHAR = 0xFF; - int ONEW_KK_OPDICT = 'x'; - -+static definedKanamode(); -+static romkan_modesw(); -+static thru_char1(); -+static Onew_kakuteiInRomkan(); -+ - #define MODE_SWITCHER ONEW_MODE_SWITCHER - #define ZENKAKU_TOGGLE ONEW_ZENKAKU_TOGGLE - #define KANA_TOGGLE ONEW_KANA_TOGGLE -@@ -116,9 +121,6 @@ - } - ONEW_getch1(){ - int ch; -- static definedKanamode(); -- static romkan_modesw(); -- static thru_char1(); - - for(;;){ - ch = ONEW_getch0(ONEW_getch_asis); -@@ -313,7 +315,6 @@ - - kget_char1(){ - unsigned int kc; -- static Onew_kakuteiInRomkan(); - - if( !Onew_RK_init() ){ - kc = OnewGetchar(); diff --git a/japanese/onew-freewnn/files/patch-sys_sys.h b/japanese/onew-freewnn/files/patch-sys_sys.h deleted file mode 100644 index 927e305ee5a3..000000000000 --- a/japanese/onew-freewnn/files/patch-sys_sys.h +++ /dev/null @@ -1,35 +0,0 @@ ---- sys/sys.h 1995-06-30 06:56:38.000000000 +0200 -+++ sys/sys.h 2007-12-28 14:24:01.000000000 +0100 -@@ -29,12 +29,16 @@ - || defined(sony_news) \ - || defined(MACH) \ - || defined(NeXT) \ -- || defined(bsdi) \ -- || defined(__FreeBSD__) -+ || defined(bsdi) - #define USE_SGTTY - #define HAS_SELECT - #endif - -+#if defined(__FreeBSD__) -+#define USE_TERMIOS -+#define HAS_SELECT -+#endif -+ - #if defined(solaris) \ - || defined(sgi) \ - || defined(nec_ews) \ ---- sys/tty.c 1994-02-09 08:45:24.000000000 +0100 -+++ sys/tty.c 2007-12-28 14:31:11.000000000 +0100 -@@ -76,8 +76,10 @@ - if( on ) - buf.c_lflag |= (ECHO|ICANON); - else buf.c_lflag &= ~(ECHO|ICANON); -+ buf.c_cc[VMIN] = 0; -+ buf.c_cc[VTIME] = ('D'-0x40); -+ buf.c_lflag |= ICANON; - tcsetattr(fd, TCSADRAIN, &buf); -- set_cbreak(fd,!on); - close(fd); - } - #endif diff --git a/japanese/onew-freewnn/pkg-descr b/japanese/onew-freewnn/pkg-descr deleted file mode 100644 index 4b60b13e8488..000000000000 --- a/japanese/onew-freewnn/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -ONEW is a library for using Japanese Input Methods: Canna, FreeWnn, -Wnn6 or Wnn7. - -This port supports FreeWnn. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/onew-freewnn/pkg-plist b/japanese/onew-freewnn/pkg-plist deleted file mode 100644 index e9a53a028bc6..000000000000 --- a/japanese/onew-freewnn/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/libonew-freewnn.a -%%PORTDOCS%%share/doc/ja-onew-freewnn/README.ONEW -%%PORTDOCS%%@dirrm share/doc/ja-onew-freewnn diff --git a/japanese/onew-wnn6/Makefile b/japanese/onew-wnn6/Makefile deleted file mode 100644 index cd3bcbcee47e..000000000000 --- a/japanese/onew-wnn6/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: ONEW for Wnn6 -# Date created: 5 Sep 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= A library for Japanese Input Method Wnn6 - -WNN6= yes - -MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-wnn6/pkg-descr b/japanese/onew-wnn6/pkg-descr deleted file mode 100644 index 7cc4a052ac8a..000000000000 --- a/japanese/onew-wnn6/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -ONEW is a library for using Japanese Input Method Canna, Wnn4, or -Wnn6. - -This is for Wnn6. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/onew-wnn6/pkg-plist b/japanese/onew-wnn6/pkg-plist deleted file mode 100644 index 306b81fb752a..000000000000 --- a/japanese/onew-wnn6/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -lib/libonew-wnn6.a -%%PORTDOCS%%share/doc/ja-onew-wnn6/README.ONEW -%%PORTDOCS%%@dirrm share/doc/ja-onew-wnn6 -lib/wnn/ja_JP/rk.wnn6/1B_TOUPPER -lib/wnn/ja_JP/rk.wnn6/1B_ZENHIRA -lib/wnn/ja_JP/rk.wnn6/1B_ZENKATA -lib/wnn/ja_JP/rk.wnn6/1B_newTOUPPER -lib/wnn/ja_JP/rk.wnn6/2A_CTRL -lib/wnn/ja_JP/rk.wnn6/2B_DAKUTEN -lib/wnn/ja_JP/rk.wnn6/2B_JIS -lib/wnn/ja_JP/rk.wnn6/2B_ROMKANA -lib/wnn/ja_JP/rk.wnn6/2_TCODE -lib/wnn/ja_JP/rk.wnn6/3B_HANKATA -lib/wnn/ja_JP/rk.wnn6/3B_KATAKANA -lib/wnn/ja_JP/rk.wnn6/3B_ZENKAKU -lib/wnn/ja_JP/rk.wnn6/autork -lib/wnn/ja_JP/rk.wnn6/mode -lib/wnn/ja_JP/rk.wnn6/mode.hankata -lib/wnn/ja_JP/rk.wnn6/mode.nohankata -@dirrm lib/wnn/ja_JP/rk.wnn6 -@dirrm lib/wnn/ja_JP -@dirrm lib/wnn diff --git a/japanese/onew-wnn7/Makefile b/japanese/onew-wnn7/Makefile deleted file mode 100644 index a98fea179a12..000000000000 --- a/japanese/onew-wnn7/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: ONEW for Wnn7 -# Date created: 01/07/11 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= A library for a Japanese Input Method: Wnn7 - -WNN7= yes - -MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-wnn7/pkg-descr b/japanese/onew-wnn7/pkg-descr deleted file mode 100644 index 7ebf71782454..000000000000 --- a/japanese/onew-wnn7/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -ONEW is a library for using Japanese Input Methods: Canna, FreeWnn, -Wnn6 or Wnn7. - -This port supports Wnn7. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/onew-wnn7/pkg-plist b/japanese/onew-wnn7/pkg-plist deleted file mode 100644 index a3aa3a2b599f..000000000000 --- a/japanese/onew-wnn7/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -lib/libonew-wnn7.a -%%PORTDOCS%%share/doc/ja-onew-wnn7/README.ONEW -%%PORTDOCS%%@dirrm share/doc/ja-onew-wnn7 -lib/wnn/ja_JP/rk.wnn7/1B_TOUPPER -lib/wnn/ja_JP/rk.wnn7/1B_ZENHIRA -lib/wnn/ja_JP/rk.wnn7/1B_ZENKATA -lib/wnn/ja_JP/rk.wnn7/1B_newTOUPPER -lib/wnn/ja_JP/rk.wnn7/2A_CTRL -lib/wnn/ja_JP/rk.wnn7/2B_DAKUTEN -lib/wnn/ja_JP/rk.wnn7/2B_JIS -lib/wnn/ja_JP/rk.wnn7/2B_ROMKANA -lib/wnn/ja_JP/rk.wnn7/2_TCODE -lib/wnn/ja_JP/rk.wnn7/3B_HANKATA -lib/wnn/ja_JP/rk.wnn7/3B_KATAKANA -lib/wnn/ja_JP/rk.wnn7/3B_ZENKAKU -lib/wnn/ja_JP/rk.wnn7/autork -lib/wnn/ja_JP/rk.wnn7/mode -lib/wnn/ja_JP/rk.wnn7/mode.hankata -lib/wnn/ja_JP/rk.wnn7/mode.nohankata -@dirrm lib/wnn/ja_JP/rk.wnn7 -@dirrm lib/wnn/ja_JP -@dirrm lib/wnn diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile index 90a0043f69e7..df9292a73562 100644 --- a/japanese/onew/Makefile +++ b/japanese/onew/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: ONEW for FreeWnn +# New ports collection makefile for: ONEW # Date created: 5 Sep 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -6,87 +6,71 @@ # PORTNAME= onew -PORTVERSION?= 2.2.10 -PORTREVISION= 1 -PKGNAMESUFFIX= ${INPUT_METHOD} +PORTVERSION= 2.2.10 +PORTREVISION= 2 CATEGORIES= japanese MASTER_SITES= ftp://ftp.lab.kdd.co.jp/Japan/onew/ \ ftp://ftp.leo.chubu.ac.jp/pub/editor/jvim/ DISTNAME= jvim2.0r+${PORTNAME}${PORTVERSION} -MAINTAINER= ports@FreeBSD.org -COMMENT?= A library for a Japanese Input Method: FreeWnn +MAINTAINER= hrs@FreeBSD.org +COMMENT= A library for Japanese Input Methods WRKSRC= ${WRKDIR}/${PORTNAME} -# A value 'all' must not be set to TARGET. -ALL_TARGET= +ALL_TARGET= +PORTDOCS= README.ONEW -.if !defined(CANNA) && !defined(FREEWNN) && !defined(WNN6) && !defined(WNN7) -# For this port -FREEWNN= yes -.endif -# Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS, -# LIB_DEPENDS, etc. -.if defined(CANNA) -INPUT_METHOD+= canna -LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/Canna -JPLIB+= -lcanna -.endif -.if defined(FREEWNN) -INPUT_METHOD+= freewnn -BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib -JPLIB+= -ljd -lcrypt -JPDEF+= -DWNN_ISDIR -.elif defined(WNN6) -INPUT_METHOD+= wnn6 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib -JPLIB+= -ljd -lcrypt -JPDEF+= -DWNN_ISDIR -RK_DIR= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6 -.elif defined(WNN7) -INPUT_METHOD+= wnn7 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib -JPLIB+= -ljd -lcrypt -JPDEF+= -DWNN_ISDIR -RK_DIR= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn7 -.endif -# -# Make a value of INPUT_METHOD -.if defined(INPUT_METHOD) -INPUT_METHOD!= echo ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g' -.endif -# -ONEW_CONF= ${FILESDIR}/ONEW_CONF-for${INPUT_METHOD} -LIB_NAME= libonew${INPUT_METHOD}.a -PORT_DOCDIR= ${LOCALBASE}/share/doc/ja-onew${INPUT_METHOD} +OPTIONS= CANNA "Build Canna-backend library" on \ + CANNA_FREEWNN "Build Canna+FreeWnn-backend library" on \ + CANNA_WNN6 "Build Canna+Wnn6-backend library" on \ + CANNA_WNN7 "Build Canna+Wnn7-backend library" on \ + FREEWNN "Build FreeWnn-backend library" on \ + WNN6 "Build Wnn6-backend library" on \ + WNN7 "Build Wnn7-backend library" on + +LIB_DEPENDS.CANNA= canna.1:${PORTSDIR}/japanese/canna-lib +BUILD_DEPENDS.CANNA_FREEWNN= ${BUILD_DEPENDS.FREEWNN} +BUILD_DEPENDS.CANNA_WNN6= ${BUILD_DEPENDS.WNN6} +BUILD_DEPENDS.CANNA_WNN7= ${BUILD_DEPENDS.WNN7} +RK_DIR.CANNA_WNN6= ${RKDIR.WNN6} +RK_DIR.CANNA_WNN7= ${RKDIR.WNN7} + +BUILD_DEPENDS.FREEWNN= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib +BUILD_DEPENDS.WNN6= ${BUILD_DEPENDS.FREEWNN} +RK_DIR.WNN6= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6 + +BUILD_DEPENDS.WNN7= ${BUILD_DEPENDS.FREEWNN} +RK_DIR.WNN7= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn7 .include <bsd.port.pre.mk> -post-patch: - ${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \ - ${ONEW_CONF} > ${WRKSRC}/ONEW_CONF +.for I in WITH_CANNA WITH_FREEWNN WITH_WNN6 WITH_WNN7 WITH_CANNA_FREEWNN WITH_CANNA_WNN6 WITH_CANNA_WNN7 +.if defined(${I}) +INPUT_METHOD+= ${I:S/^WITH_//:S/_/+/g:L} +SUB_FILES+= ONEW_CONF-for-${I:S/^WITH_//:S/_/+/g:L} +PLIST_FILES+= lib/libonew-${I:S/^WITH_//:S/_/+/g:L}.a +LIB_DEPENDS+= ${LIB_DEPENDS.${I:S/^WITH_//}} +BUILD_DEPENDS+= ${BUILD_DEPENDS.${I:S/^WITH_//}} +RK_DIR+= ${RK_DIR.${I:S/^WITH_//}} +.endif +.endfor + +pre-build: apply-slist + +do-build: +.for I in ${INPUT_METHOD} + ${INSTALL_DATA} ${WRKDIR}/ONEW_CONF-for-${I} ${WRKSRC}/ONEW_CONF + cd ${WRKSRC} && ${MAKE} clean && ${MAKE} + ${INSTALL_DATA} ${WRKSRC}/libonew.a ${WRKDIR}/libonew-${I}.a +.endfor do-install: - ${INSTALL_DATA} ${WRKSRC}/libonew.a ${LOCALBASE}/lib/${LIB_NAME} +.for I in ${INPUT_METHOD} + ${INSTALL_DATA} ${WRKDIR}/libonew-${I}.a ${PREFIX}/lib/libonew-${I}.a +.endfor .if !defined(NOPORTDOCS) -.if defined(PORT_DOCDIR) - ${MKDIR} ${PORT_DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/README.ONEW ${PORT_DOCDIR} -.endif -.endif -.if defined(WNN6) || defined(WNN7) - ${MKDIR} ${RK_DIR} - for file in 1B_TOUPPER 1B_ZENHIRA 1B_ZENKATA 1B_newTOUPPER \ - 2A_CTRL 2B_DAKUTEN 2B_JIS 2B_ROMKANA 2_TCODE \ - 3B_HANKATA 3B_KATAKANA 3B_ZENKAKU autork \ - mode mode.hankata mode.nohankata; do \ - ${INSTALL_DATA} ${LOCALBASE}/lib/wnn/ja_JP/rk/$${file} \ - ${RK_DIR}; \ - done - @${ECHO} "############################################################" - @${ECHO} "We install all files in ${LOCALBASE}/lib/wnn/ja_JP/rk/" - @${ECHO} " into a new directory ${RK_DIR}" - @${ECHO} "############################################################" + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.ONEW ${DOCSDIR} .endif .include <bsd.port.post.mk> diff --git a/japanese/onew/files/ONEW_CONF-for-canna b/japanese/onew/files/ONEW_CONF-for-canna deleted file mode 100644 index 76379327e7ca..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-canna +++ /dev/null @@ -1,8 +0,0 @@ -CANNAINC = -I%LOCALBASE%/include -CANNAOBJ = Canna.o CannaRk.o -CANNALIB = -L%LOCALBASE%/lib -lcanna -CANNA_RKPATH = '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"' -CANNA_RKTAB = '"default.cbp"' -RKKLIBS = $(CANNALIB) -RKKOBJS = $(CANNAOBJ) -ONEW_ENGINE = '"canna/canna"' diff --git a/japanese/onew/files/ONEW_CONF-for-canna+freewnn b/japanese/onew/files/ONEW_CONF-for-canna+freewnn deleted file mode 100644 index d5b91c95e403..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-canna+freewnn +++ /dev/null @@ -1,11 +0,0 @@ -WNNINC = -I%LOCALBASE%/include/wnn -WNNLIB = -L%LOCALBASE%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -CANNAINC = -I%LOCALBASE%/include -CANNAOBJ = Canna.o CannaRk.o -CANNALIB = -L%LOCALBASE%/lib -lcanna -CANNA_RKPATH = '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"' -CANNA_RKTAB = '"default.cbp"' -RKKLIBS = $(CANNALIB) $(WNNLIB) -RKKOBJS = $(CANNAOBJ) $(WNNOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-canna+freewnn.in b/japanese/onew/files/ONEW_CONF-for-canna+freewnn.in new file mode 100644 index 000000000000..96b7a2282a64 --- /dev/null +++ b/japanese/onew/files/ONEW_CONF-for-canna+freewnn.in @@ -0,0 +1,11 @@ +WNNINC = -I%%LOCALBASE%%/include/wnn +WNNLIB = -L%%LOCALBASE%%/lib -ljd +WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' +CANNAINC = -I%%LOCALBASE%%/include +CANNAOBJ = Canna.o CannaRk.o +CANNALIB = -L%%LOCALBASE%%/lib -lcanna +CANNA_RKPATH = '".:$$HOME:%%LOCALBASE%%/lib/canna/dic:/tmp/onew_rktabs/canna"' +CANNA_RKTAB = '"default.cbp"' +RKKLIBS = $(CANNALIB) $(WNNLIB) +RKKOBJS = $(CANNAOBJ) $(WNNOBJ) +MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-canna+wnn6 b/japanese/onew/files/ONEW_CONF-for-canna+wnn6.in index 30466c39e23a..69bf566a03d4 100644 --- a/japanese/onew/files/ONEW_CONF-for-canna+wnn6 +++ b/japanese/onew/files/ONEW_CONF-for-canna+wnn6.in @@ -1,12 +1,12 @@ -WNNINC = -I%LOCALBASE%/include/wnn -WNNLIB = -L%LOCALBASE%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' +WNNINC = -I%%LOCALBASE%%/include/wnn +WNNLIB = -L%%LOCALBASE%%/lib -ljd +WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk.wnn6:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"' -CANNAINC = -I%LOCALBASE%/include +CANNAINC = -I%%LOCALBASE%%/include CANNAOBJ = Canna.o CannaRk.o -CANNALIB = -L%LOCALBASE%/lib -lcanna -CANNA_RKPATH = '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"' +CANNALIB = -L%%LOCALBASE%%/lib -lcanna +CANNA_RKPATH = '".:$$HOME:%%LOCALBASE%%/lib/canna/dic:/tmp/onew_rktabs/canna"' CANNA_RKTAB = '"default.cbp"' RKKLIBS = $(WNNLIB) $(CANNALIB) RKKOBJS = $(WNNOBJ) $(CANNAOBJ) diff --git a/japanese/onew/files/ONEW_CONF-for-canna+wnn7 b/japanese/onew/files/ONEW_CONF-for-canna+wnn7.in index fe8d22ad23de..96a5fd94a4cd 100644 --- a/japanese/onew/files/ONEW_CONF-for-canna+wnn7 +++ b/japanese/onew/files/ONEW_CONF-for-canna+wnn7.in @@ -1,12 +1,12 @@ -WNNINC = -I%LOCALBASE%/include/wnn -WNNLIB = -L%LOCALBASE%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn7:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' +WNNINC = -I%%LOCALBASE%%/include/wnn +WNNLIB = -L%%LOCALBASE%%/lib -ljd +WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk.wnn7:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' WNN_DICDIRS = '"system/%s.dic;usr/$$USER/%s.h"' -CANNAINC = -I%LOCALBASE%/include +CANNAINC = -I%%LOCALBASE%%/include CANNAOBJ = Canna.o CannaRk.o -CANNALIB = -L%LOCALBASE%/lib -lcanna -CANNA_RKPATH = '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"' +CANNALIB = -L%%LOCALBASE%%/lib -lcanna +CANNA_RKPATH = '".:$$HOME:%%LOCALBASE%%/lib/canna/dic:/tmp/onew_rktabs/canna"' CANNA_RKTAB = '"default.cbp"' RKKLIBS = $(WNNLIB) $(CANNALIB) RKKOBJS = $(WNNOBJ) $(CANNAOBJ) diff --git a/japanese/onew/files/ONEW_CONF-for-canna.in b/japanese/onew/files/ONEW_CONF-for-canna.in new file mode 100644 index 000000000000..4b53cd211fed --- /dev/null +++ b/japanese/onew/files/ONEW_CONF-for-canna.in @@ -0,0 +1,8 @@ +CANNAINC = -I%%LOCALBASE%%/include +CANNAOBJ = Canna.o CannaRk.o +CANNALIB = -L%%LOCALBASE%%/lib -lcanna +CANNA_RKPATH = '".:$$HOME:%%LOCALBASE%%/lib/canna/dic:/tmp/onew_rktabs/canna"' +CANNA_RKTAB = '"default.cbp"' +RKKLIBS = $(CANNALIB) +RKKOBJS = $(CANNAOBJ) +ONEW_ENGINE = '"canna/canna"' diff --git a/japanese/onew/files/ONEW_CONF-for-freewnn b/japanese/onew/files/ONEW_CONF-for-freewnn deleted file mode 100644 index ee9b45cb37a2..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-freewnn +++ /dev/null @@ -1,6 +0,0 @@ -WNNINC = -I%LOCALBASE%/include/wnn -WNNLIB = -L%LOCALBASE%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -RKKLIBS = $(WNNLIB) -RKKOBJS = $(WNNOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-freewnn.in b/japanese/onew/files/ONEW_CONF-for-freewnn.in new file mode 100644 index 000000000000..c9e706222656 --- /dev/null +++ b/japanese/onew/files/ONEW_CONF-for-freewnn.in @@ -0,0 +1,6 @@ +WNNINC = -I%%LOCALBASE%%/include/wnn +WNNLIB = -L%%LOCALBASE%%/lib -ljd +WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' +RKKLIBS = $(WNNLIB) +RKKOBJS = $(WNNOBJ) +MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-wnn.in b/japanese/onew/files/ONEW_CONF-for-wnn.in new file mode 100644 index 000000000000..8d5b5c70d144 --- /dev/null +++ b/japanese/onew/files/ONEW_CONF-for-wnn.in @@ -0,0 +1,14 @@ +WNNINC = -I%%LOCALBASE%%/include/wnn +WNNLIB = -L%%LOCALBASE%%/lib -ljd +WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk.wnn7:%%LOCALBASE%%/lib/wnn/ja_JP/rk.wnn6:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' +WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' +WNN_DICDIRS = ' \ + "iwanami/%s.dic;usr/$$USER/%s.h",\ + "system/%s.dic;usr/$$USER/%s.h",\ + "pubdic/%s.dic;usr/$$USER/%s.h",\ + "gerodic/%s.dic;usr/$$USER/%s.h",\ + "wnncons/%s.doc;usr/$$USER/%s.h" \ + ' +RKKLIBS = $(WNNLIB) +RKKOBJS = $(WNNOBJ) +MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-wnn6 b/japanese/onew/files/ONEW_CONF-for-wnn6 deleted file mode 100644 index 0d02ec1c4d9a..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-wnn6 +++ /dev/null @@ -1,8 +0,0 @@ -WNNINC = -I%LOCALBASE%/include/wnn -WNNLIB = -L%LOCALBASE%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' -WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"' -RKKLIBS = $(WNNLIB) -RKKOBJS = $(WNNOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-wnn6 b/japanese/onew/files/ONEW_CONF-for-wnn6.in index 0d02ec1c4d9a..8bbb9fa29816 100644 --- a/japanese/onew-freewnn/files/ONEW_CONF-for-wnn6 +++ b/japanese/onew/files/ONEW_CONF-for-wnn6.in @@ -1,6 +1,6 @@ -WNNINC = -I%LOCALBASE%/include/wnn -WNNLIB = -L%LOCALBASE%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' +WNNINC = -I%%LOCALBASE%%/include/wnn +WNNLIB = -L%%LOCALBASE%%/lib -ljd +WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk.wnn6:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"' RKKLIBS = $(WNNLIB) diff --git a/japanese/onew/files/ONEW_CONF-for-wnn7 b/japanese/onew/files/ONEW_CONF-for-wnn7 deleted file mode 100644 index a1ea6b4dbb25..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-wnn7 +++ /dev/null @@ -1,8 +0,0 @@ -WNNINC = -I%LOCALBASE%/include/wnn -WNNLIB = -L%LOCALBASE%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn7:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' -WNN_DICDIRS = '"system/%s.dic;usr/$$USER/%s.h"' -RKKLIBS = $(WNNLIB) -RKKOBJS = $(WNNOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-wnn7 b/japanese/onew/files/ONEW_CONF-for-wnn7.in index a1ea6b4dbb25..45fd9650024f 100644 --- a/japanese/onew-freewnn/files/ONEW_CONF-for-wnn7 +++ b/japanese/onew/files/ONEW_CONF-for-wnn7.in @@ -1,6 +1,6 @@ -WNNINC = -I%LOCALBASE%/include/wnn -WNNLIB = -L%LOCALBASE%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn7:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' +WNNINC = -I%%LOCALBASE%%/include/wnn +WNNLIB = -L%%LOCALBASE%%/lib -ljd +WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk.wnn7:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' WNN_DICDIRS = '"system/%s.dic;usr/$$USER/%s.h"' RKKLIBS = $(WNNLIB) diff --git a/japanese/onew/pkg-descr b/japanese/onew/pkg-descr index 4b60b13e8488..8bbd93e28aee 100644 --- a/japanese/onew/pkg-descr +++ b/japanese/onew/pkg-descr @@ -1,7 +1,2 @@ ONEW is a library for using Japanese Input Methods: Canna, FreeWnn, Wnn6 or Wnn7. - -This port supports FreeWnn. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/onew/pkg-plist b/japanese/onew/pkg-plist deleted file mode 100644 index e9a53a028bc6..000000000000 --- a/japanese/onew/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/libonew-freewnn.a -%%PORTDOCS%%share/doc/ja-onew-freewnn/README.ONEW -%%PORTDOCS%%@dirrm share/doc/ja-onew-freewnn |