8 files changed, 33 insertions, 17 deletions

diff --git a/japanese/onew-freewnn/Makefile b/japanese/onew-freewnn/Makefile
index e12d80183ca7..0a854f5c97a2 100644
--- a/japanese/onew-freewnn/Makefile
+++ b/japanese/onew-freewnn/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	ONEW for Wnn4
+# New ports collection makefile for:	ONEW for FreeWnn
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
@@ -19,9 +19,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 # A value 'all' must not be set to TARGET.
 ALL_TARGET=	
 
-.if !defined(CANNA) && !defined(WNN4) && !defined(WNN6)
+.if !defined(CANNA) && !defined(FREEWNN) && !defined(WNN6)
 # For this port
-WNN4=		yes
+FREEWNN=	yes
 .endif
 # Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS,
 # LIB_DEPENDS, etc.
@@ -30,14 +30,14 @@ INPUT_METHOD+=	canna
 LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
 JPLIB+=		-lcanna
 .endif
-.if defined(WNN4)
-INPUT_METHOD+=	wnn4
-BUILD_DEPENDS+=	${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn
+.if defined(FREEWNN)
+INPUT_METHOD+=	freewnn
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib
 JPLIB+=		-ljd -lcrypt
 JPDEF+=		-DWNN_ISDIR
 .elif defined(WNN6)
 INPUT_METHOD+=	wnn6
-BUILD_DEPENDS+=	${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib
 JPLIB+=		-ljd -lcrypt
 JPDEF+=		-DWNN_ISDIR
 .endif
diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+freewnn b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+freewnn
new file mode 100644
index 000000000000..e26feda99694
--- /dev/null
+++ b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+freewnn
@@ -0,0 +1,10 @@
+WNNINC		= -I%LOCALBASE%/include/wnn
+WNNLIB		= -L%LOCALBASE%/lib -ljd
+WNN_RKPATH      = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"'
+CANNAINC	= -I%LOCALBASE%/include
+CANNAOBJ	= Canna.o CannaRk.o
+CANNALIB	= -L%LOCALBASE%/lib -lcanna
+CANNA_RKPATH	= '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"'
+RKKLIBS		= $(CANNALIB) $(WNNLIB)
+RKKOBJS		= $(CANNAOBJ) $(WNNOBJ)
+MISCLIB		= -lcrypt
diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn6 b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn6
index 0cbb7a50735a..60ee73815e87 100644
--- a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn6
+++ b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn6
@@ -1,5 +1,5 @@
-WNNINC		= -I%X11BASE%/include/wnn
-WNNLIB		= -L%X11BASE%/lib -ljd
+WNNINC		= -I%LOCALBASE%/include/wnn
+WNNLIB		= -L%LOCALBASE%/lib -ljd
 WNN_RKPATH      = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"'
 WNN_DICLIST	= '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"'
 WNN_DICDIRS	= '"iwanami/%s.dic;usr/$$USER/%s.h"'
diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-freewnn b/japanese/onew-freewnn/files/ONEW_CONF-for-freewnn
new file mode 100644
index 000000000000..ee9b45cb37a2
--- /dev/null
+++ b/japanese/onew-freewnn/files/ONEW_CONF-for-freewnn
@@ -0,0 +1,6 @@
+WNNINC		= -I%LOCALBASE%/include/wnn
+WNNLIB		= -L%LOCALBASE%/lib -ljd
+WNN_RKPATH      = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"'
+RKKLIBS		= $(WNNLIB)
+RKKOBJS		= $(WNNOBJ)
+MISCLIB		= -lcrypt
diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-wnn6 b/japanese/onew-freewnn/files/ONEW_CONF-for-wnn6
index c335244a06bd..0d02ec1c4d9a 100644
--- a/japanese/onew-freewnn/files/ONEW_CONF-for-wnn6
+++ b/japanese/onew-freewnn/files/ONEW_CONF-for-wnn6
@@ -1,5 +1,5 @@
-WNNINC		= -I%X11BASE%/include/wnn
-WNNLIB		= -L%X11BASE%/lib -ljd
+WNNINC		= -I%LOCALBASE%/include/wnn
+WNNLIB		= -L%LOCALBASE%/lib -ljd
 WNN_RKPATH      = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"'
 WNN_DICLIST	= '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"'
 WNN_DICDIRS	= '"iwanami/%s.dic;usr/$$USER/%s.h"'
diff --git a/japanese/onew-freewnn/pkg-comment b/japanese/onew-freewnn/pkg-comment
index 6228d350bc5b..fde919fb212d 100644
--- a/japanese/onew-freewnn/pkg-comment
+++ b/japanese/onew-freewnn/pkg-comment
@@ -1 +1 @@
-A library for Japanese Input Method Wnn4
+A library for Japanese Input Method FreeWnn
diff --git a/japanese/onew-freewnn/pkg-descr b/japanese/onew-freewnn/pkg-descr
index a4cf8e5bacdb..ddd5d708242e 100644
--- a/japanese/onew-freewnn/pkg-descr
+++ b/japanese/onew-freewnn/pkg-descr
@@ -1,7 +1,7 @@
-ONEW is a library for using Japanese Input Method Canna, Wnn4, or
+ONEW is a library for using Japanese Input Method Canna, FreeWnn, or
 Wnn6.
 
-This is for Wnn4.
+This is for FreeWnn.
 
 -- S. Taoka
 <taoka@FreeBSD.org>
diff --git a/japanese/onew-freewnn/pkg-plist b/japanese/onew-freewnn/pkg-plist
index d82a3936d3db..230a020307f7 100644
--- a/japanese/onew-freewnn/pkg-plist
+++ b/japanese/onew-freewnn/pkg-plist
@@ -1,3 +1,3 @@
-lib/libonew-wnn4.a
-share/doc/ja-onew-wnn4/README.ONEW
-@dirrm share/doc/ja-onew-wnn4
+lib/libonew-freewnn.a
+share/doc/ja-onew-freewnn/README.ONEW
+@dirrm share/doc/ja-onew-freewnn