16 files changed, 120 insertions, 72 deletions

diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile
index dc6f898b3c62..062b710eaa1c 100644
--- a/japanese/Wnn6-lib/Makefile
+++ b/japanese/Wnn6-lib/Makefile
@@ -1,30 +1,39 @@
 # New ports collection makefile for:	head files and libraries of Wnn6
-# Version required:	97.6.6
+# Version required:	99.10.28
 # Date created:		11 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.19 1997/09/19 09:30:10 asami Exp $
+# $Id: Makefile,v 1.20 1998/06/27 05:18:58 asami Exp $
 #
 
-DISTNAME=	FreeBSD-2.2R
-PKGNAME=	ja-Wnn6-lib-97.6.6
+DISTNAME=	Wnn6-SDK-sources
+PKGNAME=	ja-Wnn6-lib-98.10.28
 CATEGORIES=	japanese
-MASTER_SITES=	file://localhost${PREFIX}/OMRONWnn6/wnnsdk/sdk/ \
-		ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk/
+MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk_source/
 
 MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
-WRKSRC=		${WRKDIR}
-DIST_SUBDIR=	Wnn6-lib
-DOCDIR=		${PREFIX}/share/doc/Wnn6-lib
+BUILD_DEPENDS=	imake:${PORTSDIR}/x11/XFree86
 
-NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/src/contrib/im/Xsi
+DOCDIR=		${PREFIX}/share/doc/ja-Wnn6-lib
 
-do-install:
+# Warning: we cannot use USE_IMAKE.
+do-build:
+	( cd $(WRKSRC) ; make World -f Makefile.ini )
+
+.include <bsd.port.pre.mk>
+
+post-install:
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libwnn6.so.1.0 ${PREFIX}/lib/libwnn6.so
+.endif
+	${LN} -sf libwnn6_fromsrc.a ${PREFIX}/lib/libwnn.a
+	${LN} -sf libwnn6_fromsrc.a ${PREFIX}/lib/libwnn6.a
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	@${MKDIR} ${PREFIX}/include/wnn
-	@${INSTALL_DATA} ${WRKSRC}/include/wnn/* ${PREFIX}/include/wnn
-	@${INSTALL_DATA} ${WRKSRC}/lib/libwnn.a ${PREFIX}/lib
+	@${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${PREFIX}/include/wnn
 	@${MKDIR} ${DOCDIR}
-	@${INSTALL_DATA} ${FILESDIR}/copyright.jp ${DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/Wnn6-lib/distinfo b/japanese/Wnn6-lib/distinfo
index 37cc08cb5260..931e3c42b526 100644
--- a/japanese/Wnn6-lib/distinfo
+++ b/japanese/Wnn6-lib/distinfo
@@ -1 +1 @@
-MD5 (Wnn6-lib/FreeBSD-2.2R.tar.gz) = 72c048649d0337ab4f41acfb6582b44a
+MD5 (Wnn6-SDK-sources.tar.gz) = 728364fdd1407cf9d3e87c919d5c9c99
diff --git a/japanese/Wnn6-lib/pkg-descr b/japanese/Wnn6-lib/pkg-descr
index fc5a1d43283b..be595791b3f2 100644
--- a/japanese/Wnn6-lib/pkg-descr
+++ b/japanese/Wnn6-lib/pkg-descr
@@ -1,10 +1,14 @@
-This has include files (e.g. wnn/commonhd.h) and a library file
-(libwnn.a) to build Wnn6 clients. The files are included in
+This port has include files (e.g. wnn/commonhd.h) and a library file
+(e.g. libwnn.a) to build Wnn6 clients. The files are compiled from
+sources Wnn6-SDK-sources.tar.gz which you can get in
 
-ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk/FreeBSD-2.2R.tar.gz.
+http://www.omronsoft.co.jp
 
-It is treated as a free software, so this package is, too. But a
-server of Wnn6, whose name is jserver, is not, and you must buy it
+The license of the sources is in
+
+/usr/local/share/doc/ja-Wnn6-lib/README
+
+By the way, you must buy the server of Wnn6, whose name is jserver,
 from Omron Software Co., Ltd.
 
 +------------------------------------------+
@@ -18,6 +22,5 @@ Wnn6 is one of Japanese input methods. 'Wnn6 for Linux/FreeBSD' is
 supported an only Japanese method. However, Wnn4.2 which is free is
 supported Chinese and Korean ones, too.
 
-
 - S. Taoka
 taoka@infonets.hiroshima-u.ac.jp
diff --git a/japanese/Wnn6-lib/pkg-plist b/japanese/Wnn6-lib/pkg-plist
index 5b723abd5873..7f41fb1f4bd9 100644
--- a/japanese/Wnn6-lib/pkg-plist
+++ b/japanese/Wnn6-lib/pkg-plist
@@ -1,12 +1,32 @@
 include/wnn/commonhd.h
+include/wnn/config.h
+include/wnn/copyright.h
 include/wnn/cplib.h
+include/wnn/demcom.h
+include/wnn/dslib.h
+include/wnn/fi_jdata.h
+include/wnn/hinsi_file.h
+include/wnn/jd_sock.h
+include/wnn/jdata.h
+include/wnn/jh.h
 include/wnn/jlib.h
 include/wnn/jllib.h
 include/wnn/jslib.h
 include/wnn/msg.h
+include/wnn/mt_jlib.h
+include/wnn/mt_jserver.h
 include/wnn/rk_spclval.h
+include/wnn/serverdefs.h
+include/wnn/wnn_os.h
+include/wnn/wnn_string.h
 include/wnn/wnnerror.h
 @dirrm include/wnn
+lib/libwnn6_fromsrc.a
+lib/libwnn6.a
+lib/libwnn6.so
+lib/libwnn6.so.1
 lib/libwnn.a
-share/doc/Wnn6-lib/copyright.jp
-@dirrm share/doc/Wnn6-lib
+share/doc/ja-Wnn6-lib/README
+@dirrm share/doc/ja-Wnn6-lib
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index dc6f898b3c62..062b710eaa1c 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -1,30 +1,39 @@
 # New ports collection makefile for:	head files and libraries of Wnn6
-# Version required:	97.6.6
+# Version required:	99.10.28
 # Date created:		11 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.19 1997/09/19 09:30:10 asami Exp $
+# $Id: Makefile,v 1.20 1998/06/27 05:18:58 asami Exp $
 #
 
-DISTNAME=	FreeBSD-2.2R
-PKGNAME=	ja-Wnn6-lib-97.6.6
+DISTNAME=	Wnn6-SDK-sources
+PKGNAME=	ja-Wnn6-lib-98.10.28
 CATEGORIES=	japanese
-MASTER_SITES=	file://localhost${PREFIX}/OMRONWnn6/wnnsdk/sdk/ \
-		ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk/
+MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk_source/
 
 MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
-WRKSRC=		${WRKDIR}
-DIST_SUBDIR=	Wnn6-lib
-DOCDIR=		${PREFIX}/share/doc/Wnn6-lib
+BUILD_DEPENDS=	imake:${PORTSDIR}/x11/XFree86
 
-NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/src/contrib/im/Xsi
+DOCDIR=		${PREFIX}/share/doc/ja-Wnn6-lib
 
-do-install:
+# Warning: we cannot use USE_IMAKE.
+do-build:
+	( cd $(WRKSRC) ; make World -f Makefile.ini )
+
+.include <bsd.port.pre.mk>
+
+post-install:
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libwnn6.so.1.0 ${PREFIX}/lib/libwnn6.so
+.endif
+	${LN} -sf libwnn6_fromsrc.a ${PREFIX}/lib/libwnn.a
+	${LN} -sf libwnn6_fromsrc.a ${PREFIX}/lib/libwnn6.a
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	@${MKDIR} ${PREFIX}/include/wnn
-	@${INSTALL_DATA} ${WRKSRC}/include/wnn/* ${PREFIX}/include/wnn
-	@${INSTALL_DATA} ${WRKSRC}/lib/libwnn.a ${PREFIX}/lib
+	@${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${PREFIX}/include/wnn
 	@${MKDIR} ${DOCDIR}
-	@${INSTALL_DATA} ${FILESDIR}/copyright.jp ${DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/Wnn7-lib/distinfo b/japanese/Wnn7-lib/distinfo
index 37cc08cb5260..931e3c42b526 100644
--- a/japanese/Wnn7-lib/distinfo
+++ b/japanese/Wnn7-lib/distinfo
@@ -1 +1 @@
-MD5 (Wnn6-lib/FreeBSD-2.2R.tar.gz) = 72c048649d0337ab4f41acfb6582b44a
+MD5 (Wnn6-SDK-sources.tar.gz) = 728364fdd1407cf9d3e87c919d5c9c99
diff --git a/japanese/Wnn7-lib/pkg-descr b/japanese/Wnn7-lib/pkg-descr
index fc5a1d43283b..be595791b3f2 100644
--- a/japanese/Wnn7-lib/pkg-descr
+++ b/japanese/Wnn7-lib/pkg-descr
@@ -1,10 +1,14 @@
-This has include files (e.g. wnn/commonhd.h) and a library file
-(libwnn.a) to build Wnn6 clients. The files are included in
+This port has include files (e.g. wnn/commonhd.h) and a library file
+(e.g. libwnn.a) to build Wnn6 clients. The files are compiled from
+sources Wnn6-SDK-sources.tar.gz which you can get in
 
-ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk/FreeBSD-2.2R.tar.gz.
+http://www.omronsoft.co.jp
 
-It is treated as a free software, so this package is, too. But a
-server of Wnn6, whose name is jserver, is not, and you must buy it
+The license of the sources is in
+
+/usr/local/share/doc/ja-Wnn6-lib/README
+
+By the way, you must buy the server of Wnn6, whose name is jserver,
 from Omron Software Co., Ltd.
 
 +------------------------------------------+
@@ -18,6 +22,5 @@ Wnn6 is one of Japanese input methods. 'Wnn6 for Linux/FreeBSD' is
 supported an only Japanese method. However, Wnn4.2 which is free is
 supported Chinese and Korean ones, too.
 
-
 - S. Taoka
 taoka@infonets.hiroshima-u.ac.jp
diff --git a/japanese/Wnn7-lib/pkg-plist b/japanese/Wnn7-lib/pkg-plist
index 5b723abd5873..7f41fb1f4bd9 100644
--- a/japanese/Wnn7-lib/pkg-plist
+++ b/japanese/Wnn7-lib/pkg-plist
@@ -1,12 +1,32 @@
 include/wnn/commonhd.h
+include/wnn/config.h
+include/wnn/copyright.h
 include/wnn/cplib.h
+include/wnn/demcom.h
+include/wnn/dslib.h
+include/wnn/fi_jdata.h
+include/wnn/hinsi_file.h
+include/wnn/jd_sock.h
+include/wnn/jdata.h
+include/wnn/jh.h
 include/wnn/jlib.h
 include/wnn/jllib.h
 include/wnn/jslib.h
 include/wnn/msg.h
+include/wnn/mt_jlib.h
+include/wnn/mt_jserver.h
 include/wnn/rk_spclval.h
+include/wnn/serverdefs.h
+include/wnn/wnn_os.h
+include/wnn/wnn_string.h
 include/wnn/wnnerror.h
 @dirrm include/wnn
+lib/libwnn6_fromsrc.a
+lib/libwnn6.a
+lib/libwnn6.so
+lib/libwnn6.so.1
 lib/libwnn.a
-share/doc/Wnn6-lib/copyright.jp
-@dirrm share/doc/Wnn6-lib
+share/doc/ja-Wnn6-lib/README
+@dirrm share/doc/ja-Wnn6-lib
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/japanese/mule-canna+sj3+wnn6/Makefile b/japanese/mule-canna+sj3+wnn6/Makefile
index 01ba2976018c..43069bc5e13f 100644
--- a/japanese/mule-canna+sj3+wnn6/Makefile
+++ b/japanese/mule-canna+sj3+wnn6/Makefile
@@ -3,14 +3,12 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/09/14 21:35:08 max Exp $
+# $Id: Makefile,v 1.3 1998/10/07 08:11:36 asami Exp $
 #
 
 PKGNAME=	ja-mule-canna+sj3+wnn6-2.3
 CATEGORIES=	japanese editors
 
-BROKEN_ELF=	yes
-
 CANNA=		yes
 SJ3=		yes
 WNN6=		yes
diff --git a/japanese/mule-canna+sj3+wnn7/Makefile b/japanese/mule-canna+sj3+wnn7/Makefile
index 01ba2976018c..43069bc5e13f 100644
--- a/japanese/mule-canna+sj3+wnn7/Makefile
+++ b/japanese/mule-canna+sj3+wnn7/Makefile
@@ -3,14 +3,12 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/09/14 21:35:08 max Exp $
+# $Id: Makefile,v 1.3 1998/10/07 08:11:36 asami Exp $
 #
 
 PKGNAME=	ja-mule-canna+sj3+wnn6-2.3
 CATEGORIES=	japanese editors
 
-BROKEN_ELF=	yes
-
 CANNA=		yes
 SJ3=		yes
 WNN6=		yes
diff --git a/japanese/mule-canna+wnn6/Makefile b/japanese/mule-canna+wnn6/Makefile
index b1fc6bc59ca5..c91819dd3c63 100644
--- a/japanese/mule-canna+wnn6/Makefile
+++ b/japanese/mule-canna+wnn6/Makefile
@@ -3,14 +3,12 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/09/14 21:35:11 max Exp $
+# $Id: Makefile,v 1.3 1998/10/07 08:11:37 asami Exp $
 #
 
 PKGNAME=	ja-mule-canna+wnn6-2.3
 CATEGORIES=	japanese editors
 
-BROKEN_ELF=	yes
-
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/mule-canna+wnn7/Makefile b/japanese/mule-canna+wnn7/Makefile
index b1fc6bc59ca5..c91819dd3c63 100644
--- a/japanese/mule-canna+wnn7/Makefile
+++ b/japanese/mule-canna+wnn7/Makefile
@@ -3,14 +3,12 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/09/14 21:35:11 max Exp $
+# $Id: Makefile,v 1.3 1998/10/07 08:11:37 asami Exp $
 #
 
 PKGNAME=	ja-mule-canna+wnn6-2.3
 CATEGORIES=	japanese editors
 
-BROKEN_ELF=	yes
-
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/mule-sj3+wnn6/Makefile b/japanese/mule-sj3+wnn6/Makefile
index 77a09725c2b6..18b82e381fea 100644
--- a/japanese/mule-sj3+wnn6/Makefile
+++ b/japanese/mule-sj3+wnn6/Makefile
@@ -3,14 +3,12 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/09/14 21:35:16 max Exp $
+# $Id: Makefile,v 1.3 1998/10/07 08:11:40 asami Exp $
 #
 
 PKGNAME=	ja-mule-sj3+wnn6-2.3
 CATEGORIES=	japanese editors
 
-BROKEN_ELF=	yes
-
 SJ3=		yes
 WNN6=		yes
 
diff --git a/japanese/mule-sj3+wnn7/Makefile b/japanese/mule-sj3+wnn7/Makefile
index 77a09725c2b6..18b82e381fea 100644
--- a/japanese/mule-sj3+wnn7/Makefile
+++ b/japanese/mule-sj3+wnn7/Makefile
@@ -3,14 +3,12 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/09/14 21:35:16 max Exp $
+# $Id: Makefile,v 1.3 1998/10/07 08:11:40 asami Exp $
 #
 
 PKGNAME=	ja-mule-sj3+wnn6-2.3
 CATEGORIES=	japanese editors
 
-BROKEN_ELF=	yes
-
 SJ3=		yes
 WNN6=		yes
 
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index 247926737ba2..aed63584507d 100644
--- a/japanese/mule-wnn6/Makefile
+++ b/japanese/mule-wnn6/Makefile
@@ -3,14 +3,12 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.31 1997/09/14 21:35:20 max Exp $
+# $Id: Makefile,v 1.32 1998/10/07 08:11:41 asami Exp $
 #
 
 PKGNAME=	ja-mule-wnn6-2.3
 CATEGORIES=	japanese editors
 
-BROKEN_ELF=	yes
-
 WNN6=		yes
 
 .include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index 247926737ba2..aed63584507d 100644
--- a/japanese/mule-wnn7/Makefile
+++ b/japanese/mule-wnn7/Makefile
@@ -3,14 +3,12 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.31 1997/09/14 21:35:20 max Exp $
+# $Id: Makefile,v 1.32 1998/10/07 08:11:41 asami Exp $
 #
 
 PKGNAME=	ja-mule-wnn6-2.3
 CATEGORIES=	japanese editors
 
-BROKEN_ELF=	yes
-
 WNN6=		yes
 
 .include "${.CURDIR}/../../editors/mule/Makefile"