- Style clean-ups.

- Separate */FreeWnn-server and */FreeWnn-lib.
- Take maintainership.

chinese/FreeWnn-lib/Makefile

@@ -5,12 +5,14 @@
 # $FreeBSD$
 #
 
-PKGNAMESUFFIX=	-lib
 CATEGORIES=	chinese
-MASTERDIR=	${.CURDIR}/../../japanese/FreeWnn-lib
+PKGNAMESUFFIX=	-lib
+
 COMMENT=	A Japanese/Chinese/Korean input method (Chinese client libraries)
 
+MASTERDIR=	${.CURDIR}/../../japanese/FreeWnn-lib
 PKGDIR=		${.CURDIR}
-WNN=		cWnn
+
+WNNTYPE=	CWNN
 
 .include "${MASTERDIR}/Makefile"

chinese/FreeWnn-lib/pkg-descr

@@ -1,6 +1,4 @@
-FreeWnn is a Japanese/Chinese/Korean input method.  
+FreeWnn is a Japanese/Chinese/Korean input method.
-
-WWW: http://www.freewnn.org/
 
 This port has only libraries for a Chinese imput method. The libraries
 containes a archive file (libcwnn.a), header files and files which are
@@ -9,5 +7,4 @@ used to a client.
 Note that you must set a environment variable CSERVER or TSERVER if
 you use a client of Wnn.
 
--- S. Taoka
+WWW: http://www.freewnn.org/
-<taoka@FreeBSD.org>

chinese/FreeWnn-server/Makefile

@@ -5,13 +5,14 @@
 # $FreeBSD$
 #
 
-PKGNAMESUFFIX=	-server
 CATEGORIES=	chinese
-MASTERDIR=	${.CURDIR}/../../japanese/FreeWnn-lib
+PKGNAMESUFFIX=	-server
+
 COMMENT=	A Japanese/Chinese/Korean input method (Chinese server)
 
+MASTERDIR=	${.CURDIR}/../../japanese/FreeWnn-server
 PKGDIR=		${.CURDIR}
-PKGINSTALL=	${.CURDIR}/../../japanese/FreeWnn-server/pkg-install
+
-WNN=		cWnn
+WNNTYPE=	CWNN
 
 .include "${MASTERDIR}/Makefile"

chinese/FreeWnn-server/pkg-descr

@@ -1,9 +1,6 @@
-FreeWnn is a Japanese/Chinese/Korean input method.  
+FreeWnn is a Japanese/Chinese/Korean input method.
-
-WWW: http://www.freewnn.org/
 
 This port has only the server and dictionaries used for the Chinese
 input method.
 
--- S. Taoka
+WWW: http://www.freewnn.org/
-<taoka@FreeBSD.org>

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
+WNNTYPE?=	WNN
-.if (${PKGNAMESUFFIX} == -lib)
+CONFIGURE_ARGS=	--enable-server=no ${CONFIGURE_ARGS.${WNNTYPE}}
-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
 
-.if (${WNN} == Wnn)
+CONFIGURE_ARGS.CWNN+=	--enable-Wnn=no --enable-kWnn=no
-CONFIGURE_ARGS+= --enable-cWnn=no --enable-kWnn=no
+CONFIGURE_ARGS.KWNN+=	--enable-Wnn=no --enable-cWnn=no
-MANLANG=	ja
+CONFIGURE_ARGS.WNN+=	--enable-cWnn=no --enable-kWnn=no
 
-# localized manual pages live in ${MANPREFIX}/man/${MANLANG}
+MANLANG.WNN=	ja
-post-patch:
+MAN3.WNN+= jl_bun_suu.3 jl_c_zenkouho.3 jl_close.3 jl_connect.3		\
-	@${REINPLACE_CMD} -e 's#@mandir@/#@mandir@/ja/#' \
+	jl_connect_lang.3 jl_dai_top.3 jl_dic_add.3			\
-		${WRKSRC}/makerule.mk.in
+	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)
+MLINKS.WNN= jl_dic_add.3 jl_dic_add_e.3 jl_dic_comment_set.3		\
-MAN3+= \
+	jl_dic_comment_set_e.3 jl_dic_delete.3 jl_dic_delete_e.3	\
-	jl_bun_suu.3	\
+	jl_dic_list.3 jl_dic_list_e.3 jl_dic_save.3 jl_dic_save_all.3	\
-	jl_c_zenkouho.3	\
+	jl_dic_save.3 jl_dic_save_all_e.3 jl_dic_save.3			\
-	jl_close.3	\
+	jl_dic_save_e.3 jl_dic_use.3 jl_dic_use_e.3 jl_env_get.3	\
-	jl_connect.3	\
+	jl_env_set.3 jl_env_sticky.3 jl_env_sticky_e.3 jl_env_sticky.3	\
-	jl_connect_lang.3	\
+	jl_env_un_sticky.3 jl_env_sticky.3 jl_env_un_sticky_e.3		\
-	jl_dai_top.3	\
+	jl_fuzokugo_get.3 jl_fuzokugo_get_e.3 jl_fuzokugo_set.3		\
-	jl_dic_add.3	\
+	jl_fuzokugo_set_e.3 jl_get_kanji.3 jl_get_yomi.3		\
-	jl_dic_comment_set.3	\
+	jl_hinsi_dicts.3 jl_hinsi_dicts_e.3 jl_hinsi_list.3		\
-	jl_dic_delete.3	\
+	jl_hinsi_list_e.3 jl_hinsi_name.3 jl_hinsi_name_e.3		\
-	jl_dic_list.3	\
+	jl_hinsi_number.3 jl_hinsi_number_e.3 jl_isconnect.3		\
-	jl_dic_save.3	\
+	jl_isconnect_e.3 jl_next.3 jl_next_dai.3 jl_param_get.3		\
-	jl_dic_use.3	\
+	jl_param_get_e.3 jl_param_get.3 jl_param_set.3 jl_param_get.3	\
-	jl_disconnect.3	\
+	jl_param_set_e.3 jl_next.3 jl_previous.3 jl_next.3		\
-	jl_env.3	\
+	jl_previous_dai.3 jl_set_jikouho.3 jl_set_jikouho_dai.3		\
-	jl_env_get.3	\
+	jl_word_add.3 jl_word_add_e.3 jl_word_comment_set.3		\
-	jl_env_sticky.3	\
+	jl_word_comment_set_e.3 jl_word_delete.3 jl_word_delete_e.3	\
-	jl_fuzokugo_get.3	\
+	jl_word_info.3 jl_word_info_e.3 jl_word_search.3		\
-	jl_fuzokugo_set.3	\
+	jl_word_search_by_env.3 jl_word_search.3			\
-	jl_get_kanji.3	\
+	jl_word_search_by_env_e.3 jl_word_search.3 jl_word_search_e.3	\
-	jl_get_zenkouho_kanji.3	\
+	jl_word_use.3 jl_word_use_e.3 jl_kanji_len.3 jl_yomi_len.3	\
-	jl_hinsi_dicts.3	\
+	js_env_sticky.3 js_env_un_sticky.3 js_set_lang.3 js_get_lang.3	\
-	jl_hinsi_list.3	\
+	js_param_get.3 js_param_set.3 js_word_search.3			\
-	jl_hinsi_name.3	\
+	js_word_search_by_env.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= \
+.for M in MAN3 MLINKS MANLANG
-	jl_dic_add.3 jl_dic_add_e.3	\
+. if defined(${M}.${WNNTYPE})
-	jl_dic_comment_set.3 jl_dic_comment_set_e.3	\
+${M}+=	${${M}.${WNNTYPE}}
-	jl_dic_delete.3 jl_dic_delete_e.3	\
+. endif
-	jl_dic_list.3 jl_dic_list_e.3	\
+.endfor
-	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
 
 .include <bsd.port.mk>

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@
+ 

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

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,

japanese/FreeWnn-lib/pkg-plist

@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 include/wnn/commonhd.h
 include/wnn/config.h
 include/wnn/cplib.h

japanese/FreeWnn-server/Makefile

@@ -5,11 +5,75 @@
 # $FreeBSD$
 #
 
+PORTNAME=	FreeWnn
+PORTVERSION=	1.1.1.a021
+PORTREVISION=	3
+CATEGORIES?=	japanese
+MASTER_SITES=	ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
+		${MASTER_SITE_SOURCEFORGE_JP}
+MASTER_SITE_SUBDIR=	FreeWnn/alpha \
+			freewnn/17724
 PKGNAMESUFFIX=	-server
-COMMENT=	A Japanese/Chinese/Korean input method (Japanese server)
+DISTNAME=	${PORTNAME}-1.1.1-a021
 
-MASTERDIR=	${.CURDIR}/../FreeWnn-lib
+MAINTAINER=	hrs@FreeBSD.org
-PKGDIR=		${.CURDIR}
+COMMENT?=	A Japanese/Chinese/Korean input method (Japanese client libraries)
-PATCHDIR=	${.CURDIR}/files
 
-.include "${MASTERDIR}/Makefile"
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	autoconf:262 libtool:15
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	yes
+MAKE_ARGS=	MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}"
+ALL_TARGET=	includes all
+INSTALL_TARGET=	install install.man
+SUB_FILES=	pkg-install
+SUB_LIST=	RC_SUBR=${RC_SUBR}
+PKGINSTALL=	${WRKDIR}/pkg-install
+
+WNNTYPE?=	WNN
+CONFIGURE_ARGS=	--enable-library=no ${CONFIGURE_ARGS.${WNNTYPE}}
+
+# Wnn
+LIB_DEPENDS.WNN=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
+CONFIGURE_ARGS.WNN= 	--enable-cWnn=no --enable-kWnn=no \
+			--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
+
+# CWnn
+CONFIGURE_ARGS.CWNN+=	--enable-Wnn=no --enable-kWnn=no		\
+			--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
+
+# KWnn
+CONFIGURE_ARGS.KWNN+=	--enable-Wnn=no --enable-cWnn=no \
+			--with-libkwnn=-lkwnn \
+			--with-kwnn-libraries="${PREFIX}/lib"
+LIB_DEPENDS.KWNN=	kwnn.0:${PORTSDIR}/korean/FreeWnn-lib
+
+.for M in LIB_DEPENDS MAN1 MAN4 MAN5 MLINKS MANLANG
+. if defined(${M}.${WNNTYPE})
+${M}+=		${${M}.${WNNTYPE}}
+. endif
+.endfor
+
+pre-install:
+	${SETENV} BATCH=${BATCH} \
+	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
+post-install:
+	${SETENV} PKG_PREFIX=${PREFIX} \
+	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.include <bsd.port.mk>

japanese/FreeWnn-server/distinfo

@@ -1,6 +1,3 @@
-MD5 (Wnn4.2.tar.gz) = dcb6271403577199e8141d07cd54be73
+MD5 (FreeWnn-1.1.1-a021.tar.bz2) = 7e15ab385932d58e3743400d303a05e6
-MD5 (Wnn4.2.patch-981201.tar.gz) = 542847bff36e88f0ea588153b387e932
+SHA256 (FreeWnn-1.1.1-a021.tar.bz2) = df9523b2eea7cbc94d9d01c19a01394abe3b648c5ec3f1259adac06fc8ecbb86
-MD5 (pubdic+.tar.gz) = 92dc7dfeae7eb3b637157fe2fd25480a
+SIZE (FreeWnn-1.1.1-a021.tar.bz2) = 3108905
-MD5 (pubdic+-fix01.gz) = 2469f2e65ac5f3248dd4225ca5383c49
-MD5 (pubdic+.diff) = 51e53024862273f51d8f3c51a3ea70b2
-MD5 (pubdic+.special.diff) = acf3faa8ba8219ed97ca0c4e59030145

japanese/FreeWnn-server/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:06.000000000 +0900
+@@ -32,7 +32,7 @@
+ include @top_srcdir@/makerule.mk
+ top_builddir = ../..
+ 
+-LIB_WNNMANDIR = 3.libwnn
++#LIB_WNNMANDIR = 3.libwnn
+ 
+ SERVER_WNNMANDIR = 2.env 4.cmd 6.jutil
+ 

japanese/FreeWnn-server/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

japanese/FreeWnn-server/files/pkg-install.in

@@ -2,24 +2,6 @@
 # $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
 
@@ -118,8 +100,6 @@ EOF
     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

japanese/FreeWnn-server/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 the server and dictionaries for
 the Japanese imput method.

korean/FreeWnn-lib/Makefile

@@ -5,11 +5,14 @@
 # $FreeBSD$
 #
 
-PKGNAMESUFFIX=	-lib
-COMMENT=	A Japanese/Chinese/Korean input method (Korean client libraries)
 CATEGORIES=	korean
+PKGNAMESUFFIX=	-lib
+
+COMMENT=	A Japanese/Chinese/Korean input method (Korean client libraries)
+
 MASTERDIR=	${.CURDIR}/../../japanese/FreeWnn-lib
 PKGDIR=		${.CURDIR}
-WNN=		kWnn
+
+WNNTYPE=	KWNN
 
 .include "${MASTERDIR}/Makefile"

korean/FreeWnn-lib/pkg-descr

@@ -1,6 +1,4 @@
-FreeWnn is a Japanese/Chinese/Korean input method.  
+FreeWnn is a Japanese/Chinese/Korean input method.
-
-WWW: http://www.freewnn.org/
 
 This port has only libraries for a Korean imput method. The libraries
 containes a archive file (libkwnn.a), header files and files which are
@@ -9,5 +7,4 @@ used to a client.
 Note that you must set a environment variable KSERVER if you use a
 client of Wnn.
 
--- S. Taoka
+WWW: http://www.freewnn.org/
-<taoka@FreeBSD.org>

korean/FreeWnn-server/Makefile

@@ -5,12 +5,14 @@
 # $FreeBSD$
 #
 
-PKGNAMESUFFIX=	-server
-COMMENT=	A Japanese/Chinese/Korean input method (Korean server)
 CATEGORIES=	korean
-MASTERDIR=	${.CURDIR}/../../japanese/FreeWnn-lib
+PKGNAMESUFFIX=	-server
+
+COMMENT=	A Japanese/Chinese/Korean input method (Korean server)
+
+MASTERDIR=	${.CURDIR}/../../japanese/FreeWnn-server
 PKGDIR=		${.CURDIR}
-PKGINSTALL=	${.CURDIR}/../../japanese/FreeWnn-server/pkg-install
+
-WNN=		kWnn
+WNNTYPE=	KWNN
 
 .include "${MASTERDIR}/Makefile"

korean/FreeWnn-server/pkg-descr

@@ -1,9 +1,6 @@
-FreeWnn is a Japanese/Chinese/Korean input method.  
+FreeWnn is a Japanese/Chinese/Korean input method.
-
-WWW: http://www.freewnn.org/
 
 This port has only the server and dictionaries used for the Korean
 input method.
 
--- S. Taoka
+WWW: http://www.freewnn.org/
-<taoka@FreeBSD.org>