From 048a88daf7331d1ba32b3b58abbe8f91e7f34a5f Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Thu, 28 Feb 2002 17:45:42 +0000
Subject: Move contents of misc/freewnn-common to japanese/freewnn-lib.

---
 misc/Makefile                        |  3 +-
 misc/freewnn-common/Makefile         | 87 ------------------------------------
 misc/freewnn-common/files/INSTALL    | 24 ----------
 misc/freewnn-common/files/ja_freewnn | 34 --------------
 misc/freewnn-common/patches/patch-aa | 51 ---------------------
 misc/freewnn-common/patches/patch-ab | 22 ---------
 misc/freewnn-common/patches/patch-ac | 22 ---------
 misc/freewnn-common/patches/patch-ad | 11 -----
 misc/freewnn-common/patches/patch-ae | 11 -----
 misc/freewnn-common/patches/patch-af | 15 -------
 misc/freewnn-common/patches/patch-ag | 18 --------
 11 files changed, 1 insertion(+), 297 deletions(-)
 delete mode 100644 misc/freewnn-common/Makefile
 delete mode 100644 misc/freewnn-common/files/INSTALL
 delete mode 100644 misc/freewnn-common/files/ja_freewnn
 delete mode 100644 misc/freewnn-common/patches/patch-aa
 delete mode 100644 misc/freewnn-common/patches/patch-ab
 delete mode 100644 misc/freewnn-common/patches/patch-ac
 delete mode 100644 misc/freewnn-common/patches/patch-ad
 delete mode 100644 misc/freewnn-common/patches/patch-ae
 delete mode 100644 misc/freewnn-common/patches/patch-af
 delete mode 100644 misc/freewnn-common/patches/patch-ag

(limited to 'misc')

diff --git a/misc/Makefile b/misc/Makefile
index 13dbdfd6d56..f7662d74dd3 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2002/02/13 18:11:20 mrauch Exp $
+# $NetBSD: Makefile,v 1.118 2002/02/28 17:45:42 wiz Exp $
 #
 
 COMMENT=	Miscellaneous utilities
@@ -28,7 +28,6 @@ SUBDIR+=	dync
 SUBDIR+=	fd
 SUBDIR+=	fep
 SUBDIR+=	figlet
-#SUBDIR+=	freewnn-common	# base package for japanese/freewnn-*
 SUBDIR+=	git
 SUBDIR+=	gkrellm-moon
 SUBDIR+=	gkrellm-weather
diff --git a/misc/freewnn-common/Makefile b/misc/freewnn-common/Makefile
deleted file mode 100644
index 2f472458b5c..00000000000
--- a/misc/freewnn-common/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2001/06/25 18:39:19 wiz Exp $
-#
-
-DISTNAME=	FreeWnn-1.10
-MASTER_SITES=	ftp://ftp.freewnn.org/pub/FreeWnn/	\
-		ftp://etlport.etl.go.jp/pub/FreeWnn/	\
-		ftp://ftp.st.ryukoku.ac.jp/pub/japanese-im/FreeWnn/	\
-		ftp://ftp.kddlabs.co.jp/Japan/Wnn/FreeWnn/	\
-		ftp://ftp.tomo.gr.jp/pub/FreeWnn/
-
-.if !defined(PKGNAME)
-IGNORE=		"${PKGNAME} is FreeWnn base package. Use freewnn-lib/server packages"
-.endif
-
-MAINTAINER=	tech-pkg-ja@jp.netbsd.org
-HOMEPAGE=	http://www.freewnn.org/
-COMMENT=	base package for japanese/freewnn-*
-
-INSTALL_TARGET=	install install.man
-
-.if defined(WNN_TARGET) && (${WNN_TARGET} == "SERVER")
-.include "../../mk/bsd.prefs.mk"
-MAKE_ENV+=	"WNN_TARGET=SERVER"
-WNNOWNER?=	wnn
-DICT_DIR?=	/var/dict
-SEDSCRIPT+=	-e 's|\(WNNOWNER = \).*|\1${WNNOWNER}|'
-SEDSCRIPT+=	-e 's|([CK]*WNNJLIBSRC)/\(lib[ck]*wnn.a\)|{PREFIX}/lib/\1|'
-SEDSCRIPT+=	-e 's|\([JCKT]\)\(WNNDICDIR = \).*|\1\2${DICT_DIR}/wnn/$$(\1WNNLANG)|'
-INSTALL_FILE=	${WRKDIR}/INSTALL
-INSTALL_SRC=	${FILESDIR}/INSTALL
-PLIST_SUBST=	DICT_DIR=${DICT_DIR} PREFIX=${PREFIX} WNN_LANG=${WNN_LANG}
-.else
-MAKE_ENV+=	"WNN_TARGET=LIBRARY"
-.endif
-
-.if defined(WNNDIR)
-MAKE_ENV+=	"WNNDIR=${WNNDIR}"
-.endif
-.if defined(CWNNDIR)
-MAKE_ENV+=	"CWNNDIR=${CWNNDIR}"
-.endif
-.if defined(KWNNDIR)
-MAKE_ENV+=	"KWNNDIR=${KWNNDIR}"
-.endif
-
-GNU_CONFIGURE=	YES
-WRKSRC=		${WRKDIR}/Xsi
-
-post-patch:
-	@for file in `${FIND} ${WRKSRC} -name Makefile.in`; do	\
-		${MV} $$file $$file.orig;			\
-		${SED} -e '/PREFIX = /d'			\
-			-e 's|\(WNNBINDIR = $${PREFIX}/\)\(bin\)|\1s\2|' \
-			-e 's|\([CK]*WNNBINDIR = $$(WNNBINDIR)\)/[ck]*Wnn4|\1|'\
-			-e 's|\(WNNWNNDIR = $${PREFIX}/\)lib\(/wnn\)|\1share\2|'\
-			-e '/(COMPRESSMANCMD) /d'		\
-			-e 's|\/usr\/X11R6|$${PREFIX}|'		\
-			${SEDSCRIPT}				\
-			$$file.orig > $$file;			\
-	done
-	@for file in `${FIND} ${WRKSRC}/Wnn/man -name Makefile.in`; do	\
-		${MV} $$file $$file.orig2;				\
-		${SED} -e 's|\(MANPATH = .*\)|\1/ja_JP.EUC|'		\
-			$$file.orig2 > $$file;				\
-	done
-	@(cd ${WRKSRC}/Wnn/include;				\
-		${MV} config.h config.h.orig;			\
-		${SED} -e 's|^\(\#define	LIBDIR		"\)/usr/local/lib\(/wnn"\)|\1${PREFIX}/share\2|' \
-			config.h.orig > config.h)
-
-.if defined(WNN_TARGET) && (${WNN_TARGET} == "SERVER")
-post-build:
-	@${SED} -e 's|$${WNNOWNER}|${WNNOWNER}|g'	\
-		${INSTALL_SRC} > ${INSTALL_FILE}
-	@${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/ja_freewnn \
-		> ${WRKDIR}/ja_freewnn
-
-pre-install:
-	@${SETENV} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@${LN} -s ${DICT_DIR}/wnn/${WNN_LANG} \
-		${PREFIX}/share/wnn/${WNN_LANG}/dic
-	@${INSTALL_SCRIPT} ${WRKDIR}/ja_freewnn ${PREFIX}/etc/rc.d/ja_freewnn
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/misc/freewnn-common/files/INSTALL b/misc/freewnn-common/files/INSTALL
deleted file mode 100644
index 5b0b37e7686..00000000000
--- a/misc/freewnn-common/files/INSTALL
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-case $2 in
-PRE-INSTALL)
-	uid=`id -u ${WNNOWNER} 2> /dev/null`
-	if [ X"$uid" != X ]; then
-		exit 0
-	fi
-
-	wnn_uid=69
-	uid=`id -u $wnn_uid 2> /dev/null`
-	if [ X"$uid" != X ]; then
-		wnn_uid=32768
-		while id -u $wnn_uid > /dev/null 2>&1; do
-			wnn_uid=`echo $wnn_uid+1|bc`
-			if [ $wnn_uid = 65536 ]; then
-				exit 1
-			fi
-		done
-	fi
-	chpass -l -a "${WNNOWNER}:*:$wnn_uid:1::0:0:User Wnn:/nonexistent:/sbin/nologin"
-	exit $?
-	;;
-esac
diff --git a/misc/freewnn-common/files/ja_freewnn b/misc/freewnn-common/files/ja_freewnn
deleted file mode 100644
index e6d26ad150a..00000000000
--- a/misc/freewnn-common/files/ja_freewnn
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: ja_freewnn,v 1.1 2001/06/25 18:39:19 wiz Exp $
-#
-# PROVIDE: freewnn
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="freewnn"
-command_start="@PREFIX@/sbin/jserver"
-command_stop="@PREFIX@/sbin/wnnkill"
-pidfile=""
-
-cmd=${1:-start}
-
-case ${cmd} in
-start)
-    if [ -x ${command_start} ]; then
-	echo "Starting ${name}."
-        ${command_start} >/dev/null 2>&1
-    fi
-    ;;
-stop)
-    if [ -x ${command_stop} ]; then
-        echo "Stopping ${name}."
-        ${command_stop} >/dev/null 2>&1
-    fi
-    ;;
-*)
-    :
-    ;;
-esac
-exit 0
diff --git a/misc/freewnn-common/patches/patch-aa b/misc/freewnn-common/patches/patch-aa
deleted file mode 100644
index b846576cad6..00000000000
--- a/misc/freewnn-common/patches/patch-aa
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
-
---- ./Wnn/Makefile.in.orig	Tue Mar 23 21:10:52 1999
-+++ ./Wnn/Makefile.in	Thu Sep  2 19:21:52 1999
-@@ -611,6 +611,4 @@
- # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--WNNOWNER= wnn
--
- JSERVERDIR = jserver
- 
-@@ -629,9 +627,15 @@
- JDDIR = jd
- 
--WNNMANDIR = man
--
- JLIBV3DIR = jlib.V3
- 
--SUBDIRS = $(JDDIR) $(JSERVERDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNJUTILDIR)         $(PUBDICDIR) $(WNNCONSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR)
-+.if (${WNN_TARGET} == "SERVER")
-+WNNMANDIR = man/2.env man/4.cmd man/6.jutil
-+SUBDIRS_INST = $(JSERVERDIR) $(WNNJUTILDIR) $(PUBDICDIR) $(WNNCONSDIR)			 $(WNNMANDIR)
-+SUBDIRS = $(JDDIR) $(SUBDIRS_INST)
-+.else
-+WNNMANDIR = man/3.libwnn
-+SUBDIRS_INST = $(JDDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR)
-+SUBDIRS = $(SUBDIRS_INST)
-+.endif
- 
- all::
-@@ -699,5 +703,5 @@
- 	@for flag in ${MAKEFLAGS} ''; do \
- 	case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
--	for i in $(SUBDIRS) ;\
-+	for i in $(SUBDIRS_INST) ;\
- 	do \
- 	echo "installing" "in $(CURRENT_DIR)/$$i..."; \
-@@ -709,5 +713,5 @@
- 	@for flag in ${MAKEFLAGS} ''; do \
- 	case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
--	for i in $(SUBDIRS) ;\
-+	for i in $(SUBDIRS_INST) ;\
- 	do \
- 	echo "installing man pages" "in $(CURRENT_DIR)/$$i..."; \
-@@ -719,5 +723,5 @@
- 	@for flag in ${MAKEFLAGS} ''; do \
- 	case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
--	for i in $(SUBDIRS) ;\
-+	for i in $(SUBDIRS_INST) ;\
- 	do \
- 	echo "installing link kit" "in $(CURRENT_DIR)/$$i..."; \
diff --git a/misc/freewnn-common/patches/patch-ab b/misc/freewnn-common/patches/patch-ab
deleted file mode 100644
index 7f1de7cd432..00000000000
--- a/misc/freewnn-common/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
-
---- ./cWnn/Makefile.in.orig	Tue Mar 23 21:13:41 1999
-+++ ./cWnn/Makefile.in	Thu Sep  2 19:26:52 1999
-@@ -621,6 +621,4 @@
- # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--WNNOWNER = wnn
--
- JSERVERDIR = jserver
- 
-@@ -641,5 +639,9 @@
- WNNMANDIR = man
- 
--SUBDIRS = $(JLIBDIR) $(CDDIR) $(JSERVERDIR) $(WNNCLIENTSDIR) 	$(WNNJUTILDIR) $(CDICDIR) $(TDICDIR) $(WNNMANDIR) $(TDDIR)
-+.if (${WNN_TARGET} == "SERVER")
-+SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(CDICDIR) $(TDICDIR) $(WNNMANDIR)
-+.else
-+SUBDIRS = $(JLIBDIR) $(CDDIR) $(WNNCLIENTSDIR) $(TDDIR)
-+.endif
- 
- all::
diff --git a/misc/freewnn-common/patches/patch-ac b/misc/freewnn-common/patches/patch-ac
deleted file mode 100644
index d31e22c6a95..00000000000
--- a/misc/freewnn-common/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
-
---- ./kWnn/Makefile.in.orig	Tue Mar 23 21:14:47 1999
-+++ ./kWnn/Makefile.in	Thu Sep  2 19:29:22 1999
-@@ -621,6 +621,4 @@
- # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--WNNOWNER = wnn
--
- JSERVERDIR = jserver
- 
-@@ -635,5 +633,9 @@
- KDDIR = include kd
- 
--SUBDIRS = $(KDDIR) etc $(JLIBDIR) $(JSERVERDIR) $(WNNCLIENTSDIR) 	$(WNNJUTILDIR) $(KDICDIR) $(WNNMANDIR)
-+.if (${WNN_TARGET} == "SERVER")
-+SUBDIRS = etc $(JSERVERDIR) $(WNNJUTILDIR) $(KDICDIR) $(WNNMANDIR)
-+.else
-+SUBDIRS = $(KDDIR) $(JLIBDIR) $(WNNCLIENTSDIR)
-+.endif
- 
- all::
diff --git a/misc/freewnn-common/patches/patch-ad b/misc/freewnn-common/patches/patch-ad
deleted file mode 100644
index 1b442bc68b7..00000000000
--- a/misc/freewnn-common/patches/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
-
---- ./configure.in.orig	Tue Apr  6 12:12:19 1999
-+++ ./configure.in	Thu Sep  2 14:57:48 1999
-@@ -55,5 +55,5 @@
-     fi
-     ;;
--"FreeBSD")
-+"FreeBSD" | "NetBSD" | "OpenBSD")
-     CCOPTIONS="-DCSRG_BASED"
-     CDEBUGFLAGS="-O2 -fno-strength-reduce"
diff --git a/misc/freewnn-common/patches/patch-ae b/misc/freewnn-common/patches/patch-ae
deleted file mode 100644
index f396319323f..00000000000
--- a/misc/freewnn-common/patches/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
-
---- ./configure.orig	Tue Apr  6 12:12:18 1999
-+++ ./configure	Thu Sep  2 14:57:48 1999
-@@ -705,5 +705,5 @@
-     fi
-     ;;
--"FreeBSD")
-+"FreeBSD" | "NetBSD" | "OpenBSD")
-     CCOPTIONS="-DCSRG_BASED"
-     CDEBUGFLAGS="-O2 -fno-strength-reduce"
diff --git a/misc/freewnn-common/patches/patch-af b/misc/freewnn-common/patches/patch-af
deleted file mode 100644
index d47e64df0fc..00000000000
--- a/misc/freewnn-common/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
-
---- ./Makefile.in.orig	Tue Mar 23 21:10:39 1999
-+++ ./Makefile.in	Thu Sep  2 14:57:48 1999
-@@ -611,10 +611,4 @@
- # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--WNNDIR = Wnn
--
--CWNNDIR = cWnn
--
--KWNNDIR = kWnn
--
- SUBDIRS= $(WNNDIR) $(CWNNDIR) $(KWNNDIR)
- 
diff --git a/misc/freewnn-common/patches/patch-ag b/misc/freewnn-common/patches/patch-ag
deleted file mode 100644
index 3cc2b39b32f..00000000000
--- a/misc/freewnn-common/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/09/22 10:43:23 sakamoto Exp $
-
---- Wnn/jlib/js.c.orig	Mon May 17 12:04:45 1999
-+++ Wnn/jlib/js.c	Wed Sep 22 18:37:26 1999
-@@ -221,9 +221,9 @@
- 	return -1;
-     }
--#if !(defined(BSD) && (BSD >= 199306)) /* !4.4BSD-Lite */
--    if (connect(sd,(struct sockaddr *)&saddr,strlen(saddr.sun_path)+sizeof(saddr.sun_family)) == ERROR) {
--#else /* 4.4BSD-Lite */
-+
-+#if !defined(SUN_LEN)
-+# define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
-+#endif
-     if (connect(sd,(struct sockaddr *)&saddr,SUN_LEN(&saddr)) == ERROR) {
--#endif /* 4.4BSD-Lite */
- 
- #if DEBUG
-- 
cgit v1.2.3