* Convert to USE_TOOLS+=itools instead of including nbitools/buildlink3.mk.

* Fully convert to pkginstall framework by properly using OWN_DIRS*
  to manage required directories during package installation and
  deinstallation.

* Drop the need to explicitly set PREFIX in the package Makefiles.  We
  now install into ${LOCALBASE} like all other pkgsrc packages and use
  symlinks and file copies to put the right files into ${IMDICTDIR}.

* Change default dependency relationship in sj3-lib/buildlink3.mk to a
  build dependency since it the package only installs headers and a
  static library archive.

* Move some important setup instructions from the DESCR file to MESSAGE
  files so that the admin will see them at package installation.

* Rewrite the sj3 rc.d script so that all necessary directories are
  created before the daemon is started.

* Miscellaneous touch ups to the DESCR and MESSAGE files.

Bump the PKGREVISIONs on the sj3* packages.

3 files changed, 12 insertions, 32 deletions

diff --git a/inputmethod/sj3-lib/DESCR b/inputmethod/sj3-lib/DESCR
index f794a1fa9ce..93fcb26c55a 100644
--- a/inputmethod/sj3-lib/DESCR
+++ b/inputmethod/sj3-lib/DESCR
@@ -1,20 +1,6 @@
-This is SJ3 2.0.1.20, a Japanese input method.
-This system developed by Sony Corporation.
-SJ3 is composed of Kana-Kanji conversion server(sj3serv),
-Kana-Kanji conversion client for terminal(sj3) and Kana-Kanji
-conversion library(sj3lib).
+SJ3 is a Japanese input method developed by Sony Corporation.  SJ3 is
+composed of a Kana-Kanji conversion server (sj3serv), a Kana-Kanji
+conversion client for terminals (sj3) and Kana-Kanji conversion library
+(sj3lib).
 
-If you start up sj3serv, you must add a following entry into
-/etc/services file or NIS/YP services map.
-
-sj3		3086/tcp
-
-This port number may be changed by the setup file(See manpages).
-
-This also include many patches for FreeBSD or others.
-(Remove warning, support pseudo-terminal of FreeBSD,
- some bug fix and change make rules.) If there are any problem
-in this patches, please know me via E-mail.
-
-Hidekazu Kuroki
-(hidekazu@cs.titech.ac.jp)
+This package contains the Kana-Kanji conversion library (sj3lib).
diff --git a/inputmethod/sj3-lib/Makefile b/inputmethod/sj3-lib/Makefile
index 27b6fefbde3..67deb14467e 100644
--- a/inputmethod/sj3-lib/Makefile
+++ b/inputmethod/sj3-lib/Makefile
@@ -1,20 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:24 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/05 04:55:24 jlam Exp $
 
 DISTNAME=	sj3-2.0.1.20
 PKGNAME=	sj3-lib-2.0.1.20
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/	\
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
-COMMENT=	Japanese input method (library)
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-
-.include "../../mk/bsd.prefs.mk"
+COMMENT=	SJ3 Japanese input method library
 
+USE_TOOLS+=	itools
+USE_IMAKE=	yes
 MAKE_ENV+=	IMDICTDIR=${IMDICTDIR:Q}
 
 pre-configure:
@@ -22,8 +19,4 @@ pre-configure:
 	@${SED} -e 's|\(SUBDIRS = \).*\(sj3lib\).*|\1\2|'	\
 		${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
 
-do-configure:
-	@(cd ${WRKSRC}; ${XMKMF_CMD}; ${MAKE} Makefiles)
-
-.include "../../devel/nbitools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/sj3-lib/buildlink3.mk b/inputmethod/sj3-lib/buildlink3.mk
index cf2fb5b8967..0f6f4fbd2d8 100644
--- a/inputmethod/sj3-lib/buildlink3.mk
+++ b/inputmethod/sj3-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:20 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/05 04:55:24 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SJ3_LIB_BUILDLINK3_MK:=	${SJ3_LIB_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	sj3-lib
 .if !empty(SJ3_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sj3-lib+=	sj3-lib>=2.0.1.20nb1
 BUILDLINK_PKGSRCDIR.sj3-lib?=	../../inputmethod/sj3-lib
+BUILDLINK_DEPMETHOD.sj3-lib?=	build
 .endif	# SJ3_LIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}