- STAGEDIR support

- Eliminate duplicate files installed by each */FreeWnn-lib.
- Bump PORTREVISION because of dependency and pkg-plist changes.

14 files changed, 222 insertions, 195 deletions

diff --git a/chinese/FreeWnn-lib/Makefile b/chinese/FreeWnn-lib/Makefile
index ffe2b7c3f9d3..409bdd1e6c11 100644
--- a/chinese/FreeWnn-lib/Makefile
+++ b/chinese/FreeWnn-lib/Makefile
@@ -9,7 +9,6 @@ COMMENT=	A Japanese/Chinese/Korean input method (Chinese client libraries)
 MASTERDIR=	${.CURDIR}/../../japanese/FreeWnn-lib
 PKGDIR=		${.CURDIR}
 
-WNNTYPE=	CWNN
+OPTIONS_DEFAULT=CWNN LIB
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/FreeWnn-lib/pkg-plist b/chinese/FreeWnn-lib/pkg-plist
index 6050e005bd43..36c7a02be84d 100644
--- a/chinese/FreeWnn-lib/pkg-plist
+++ b/chinese/FreeWnn-lib/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 include/cwnn/commonhd.h
 include/cwnn/cplib.h
 include/cwnn/jllib.h
@@ -6,14 +7,6 @@ include/cwnn/msg.h
 include/cwnn/rk_spclval.h
 include/cwnn/wnnerror.h
 @dirrm include/cwnn
-lib/wnn/cvt_key_empty
-lib/wnn/cvt_key_tbl
-lib/wnn/cvt_key_tbl.ST
-lib/wnn/cvt_key_tbl.gm
-lib/wnn/cvt_key_tbl.kt
-lib/wnn/cvt_key_tbl.mv
-lib/wnn/cvt_key_tbl.vt
-lib/wnn/serverdefs
 lib/wnn/zh_CN/cixing.data
 lib/wnn/zh_CN/cserverrc
 lib/wnn/zh_CN/libwnn.msg
@@ -107,6 +100,7 @@ lib/libcwnn.a
 lib/libcwnn.la
 lib/libcwnn.so
 lib/libcwnn.so.0
+lib/libcwnn.so.0.0.0
 @dirrm lib/wnn/zh_TW/rk_z
 @dirrm lib/wnn/zh_TW/rk_p
 @dirrm lib/wnn/zh_TW/rk
@@ -115,4 +109,3 @@ lib/libcwnn.so.0
 @dirrm lib/wnn/zh_CN/rk_p
 @dirrm lib/wnn/zh_CN/rk
 @dirrm lib/wnn/zh_CN
-@dirrmtry lib/wnn
diff --git a/chinese/FreeWnn-server/Makefile b/chinese/FreeWnn-server/Makefile
index 024d4fcb55f8..57751962860d 100644
--- a/chinese/FreeWnn-server/Makefile
+++ b/chinese/FreeWnn-server/Makefile
@@ -9,7 +9,6 @@ COMMENT=	A Japanese/Chinese/Korean input method (Chinese server)
 MASTERDIR=	${.CURDIR}/../../japanese/FreeWnn-server
 PKGDIR=		${.CURDIR}
 
-WNNTYPE=	CWNN
+OPTIONS_DEFAULT=CWNN SERVER
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/FreeWnn-server/pkg-plist b/chinese/FreeWnn-server/pkg-plist
index 65af404c7e39..18b2861c56a2 100644
--- a/chinese/FreeWnn-server/pkg-plist
+++ b/chinese/FreeWnn-server/pkg-plist
@@ -1,13 +1,16 @@
+@comment $FreeBSD$
 bin/cWnn4/catod
 bin/cWnn4/catof
 bin/cWnn4/cdtoa
+@owner wnn
 bin/cWnn4/cserver
+bin/cWnn4/tserver
+@owner root
 bin/cWnn4/cwddel
 bin/cWnn4/cwdreg
 bin/cWnn4/cwnnkill
 bin/cWnn4/cwnnstat
 bin/cWnn4/cwnntouch
-bin/cWnn4/tserver
 @dirrm bin/cWnn4
 lib/wnn/zh_CN/dic/sys/QianMa.dic
 lib/wnn/zh_CN/dic/sys/WuBi.dic
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index deb2726c47a3..3d98fae2dd86 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -15,98 +15,8 @@ DISTNAME=	${PORTNAME}-1.1.1-a021
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT?=	Japanese/Chinese/Korean input method (Japanese client libraries)
 
-GNU_CONFIGURE=	yes
-USES=		libtool
-USE_AUTOTOOLS=	aclocal autoheader autoconf libtoolize
-LIBTOOLIZE_ARGS=-i -c -f
-USE_BZIP2=	yes
-USE_LDCONFIG=	yes
-MAKE_ARGS=	MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}" \
-		LIBRARY_WNNMANDIR="3.libwnn" \
-		SERVER_WNNMANDIR=""
-ALL_TARGET=	includes all
-INSTALL_TARGET=	install install.man
-MAKE_JOBS_UNSAFE=	yes
+OPTIONS_DEFAULT?=	LIB WNN
+MANLANG?=		ja
 
-WNNTYPE?=	WNN
-CONFIGURE_ARGS=	--enable-server=no \
-		${CONFIGURE_ARGS.${WNNTYPE}}
-.if !defined(WITHOUT_INET6)
-CONFIGURE_ARGS+=--enable-ipv6
-.endif
-
-CONFIGURE_ARGS.CWNN+=	--enable-Wnn=no --enable-kWnn=no
-CONFIGURE_ARGS.KWNN+=	--enable-Wnn=no --enable-cWnn=no
-CONFIGURE_ARGS.WNN+=	--enable-cWnn=no --enable-kWnn=no
-
-MANLANG.WNN=	ja
-MAN3.WNN+= jl_bun_suu.3 jl_c_zenkouho.3 jl_close.3 jl_connect.3		\
-	jl_connect_lang.3 jl_dai_top.3 jl_dic_add.3			\
-	jl_dic_comment_set.3 jl_dic_delete.3 jl_dic_list.3		\
-	jl_dic_save.3 jl_dic_use.3 jl_disconnect.3 jl_env.3		\
-	jl_env_get.3 jl_env_sticky.3 jl_fuzokugo_get.3			\
-	jl_fuzokugo_set.3 jl_get_kanji.3 jl_get_zenkouho_kanji.3	\
-	jl_hinsi_dicts.3 jl_hinsi_list.3 jl_hinsi_name.3		\
-	jl_hinsi_number.3 jl_inspect.3 jl_isconnect.3 jl_jiri_len.3	\
-	jl_kanji_len.3 jl_kill.3 jl_next.3 jl_nobi_conv.3 jl_open.3	\
-	jl_open_lang.3 jl_param_get.3 jl_ren_conv.3 jl_set_env_wnnrc.3	\
-	jl_set_jikouho.3 jl_tan_conv.3 jl_update_hindo.3 jl_word_add.3	\
-	jl_word_comment_set.3 jl_word_delete.3 jl_word_info.3		\
-	jl_word_search.3 jl_word_use.3 jl_zenkouho.3 jl_zenkouho_bun.3	\
-	jl_zenkouho_dai.3 jl_zenkouho_daip.3 jl_zenkouho_suu.3		\
-	js_access.3 js_close.3 js_connect.3 js_dic_add.3		\
-	js_dic_delete.3 js_dic_file_create.3				\
-	js_dic_file_create_client.3 js_dic_info.3 js_dic_list.3		\
-	js_dic_list_all.3 js_dic_use.3 js_disconnect.3 js_env_exist.3	\
-	js_env_list.3 js_env_sticky.3 js_file_comment_set.3		\
-	js_file_discard.3 js_file_info.3 js_file_list.3			\
-	js_file_list_all.3 js_file_loaded.3 js_file_loaded_local.3	\
-	js_file_password_set.3 js_file_read.3 js_file_receive.3		\
-	js_file_remove.3 js_file_remove_client.3 js_file_send.3		\
-	js_file_stat.3 js_file_write.3 js_fuzokugo_get.3		\
-	js_fuzokugo_set.3 js_hindo_file_create.3			\
-	js_hindo_file_create_client.3 js_hindo_set.3 js_hinsi_dicts.3	\
-	js_hinsi_list.3 js_hinsi_name.3 js_hinsi_number.3		\
-	js_hinsi_table_set.3 js_isconnect.3 js_kanren.3			\
-	js_kantan_dai.3 js_kantan_sho.3 js_kanzen_dai.3			\
-	js_kanzen_sho.3 js_kill.3 js_mkdir.3 js_open.3 js_open_lang.3	\
-	js_param_get.3 js_set_lang.3 js_version.3 js_who.3		\
-	js_word_add.3 js_word_comment_set.3 js_word_delete.3		\
-	js_word_info.3 js_word_search.3 msg_close.3 msg_get.3		\
-	msg_open.3 romkan_clear.3 romkan_dispmode.3 romkan_getc.3	\
-	romkan_init.3 romkan_next.3 romkan_ungetc.3
-
-MLINKS.WNN= jl_dic_add.3 jl_dic_add_e.3 jl_dic_comment_set.3		\
-	jl_dic_comment_set_e.3 jl_dic_delete.3 jl_dic_delete_e.3	\
-	jl_dic_list.3 jl_dic_list_e.3 jl_dic_save.3 jl_dic_save_all.3	\
-	jl_dic_save.3 jl_dic_save_all_e.3 jl_dic_save.3			\
-	jl_dic_save_e.3 jl_dic_use.3 jl_dic_use_e.3 jl_env_get.3	\
-	jl_env_set.3 jl_env_sticky.3 jl_env_sticky_e.3 jl_env_sticky.3	\
-	jl_env_un_sticky.3 jl_env_sticky.3 jl_env_un_sticky_e.3		\
-	jl_fuzokugo_get.3 jl_fuzokugo_get_e.3 jl_fuzokugo_set.3		\
-	jl_fuzokugo_set_e.3 jl_get_kanji.3 jl_get_yomi.3		\
-	jl_hinsi_dicts.3 jl_hinsi_dicts_e.3 jl_hinsi_list.3		\
-	jl_hinsi_list_e.3 jl_hinsi_name.3 jl_hinsi_name_e.3		\
-	jl_hinsi_number.3 jl_hinsi_number_e.3 jl_isconnect.3		\
-	jl_isconnect_e.3 jl_next.3 jl_next_dai.3 jl_param_get.3		\
-	jl_param_get_e.3 jl_param_get.3 jl_param_set.3 jl_param_get.3	\
-	jl_param_set_e.3 jl_next.3 jl_previous.3 jl_next.3		\
-	jl_previous_dai.3 jl_set_jikouho.3 jl_set_jikouho_dai.3		\
-	jl_word_add.3 jl_word_add_e.3 jl_word_comment_set.3		\
-	jl_word_comment_set_e.3 jl_word_delete.3 jl_word_delete_e.3	\
-	jl_word_info.3 jl_word_info_e.3 jl_word_search.3		\
-	jl_word_search_by_env.3 jl_word_search.3			\
-	jl_word_search_by_env_e.3 jl_word_search.3 jl_word_search_e.3	\
-	jl_word_use.3 jl_word_use_e.3 jl_kanji_len.3 jl_yomi_len.3	\
-	js_env_sticky.3 js_env_un_sticky.3 js_set_lang.3 js_get_lang.3	\
-	js_param_get.3 js_param_set.3 js_word_search.3			\
-	js_word_search_by_env.3
-
-.for M in MAN3 MLINKS MANLANG
-. if defined(${M}.${WNNTYPE})
-${M}+=	${${M}.${WNNTYPE}}
-. endif
-.endfor
-
-NO_STAGE=	yes
+.include "${.CURDIR}/../../japanese/FreeWnn-lib/Makefile.common"
 .include <bsd.port.mk>
diff --git a/japanese/FreeWnn-lib/Makefile.common b/japanese/FreeWnn-lib/Makefile.common
new file mode 100644
index 000000000000..1c50f314b340
--- /dev/null
+++ b/japanese/FreeWnn-lib/Makefile.common
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+GNU_CONFIGURE=	yes
+USES=		libtool
+USE_AUTOTOOLS=	aclocal autoheader autoconf libtoolize
+LIBTOOLIZE_ARGS=-i -c -f
+USE_BZIP2=	yes
+USE_LDCONFIG=	yes
+MAKE_ARGS=	MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}" \
+		LIBRARY_WNNMANDIR="3.libwnn" \
+		SERVER_WNNMANDIR=""
+ALL_TARGET=	includes all
+INSTALL_TARGET=	install install.man
+MAKE_JOBS_UNSAFE=	yes
+
+OPTIONS_SINGLE=		TYPE LANG
+OPTIONS_SINGLE_TYPE=	SERVER LIB
+OPTIONS_SINGLE_LANG=	WNN KWNN CWNN
+OPTIONS_DEFAULT?=	SERVER WNN
+
+IPV6_CONFIGURE_ON=	--enable-ipv6
+WNN_CONFIGURE_ON=	--enable-cWnn=no --enable-kWnn=no
+CWNN_CONFIGURE_ON=	--enable-Wnn=no --enable-kWnn=no
+CWNN_LIB_DEPENDS=	libwnn.so:${PORTSDIR}/japanese/FreeWnn-lib
+KWNN_CONFIGURE_ON=	--enable-Wnn=no --enable-cWnn=no
+KWNN_LIB_DEPENDS=	libwnn.so:${PORTSDIR}/japanese/FreeWnn-lib
+SERVER_CONFIGURE_ON=	--enable-server=yes --enable-libraries=no
+LIB_CONFIGURE_ON=	--enable-server=no  --enable-libraries=yes
diff --git a/japanese/FreeWnn-lib/pkg-plist b/japanese/FreeWnn-lib/pkg-plist
index 160efcfbeee4..61a0ef1aa60d 100644
--- a/japanese/FreeWnn-lib/pkg-plist
+++ b/japanese/FreeWnn-lib/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 include/wnn/commonhd.h
 include/wnn/config.h
 include/wnn/cplib.h
@@ -88,3 +89,161 @@ lib/libwnn.so.0.0.0
 @dirrm lib/wnn/lt_LN/rk
 @dirrm lib/wnn/lt_LN
 @dirrmtry lib/wnn
+man/ja/man3/jl_bun_suu.3.gz
+man/ja/man3/jl_c_zenkouho.3.gz
+man/ja/man3/jl_close.3.gz
+man/ja/man3/jl_connect.3.gz
+man/ja/man3/jl_connect_lang.3.gz
+man/ja/man3/jl_dai_top.3.gz
+man/ja/man3/jl_dic_add.3.gz
+man/ja/man3/jl_dic_add_e.3.gz
+man/ja/man3/jl_dic_comment_set.3.gz
+man/ja/man3/jl_dic_comment_set_e.3.gz
+man/ja/man3/jl_dic_delete.3.gz
+man/ja/man3/jl_dic_delete_e.3.gz
+man/ja/man3/jl_dic_list.3.gz
+man/ja/man3/jl_dic_list_e.3.gz
+man/ja/man3/jl_dic_save.3.gz
+man/ja/man3/jl_dic_save_all.3.gz
+man/ja/man3/jl_dic_save_all_e.3.gz
+man/ja/man3/jl_dic_save_e.3.gz
+man/ja/man3/jl_dic_use.3.gz
+man/ja/man3/jl_dic_use_e.3.gz
+man/ja/man3/jl_disconnect.3.gz
+man/ja/man3/jl_env.3.gz
+man/ja/man3/jl_env_get.3.gz
+man/ja/man3/jl_env_set.3.gz
+man/ja/man3/jl_env_sticky.3.gz
+man/ja/man3/jl_env_sticky_e.3.gz
+man/ja/man3/jl_env_un_sticky.3.gz
+man/ja/man3/jl_env_un_sticky_e.3.gz
+man/ja/man3/jl_fuzokugo_get.3.gz
+man/ja/man3/jl_fuzokugo_get_e.3.gz
+man/ja/man3/jl_fuzokugo_set.3.gz
+man/ja/man3/jl_fuzokugo_set_e.3.gz
+man/ja/man3/jl_get_kanji.3.gz
+man/ja/man3/jl_get_yomi.3.gz
+man/ja/man3/jl_get_zenkouho_kanji.3.gz
+man/ja/man3/jl_hinsi_dicts.3.gz
+man/ja/man3/jl_hinsi_dicts_e.3.gz
+man/ja/man3/jl_hinsi_list.3.gz
+man/ja/man3/jl_hinsi_list_e.3.gz
+man/ja/man3/jl_hinsi_name.3.gz
+man/ja/man3/jl_hinsi_name_e.3.gz
+man/ja/man3/jl_hinsi_number.3.gz
+man/ja/man3/jl_hinsi_number_e.3.gz
+man/ja/man3/jl_inspect.3.gz
+man/ja/man3/jl_isconnect.3.gz
+man/ja/man3/jl_isconnect_e.3.gz
+man/ja/man3/jl_jiri_len.3.gz
+man/ja/man3/jl_kanji_len.3.gz
+man/ja/man3/jl_kill.3.gz
+man/ja/man3/jl_next.3.gz
+man/ja/man3/jl_next_dai.3.gz
+man/ja/man3/jl_nobi_conv.3.gz
+man/ja/man3/jl_open.3.gz
+man/ja/man3/jl_open_lang.3.gz
+man/ja/man3/jl_param_get.3.gz
+man/ja/man3/jl_param_get_e.3.gz
+man/ja/man3/jl_param_set.3.gz
+man/ja/man3/jl_param_set_e.3.gz
+man/ja/man3/jl_previous.3.gz
+man/ja/man3/jl_previous_dai.3.gz
+man/ja/man3/jl_ren_conv.3.gz
+man/ja/man3/jl_set_env_wnnrc.3.gz
+man/ja/man3/jl_set_jikouho.3.gz
+man/ja/man3/jl_set_jikouho_dai.3.gz
+man/ja/man3/jl_tan_conv.3.gz
+man/ja/man3/jl_update_hindo.3.gz
+man/ja/man3/jl_word_add.3.gz
+man/ja/man3/jl_word_add_e.3.gz
+man/ja/man3/jl_word_comment_set.3.gz
+man/ja/man3/jl_word_comment_set_e.3.gz
+man/ja/man3/jl_word_delete.3.gz
+man/ja/man3/jl_word_delete_e.3.gz
+man/ja/man3/jl_word_info.3.gz
+man/ja/man3/jl_word_info_e.3.gz
+man/ja/man3/jl_word_search.3.gz
+man/ja/man3/jl_word_search_by_env.3.gz
+man/ja/man3/jl_word_search_by_env_e.3.gz
+man/ja/man3/jl_word_search_e.3.gz
+man/ja/man3/jl_word_use.3.gz
+man/ja/man3/jl_word_use_e.3.gz
+man/ja/man3/jl_yomi_len.3.gz
+man/ja/man3/jl_zenkouho.3.gz
+man/ja/man3/jl_zenkouho_bun.3.gz
+man/ja/man3/jl_zenkouho_dai.3.gz
+man/ja/man3/jl_zenkouho_daip.3.gz
+man/ja/man3/jl_zenkouho_suu.3.gz
+man/ja/man3/js_access.3.gz
+man/ja/man3/js_close.3.gz
+man/ja/man3/js_connect.3.gz
+man/ja/man3/js_dic_add.3.gz
+man/ja/man3/js_dic_delete.3.gz
+man/ja/man3/js_dic_file_create.3.gz
+man/ja/man3/js_dic_file_create_client.3.gz
+man/ja/man3/js_dic_info.3.gz
+man/ja/man3/js_dic_list.3.gz
+man/ja/man3/js_dic_list_all.3.gz
+man/ja/man3/js_dic_use.3.gz
+man/ja/man3/js_disconnect.3.gz
+man/ja/man3/js_env_exist.3.gz
+man/ja/man3/js_env_list.3.gz
+man/ja/man3/js_env_sticky.3.gz
+man/ja/man3/js_env_un_sticky.3.gz
+man/ja/man3/js_file_comment_set.3.gz
+man/ja/man3/js_file_discard.3.gz
+man/ja/man3/js_file_info.3.gz
+man/ja/man3/js_file_list.3.gz
+man/ja/man3/js_file_list_all.3.gz
+man/ja/man3/js_file_loaded.3.gz
+man/ja/man3/js_file_loaded_local.3.gz
+man/ja/man3/js_file_password_set.3.gz
+man/ja/man3/js_file_read.3.gz
+man/ja/man3/js_file_receive.3.gz
+man/ja/man3/js_file_remove.3.gz
+man/ja/man3/js_file_remove_client.3.gz
+man/ja/man3/js_file_send.3.gz
+man/ja/man3/js_file_stat.3.gz
+man/ja/man3/js_file_write.3.gz
+man/ja/man3/js_fuzokugo_get.3.gz
+man/ja/man3/js_fuzokugo_set.3.gz
+man/ja/man3/js_get_lang.3.gz
+man/ja/man3/js_hindo_file_create.3.gz
+man/ja/man3/js_hindo_file_create_client.3.gz
+man/ja/man3/js_hindo_set.3.gz
+man/ja/man3/js_hinsi_dicts.3.gz
+man/ja/man3/js_hinsi_list.3.gz
+man/ja/man3/js_hinsi_name.3.gz
+man/ja/man3/js_hinsi_number.3.gz
+man/ja/man3/js_hinsi_table_set.3.gz
+man/ja/man3/js_isconnect.3.gz
+man/ja/man3/js_kanren.3.gz
+man/ja/man3/js_kantan_dai.3.gz
+man/ja/man3/js_kantan_sho.3.gz
+man/ja/man3/js_kanzen_dai.3.gz
+man/ja/man3/js_kanzen_sho.3.gz
+man/ja/man3/js_kill.3.gz
+man/ja/man3/js_mkdir.3.gz
+man/ja/man3/js_open.3.gz
+man/ja/man3/js_open_lang.3.gz
+man/ja/man3/js_param_get.3.gz
+man/ja/man3/js_param_set.3.gz
+man/ja/man3/js_set_lang.3.gz
+man/ja/man3/js_version.3.gz
+man/ja/man3/js_who.3.gz
+man/ja/man3/js_word_add.3.gz
+man/ja/man3/js_word_comment_set.3.gz
+man/ja/man3/js_word_delete.3.gz
+man/ja/man3/js_word_info.3.gz
+man/ja/man3/js_word_search.3.gz
+man/ja/man3/js_word_search_by_env.3.gz
+man/ja/man3/msg_close.3.gz
+man/ja/man3/msg_get.3.gz
+man/ja/man3/msg_open.3.gz
+man/ja/man3/romkan_clear.3.gz
+man/ja/man3/romkan_dispmode.3.gz
+man/ja/man3/romkan_getc.3.gz
+man/ja/man3/romkan_init.3.gz
+man/ja/man3/romkan_next.3.gz
+man/ja/man3/romkan_ungetc.3.gz
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index 35f44752f066..f31021555380 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -15,70 +15,25 @@ DISTNAME=	${PORTNAME}-1.1.1-a021
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT?=	Japanese/Chinese/Korean input method (Japanese server)
 
-GNU_CONFIGURE=	yes
-USES=		libtool
-USE_AUTOTOOLS=	aclocal autoheader autoconf libtoolize
-LIBTOOLIZE_ARGS=-i -c -f
-USE_BZIP2=	yes
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	# defined below
-MAKE_ARGS=	MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}" \
-		LIBRARY_WNNMANDIR="" \
-		SERVER_WNNMANDIR="2.env 4.cmd 6.jutil"
-ALL_TARGET=	includes all
-INSTALL_TARGET=	install install.man
-SUB_FILES=	pkg-install
-PKGINSTALL=	${WRKDIR}/pkg-install
-MAKE_JOBS_UNSAFE=	yes
-USERS=		wnn
+OPTIONS_DEFAULT?=	WNN SERVER
+MANLANG?=		ja
+USERS=			wnn
 
-WNNTYPE?=	WNN
-CONFIGURE_ARGS=	--enable-libraries=no \
-		${CONFIGURE_ARGS.${WNNTYPE}}
-.if !defined(WITHOUT_INET6)
-CONFIGURE_ARGS+=--enable-ipv6
-.endif
+.include "${.CURDIR}/../../japanese/FreeWnn-lib/Makefile.common"
 
-# Wnn
-LIB_DEPENDS.WNN=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
-CONFIGURE_ARGS.WNN= 	--enable-cWnn=no --enable-kWnn=no \
-			--with-libwnn=-lwnn \
+WNN_LIB_DEPENDS+=	libwnn.so:${PORTSDIR}/japanese/FreeWnn-lib
+WNN_CONFIGURE_ON+=	--with-libwnn=-lwnn \
 			--with-wnn-libraries="${PREFIX}/lib"
-MAN1.WNN=	atod.1 atof.1 dtoa.1 jserver.1 oldatonewa.1 uum.1 wddel.1 \
-		wdreg.1 wnnkill.1 wnnstat.1 wnntouch.1
-MAN4.WNN=	2a_ctrl.4 2b_romkana.4 cvt_key_tbl.4 fzk.data.4 fzk.u.4	\
-		hinsi_data.4 jserverrc.4 mode.4 serverdefs.4 ujis_dic.4	\
-		uumkey.4 uumrc.4 wnnenvrc.4
-MAN5.WNN=	pubdic.5 usr_dic.5
-MANLANG.WNN=	ja
-USE_RC_SUBR.WNN=	wnn
+WNN_USE=	RC_SUBR=wnn
 
-# CWnn
-CONFIGURE_ARGS.CWNN+=	--enable-Wnn=no --enable-kWnn=no		\
-			--with-libcwnn=-lcwnn \
+CWNN_LIB_DEPENDS+=	libcwnn.so:${PORTSDIR}/chinese/FreeWnn-lib
+CWNN_CONFIGURE_ON+=	--with-libcwnn=-lcwnn \
 			--with-cwnn-libraries="${PREFIX}/lib"
-LIB_DEPENDS.CWNN=	cwnn.0:${PORTSDIR}/chinese/FreeWnn-lib
-MAN1.CWNN=	cserver.1 cuum.1 cwnnkill.1 cwnnstat.1 catod.1 catof.1	\
-		cdicsort.1 cdtoa.1 cwddel.1 cwdreg.1 cwnntouch.1
-MAN4.CWNN=	cst_end.4 cwnn.4 cenv.4 ckey.4
-USE_RC_SUBR.CWNN=	cwnn twnn
+CWNN_USE=	RC_SUBR=cwnn RC_SUBR=twnn
 
-# KWnn
-CONFIGURE_ARGS.KWNN+=	--enable-Wnn=no --enable-cWnn=no \
-			--with-libkwnn=-lkwnn \
+KWNN_LIB_DEPENDS+=	libkwnn.so:${PORTSDIR}/korean/FreeWnn-lib
+KWNN_CONFIGURE_ON+=	--with-libkwnn=-lkwnn \
 			--with-kwnn-libraries="${PREFIX}/lib"
-LIB_DEPENDS.KWNN=	kwnn.0:${PORTSDIR}/korean/FreeWnn-lib
-USE_RC_SUBR.KWNN=	kwnn
-
-.for M in LIB_DEPENDS MAN1 MAN4 MAN5 MLINKS MANLANG USE_RC_SUBR
-. if defined(${M}.${WNNTYPE})
-${M}+=		${${M}.${WNNTYPE}}
-. endif
-.endfor
-
-NO_STAGE=	yes
-post-install:
-	${SETENV} PKG_PREFIX=${PREFIX} \
-	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+KWNN_USE=	RC_SUBR=kwnn
 
 .include <bsd.port.mk>
diff --git a/japanese/FreeWnn-server/files/pkg-install.in b/japanese/FreeWnn-server/files/pkg-install.in
deleted file mode 100644
index c1c539414581..000000000000
--- a/japanese/FreeWnn-server/files/pkg-install.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-case $2 in
-POST-INSTALL)
-	case $1 in
-	ja-FreeWnn-*)
-		chown wnn ${PKG_PREFIX}/bin/Wnn4/jserver
-		;;
-	zh-FreeWnn-*)
-		chown wnn ${PKG_PREFIX}/bin/cWnn4/cserver \
-		    ${PKG_PREFIX}/bin/cWnn4/tserver
-		;;
-	ko-FreeWnn-*)
-		chown wnn ${PKG_PREFIX}/bin/kWnn4/kserver
-	esac
-esac
diff --git a/japanese/FreeWnn-server/pkg-plist b/japanese/FreeWnn-server/pkg-plist
index a3dc846f43b1..a4c22f88f3dd 100644
--- a/japanese/FreeWnn-server/pkg-plist
+++ b/japanese/FreeWnn-server/pkg-plist
@@ -1,7 +1,10 @@
+@comment $FreeBSD$
 bin/Wnn4/atod
 bin/Wnn4/atof
 bin/Wnn4/dtoa
+@owner wnn
 bin/Wnn4/jserver
+@owner root
 bin/Wnn4/oldatonewa
 bin/Wnn4/wddel
 bin/Wnn4/wdreg
diff --git a/korean/FreeWnn-lib/Makefile b/korean/FreeWnn-lib/Makefile
index 08ab691216f9..3a7033c64601 100644
--- a/korean/FreeWnn-lib/Makefile
+++ b/korean/FreeWnn-lib/Makefile
@@ -9,7 +9,6 @@ COMMENT=	A Japanese/Chinese/Korean input method (Korean client libraries)
 MASTERDIR=	${.CURDIR}/../../japanese/FreeWnn-lib
 PKGDIR=		${.CURDIR}
 
-WNNTYPE=	KWNN
+OPTIONS_DEFAULT=KWNN LIB
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/korean/FreeWnn-lib/pkg-plist b/korean/FreeWnn-lib/pkg-plist
index b00bfabd604f..60642bf6d88e 100644
--- a/korean/FreeWnn-lib/pkg-plist
+++ b/korean/FreeWnn-lib/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 include/kwnn/commonhd.h
 include/kwnn/cplib.h
 include/kwnn/jllib.h
@@ -6,13 +7,6 @@ include/kwnn/msg.h
 include/kwnn/rk_spclval.h
 include/kwnn/wnnerror.h
 @dirrm include/kwnn
-lib/wnn/cvt_key_empty
-lib/wnn/cvt_key_tbl
-lib/wnn/cvt_key_tbl.ST
-lib/wnn/cvt_key_tbl.gm
-lib/wnn/cvt_key_tbl.kt
-lib/wnn/cvt_key_tbl.mv
-lib/wnn/cvt_key_tbl.vt
 lib/wnn/ko_KR/hinsi.data
 lib/wnn/ko_KR/kserverrc
 lib/wnn/ko_KR/libwnn.msg
@@ -31,11 +25,10 @@ lib/wnn/ko_KR/uumrc
 lib/wnn/ko_KR/wnnenvrc
 lib/wnn/ko_KR/wnnenvrc_R
 lib/wnn/ko_KR/wnnstat.msg
-lib/wnn/serverdefs
 lib/libkwnn.a
 lib/libkwnn.la
 lib/libkwnn.so
 lib/libkwnn.so.0
+lib/libkwnn.so.0.0.0
 @dirrm lib/wnn/ko_KR/rk
 @dirrm lib/wnn/ko_KR
-@dirrmtry lib/wnn
diff --git a/korean/FreeWnn-server/Makefile b/korean/FreeWnn-server/Makefile
index 76e4efbd9a51..175ab59daa3d 100644
--- a/korean/FreeWnn-server/Makefile
+++ b/korean/FreeWnn-server/Makefile
@@ -9,7 +9,6 @@ COMMENT=	A Japanese/Chinese/Korean input method (Korean server)
 MASTERDIR=	${.CURDIR}/../../japanese/FreeWnn-server
 PKGDIR=		${.CURDIR}
 
-WNNTYPE=	KWNN
+OPTIONS_DEFAULT=KWNN SERVER
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/korean/FreeWnn-server/pkg-plist b/korean/FreeWnn-server/pkg-plist
index c8421e2233a5..214cef03acf9 100644
--- a/korean/FreeWnn-server/pkg-plist
+++ b/korean/FreeWnn-server/pkg-plist
@@ -1,7 +1,10 @@
+@comment $FreeBSD$
 bin/kWnn4/katod
 bin/kWnn4/katof
 bin/kWnn4/kdtoa
+@owner wnn
 bin/kWnn4/kserver
+@owner root
 bin/kWnn4/kwddel
 bin/kWnn4/kwdreg
 bin/kWnn4/kwnnkill
@@ -13,3 +16,4 @@ lib/wnn/ko_KR/dic/sys/hword.dic
 lib/wnn/ko_KR/dic/sys/single.dic
 @dirrm lib/wnn/ko_KR/dic/sys
 @dirrm lib/wnn/ko_KR/dic
+@dirrm lib/wnn/ko_KR