Move contents of misc/freewnn-common to japanese/freewnn-lib.

13 files changed, 16 insertions, 24 deletions

diff --git a/japanese/freewnn-lib/Makefile b/japanese/freewnn-lib/Makefile
index 3ffeac4c8a6..b1141853517 100644
--- a/japanese/freewnn-lib/Makefile
+++ b/japanese/freewnn-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/02/28 13:25:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/28 17:45:44 wiz Exp $
 #
 
 PKGNAME=	ja-FreeWnn-lib-1.10
@@ -10,7 +10,4 @@ WNNDIR=		Wnn
 WNN_TARGET=	LIBRARY
 WNN_LANG=	ja_JP
 
-FILESDIR=	${.CURDIR}/../../misc/freewnn-common/files
-PATCHDIR=	${.CURDIR}/../../misc/freewnn-common/patches
-
-.include "../../misc/freewnn-common/Makefile"
+.include "Makefile.common"
diff --git a/misc/freewnn-common/Makefile b/japanese/freewnn-lib/Makefile.common
index 2f472458b5c..b86fe884b59 100644
--- a/misc/freewnn-common/Makefile
+++ b/japanese/freewnn-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/06/25 18:39:19 wiz Exp $
+# $NetBSD: Makefile.common,v 1.1 2002/02/28 17:45:44 wiz Exp $
 #
 
 DISTNAME=	FreeWnn-1.10
@@ -8,10 +8,6 @@ MASTER_SITES=	ftp://ftp.freewnn.org/pub/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-*
diff --git a/misc/freewnn-common/files/INSTALL b/japanese/freewnn-lib/files/INSTALL
index 5b0b37e7686..5b0b37e7686 100644
--- a/misc/freewnn-common/files/INSTALL
+++ b/japanese/freewnn-lib/files/INSTALL
diff --git a/misc/freewnn-common/files/ja_freewnn b/japanese/freewnn-lib/files/ja_freewnn
index e6d26ad150a..53d75e7b55d 100644
--- a/misc/freewnn-common/files/ja_freewnn
+++ b/japanese/freewnn-lib/files/ja_freewnn
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ja_freewnn,v 1.1 2001/06/25 18:39:19 wiz Exp $
+# $NetBSD: ja_freewnn,v 1.1 2002/02/28 17:45:45 wiz Exp $
 #
 # PROVIDE: freewnn
 # REQUIRE: DAEMON
diff --git a/misc/freewnn-common/patches/patch-aa b/japanese/freewnn-lib/patches/patch-aa
index b846576cad6..7e052c5b763 100644
--- a/misc/freewnn-common/patches/patch-aa
+++ b/japanese/freewnn-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
+$NetBSD: patch-aa,v 1.1 2002/02/28 17:45:45 wiz Exp $
 
 --- ./Wnn/Makefile.in.orig	Tue Mar 23 21:10:52 1999
 +++ ./Wnn/Makefile.in	Thu Sep  2 19:21:52 1999
diff --git a/misc/freewnn-common/patches/patch-ab b/japanese/freewnn-lib/patches/patch-ab
index 7f1de7cd432..d6bd4a2439e 100644
--- a/misc/freewnn-common/patches/patch-ab
+++ b/japanese/freewnn-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
+$NetBSD: patch-ab,v 1.1 2002/02/28 17:45:45 wiz Exp $
 
 --- ./cWnn/Makefile.in.orig	Tue Mar 23 21:13:41 1999
 +++ ./cWnn/Makefile.in	Thu Sep  2 19:26:52 1999
diff --git a/misc/freewnn-common/patches/patch-ac b/japanese/freewnn-lib/patches/patch-ac
index d31e22c6a95..a2b3faa31eb 100644
--- a/misc/freewnn-common/patches/patch-ac
+++ b/japanese/freewnn-lib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
+$NetBSD: patch-ac,v 1.1 2002/02/28 17:45:45 wiz Exp $
 
 --- ./kWnn/Makefile.in.orig	Tue Mar 23 21:14:47 1999
 +++ ./kWnn/Makefile.in	Thu Sep  2 19:29:22 1999
diff --git a/misc/freewnn-common/patches/patch-ad b/japanese/freewnn-lib/patches/patch-ad
index 1b442bc68b7..908cf739138 100644
--- a/misc/freewnn-common/patches/patch-ad
+++ b/japanese/freewnn-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
+$NetBSD: patch-ad,v 1.1 2002/02/28 17:45:45 wiz Exp $
 
 --- ./configure.in.orig	Tue Apr  6 12:12:19 1999
 +++ ./configure.in	Thu Sep  2 14:57:48 1999
diff --git a/misc/freewnn-common/patches/patch-ae b/japanese/freewnn-lib/patches/patch-ae
index f396319323f..52d74f87220 100644
--- a/misc/freewnn-common/patches/patch-ae
+++ b/japanese/freewnn-lib/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
+$NetBSD: patch-ae,v 1.1 2002/02/28 17:45:45 wiz Exp $
 
 --- ./configure.orig	Tue Apr  6 12:12:18 1999
 +++ ./configure	Thu Sep  2 14:57:48 1999
diff --git a/misc/freewnn-common/patches/patch-af b/japanese/freewnn-lib/patches/patch-af
index d47e64df0fc..2ce860bd8b6 100644
--- a/misc/freewnn-common/patches/patch-af
+++ b/japanese/freewnn-lib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
+$NetBSD: patch-af,v 1.1 2002/02/28 17:45:45 wiz Exp $
 
 --- ./Makefile.in.orig	Tue Mar 23 21:10:39 1999
 +++ ./Makefile.in	Thu Sep  2 14:57:48 1999
diff --git a/misc/freewnn-common/patches/patch-ag b/japanese/freewnn-lib/patches/patch-ag
index 3cc2b39b32f..d0b68750404 100644
--- a/misc/freewnn-common/patches/patch-ag
+++ b/japanese/freewnn-lib/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 1999/09/22 10:43:23 sakamoto Exp $
+$NetBSD: patch-ag,v 1.1 2002/02/28 17:45:45 wiz Exp $
 
 --- Wnn/jlib/js.c.orig	Mon May 17 12:04:45 1999
 +++ Wnn/jlib/js.c	Wed Sep 22 18:37:26 1999
diff --git a/japanese/freewnn-server/Makefile b/japanese/freewnn-server/Makefile
index a726ab7ddbf..9174fd2ad5d 100644
--- a/japanese/freewnn-server/Makefile
+++ b/japanese/freewnn-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/02/28 13:22:50 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/02/28 17:45:45 wiz Exp $
 #
 
 PKGNAME=	ja-FreeWnn-server-1.10
@@ -11,7 +11,7 @@ WNNDIR=		Wnn
 WNN_TARGET=	SERVER
 WNN_LANG=	ja_JP
 
-FILESDIR=	${.CURDIR}/../../misc/freewnn-common/files
-PATCHDIR=	${.CURDIR}/../../misc/freewnn-common/patches
+FILESDIR=	${.CURDIR}/../../japanese/freewnn-lib/files
+PATCHDIR=	${.CURDIR}/../../japanese/freewnn-lib/patches
 
-.include "../../misc/freewnn-common/Makefile"
+.include "../../japanese/freewnn-lib/Makefile.common"
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