From 9b637257eb91b8f63ed844e405fc6e3e8219931a Mon Sep 17 00:00:00 2001
From: uebayasi <uebayasi@pkgsrc.org>
Date: Sat, 31 May 2003 08:28:33 +0000
Subject: * 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.
---
 inputmethod/canna-dict/Makefile | 42 ++++++++++-------------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

(limited to 'inputmethod/canna-dict')

diff --git a/inputmethod/canna-dict/Makefile b/inputmethod/canna-dict/Makefile
index 7e28ac5eef4..c5150bc34f2 100644
--- a/inputmethod/canna-dict/Makefile
+++ b/inputmethod/canna-dict/Makefile
@@ -1,34 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2002/12/29 01:03:21 seb Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/31 08:28:33 uebayasi Exp $
+#
+.include "../canna/Makefile.common"
 
-DISTNAME=	Canna36p1
-PKGNAME=	Canna-dict-3.6.1
-CATEGORIES=	japanese inputmethod
-MASTER_SITES=	http://downloads.sourceforge.jp/canna/1722/
+CANNA_MODULE=	dict
 
-MAINTAINER=	tech-pkg-ja@jp.netbsd.org
-HOMEPAGE=	http://canna.sourceforge.jp/
-COMMENT=	Kana-Kanji conversion system (dictionary)
+BUILD_DEPENDS+=	Canna-server-bin>=${CANNA_VERSION}:../canna-server-bin
 
-BUILD_DEPENDS+=	Canna-server-bin>=3.6.1:../canna-server-bin
-
-FILESDIR=	${.CURDIR}/../canna-lib/files
-DISTINFO_FILE=	${.CURDIR}/../canna-lib/distinfo
-PATCHDIR=	${.CURDIR}/../canna-lib/patches
-
-BUILD_DEFS+=	USE_INET6
-#USE_X11BASE=	yes
-
-.include "../../mk/bsd.prefs.mk"
 NO_MTREE=	yes
-.if 0	# defined(USE_INET6) && ${USE_INET6} == "YES"
-INET6=		-DINET6
-.else
-INET6=		# empty
-.endif
-CANNAOWNER?=	daemon
-CANNAGROUP?=	daemon
-MAKE_ENV+=	CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
-		IMDICTDIR=${IMDICTDIR} INET6=${INET6}
+OWN_DIRS=	${PREFIX}/canna
 
 EVAL_PREFIX+=	CANNASERVERBINDIR=Canna-server-bin
 .for cmd in MERGE FORCPP FORSORT SPLITWORD MERGEWORD CRXGRAM CRXDIC CRFREQ KPDIC
@@ -45,16 +24,15 @@ post-patch:
 	 done
 
 do-configure:
-	@(cd ${WRKSRC}/dic/ideo; ${XMKMF})
+	@cd ${WRKSRC}/dic/ideo; ${XMKMF}
 
 do-build:
-	@(cd ${WRKSRC}/dic/ideo; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM})
+	@cd ${WRKSRC}/dic/ideo; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
 
 do-install:
-	@(cd ${WRKSRC}/dic/ideo; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install)
+	@cd ${WRKSRC}/dic/ideo; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install
 
-.include "../../devel/nbitools/nbitools.mk"
-.include "../../mk/bsd.pkg.mk"
+.include "../canna/Makefile.include"
 
 # Need to set this here _after_ bsd.pkg.mk
 PREFIX=		${IMDICTDIR}
-- 
cgit v1.2.3