diff options
author | uebayasi <uebayasi> | 2003-09-23 15:06:57 +0000 |
---|---|---|
committer | uebayasi <uebayasi> | 2003-09-23 15:06:57 +0000 |
commit | 8afc3ddba3da98e5f426fa7bf8adf7b490c07c22 (patch) | |
tree | 0ef82f55ffe232e60c7ef19ebf5cb02b8a114082 | |
parent | 3ed70f3fc5248012d1527c24b6241455ba181f4b (diff) | |
download | pkgsrc-8afc3ddba3da98e5f426fa7bf8adf7b490c07c22.tar.gz |
1) Update Canna to 3.6p4.
* Reconstruct sample init files.
* RC-style start script.
* Auto-registration of Kana conversion.
* Abolish fuzokugo.cld.
* More key symbols can be configured with Lisp.
* Server returns more appropriate values at abort.
* TeX document improvements.
* And many bug fixes.
2) Make Canuum use Canna's common make files. From Osamu Oishi in PR 22244.
-rw-r--r-- | inputmethod/Makefile | 6 | ||||
-rw-r--r-- | inputmethod/canna-canuum/DESCR (renamed from inputmethod/canuum/DESCR) | 0 | ||||
-rw-r--r-- | inputmethod/canna-canuum/MESSAGE | 8 | ||||
-rw-r--r-- | inputmethod/canna-canuum/Makefile | 38 | ||||
-rw-r--r-- | inputmethod/canna-canuum/PLIST | 3 | ||||
-rw-r--r-- | inputmethod/canna-dict/Makefile | 6 | ||||
-rw-r--r-- | inputmethod/canna-dict/PLIST | 3 | ||||
-rw-r--r-- | inputmethod/canna-lib/PLIST | 4 | ||||
-rw-r--r-- | inputmethod/canna-server-bin/Makefile | 6 | ||||
-rw-r--r-- | inputmethod/canna/Makefile | 6 | ||||
-rw-r--r-- | inputmethod/canna/Makefile.common | 4 | ||||
-rw-r--r-- | inputmethod/canna/Makefile.version | 4 | ||||
-rw-r--r-- | inputmethod/canna/distinfo | 6 | ||||
-rw-r--r-- | inputmethod/canuum/Makefile | 53 | ||||
-rw-r--r-- | inputmethod/canuum/PLIST | 3 | ||||
-rw-r--r-- | inputmethod/canuum/distinfo | 10 | ||||
-rw-r--r-- | inputmethod/canuum/patches/patch-aa | 113 | ||||
-rw-r--r-- | inputmethod/canuum/patches/patch-ac | 40 | ||||
-rw-r--r-- | inputmethod/canuum/patches/patch-ae | 89 | ||||
-rw-r--r-- | inputmethod/canuum/patches/patch-af | 13 |
20 files changed, 70 insertions, 345 deletions
diff --git a/inputmethod/Makefile b/inputmethod/Makefile index c5efba26797..6e34006b5fc 100644 --- a/inputmethod/Makefile +++ b/inputmethod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/09/02 14:20:21 minoura Exp $ +# $NetBSD: Makefile,v 1.14 2003/09/23 15:06:57 uebayasi Exp $ # COMMENT= Input method tools and libraries @@ -6,10 +6,10 @@ COMMENT= Input method tools and libraries SUBDIR+= Chinput SUBDIR+= ami SUBDIR+= canna +SUBDIR+= canna-canuum SUBDIR+= canna-dict SUBDIR+= canna-lib -SUBDIR+= canna-server-bin -SUBDIR+= canuum +SUBDIR+= canna-server SUBDIR+= iiimecf SUBDIR+= ja-freewnn-dict SUBDIR+= ja-freewnn-lib diff --git a/inputmethod/canuum/DESCR b/inputmethod/canna-canuum/DESCR index acb5b2f5aee..acb5b2f5aee 100644 --- a/inputmethod/canuum/DESCR +++ b/inputmethod/canna-canuum/DESCR diff --git a/inputmethod/canna-canuum/MESSAGE b/inputmethod/canna-canuum/MESSAGE new file mode 100644 index 00000000000..fdb62555fe3 --- /dev/null +++ b/inputmethod/canna-canuum/MESSAGE @@ -0,0 +1,8 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2003/09/23 15:06:58 uebayasi Exp $ + +You at least should set up key functions in "${HOME}/.canna". +such as: +(set-key 'alpha-mode "\C-i" 'japanese-mode) +(set-key 'empty-mode "\C-i" 'alpha-mode) +=========================================================================== diff --git a/inputmethod/canna-canuum/Makefile b/inputmethod/canna-canuum/Makefile new file mode 100644 index 00000000000..a94c328ee6b --- /dev/null +++ b/inputmethod/canna-canuum/Makefile @@ -0,0 +1,38 @@ +# $NetBSD: Makefile,v 1.1 2003/09/23 15:06:58 uebayasi Exp $ +# +.include "../../inputmethod/canna/Makefile.common" + +CANNA_MODULE= canuum + +MAINTAINER= oishi@ims.ac.jp + +USE_BUILDLINK2= YES +MAKE_ARGS+= PREFIX=${PREFIX} + +do-configure: + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \ + ${MAKE_PROGRAM} ${MAKE_ARGS} Makefile; \ + ${MAKE_PROGRAM} ${MAKE_ARGS} cannaconf.h + @cd ${WRKSRC}/canuum; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \ + ${MAKE_PROGRAM} ${MAKE_ARGS} Makefile; \ + ${MAKE_PROGRAM} ${MAKE_ARGS} includes + @${LN} ${WRKSRC}/cannaconf.h ${WRKSRC}/canuum + @${LN} ${WRKSRC}/canna/ccompat.h ${WRKSRC}/canuum + @cd ${WRKSRC}/canuum; ${MAKE_PROGRAM} ${MAKE_ARGS} depend + +do-build: + @cd ${WRKSRC}/canuum; ${MAKE_PROGRAM} ${MAKE_ARGS} all + +pre-install: + @${MKDIR} ${WRKSRC}/canuum/misc + +do-install: + @cd ${WRKSRC}/canuum; ${MAKE_PROGRAM} ${MAKE_ARGS} install + +post-install: + @${INSTALL_MAN} ${WRKSRC}/canuum/canuum.jmn \ + ${PREFIX}/man/ja_JP.EUC/man1/canuum.1 + +.include "../../devel/nbitools/buildlink2.mk" +.include "../../inputmethod/canna-lib/buildlink2.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/canna-canuum/PLIST b/inputmethod/canna-canuum/PLIST new file mode 100644 index 00000000000..f72696e88b1 --- /dev/null +++ b/inputmethod/canna-canuum/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1 2003/09/23 15:06:59 uebayasi Exp $ +bin/canuum +man/ja_JP.EUC/man1/canuum.1 diff --git a/inputmethod/canna-dict/Makefile b/inputmethod/canna-dict/Makefile index c5150bc34f2..c35bb66e026 100644 --- a/inputmethod/canna-dict/Makefile +++ b/inputmethod/canna-dict/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.5 2003/05/31 08:28:33 uebayasi Exp $ +# $NetBSD: Makefile,v 1.6 2003/09/23 15:06:59 uebayasi Exp $ # .include "../canna/Makefile.common" CANNA_MODULE= dict -BUILD_DEPENDS+= Canna-server-bin>=${CANNA_VERSION}:../canna-server-bin +BUILD_DEPENDS+= Canna-server>=${CANNA_VERSION}:../canna-server NO_MTREE= yes OWN_DIRS= ${PREFIX}/canna -EVAL_PREFIX+= CANNASERVERBINDIR=Canna-server-bin +EVAL_PREFIX+= CANNASERVERBINDIR=Canna-server .for cmd in MERGE FORCPP FORSORT SPLITWORD MERGEWORD CRXGRAM CRXDIC CRFREQ KPDIC CANNA_CMD_SED_SCRIPT+=-e 's|\(${cmd} = \).*/\(.*\)|\1${CANNASERVERBINDIR}/bin/\2|' .endfor diff --git a/inputmethod/canna-dict/PLIST b/inputmethod/canna-dict/PLIST index 1961a80c42c..71b879d3390 100644 --- a/inputmethod/canna-dict/PLIST +++ b/inputmethod/canna-dict/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/10 09:05:09 sakamoto Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/09/23 15:06:59 uebayasi Exp $ canna/canna/bushu.cld canna/canna/chimei.ctd canna/canna/dics.dir canna/canna/fuzokugo.cbd -canna/canna/fuzokugo.cld canna/canna/hojomwd.ctd canna/canna/hojoswd.ctd canna/canna/iroha.cbd diff --git a/inputmethod/canna-lib/PLIST b/inputmethod/canna-lib/PLIST index 64d35a1eeb9..9511ab15d13 100644 --- a/inputmethod/canna-lib/PLIST +++ b/inputmethod/canna-lib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2003/05/31 08:28:34 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.7 2003/09/23 15:06:59 uebayasi Exp $ include/canna/RK.h include/canna/jrkanji.h include/canna/keydef.h @@ -142,10 +142,10 @@ share/canna/sample/matsu.canna share/canna/sample/modes.canna share/canna/sample/sample.canna share/canna/sample/skk.canna -share/canna/sample/src/Makefile share/canna/sample/src/is.c share/canna/sample/tut.canna share/canna/sample/unix.canna +share/canna/sample/verbose.canna share/canna/sample/vje.canna share/canna/sample/wx2+.canna @dirrm share/canna/sample/src diff --git a/inputmethod/canna-server-bin/Makefile b/inputmethod/canna-server-bin/Makefile index 0069d4ad8ff..e516645dfb1 100644 --- a/inputmethod/canna-server-bin/Makefile +++ b/inputmethod/canna-server-bin/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:18 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2003/09/23 15:07:00 uebayasi Exp $ # .include "../canna/Makefile.common" -PKGREVISION= 1 - -CANNA_MODULE= server-bin +CANNA_MODULE= server USE_BUILDLINK2= # defined INSTALL_TARGET= instserver diff --git a/inputmethod/canna/Makefile b/inputmethod/canna/Makefile index fab8efb7bf4..16ff1542fe6 100644 --- a/inputmethod/canna/Makefile +++ b/inputmethod/canna/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2003/05/31 07:24:38 uebayasi Exp $ +# $NetBSD: Makefile,v 1.2 2003/09/23 15:06:57 uebayasi Exp $ # .include "Makefile.common" -CANNA_MODULE= server +PKGNAME:= Canna-${CANNA_VERSION} -DEPENDS+= Canna-server-bin>=${CANNA_VERSION}:../canna-server-bin +DEPENDS+= Canna-server>=${CANNA_VERSION}:../canna-server DEPENDS+= Canna-dict>=${CANNA_VERSION}:../canna-dict EXTRACT_ONLY= # empty diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common index 7473c419c8a..ee72a9bab5b 100644 --- a/inputmethod/canna/Makefile.common +++ b/inputmethod/canna/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2003/07/31 20:10:22 jmc Exp $ +# $NetBSD: Makefile.common,v 1.7 2003/09/23 15:06:57 uebayasi Exp $ # # Canna common makefile. # @@ -6,7 +6,7 @@ DISTNAME= Canna${CANNA_VERSION:S|.||:S|pl|p|} PKGNAME= Canna-${CANNA_MODULE}-${CANNA_VERSION} CATEGORIES= japanese inputmethod -MASTER_SITES= http://downloads.sourceforge.jp/canna/2181/ +MASTER_SITES= http://downloads.sourceforge.jp/canna/6059/ MAINTAINER= tech-pkg-ja@jp.NetBSD.org HOMEPAGE= http://canna.sourceforge.jp/ diff --git a/inputmethod/canna/Makefile.version b/inputmethod/canna/Makefile.version index 825bf53091d..b6fda755379 100644 --- a/inputmethod/canna/Makefile.version +++ b/inputmethod/canna/Makefile.version @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.version,v 1.1 2003/07/31 13:04:40 uebayasi Exp $ +# $NetBSD: Makefile.version,v 1.2 2003/09/23 15:06:57 uebayasi Exp $ # "Pkgsrc" version. -CANNA_VERSION= 3.6pl3 +CANNA_VERSION= 3.6pl4 _CANNA_VERS= \ CANNA_USER=${CANNA_USER} \ diff --git a/inputmethod/canna/distinfo b/inputmethod/canna/distinfo index fc4cc8092b5..1365483f019 100644 --- a/inputmethod/canna/distinfo +++ b/inputmethod/canna/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2003/07/31 13:04:40 uebayasi Exp $ +$NetBSD: distinfo,v 1.3 2003/09/23 15:06:57 uebayasi Exp $ -SHA1 (Canna36p3.tar.gz) = 183c4e160babd49d5d8c542fbf06db980e3965da -Size (Canna36p3.tar.gz) = 1441598 bytes +SHA1 (Canna36p4.tar.gz) = 4edc22e2e4e5c6db42daa2083fabb53aa1ae8168 +Size (Canna36p4.tar.gz) = 1455672 bytes SHA1 (patch-aa) = eb21b7beaa66c4d0c5815599dc49b7c0b7eb3a40 SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9 SHA1 (patch-ac) = 8f9f999eb8abd9c8e3d3e5c66cf55150ce700919 diff --git a/inputmethod/canuum/Makefile b/inputmethod/canuum/Makefile deleted file mode 100644 index f659949dee4..00000000000 --- a/inputmethod/canuum/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# $NetBSD: Makefile,v 1.6 2003/04/19 03:51:24 uebayasi Exp $ -# - -DISTNAME= canuum-1.0 -PKGREVISION= 2 -WRKSRC= ${WRKDIR}/${CANNA_VER}/canuum -CATEGORIES= japanese inputmethod -MASTER_SITES= ftp://ftp.nec.co.jp/pub/Canna/${CANNA_VER}5/ -DISTFILES= Uum${UUM_VER}.tar.gz ${CANNA_VER}.tar.gz - -MAINTAINER= oishi@ims.ac.jp -HOMEPAGE= http://www.nec.co.jp/japanese/product/computer/soft/canna/ -COMMENT= Japanese input tty frontend for Canna using uum - -EXTRACT_ONLY= Uum${UUM_VER}.tar.gz - -USE_BUILDLINK2= YES -MAKE_ARGS= PREFIX=${PREFIX} - -MAKE_ENV+= CCOPTIONS="${CPPFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" - -UUM_VER= 4.109 -CANNA_VER= Canna36p1 - -post-extract: - @${GTAR} -xzf ${DISTDIR}/${CANNA_VER}.tar.gz -C ${WRKDIR} \ - ${CANNA_VER}/Canna.conf ${CANNA_VER}/canuum ${CANNA_VER}/canna - @${MV} ${WRKDIR}/${CANNA_VER}/Canna.conf ${WRKSRC} - @${CP} ${WRKDIR}/Uum${UUM_VER}/* ${WRKSRC} - @${CP} ${WRKDIR}/${CANNA_VER}/canna/*.h ${WRKSRC} - -pre-patch: - @(cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < Canuum.patch) - -do-configure: - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \ - ${MAKE} ${MAKE_ARGS} Makefile; \ - ${MAKE} ${MAKE_ARGS} cannaconf.h; \ - ${MAKE} ${MAKE_ARGS} depend) - -do-build: - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_ARGS} all) - -pre-install: - @${MKDIR} ${WRKSRC}/misc - -post-install: - @${INSTALL_MAN} ${WRKSRC}/canuum.jmn \ - ${PREFIX}/man/ja_JP.EUC/man1/canuum.1 - -.include "../../devel/nbitools/buildlink2.mk" -.include "../../inputmethod/canna-lib/buildlink2.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/canuum/PLIST b/inputmethod/canuum/PLIST deleted file mode 100644 index a879d463441..00000000000 --- a/inputmethod/canuum/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2002/06/10 09:54:59 sakamoto Exp $ -bin/canuum -man/ja_JP.EUC/man1/canuum.1 diff --git a/inputmethod/canuum/distinfo b/inputmethod/canuum/distinfo deleted file mode 100644 index 6dd14d2ec8a..00000000000 --- a/inputmethod/canuum/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: distinfo,v 1.3 2003/04/19 03:51:25 uebayasi Exp $ - -SHA1 (Uum4.109.tar.gz) = 9d57fa67fc321c0b1101970b02154b5d6e42e88e -Size (Uum4.109.tar.gz) = 43738 bytes -SHA1 (Canna36p1.tar.gz) = 3e08fc03e16298ad7941a923989ea35929cdf3ba -Size (Canna36p1.tar.gz) = 1337483 bytes -SHA1 (patch-aa) = 816a5fddac06c980eaa7f622b6872231741c76a5 -SHA1 (patch-ac) = 9b8cd3f8d93c592f4f97956f77dadf118f4f03eb -SHA1 (patch-ae) = 1ef38a6651f2f619c15d68032787be694a2fa970 -SHA1 (patch-af) = 5860402e3dc72e0d6ddaffc6cf33c017c7e19a34 diff --git a/inputmethod/canuum/patches/patch-aa b/inputmethod/canuum/patches/patch-aa deleted file mode 100644 index 637b3942281..00000000000 --- a/inputmethod/canuum/patches/patch-aa +++ /dev/null @@ -1,113 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2003/04/19 03:51:26 uebayasi Exp $ ---- Canna.conf.orig Thu Dec 5 22:25:03 2002 -+++ Canna.conf Thu Dec 5 22:51:29 2002 -@@ -132,11 +132,11 @@ - - /* rootにならずにインストールする時はこれを定義して下さい */ - /* #define InstallAsUser */ --cannaPrefix = /usr/local/canna -+cannaPrefix = ${PREFIX} - cannaExecPrefix = $(cannaPrefix) - cannaBinDir = $(cannaExecPrefix)/bin --cannaSrvDir = $(cannaExecPrefix)/bin --cannaLibDir = $(cannaPrefix)/lib -+cannaSrvDir = $(cannaExecPrefix)/sbin -+cannaLibDir = $(cannaPrefix)/share/canna - cannaManDir = $(cannaPrefix)/man - cannaIncDir = $(cannaPrefix)/include/canna - -@@ -144,17 +144,19 @@ - libCannaDir = $(cannaExecPrefix)/lib - ErrDir = $(cannaExecPrefix)/log - #else --libCannaDir = /usr/lib --ErrDir = /usr/spool/canna -+libCannaDir = $(cannaPrefix)/lib -+ErrDir = ${CANNA_SPOOL} - #endif - -+INET6_DEFS = ${INET6} -+ - /* 次の3行は変更しないでください */ - wcharDefinition = -DCANNA_WCHAR - Wlib = --JapaneseLocale = japanese -+JapaneseLocale = ja_JP.eucJP - --cannaOwner = bin --cannaGroup = bin -+cannaOwner = ${CANNAOWNER} -+cannaGroup = ${CANNAGROUP} - - #ifdef InstallAsUser - cannaOwnerGroup = -@@ -164,7 +166,7 @@ - - pointerIntegerDef = - --cannaDsoRev = 1 -+cannaDsoRev = 1.0 - /* SunOS 4.x をお使いの方で shared object を利用する場合には - cannaDsoRev = 1.1 - と指定してください。また、FreeBSD を利用する場合は、 -@@ -229,7 +231,7 @@ - * コマンド類をリンクする時は、次を YES にしてくだい。 - */ - /* #define UseInstalledLibCanna YES */ --#define UseInstalledLibCanna NO -+#define UseInstalledLibCanna YES - - DicDir = $(cannaLibDir)/dic - -@@ -274,18 +276,18 @@ - DEPCANNALIB = $(libCannaDir)/libcanna.a - #endif - # endif -- CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB) -+ CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB) - #else /* ! UseInstalledLibCanna */ - # if DoSharedLib -- DEPCANNALIB = $(CANNASRC)/libcanna.$(sharedLibExtension) -+ DEPCANNALIB = $(libCannaDir)/libcanna.$(sharedLibExtension) - # else - #ifdef __EMX__ -- DEPCANNALIB = $(CANNASRC)/canna.a -+ DEPCANNALIB = $(libCannaDir)/canna.a - #else -- DEPCANNALIB = $(CANNASRC)/libcanna.a -+ DEPCANNALIB = $(libCannaDir)/libcanna.a - #endif - # endif -- CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB) -+ CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB) - #endif /* UseInstalledLibCanna */ - - #if UseInstalledLibCanna -@@ -294,14 +296,14 @@ - # else - DEPCANNALIB16 = $(libCannaDir)/libcanna16.a - # endif -- CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB) -+ CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB) - #else /* ! UseInstalledLibCanna */ - # if DoSharedLib -- DEPCANNALIB16 = $(CANNASRC)/libcanna16.$(sharedLibExtension) -+ DEPCANNALIB16 = $(libCannaDir)/libcanna16.$(sharedLibExtension) - # else -- DEPCANNALIB16 = $(CANNASRC)/libcanna16.a -+ DEPCANNALIB16 = $(libCannaDir)/libcanna16.a - # endif -- CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB) -+ CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB) - #endif /* UseInstalledLibCanna */ - - /* -@@ -318,7 +320,7 @@ - SCRIPTS_DEFINES = - - #ifdef JAPANESEMAN --JMNLOCALE = ja -+JMNLOCALE = ja_JP.EUC - #endif - - /* USE_OBSOLETE_STYLE_FILENAME を定義するための定義 */ diff --git a/inputmethod/canuum/patches/patch-ac b/inputmethod/canuum/patches/patch-ac deleted file mode 100644 index ef73abf6054..00000000000 --- a/inputmethod/canuum/patches/patch-ac +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2002/06/10 09:55:00 sakamoto Exp $ - ---- Imakefile.orig Tue Apr 19 20:38:45 1994 -+++ Imakefile Fri Jan 22 00:50:46 1999 -@@ -2,4 +1,4 @@ --#include "../Canna.conf" -+#include "./Canna.conf" - - #if SystemV || SystemV4 - SYS_LIBRARIES = -lcurses -@@ -7,11 +7,12 @@ - SYS_LIBRARIES = -ltermcap - #endif - -- CANNAROOT = .. -+ CANNAROOT = . - INSTUGIDFLAGS = -m 4755 -o root -- CANNASRC = $(CANNAROOT)/lib/canna16 -+ CANNASRC = $(CANNAROOT) - DEFINES = -DCANNA -DJAPANESE $(SIGNAL_DEFINES) -- INCLUDES = -I$(CANNAROOT)/include -+ INCLUDES = -I$(CANNAROOT) ${CPPFLAGS} -+EXTRA_LIBRARIES = ${LDFLAGS} -lcanna16 -lcanna - - SRCS = header.c printf.c termio.c termcap.c ttyfdslot.c setutmp.c \ - screen.c cursor.c jhlp.c xutoj.c canna.c -@@ -21,8 +22,12 @@ - TARGET = canuum - - AllTarget($(TARGET)) --NormalProgramTarget($(TARGET),$(OBJS),$(DEPCANNALIB16),$(CANNALIB16),) -+NormalProgramTarget($(TARGET),$(OBJS),,,) - InstallMultipleFlags($(TARGET),$(cannaBinDir),$(INSTUGIDFLAGS)) - InstallManPage($(TARGET),$(cannaManDir)) - DependTarget() - LintTarget() -+MakeCannaConfigH(cannaconf.h) -+ -+clean:: -+ $(RM) -f cannaconf.h diff --git a/inputmethod/canuum/patches/patch-ae b/inputmethod/canuum/patches/patch-ae deleted file mode 100644 index f6e747c8e4d..00000000000 --- a/inputmethod/canuum/patches/patch-ae +++ /dev/null @@ -1,89 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2002/06/10 09:55:00 sakamoto Exp $ - ---- jhlp.c.orig Thu Jan 21 21:52:56 1999 -+++ jhlp.c Thu Jan 21 21:56:35 1999 -@@ -76,6 +76,9 @@ - - jmp_buf kk_env; - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif - #ifdef SYSVR2 - # include <sys/param.h> - #endif /* SYSVR2 */ -@@ -285,9 +288,11 @@ - - - #if defined(BSD42) && !defined(DGUX) -+#if !(defined(BSD) && (BSD >= 199306)) - if (saveutmp() < 0) { - puts("Can't save utmp\n"); - } -+#endif - #endif /* BSD42 */ - - -@@ -781,7 +786,12 @@ - #endif - int pid; - -- if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) { -+/* -+ * Remove warning. -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 -+ */ -+/* if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) { */ -+ if ((pid = wait3((int *)&status, WNOHANG | WUNTRACED, NULL)) == child_id) { - if (WIFSTOPPED(status)) { - #ifdef SIGCONT - kill(pid, SIGCONT); -@@ -1174,9 +1184,11 @@ - setpgrp(0, pid); - #endif /* BSD42 */ - -+#if !(defined(BSD) && (BSD >= 199306)) - if (setutmp(ttypfd) == ERROR) { - puts("Can't set utmp."); - } -+#endif - - #ifdef linux - setsid(); -@@ -1634,9 +1646,11 @@ - perror(prog); - } - -+#if !(defined(BSD) && (BSD >= 199306)) - if (resetutmp(ttypfd) == ERROR) { - printf("Can't reset utmp."); - } -+#endif - #ifdef TIOCSSIZE - pty_rowcol.ts_lines = 0; - pty_rowcol.ts_cols = 0; -@@ -1706,11 +1720,24 @@ - char *b, *pty; - int no; - { -+/* -+ * Change pseudo-devices. -+ * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v]. -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 -+ */ - if (no < 0x10 * ('z' - 'p' + 1)) { -+#if (defined(BSD) && (BSD >= 199306)) /* 4.4BSD-Lite by Taoka */ -+ sprintf(b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9)? 'a' : '0') + (no & 0x1f)); -+#else /* ! 4.4BSD-Lite */ - sprintf(b, "%s%1c%1x", pty, 'p' + (no >> 4), no & 0x0f); -+#endif /* ! 4.4BSD-Lite */ - } else { - no -= 0x10 * ('z' - 'p' + 1); -+#if (defined(BSD) && (BSD >= 199306)) /* 4.4BSD-Lite by Taoka */ -+ sprintf(b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9)? 'a' : '0') + (no & 0x1f)); -+#else /* ! 4.4BSD-Lite */ - sprintf(b, "%s%1c%1x", pty, 'P' + (no >> 4), no & 0x0f); -+#endif /* ! 4.4BSD-Lite */ - } - } - diff --git a/inputmethod/canuum/patches/patch-af b/inputmethod/canuum/patches/patch-af deleted file mode 100644 index 9db2aec4eee..00000000000 --- a/inputmethod/canuum/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.2 2002/06/10 09:55:00 sakamoto Exp $ - ---- sheader.h.orig Tue Aug 17 17:47:04 1999 -+++ sheader.h Tue Aug 17 17:48:00 1999 -@@ -336,7 +336,7 @@ - extern void set_keypad_on(); - extern void set_keypad_off(); - extern void set_scroll_region(); --#if defined(linux) || defined(__FreeBSD__) || defined(__MACHTEN__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__MACHTEN__) - #define HAVE_SETENV - #endif - #ifndef HAVE_SETENV |