* 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.

13 files changed, 102 insertions, 159 deletions

diff --git a/inputmethod/sj3-dict/DESCR b/inputmethod/sj3-dict/DESCR
index f794a1fa9ce..f7814379cba 100644
--- a/inputmethod/sj3-dict/DESCR
+++ b/inputmethod/sj3-dict/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 dictionary file.
diff --git a/inputmethod/sj3-dict/INSTALL b/inputmethod/sj3-dict/INSTALL
deleted file mode 100644
index 5cdccc89f20..00000000000
--- a/inputmethod/sj3-dict/INSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-case $2 in
-    POST-INSTALL)
-	dic="${PKG_PREFIX}/sj3/user"
-	mkdir -p $dic
-	chmod 755 $dic
-	chown @SJ3OWNER@:@SJ3GROUP@ $dic
-	;;
-esac
diff --git a/inputmethod/sj3-dict/Makefile b/inputmethod/sj3-dict/Makefile
index 8fb70ab7633..3b9984e03b3 100644
--- a/inputmethod/sj3-dict/Makefile
+++ b/inputmethod/sj3-dict/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:29 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/07/05 04:55:23 jlam Exp $
 #
 
 DISTNAME=	sj3-2.0.1.20
 PKGNAME=	sj3-dict-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 (dictionary)
+COMMENT=	SJ3 Japanese input method dictionary
 
 BUILD_DEPENDS+=	sj3-server-bin>=2.0.1.20nb1:../../inputmethod/sj3-server-bin
 
@@ -17,22 +17,22 @@ FILESDIR=	${.CURDIR}/../sj3-lib/files
 DISTINFO_FILE=	${.CURDIR}/../sj3-lib/distinfo
 PATCHDIR=	${.CURDIR}/../sj3-lib/patches
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-
 .include "../../mk/bsd.prefs.mk"
 
-NO_MTREE=       YES
-SJ3OWNER?=	daemon
-SJ3GROUP?=	daemon
+USE_TOOLS+=	itools
+USE_IMAKE=	yes
 MAKE_ENV+=	SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \
 		IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
 FILES_SUBST+=	SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} IMDICTDIR=${IMDICTDIR}
-DEINSTALL_SRC=	# empty
-INSTALL_SRC=	${PKGDIR}/INSTALL
-
 EVAL_PREFIX+=	SJ3SERVERBINDIR=sj3-server-bin
 
+CONFIGURE_DIRS+=	dict/dict
+
+SJ3OWNER?=	daemon
+SJ3GROUP?=	daemon
+
+INSTALLATION_DIRS=	${PREFIX}/libdata
+
 pre-configure:
 	@${CHMOD} +w ${WRKSRC}/dict/dict/Imakefile*
 	@${MV} ${WRKSRC}/dict/dict/Imakefile ${WRKSRC}/dict/dict/Imakefile.orig
@@ -40,18 +40,7 @@ pre-configure:
 		${WRKSRC}/dict/dict/Imakefile.orig \
 			> ${WRKSRC}/dict/dict/Imakefile
 
-do-configure:
-	@(cd ${WRKSRC}/dict/dict; ${XMKMF_CMD}; \
-		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} Makefiles)
-
-do-build:
-	@(cd ${WRKSRC}/dict/dict; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM})
-
 do-install:
-	@(cd ${WRKSRC}/dict/dict; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install)
+	${INSTALL_DATA} ${WRKSRC}/dict/dict/sj3main.dic ${PREFIX}/libdata
 
-.include "../../devel/nbitools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
-# Need to set this here _after_ bsd.pkg.mk
-PREFIX=		${IMDICTDIR}
diff --git a/inputmethod/sj3-dict/PLIST b/inputmethod/sj3-dict/PLIST
index 6fb60e9f79e..c424ae0d0a1 100644
--- a/inputmethod/sj3-dict/PLIST
+++ b/inputmethod/sj3-dict/PLIST
@@ -1,4 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/10 09:15:23 sakamoto Exp $
-sj3/sj3main.dic
-@dirrm sj3/user
-@dirrm sj3
+@comment $NetBSD: PLIST,v 1.2 2006/07/05 04:55:23 jlam Exp $
+libdata/sj3main.dic
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/+$//}
diff --git a/inputmethod/sj3-server-bin/DESCR b/inputmethod/sj3-server-bin/DESCR
index f794a1fa9ce..cebe440e506 100644
--- a/inputmethod/sj3-server-bin/DESCR
+++ b/inputmethod/sj3-server-bin/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 server and client.
diff --git a/inputmethod/sj3-server-bin/MESSAGE b/inputmethod/sj3-server-bin/MESSAGE
new file mode 100644
index 00000000000..5697365ad21
--- /dev/null
+++ b/inputmethod/sj3-server-bin/MESSAGE
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2006/07/05 04:55:24 jlam Exp $
+
+The default port number for the SJ3 service should be added to the
+/etc/services database:
+
+    sj3       3086/tcp
+
+This port number may be changed in configuration files.
+===========================================================================
diff --git a/inputmethod/sj3-server-bin/Makefile b/inputmethod/sj3-server-bin/Makefile
index f17c33a558e..d2dfb0d88c8 100644
--- a/inputmethod/sj3-server-bin/Makefile
+++ b/inputmethod/sj3-server-bin/Makefile
@@ -1,31 +1,41 @@
-# $NetBSD: Makefile,v 1.13 2005/12/29 06:21:45 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/05 04:55:24 jlam Exp $
 #
 
 DISTNAME=	sj3-2.0.1.20
 PKGNAME=	sj3-server-bin-2.0.1.20
-PKGREVISION=	5
+PKGREVISION=	6
 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 (server binary)
+COMMENT=	SJ3 Japanese input method server & client
 
 DISTINFO_FILE=	${.CURDIR}/../sj3-lib/distinfo
 PATCHDIR=	${.CURDIR}/../sj3-lib/patches
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=	SJ3OWNER SJ3GROUP
+USE_TOOLS+=	itools
+USE_IMAKE=	yes
+MAKE_ENV+=	SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q}		\
+		IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
+
 SJ3OWNER?=	daemon
 SJ3GROUP?=	daemon
-MAKE_ENV+=	SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \
-		IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
 
-RCD_SCRIPTS=		sj3
+FILES_SUBST+=	IMDICTDIR=${IMDICTDIR:Q}
+FILES_SUBST+=	SJ3OWNER=${SJ3OWNER:Q}
+FILES_SUBST+=	SJ3GROUP=${SJ3GROUP:Q}
+
+PKG_GROUPS+=	${SJ3GROUP}
+PKG_USERS+=	${SJ3OWNER}:${SJ3GROUP}
+
+MAKE_DIRS+=		${IMDICTDIR}
+OWN_DIRS+=		${IMDICTDIR}/sj3
+OWN_DIRS_PERMS+=	${IMDICTDIR}/sj3/user ${SJ3OWNER} ${SJ3GROUP} 0755
+
+RCD_SCRIPTS=	sj3
 
 pre-configure:
 	@${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
@@ -41,9 +51,5 @@ pre-configure:
 			$$file.orig > $$file;			\
 	 done
 
-do-configure:
-	@(cd ${WRKSRC}; ${XMKMF_CMD}; ${MAKE} Makefiles)
-
-.include "../../devel/nbitools/buildlink3.mk"
 .include "../../inputmethod/sj3-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/sj3-server-bin/files/sj3.sh b/inputmethod/sj3-server-bin/files/sj3.sh
index 856749f5473..745cc890cc7 100644
--- a/inputmethod/sj3-server-bin/files/sj3.sh
+++ b/inputmethod/sj3-server-bin/files/sj3.sh
@@ -1,23 +1,37 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: sj3.sh,v 1.1 2003/07/31 12:33:03 jmmv Exp $
+# $NetBSD: sj3.sh,v 1.2 2006/07/05 04:55:24 jlam Exp $
 #
 # PROVIDE: sj3
 # REQUIRE: LOGIN
 #
 
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="sj3"
-rcvar="${name}"
+rcvar=$name
 command="@PREFIX@/bin/sj3serv"
+start_precmd="sj3_prestart"
 
-if [ -f /etc/rc.subr ]; then
-	load_rc_config "${name}"
-	run_rc_command "$1"
-else
-	printf " sj3"
-	eval ${command} ${sj3_flags} ${command_args}
-fi
+mkdir_perms() {
+	dir="$1"; user="$2"; group="$3"; mode="$4"
+	@TEST@ -d $dir || @MKDIR@ $dir
+	@CHOWN@ $user $dir
+	@CHGRP@ $group $dir
+	@CHMOD@ $mode $dir
+}
+
+sj3_prestart()
+{
+	@MKDIR@ @IMDICTDIR@/sj3
+	mkdir_perms @IMDICTDIR@/sj3/user @SJ3OWNER@ @SJ3GROUP@ 0755
+	srcdict="@PREFIX@/libdata/sj3main.dic"
+	dict="@IMDICTDIR@/sj3/sj3main.dic"
+	if @TEST@ -f $srcdict; then
+		@RM@ -f $srcdict
+		@LN@ -fs $srcdict $dict
+	fi
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/inputmethod/sj3-server/DESCR b/inputmethod/sj3-server/DESCR
index f794a1fa9ce..447a901c972 100644
--- a/inputmethod/sj3-server/DESCR
+++ b/inputmethod/sj3-server/DESCR
@@ -1,20 +1,4 @@
-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).
-
-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)
+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).
diff --git a/inputmethod/sj3-server/Makefile b/inputmethod/sj3-server/Makefile
index 17b5c35d339..66c8fe83688 100644
--- a/inputmethod/sj3-server/Makefile
+++ b/inputmethod/sj3-server/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.7 2005/09/28 18:22:11 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/07/05 04:55:24 jlam Exp $
 
 DISTNAME=	sj3-server-2.0.1.20
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
-COMMENT=	Japanese input method (server)
+COMMENT=	SJ3 Japanese input method server
 
-DEPENDS+=	sj3-server-bin>=2.0.1.20nb1:../../inputmethod/sj3-server-bin
-DEPENDS+=	sj3-dict>=2.0.1.20nb1:../../inputmethod/sj3-dict
+DEPENDS+=	sj3-server-bin>=2.0.1.20nb6:../../inputmethod/sj3-server-bin
+DEPENDS+=	sj3-dict>=2.0.1.20nb3:../../inputmethod/sj3-dict
 
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	YES