Update to 3.6nb2; make this available for Canna 3.6p1, and work without X.

Submitted by Osamu Oishi <oishi at ims dot ac dot jp> in tech-pkg-ja@.

3 files changed, 78 insertions, 46 deletions

diff --git a/inputmethod/canuum/Makefile b/inputmethod/canuum/Makefile
index 8693da09b67..f659949dee4 100644
--- a/inputmethod/canuum/Makefile
+++ b/inputmethod/canuum/Makefile
@@ -1,30 +1,33 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/04/19 03:51:24 uebayasi Exp $
 #
 
 DISTNAME=	canuum-1.0
-PKGREVISION=	1
-WRKSRC=		${WRKDIR}/Canna35b2/canuum
+PKGREVISION=	2
+WRKSRC=		${WRKDIR}/${CANNA_VER}/canuum
 CATEGORIES=	japanese inputmethod
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna35/
-DISTFILES=	Uum4.109.tar.gz Canna35b2.tar.gz
-EXTRACT_ONLY=	Uum4.109.tar.gz
+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
-USE_IMAKE=	YES
-USE_X11=	YES
 MAKE_ARGS=	PREFIX=${PREFIX}
 
 MAKE_ENV+=	CCOPTIONS="${CPPFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
 
+UUM_VER=	4.109
+CANNA_VER=	Canna36p1
+
 post-extract:
-	@${GTAR} -xzf ${DISTDIR}/Canna35b2.tar.gz -C ${WRKDIR} \
-		Canna35b2/Canna.conf Canna35b2/canuum
-	@${MV} ${WRKDIR}/Canna35b2/Canna.conf ${WRKSRC}/
-	@${CP} ${WRKDIR}/Uum4.109/* ${WRKSRC}
+	@${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)
@@ -32,7 +35,8 @@ pre-patch:
 do-configure:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \
 		${MAKE} ${MAKE_ARGS} Makefile; \
-		${MAKE} ${MAKE_ARGS} cannaconf.h; ${MAKE} ${MAKE_ARGS} depend)
+		${MAKE} ${MAKE_ARGS} cannaconf.h; \
+		${MAKE} ${MAKE_ARGS} depend)
 
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_ARGS} all)
diff --git a/inputmethod/canuum/distinfo b/inputmethod/canuum/distinfo
index de07668f646..6dd14d2ec8a 100644
--- a/inputmethod/canuum/distinfo
+++ b/inputmethod/canuum/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2002/06/10 09:54:59 sakamoto Exp $
+$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 (Canna35b2.tar.gz) = 66742205272cbc6bd91f272596381f761feac0a2
-Size (Canna35b2.tar.gz) = 1333329 bytes
-SHA1 (patch-aa) = 45cdfd8107ee0beeae878c9940273fc6bca0385a
+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
index 8c133748d21..637b3942281 100644
--- a/inputmethod/canuum/patches/patch-aa
+++ b/inputmethod/canuum/patches/patch-aa
@@ -1,31 +1,35 @@
-$NetBSD: patch-aa,v 1.2 2002/06/10 09:55:00 sakamoto Exp $
-
---- Canna.conf-	Fri Dec  1 00:31:14 2000
-+++ Canna.conf	Fri Dec  1 00:31:36 2000
-@@ -130,10 +130,14 @@
+$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 @@
  
--cannaBinDir = /usr/local/canna/bin
--cannaSrvDir = /usr/local/canna/bin
--cannaLibDir = /usr/local/canna/lib
--cannaManDir = /usr/local/canna/man
--cannaIncDir = /usr/local/canna/include/canna
+ /* 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
-+cannaBinDir = ${PREFIX}/bin
-+cannaSrvDir = ${PREFIX}/sbin
-+cannaLibDir = ${PREFIX}/share/canna
-+cannaManDir = ${PREFIX}/man/ja_JP.EUC
-+cannaIncDir = ${PREFIX}/include/canna
-+libCannaDir = ${PREFIX}/lib
-+
++libCannaDir = $(cannaPrefix)/lib
 +ErrDir  = ${CANNA_SPOOL}
-+
-+/* INET6 related stuff */
-+INET6_DEFS = ${INET6}
-+INET6_LIBS = #-L/usr/local/v6/lib -linet6
+ #endif
  
-@@ -141,6 +145,6 @@
++INET6_DEFS = ${INET6}
++
+ /* 次の3行は変更しないでください */
+ wcharDefinition = -DCANNA_WCHAR
  Wlib =
 -JapaneseLocale = japanese
 +JapaneseLocale = ja_JP.eucJP
@@ -35,20 +39,29 @@ $NetBSD: patch-aa,v 1.2 2002/06/10 09:55:00 sakamoto Exp $
 +cannaOwner = ${CANNAOWNER}
 +cannaGroup = ${CANNAGROUP}
  
-@@ -150,3 +154,3 @@
+ #ifdef InstallAsUser
+ cannaOwnerGroup =
+@@ -164,7 +166,7 @@
+ 
+ pointerIntegerDef =
  
 -cannaDsoRev = 1
 +cannaDsoRev = 1.0
      /* SunOS 4.x をお使いの方で shared object を利用する場合には
-@@ -203,6 +207,5 @@
+             cannaDsoRev = 1.1
+     と指定してください。また、FreeBSD を利用する場合は、
+@@ -229,7 +231,7 @@
+  * コマンド類をリンクする時は、次を YES にしてくだい。
   */
--/* #define UseInstalledLibCanna YES */
+ /* #define UseInstalledLibCanna YES */
 -#define UseInstalledLibCanna NO
 +#define UseInstalledLibCanna YES
  
  DicDir   = $(cannaLibDir)/dic
  
-@@ -241,14 +244,14 @@
+@@ -274,18 +276,18 @@
+     DEPCANNALIB = $(libCannaDir)/libcanna.a
+ #endif
  # endif
 -       CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
 +       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
@@ -68,7 +81,11 @@ $NetBSD: patch-aa,v 1.2 2002/06/10 09:55:00 sakamoto Exp $
 -       CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
 +       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
  #endif /* UseInstalledLibCanna */
-@@ -261,10 +264,10 @@
+ 
+ #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)
@@ -81,5 +98,16 @@ $NetBSD: patch-aa,v 1.2 2002/06/10 09:55:00 sakamoto Exp $
 +    DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
  # endif
 -       CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
-+       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -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 を定義するための定義 */