6 files changed, 44 insertions, 52 deletions

diff --git a/korean/FreeWnn-lib/Makefile b/korean/FreeWnn-lib/Makefile
index c3e1b8e938fc..221fde852a6f 100644
--- a/korean/FreeWnn-lib/Makefile
+++ b/korean/FreeWnn-lib/Makefile
@@ -1,32 +1,17 @@
-# New ports collection makefile for:	Wnn
+# New ports collection makefile for:	Wnn for Korea
 # Version required:	4.2
-# Date created:		22 November 1994
-# Whom:			asami
+# Date created:		20 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/04/16 05:00:06 asami Exp $
+# $Id: Makefile,v 1.3 1997/06/19 11:26:08 asami Exp $
 #
 
-DISTNAME=	Wnn4.2
 PKGNAME=	kr-Wnn-4.2
 CATEGORIES=	korean
-MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/
 
-MAINTAINER=	ports@FreeBSD.ORG
+## COMMENT, DESCR, PLIST is used in a local 'pkg' directory
+COMMENT=	${.CURDIR}/pkg/COMMENT
+DESCR=		${.CURDIR}/pkg/DESCR
+PLIST=		${.CURDIR}/pkg/PLIST
 
-WRKSRC=		${WRKDIR}/Xsi
-IS_INTERACTIVE=	yes	# needs "wnn" user
-
-post-extract:
-	/bin/ln -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
-
-# These are necesary because this package uses a different Makefile for
-#  building and installing etc.
-do-build:
-	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
-
-post-install:
-# This package uses imake's "install.man" target to install man pages but
-#  I can't define USE_IMAKE because it doesn't involve xmkmf
-	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
-
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../japanese/Wnn/Makefile"
diff --git a/korean/FreeWnn-lib/pkg-descr b/korean/FreeWnn-lib/pkg-descr
index 55f7ea71c328..24be64c26fc8 100644
--- a/korean/FreeWnn-lib/pkg-descr
+++ b/korean/FreeWnn-lib/pkg-descr
@@ -20,3 +20,12 @@ If there are any problem in this patches, please know me via E-mail.
 
 Hidekazu Kuroki
 (hidekazu@cs.titech.ac.jp)
+
+-------------------------------------------------------------------
+
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for Wnn4.2.
+Patches for those are in 'Wnn4.2.patch.tar.gz' and are applied in this
+port.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/korean/FreeWnn-lib/pkg-plist b/korean/FreeWnn-lib/pkg-plist
index e4b6c782faa9..5bbe35e67a0b 100644
--- a/korean/FreeWnn-lib/pkg-plist
+++ b/korean/FreeWnn-lib/pkg-plist
@@ -1,4 +1,5 @@
-@cwd /usr/local
+@cwd %%LOCALBASE%%
+etc/rc.d/kWnn.sh
 lib/wnn/cvt_key_empty
 lib/wnn/cvt_key_tbl
 lib/wnn/cvt_key_tbl.ST
@@ -30,6 +31,7 @@ lib/wnn/ko_KR/wnnstat.msg
 lib/wnn/serverdefs
 @dirrm lib/wnn/ko_KR/rk
 @dirrm lib/wnn/ko_KR/dic/sys
+@dirrm lib/wnn/ko_KR/dic/usr
 @dirrm lib/wnn/ko_KR/dic
 @dirrm lib/wnn/ko_KR
 @dirrm lib/wnn
@@ -44,7 +46,7 @@ bin/kWnn4/kwnnkill
 bin/kWnn4/kwnnstat
 bin/kWnn4/kwnntouch
 @dirrm bin/kWnn4
-@cwd /usr/X11R6
+@cwd %%X11BASE%%
 lib/libkwnn.a
 include/kwnn/commonhd.h
 include/kwnn/cplib.h
diff --git a/korean/FreeWnn-server/Makefile b/korean/FreeWnn-server/Makefile
index c3e1b8e938fc..221fde852a6f 100644
--- a/korean/FreeWnn-server/Makefile
+++ b/korean/FreeWnn-server/Makefile
@@ -1,32 +1,17 @@
-# New ports collection makefile for:	Wnn
+# New ports collection makefile for:	Wnn for Korea
 # Version required:	4.2
-# Date created:		22 November 1994
-# Whom:			asami
+# Date created:		20 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/04/16 05:00:06 asami Exp $
+# $Id: Makefile,v 1.3 1997/06/19 11:26:08 asami Exp $
 #
 
-DISTNAME=	Wnn4.2
 PKGNAME=	kr-Wnn-4.2
 CATEGORIES=	korean
-MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/
 
-MAINTAINER=	ports@FreeBSD.ORG
+## COMMENT, DESCR, PLIST is used in a local 'pkg' directory
+COMMENT=	${.CURDIR}/pkg/COMMENT
+DESCR=		${.CURDIR}/pkg/DESCR
+PLIST=		${.CURDIR}/pkg/PLIST
 
-WRKSRC=		${WRKDIR}/Xsi
-IS_INTERACTIVE=	yes	# needs "wnn" user
-
-post-extract:
-	/bin/ln -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
-
-# These are necesary because this package uses a different Makefile for
-#  building and installing etc.
-do-build:
-	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
-
-post-install:
-# This package uses imake's "install.man" target to install man pages but
-#  I can't define USE_IMAKE because it doesn't involve xmkmf
-	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
-
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../japanese/Wnn/Makefile"
diff --git a/korean/FreeWnn-server/pkg-descr b/korean/FreeWnn-server/pkg-descr
index 55f7ea71c328..24be64c26fc8 100644
--- a/korean/FreeWnn-server/pkg-descr
+++ b/korean/FreeWnn-server/pkg-descr
@@ -20,3 +20,12 @@ If there are any problem in this patches, please know me via E-mail.
 
 Hidekazu Kuroki
 (hidekazu@cs.titech.ac.jp)
+
+-------------------------------------------------------------------
+
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for Wnn4.2.
+Patches for those are in 'Wnn4.2.patch.tar.gz' and are applied in this
+port.
+
+-- S. Taoka
+<taoka@infonets.hiroshima-u.ac.jp>
diff --git a/korean/FreeWnn-server/pkg-plist b/korean/FreeWnn-server/pkg-plist
index e4b6c782faa9..5bbe35e67a0b 100644
--- a/korean/FreeWnn-server/pkg-plist
+++ b/korean/FreeWnn-server/pkg-plist
@@ -1,4 +1,5 @@
-@cwd /usr/local
+@cwd %%LOCALBASE%%
+etc/rc.d/kWnn.sh
 lib/wnn/cvt_key_empty
 lib/wnn/cvt_key_tbl
 lib/wnn/cvt_key_tbl.ST
@@ -30,6 +31,7 @@ lib/wnn/ko_KR/wnnstat.msg
 lib/wnn/serverdefs
 @dirrm lib/wnn/ko_KR/rk
 @dirrm lib/wnn/ko_KR/dic/sys
+@dirrm lib/wnn/ko_KR/dic/usr
 @dirrm lib/wnn/ko_KR/dic
 @dirrm lib/wnn/ko_KR
 @dirrm lib/wnn
@@ -44,7 +46,7 @@ bin/kWnn4/kwnnkill
 bin/kWnn4/kwnnstat
 bin/kWnn4/kwnntouch
 @dirrm bin/kWnn4
-@cwd /usr/X11R6
+@cwd %%X11BASE%%
 lib/libkwnn.a
 include/kwnn/commonhd.h
 include/kwnn/cplib.h