6 files changed, 101 insertions, 419 deletions

diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 76c6392c0fbb..88d0ccfa95bc 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -7,248 +7,100 @@
 
 PORTNAME=	FreeWnn
 PORTVERSION=	1.1.1.a021
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	japanese
 MASTER_SITES=	ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	FreeWnn/alpha \
 			freewnn/17724
-PKGNAMESUFFIX?=	-lib
+PKGNAMESUFFIX=	-lib
 DISTNAME=	${PORTNAME}-1.1.1-a021
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT?=	A Japanese/Chinese/Korean input method (Japanese client libraries)
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:262 libtool:15
 USE_LDCONFIG=	yes
-MAKE_ARGS=	CDEBUGFLAGS="${CFLAGS}"
+MAKE_ARGS=	MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}"
 ALL_TARGET=	includes all
 INSTALL_TARGET=	install install.man
 
-WNN?=		Wnn
-.if (${PKGNAMESUFFIX} == -lib)
-CONFIGURE_ARGS=	--enable-server=no
-.else
-CONFIGURE_ARGS=	--enable-libraries=no
-USE_RC_SUBR=	yes
-SUB_FILES=	pkg-install
-SUB_LIST=	RC_SUBR=${RC_SUBR}
-PKGINSTALL=	${WRKDIR}/pkg-install
-.endif
+WNNTYPE?=	WNN
+CONFIGURE_ARGS=	--enable-server=no ${CONFIGURE_ARGS.${WNNTYPE}}
 
-.if (${WNN} == Wnn)
-CONFIGURE_ARGS+= --enable-cWnn=no --enable-kWnn=no
-MANLANG=	ja
+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
 
-# localized manual pages live in ${MANPREFIX}/man/${MANLANG}
-post-patch:
-	@${REINPLACE_CMD} -e 's#@mandir@/#@mandir@/ja/#' \
-		${WRKSRC}/makerule.mk.in
+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
 
-.if (${PKGNAMESUFFIX} == -lib)
-MAN3+= \
-	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
 
-MLINKS= \
-	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
-.else
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libwnn.a:${PORTSDIR}/japanese/FreeWnn-lib
-#RUN_DEPENDS=	${LOCALBASE}/lib/wnn/ja_JP/jserverrc:${PORTSDIR}/japanese/FreeWnn-lib
-LIB_DEPENDS=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
-CONFIGURE_ARGS+= --with-libwnn=-lwnn --with-wnn-libraries="${PREFIX}/lib"
-MAN1=	atod.1 atof.1 dtoa.1 jserver.1 oldatonewa.1 uum.1 wddel.1 wdreg.1 \
-	wnnkill.1 wnnstat.1 wnntouch.1
-MAN4=	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=	pubdic.5 usr_dic.5
-.endif
-.elif (${WNN} == cWnn)
-CONFIGURE_ARGS+=	--enable-Wnn=no --enable-kWnn=no
-.if (${PKGNAMESUFFIX} == -server)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libcwnn.a:${PORTSDIR}/chinese/FreeWnn-lib
-#RUN_DEPENDS=	${LOCALBASE}/lib/wnn/zh_CN/cserverrc:${PORTSDIR}/chinese/FreeWnn-lib
-LIB_DEPENDS=	cwnn.0:${PORTSDIR}/chinese/FreeWnn-lib
-MAN1=	cserver.1 cuum.1 cwnnkill.1 cwnnstat.1 catod.1 catof.1 cdicsort.1 \
-	cdtoa.1 cwddel.1 cwdreg.1 cwnntouch.1
-MAN4=	cst_end.4 cwnn.4 cenv.4 ckey.4
-CONFIGURE_ARGS+= --with-libcwnn=-lcwnn --with-cwnn-libraries="${PREFIX}/lib"
-.endif
-.elif (${WNN} == kWnn)
-CONFIGURE_ARGS+=	--enable-Wnn=no --enable-cWnn=no
-.if (${PKGNAMESUFFIX} == -server)
-#BUILD_DEPENDS=	${LOCALBASE}/lib/libkwnn.a:${PORTSDIR}/korean/FreeWnn-lib
-#RUN_DEPENDS=	${LOCALBASE}/lib/wnn/ko_KR/kserverrc:${PORTSDIR}/korean/FreeWnn-lib
-LIB_DEPENDS=	kwnn.0:${PORTSDIR}/korean/FreeWnn-lib
-CONFIGURE_ARGS+= --with-libkwnn=-lkwnn --with-kwnn-libraries="${PREFIX}/lib"
-.endif
-.endif
-
-.if (${PKGNAMESUFFIX} == -server)
-pre-install:
-	${SETENV} BATCH=${BATCH} \
-	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-post-install:
-	${SETENV} PKG_PREFIX=${PREFIX} \
-	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
+.for M in MAN3 MLINKS MANLANG
+. if defined(${M}.${WNNTYPE})
+${M}+=	${${M}.${WNNTYPE}}
+. endif
+.endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-man-Makefile.in b/japanese/FreeWnn-lib/files/patch-Wnn-man-Makefile.in
new file mode 100644
index 000000000000..306a69e795cc
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-Wnn-man-Makefile.in
@@ -0,0 +1,11 @@
+--- Wnn/man/Makefile.in.orig	2008-10-27 03:58:56.000000000 +0900
++++ Wnn/man/Makefile.in	2008-10-27 04:04:21.000000000 +0900
+@@ -34,7 +34,7 @@
+ 
+ LIB_WNNMANDIR = 3.libwnn
+ 
+-SERVER_WNNMANDIR = 2.env 4.cmd 6.jutil
++#SERVER_WNNMANDIR = 2.env 4.cmd 6.jutil
+ 
+ SUBDIRS = @WNNMANDIR@
+ 
diff --git a/japanese/FreeWnn-lib/files/patch-makerule.mk.in b/japanese/FreeWnn-lib/files/patch-makerule.mk.in
new file mode 100644
index 000000000000..38dab5046455
--- /dev/null
+++ b/japanese/FreeWnn-lib/files/patch-makerule.mk.in
@@ -0,0 +1,13 @@
+--- makerule.mk.in.orig	2008-10-27 03:37:44.000000000 +0900
++++ makerule.mk.in	2008-10-27 03:38:15.000000000 +0900
+@@ -42,8 +42,8 @@
+ # for libtool (AM_PROG_LIBTOOL)
+ #     top_builddir = @abs_top_srcdir@
+ 
+-           MANDIR = @mandir@/man$(MANSUFFIX)
+-        LIBMANDIR = @mandir@/man$(LIBMANSUFFIX)
++           MANDIR = @mandir@/${MANLANG}/man$(MANSUFFIX)
++        LIBMANDIR = @mandir@/${MANLANG}/man$(LIBMANSUFFIX)
+ 
+         MANSUFFIX = 1
+      LIBMANSUFFIX = 3
diff --git a/japanese/FreeWnn-lib/files/pkg-install.in b/japanese/FreeWnn-lib/files/pkg-install.in
deleted file mode 100644
index a3d47148f297..000000000000
--- a/japanese/FreeWnn-lib/files/pkg-install.in
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-# an installation script for Wnn4.2
-
-check_pw()
-{
-    if which -s pw; then
-	:
-    else
-	cat <<EOF
-
-This system looks like a pre-2.2 version of FreeBSD.  We see that it
-is missing the "pw" utility.  We need this utility.  Please get and
-install it, and try again.  You can get the source from:
-
-  ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar.gz
-
-EOF
-	exit 1
-    fi
-}
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-	read -p "${question} (y/n) [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-	answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-	answer=$(ask "${question}" "${dflt}")
-	case "${answer}" in
-	[Yy]*)		return 0;;
-	[Nn]*)		return 1;;
-	esac
-	echo "Please answer yes or no."
-    done
-}
-
-mk_startup_script() {
-	_wnnname=$1
-	_wnnserver=$2
-	_wnn_socket=$3
-	_scriptfile=${PKG_PREFIX}/etc/rc.d/${_wnnname}.sh
-
-      echo "Installing ${_scriptfile} startup file.";
-      cat << EOF > ${_scriptfile}
-#!/bin/sh
-#
-# PROVIDE: ${_wnnname}
-# REQUIRE: LOGIN
-#
-
-. %%RC_SUBR%%
-
-name=${_wnnname}
-rcvar=\`set_rcvar\`
-command=${_wnnserver}
-procname=${_wnnserver}
-
-load_rc_config \${name}
-
-start_precmd()
-{
-	rm -f ${_wnn_socket}
-}
-
-stop_postcmd()
-{
-	rm -f ${_wnn_socket}
-}
-
-run_rc_command "\$1"
-EOF
-	chmod 0555 ${_scriptfile}
-
-}
-
-case $2 in
-PRE-INSTALL)
-
-    ## Hack /etc/master.passwd ##
-    # check
-    id_69=`id -u 69 2> /dev/null`
-    id_wnn=`id -u wnn 2> /dev/null`
-    if [ X"$id_wnn" != X ];then
-	exit 0
-    elif [ X"$id_69" != X ]; then
-	cat <<EOF
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-This system already has an account whose name is not 'wnn' and ID
-number is 69.
-
-   '`id 69`'
-
-For Wnn4.2 in this port or package, ID number of 'wnn' has to be 69.
-Please try again after you delete the account.
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-EOF
-	exit 1
-    fi
-
-    # add an account 'wnn' to this system
-    echo ""
-    echo "You need an account 'wnn' whose ID number is 69"
-    if [ -z "${BATCH}" ]; then
-	if yesno "Would you like to create it automatically?" y; then
-	    # We need a command 'pw(8)'
-	    check_pw
-	    pw useradd wnn -u 69 -g 7 -h - -d /nonexistent \
-		    -s /nonexistent -c Wnn || exit
-	else
-	    echo "Please create it, and try again."
-	    exit 1
-	fi
-    else
-	echo "Create it automatically!"
-	check_pw
-	pw useradd wnn -u 69 -g 7 -h - -d /nonexistent \
-	    -s /nonexistent -c Wnn || exit
-    fi
-    ;;
-
-POST-INSTALL)
-
-    case $1 in
-      ja-FreeWnn-*)
-	sys_dirs="${PKG_PREFIX}/lib/wnn/ja_JP/dic/pubdic ${PKG_PREFIX}/lib/wnn/ja_JP/dic/wnncons ${PKG_PREFIX}/lib/wnn/ja_JP/dic/gerodic"
-	usr_dirs=${PKG_PREFIX}/lib/wnn/ja_JP/dic/usr
-	wnnserver=${PKG_PREFIX}/bin/Wnn4/jserver
-	wnntouch=${PKG_PREFIX}/bin/Wnn4/wnntouch
-	wnnstat=${PKG_PREFIX}/bin/Wnn4/wnnstat
-	wnnkill=${PKG_PREFIX}/bin/Wnn4/wnnkill
-	wnnname=wnn
-	wnn_socket=/tmp/jd_sockV4
-	wnn_lang=ja_JP
-	mk_startup_script ${wnnname} ${wnnserver} ${wnn_socket}
-	;;
-      zh-FreeWnn-*)
-	sys_dirs="${PKG_PREFIX}/lib/wnn/zh_CN/dic/sys ${PKG_PREFIX}/lib/wnn/zh_TW/dic/sys"
-	usr_dirs="${PKG_PREFIX}/lib/wnn/zh_CN/dic/usr ${PKG_PREFIX}/lib/wnn/zh_TW/dic/usr"
-	wnnserver=${PKG_PREFIX}/bin/cWnn4/cserver
-	wnntouch=${PKG_PREFIX}/bin/cWnn4/cwnntouch
-	wnnstat=${PKG_PREFIX}/bin/cWnn4/cwnnstat
-	wnnkill=${PKG_PREFIX}/bin/cWnn4/cwnnkill
-	wnnname=cwnn
-	wnn_socket=/tmp/cd_sockV4
-	wnn_lang=zh_CN
-	mk_startup_script ${wnnname} ${wnnserver} ${wnn_socket}
-	
-	wnnserver=${PKG_PREFIX}/bin/cWnn4/tserver
-	wnn_lang=zh_TW
-	wnnname=twnn
-	wnn_socket=/tmp/td_sockV4
-	mk_startup_script ${wnnname} ${wnnserver} ${wnn_socket}
-	;;
-      ko-FreeWnn-*)
-	sys_dirs="${PKG_PREFIX}/lib/wnn/ko_KR/dic/sys"
-	usr_dirs=${PKG_PREFIX}/lib/wnn/ko_KR/dic/usr
-	wnnserver=${PKG_PREFIX}/bin/kWnn4/kserver
-	wnntouch=${PKG_PREFIX}/bin/kWnn4/kwnntouch
-	wnnstat=${PKG_PREFIX}/bin/kWnn4/kwnnstat
-	wnnkill=${PKG_PREFIX}/bin/kWnn4/kwnnkill
-	wnnname=kwnn
-	wnn_socket=/tmp/kd_sockV4
-	wnn_lang=ko_KR
-	mk_startup_script ${wnnname} ${wnnserver} ${wnn_socket}
-	;;
-    esac
-
-    chown wnn $wnnserver
-    for dir in $sys_dirs; do
-      $wnntouch $dir/*
-    done
-    for dir in $usr_dirs; do
-      if [ ! -d $dir ]; then
-	mkdir -p $dir
-      fi
-      chown wnn $dir
-    done
-	;;
-esac
diff --git a/japanese/FreeWnn-lib/pkg-descr b/japanese/FreeWnn-lib/pkg-descr
index ef935bbd0ab1..06fc1dee6b3b 100644
--- a/japanese/FreeWnn-lib/pkg-descr
+++ b/japanese/FreeWnn-lib/pkg-descr
@@ -1,4 +1,4 @@
-FreeWnn is a Japanese/Chinese/Korean input method.  
+FreeWnn is a Japanese/Chinese/Korean input method.
 
 This port installs only libraries for the Japanese imput method.
 They include an static library (libwnn.a), header files,
diff --git a/japanese/FreeWnn-lib/pkg-plist b/japanese/FreeWnn-lib/pkg-plist
index 919e5c6d2ce6..998dae027431 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