Adapt this package to NetBSD.

12 files changed, 80 insertions, 85 deletions

diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile
index cc7f4f6b7a6..3b953c3ef66 100644
--- a/japanese/sj3-lib/Makefile
+++ b/japanese/sj3-lib/Makefile
@@ -1,45 +1,20 @@
-# New ports collection makefile for:	SJ3
-# Version required:	2.0.1.20
-# Date created:		18 Aug 1998
-# Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
-#
-# $Id: Makefile,v 1.1.1.1 1999/08/02 11:21:09 sakamoto Exp $
-#
+# $NetBSD: Makefile,v 1.2 1999/08/02 11:28:35 sakamoto Exp $
+# FreeBSD Id: Makefile,v 1.9 1998/11/28 05:08:27 asami Exp $
 
 DISTNAME=	sj3-2.0.1.20
-PKGNAME=	ja-sj3-2.0.1.20
+PKGNAME=	sj3-lib-2.0.1.20
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/ \
+MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/	\
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
 
-MAINTAINER=	hidekazu@cs.titech.ac.jp
+MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 
-BUILD_DEPENDS=	xmkmf:${PORTSDIR}/x11/XFree86
-
-MAN1=		sj3.1 sj3dic.1 sj3mkdic.1 sj3serv.1
-MANLANG=	ja
-
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/sj3.sh
-
-# This port requires xmkmf but installs in /usr/local
-#
-# NOTE : You must not use 'xmkmf -a', because the running 'make depend' caused a error.
+pre-configure:
+	@${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
+	@${SED} -e 's|\(SUBDIRS = \).*\(sj3lib\).*|\1\2|'	\
+		${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
 
 do-configure:
-	( cd $(WRKSRC) ; xmkmf ; make Makefiles )
-
-post-install:
-	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
-		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
-		${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT}; 			\
-		${ECHO} 'sj3=${PREFIX}/bin/sj3serv' >> ${STARTUP_SCRIPT} ; \
-		${ECHO} 'if [ -f $$sj3 ]; then' >> ${STARTUP_SCRIPT} ;	\
-		${ECHO} '     $$sj3' >> ${STARTUP_SCRIPT} ;		\
-		${ECHO} "fi" >> ${STARTUP_SCRIPT} ;			\
-		chmod 755 ${STARTUP_SCRIPT} ;				\
-		chown bin.bin ${STARTUP_SCRIPT};			\
-	fi
-	${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@(cd ${WRKSRC}; xmkmf; ${MAKE} Makefiles)
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/sj3-lib/files/md5 b/japanese/sj3-lib/files/md5
index 31c66f8d7ce..3aaa2a3fb38 100644
--- a/japanese/sj3-lib/files/md5
+++ b/japanese/sj3-lib/files/md5
@@ -1 +1,3 @@
+$NetBSD: md5,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
+
 MD5 (sj3-2.0.1.20.tar.gz) = 36cc23702e2295e4552271b9d481c863
diff --git a/japanese/sj3-lib/files/patch-sum b/japanese/sj3-lib/files/patch-sum
new file mode 100644
index 00000000000..a3d2c952bcc
--- /dev/null
+++ b/japanese/sj3-lib/files/patch-sum
@@ -0,0 +1,8 @@
+$NetBSD: patch-sum,v 1.1 1999/08/02 11:28:36 sakamoto Exp $
+
+MD5 (patch-aa) = ba8c1b6d09186f21bc7af6381ab7b110
+MD5 (patch-ab) = 78ef4b36a237b0348c160a1beaa473f2
+MD5 (patch-ac) = beb456604f85f55cad222aa3e6816fc6
+MD5 (patch-ad) = 5337f89da04783ba2b9762675035c265
+MD5 (patch-ae) = f315e073951a9efaf3304ce35dcf3f79
+MD5 (patch-af) = c9ddf075336544374d73e6b9c99f305b
diff --git a/japanese/sj3-lib/patches/patch-aa b/japanese/sj3-lib/patches/patch-aa
index 2ff33a40a0c..13d21484202 100644
--- a/japanese/sj3-lib/patches/patch-aa
+++ b/japanese/sj3-lib/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
+
 diff -arcN ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms ./doc/doc/sj3lib.ms
 *** ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms	Fri Jun  3 17:00:49 1994
 --- ./doc/doc/sj3lib.ms	Tue Aug 13 03:17:26 1996
diff --git a/japanese/sj3-lib/patches/patch-ab b/japanese/sj3-lib/patches/patch-ab
index ea8aebc78dd..6066ca06cc8 100644
--- a/japanese/sj3-lib/patches/patch-ab
+++ b/japanese/sj3-lib/patches/patch-ab
@@ -1,3 +1,5 @@
+$NetBSD: patch-ab,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
+
 diff -arcN ../sj3-2.0.1.13.old/include/Const.h ./include/Const.h
 *** ../sj3-2.0.1.13.old/include/Const.h	Tue Aug 13 03:13:39 1996
 --- ./include/Const.h	Wed Aug 21 14:01:27 1996
@@ -11,11 +13,11 @@ diff -arcN ../sj3-2.0.1.13.old/include/Const.h ./include/Const.h
 +  * Change the default Port number of sj3 for FreeBSD.
 +  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
 +  */
-+ #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 + #define	PortNumber		3086
-+ #else /* ! __FreeBSD__ */
++ #else /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */
   #define	PortNumber		3000
-+ #endif /* ! __FreeBSD__ */
++ #endif /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */
   #endif
   #define	SocketName		"/tmp/sj3sock"
   #define	LockFile		"/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3-lib/patches/patch-ac b/japanese/sj3-lib/patches/patch-ac
index 148a043fdad..843f5eef22b 100644
--- a/japanese/sj3-lib/patches/patch-ac
+++ b/japanese/sj3-lib/patches/patch-ac
@@ -1,3 +1,5 @@
+$NetBSD: patch-ac,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
+
 --- dict/dict/Imakefile.~1~	Thu Jan 23 20:20:51 1997
 +++ dict/dict/Imakefile	Tue Aug 18 10:51:14 1998
 @@ -48,7 +48,7 @@
diff --git a/japanese/sj3-lib/patches/patch-ad b/japanese/sj3-lib/patches/patch-ad
index 8c714daa84f..ce2e055fcc6 100644
--- a/japanese/sj3-lib/patches/patch-ad
+++ b/japanese/sj3-lib/patches/patch-ad
@@ -1,6 +1,28 @@
---- sj3.tmpl.~1~	Thu Jan 23 20:20:58 1997
-+++ sj3.tmpl	Tue Aug 18 11:07:42 1998
-@@ -48,7 +48,7 @@
+$NetBSD: patch-ad,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
+
+--- sj3.tmpl.orig	Thu Jan 23 20:20:58 1997
++++ sj3.tmpl	Fri Jul 30 20:27:08 1999
+@@ -32,12 +32,12 @@
+  * $SonyDate: 1997/01/23 11:20:57 $
+  */
+ 
+-SJ3TOP		= /usr/local
++SJ3TOP		= $(PREFIX)
+ SJ3BINDIR	= $(SJ3TOP)/bin
+ SJ3HDRDIR	= $(SJ3TOP)/include
+ SJ3LIBDIR	= $(SJ3TOP)/lib
+-SJ3CONFDIR	= $(SJ3TOP)/lib/sj3
+-SJ3DICTDIR	= $(SJ3CONFDIR)/dict
++SJ3CONFDIR	= $(SJ3TOP)/share/sj3
++SJ3DICTDIR	= $(DICT_DIR)/sj3
+ 
+ /*
+  * Change for FreeBSD.
+@@ -45,10 +45,11 @@
+  * return NULL, use it in library libxpg4 
+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
+  */
++#if 0
  #if defined(FreeBSDArchitecture)
  
  CODE_LIBS	= -lxpg4
@@ -9,3 +31,9 @@
  SJ3GROUP	= bin
  
  #else
+@@ -61,4 +62,5 @@
+ SJ3GROUP	= staff
+ #endif
+ 
++#endif
+ #endif
diff --git a/japanese/sj3-lib/patches/patch-ae b/japanese/sj3-lib/patches/patch-ae
index 939c71115c9..f5eb2edace4 100644
--- a/japanese/sj3-lib/patches/patch-ae
+++ b/japanese/sj3-lib/patches/patch-ae
@@ -1,3 +1,5 @@
+$NetBSD: patch-ae,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
+
 --- include/Paths.h.in.orig	Thu Jan 23 20:20:57 1997
 +++ include/Paths.h.in	Tue Aug 18 11:29:00 1998
 @@ -33,7 +33,22 @@
@@ -15,7 +17,7 @@
 + * This default value is "/dev/null" in document.
 + * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/11
 + */
-+#if !defined(__FreeBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
 +#define	ErrorOutFile		"/dev/console"
 +#else
 +/* #define	ErrorOutFile		"/dev/stderr" */ 	/* for test */
diff --git a/japanese/sj3-lib/patches/patch-af b/japanese/sj3-lib/patches/patch-af
index 13b49cf298b..70c7174f02a 100644
--- a/japanese/sj3-lib/patches/patch-af
+++ b/japanese/sj3-lib/patches/patch-af
@@ -1,11 +1,16 @@
---- doc/man/Imakefile.~1~	Thu Jan 23 20:20:52 1997
-+++ doc/man/Imakefile	Tue Aug 18 12:15:20 1998
-@@ -40,7 +40,7 @@
-  */
- 
- #ifndef JapaneseManLocale
--#define JapaneseManLocale	ja_JP.EUC
-+#define JapaneseManLocale	ja
+$NetBSD: patch-af,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
+
+--- server/main.c.orig	Mon Mar 23 19:48:03 1998
++++ server/main.c	Mon Aug  2 19:26:45 1999
+@@ -215,9 +215,11 @@
+ 	(void) setlocale(LC_CTYPE, "ja_JP.EUC");
  #endif
- JMANLOCALE = JapaneseManLocale
+ 	opening();
++#ifndef __NetBSD__
+ 	if (setuid(geteuid())) {
+ 		fprintf(stderr, "error at setuid.\r\n"); exit(1);
+ 	}
++#endif
  
+ 	parse_arg(argc, argv);		
+ 	read_runcmd();			
diff --git a/japanese/sj3-lib/pkg/COMMENT b/japanese/sj3-lib/pkg/COMMENT
index 5aea583c5d8..12ece78e960 100644
--- a/japanese/sj3-lib/pkg/COMMENT
+++ b/japanese/sj3-lib/pkg/COMMENT
@@ -1 +1 @@
-A Japanese input method
+A Japanese input method (library)
diff --git a/japanese/sj3-lib/pkg/INSTALL b/japanese/sj3-lib/pkg/INSTALL
deleted file mode 100644
index f93fb1a1ca9..00000000000
--- a/japanese/sj3-lib/pkg/INSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-case $2 in
-    POST-INSTALL)
-	dic="${PKG_PREFIX}/lib/sj3/dict/user"
-	mkdir -p $dic
-	chown bin.bin $dic
-	;;
-esac
-
diff --git a/japanese/sj3-lib/pkg/PLIST b/japanese/sj3-lib/pkg/PLIST
index 1e3a58b681f..3aca78b786b 100644
--- a/japanese/sj3-lib/pkg/PLIST
+++ b/japanese/sj3-lib/pkg/PLIST
@@ -1,24 +1,3 @@
-bin/sj3
-bin/sj3dic
-bin/sj3mkdic
-bin/sj3serv
-bin/sj3stat
+@comment $NetBSD: PLIST,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
 include/sj3lib.h
 lib/libsj3lib.a
-lib/sj3/Nihongo.ps.Z
-lib/sj3/cvtkey.news
-lib/sj3/cvtkey.nwp511
-lib/sj3/cvtkey.nwp517
-lib/sj3/cvtkey.xterm
-lib/sj3/dict/sj3main.dic
-lib/sj3/hinsi.ms
-lib/sj3/makedict.ms
-lib/sj3/serverrc
-lib/sj3/sj3lib.ms
-lib/sj3/sj3serv.ms
-lib/sj3/sjrc
-lib/sj3/sjrk
-etc/rc.d/sj3.sh
-@dirrm lib/sj3/dict/user
-@dirrm lib/sj3/dict
-@dirrm lib/sj3