* Move to use inputmethod/canna/Makefile.{common,include} for common

  definitions/inclusions.

* Deprecate canna-server and introduce inputmethod/canna as the new
  Canna meta package.

9 files changed, 13 insertions, 233 deletions

diff --git a/inputmethod/canna-lib/Makefile b/inputmethod/canna-lib/Makefile
index 68b17cc4aae..2f1dd3ee584 100644
--- a/inputmethod/canna-lib/Makefile
+++ b/inputmethod/canna-lib/Makefile
@@ -1,30 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2002/12/27 08:41:24 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/31 08:28:34 uebayasi Exp $
 #
+.include "../canna/Makefile.common"
 
-DISTNAME=	Canna36p1
-PKGNAME=	Canna-lib-3.6.1
-CATEGORIES=	japanese inputmethod
-MASTER_SITES=	http://downloads.sourceforge.jp/canna/1722/
-
-MAINTAINER=	tech-pkg-ja@jp.netbsd.org
-HOMEPAGE=	http://canna.sourceforge.jp/
-COMMENT=	Kana-Kanji conversion system (library)
+CANNA_MODULE=	lib
 
 INSTALL_TARGET=	install install.man
 
-BUILD_DEFS+=	USE_INET6
-
-.include "../../mk/bsd.prefs.mk"
-.if 0	# defined(USE_INET6) && ${USE_INET6} == "YES"
-INET6=		-DINET6
-.else
-INET6=		# empty
-.endif
-CANNAOWNER?=    daemon
-CANNAGROUP?=    daemon
-MAKE_ENV+=      CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
-		INET6=${INET6}
-
 # (1) Change SUBDIRS.
 # (2) Don't install `forcpp', `kpdic'.
 post-patch:
@@ -46,5 +27,4 @@ do-configure:
 post-configure:
 	@${LN} -s ${WRKSRC}/server/*.h ${WRKSRC}/include
 
-.include "../../devel/nbitools/nbitools.mk"
-.include "../../mk/bsd.pkg.mk"
+.include "../canna/Makefile.include"
diff --git a/inputmethod/canna-lib/PLIST b/inputmethod/canna-lib/PLIST
index bde54161726..64d35a1eeb9 100644
--- a/inputmethod/canna-lib/PLIST
+++ b/inputmethod/canna-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/27 08:41:24 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/05/31 08:28:34 uebayasi Exp $
 include/canna/RK.h
 include/canna/jrkanji.h
 include/canna/keydef.h
@@ -6,19 +6,19 @@ include/canna/mfdef.h
 lib/libRKC.a
 lib/libRKC.so
 lib/libRKC.so.1
-lib/libRKC.so.1.0
+lib/libRKC.so.1.1
 lib/libRKC16.a
 lib/libRKC16.so
 lib/libRKC16.so.1
-lib/libRKC16.so.1.0
+lib/libRKC16.so.1.1
 lib/libcanna.a
 lib/libcanna.so
 lib/libcanna.so.1
-lib/libcanna.so.1.0
+lib/libcanna.so.1.1
 lib/libcanna16.a
 lib/libcanna16.so
 lib/libcanna16.so.1
-lib/libcanna16.so.1.0
+lib/libcanna16.so.1.1
 man/ja_JP.EUC/man3/RkBgnBun.3
 man/ja_JP.EUC/man3/RkCloseRoma.3
 man/ja_JP.EUC/man3/RkCvtEuc.3
@@ -43,7 +43,7 @@ man/ja_JP.EUC/man3/RkIntro.3
 man/ja_JP.EUC/man3/RkLeft.3
 man/ja_JP.EUC/man3/RkMapPhonogram.3
 man/ja_JP.EUC/man3/RkMapRoma.3
-man/ja_JP.EUC/man3/RkMountD.3
+man/ja_JP.EUC/man3/RkMountDic.3
 man/ja_JP.EUC/man3/RkNext.3
 man/ja_JP.EUC/man3/RkNfer.3
 man/ja_JP.EUC/man3/RkOpenRoma.3
@@ -85,7 +85,7 @@ man/man3/RkIntro.3
 man/man3/RkLeft.3
 man/man3/RkMapPhonogram.3
 man/man3/RkMapRoma.3
-man/man3/RkMountD.3
+man/man3/RkMountDic.3
 man/man3/RkNext.3
 man/man3/RkNfer.3
 man/man3/RkOpenRoma.3
@@ -134,7 +134,6 @@ share/canna/dic/vje.cbp
 share/canna/dic/wx2+.cbp
 share/canna/sample/1.1.canna
 share/canna/sample/1.2.canna
-share/canna/sample/default.canna
 share/canna/sample/fixer.canna
 share/canna/sample/jdemon.canna
 share/canna/sample/just.canna
diff --git a/inputmethod/canna-lib/buildlink2.mk b/inputmethod/canna-lib/buildlink2.mk
index 451b7f28188..46e2c439a88 100644
--- a/inputmethod/canna-lib/buildlink2.mk
+++ b/inputmethod/canna-lib/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/12/27 08:41:24 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/31 08:28:34 uebayasi Exp $
 
 .if !defined(CANNA_BUILDLINK2_MK)
 CANNA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		canna
-BUILDLINK_DEPENDS.canna?=	Canna-lib>=3.6.1
+BUILDLINK_DEPENDS.canna?=	Canna-lib>=3.6p3
 BUILDLINK_PKGSRCDIR.canna?=	../../inputmethod/canna-lib
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.canna=canna-lib
diff --git a/inputmethod/canna-lib/files/canna b/inputmethod/canna-lib/files/canna
deleted file mode 100644
index 217450b09bf..00000000000
--- a/inputmethod/canna-lib/files/canna
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: canna,v 1.4 2002/08/25 19:22:55 jlam Exp $
-#
-# PROVIDE: canna
-# REQUIRE: DAEMON
-
-if [ -f /etc/rc.subr ]
-then
-	. /etc/rc.subr
-fi
-
-name="canna"
-rcvar=$name
-command="@PREFIX@/sbin/cannaserver"
-stop_cmd="@PREFIX@/bin/cannakill"
-
-if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]
-then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n ' ${name}'
-	${command} ${canna_flags} ${command_args}
-fi
diff --git a/inputmethod/canna-lib/patches/patch-aa b/inputmethod/canna-lib/patches/patch-aa
deleted file mode 100644
index b4fba87ebc2..00000000000
--- a/inputmethod/canna-lib/patches/patch-aa
+++ /dev/null
@@ -1,113 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/12/27 08:41:24 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/canna-lib/patches/patch-ab b/inputmethod/canna-lib/patches/patch-ab
deleted file mode 100644
index 70697472001..00000000000
--- a/inputmethod/canna-lib/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2002/12/27 08:41:24 uebayasi Exp $
---- Imakefile.orig	Thu Dec  5 22:39:41 2002
-+++ Imakefile	Thu Dec  5 22:40:03 2002
-@@ -60,7 +60,7 @@
- 	for i in $(SERVERDIR) ;\
- 	do \
- 		(cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
--		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
-+		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \
- 	done
- 
- instclient::
-@@ -68,7 +68,7 @@
- 	for i in $(CLIENTDIR) ;\
- 	do \
- 		(cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
--		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
-+		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \
- 	done
- 
- instsgs::
diff --git a/inputmethod/canna-lib/patches/patch-ac b/inputmethod/canna-lib/patches/patch-ac
deleted file mode 100644
index 80fab924b54..00000000000
--- a/inputmethod/canna-lib/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/08/25 19:22:56 jlam Exp $
-
---- dic/phono/Imakefile.orig	Wed Nov 27 16:15:14 1996
-+++ dic/phono/Imakefile	Fri Jul 30 19:57:02 1999
-@@ -27,7 +27,7 @@
- 
-        ROMAJI_DIC_DEF = -DSHIFT
- 
--               DICDIR = $(cannaLibDir)/dic
--            SAMPLEDIR = $(cannaLibDir)/sample
--         SAMPLESRCDIR = $(cannaLibDir)/sample/src
-+               DICDIR = $(DicDir)
-+            SAMPLEDIR = $(DicDir)/sample
-+         SAMPLESRCDIR = $(DicDir)/sample/src
-
diff --git a/inputmethod/canna-lib/patches/patch-ad b/inputmethod/canna-lib/patches/patch-ad
deleted file mode 100644
index ef10a2b7ed1..00000000000
--- a/inputmethod/canna-lib/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2002/12/27 08:41:24 uebayasi Exp $
---- dic/ideo/pubdic/Imakefile.orig	Thu Dec  5 23:43:40 2002
-+++ dic/ideo/pubdic/Imakefile	Thu Dec  5 23:43:52 2002
-@@ -9,7 +9,7 @@
-       CANNAROOT = ../../..
-     CANNACMDDIR = $(CANNAROOT)/cmd
-           MERGE = $(CANNACMDDIR)/mergewd/mergeword
--       INCLUDES = -I$(CANNAROOT)/include
-+       INCLUDES = -I$(CANNAROOT)/canna
- #endif
-         TARGETS = iroha.t
-         PUBDICS = a.p k.p s.p t.p n.p h.p m.p y.p r.p w.p x.p
diff --git a/inputmethod/canna-lib/patches/patch-af b/inputmethod/canna-lib/patches/patch-af
deleted file mode 100644
index 2318a3f6d58..00000000000
--- a/inputmethod/canna-lib/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2002/08/25 19:22:56 jlam Exp $
-
---- lib/RKC/convert.c.orig	Wed May 22 22:02:57 1996
-+++ lib/RKC/convert.c
-@@ -32,7 +32,7 @@
- #ifndef WIN
- #include "sglobal.h"
- #endif
--#include "IRproto.h"
-+#include "../server/IRproto.h"
- 
- #include <errno.h>
- #include <sys/types.h>