diff options
| -rw-r--r-- | chinese/FreeWnn-lib/pkg-plist | 1 | ||||
| -rw-r--r-- | chinese/FreeWnn-server/pkg-plist | 1 | ||||
| -rw-r--r-- | japanese/FreeWnn-lib/Makefile | 15 | ||||
| -rw-r--r-- | japanese/FreeWnn-lib/distinfo | 2 | ||||
| -rw-r--r-- | japanese/FreeWnn-lib/pkg-plist | 2 | ||||
| -rw-r--r-- | japanese/FreeWnn-server/pkg-install | 76 | ||||
| -rw-r--r-- | korean/FreeWnn-lib/pkg-plist | 1 |
7 files changed, 60 insertions, 38 deletions
diff --git a/chinese/FreeWnn-lib/pkg-plist b/chinese/FreeWnn-lib/pkg-plist index b915b79365dd..5aeccb8adc13 100644 --- a/chinese/FreeWnn-lib/pkg-plist +++ b/chinese/FreeWnn-lib/pkg-plist @@ -104,6 +104,7 @@ lib/wnn/zh_TW/wnnenvrc lib/wnn/zh_TW/wnnenvrc_R lib/wnn/zh_TW/wnnstat.msg lib/libcwnn.a +lib/libcwnn.la lib/libcwnn.so lib/libcwnn.so.0 @dirrm lib/wnn/zh_TW/rk_z diff --git a/chinese/FreeWnn-server/pkg-plist b/chinese/FreeWnn-server/pkg-plist index abc8dd6f3540..2c36f6cf52a5 100644 --- a/chinese/FreeWnn-server/pkg-plist +++ b/chinese/FreeWnn-server/pkg-plist @@ -10,6 +10,7 @@ bin/cWnn4/cwnntouch bin/cWnn4/tserver @dirrm bin/cWnn4 etc/rc.d/cWnn.sh +etc/rc.d/tWnn.sh lib/wnn/zh_CN/dic/sys/QianMa.dic lib/wnn/zh_CN/dic/sys/WuBi.dic lib/wnn/zh_CN/dic/sys/basic.dic diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile index 514ac2c41fc3..5aec50ec3db3 100644 --- a/japanese/FreeWnn-lib/Makefile +++ b/japanese/FreeWnn-lib/Makefile @@ -7,7 +7,7 @@ PORTNAME= FreeWnn PORTVERSION= ${WMMVERSION:S/-/./} -PORTREVISION= 1 +#PORTREVISION= 1 CATEGORIES?= japanese MASTER_SITES= ftp://ftp.freewnn.org/pub/FreeWnn/alpha/ PKGNAMESUFFIX?= -lib @@ -16,17 +16,17 @@ DISTNAME= ${PORTNAME}-${WMMVERSION} MAINTAINER= taoka@FreeBSD.org COMMENT?= A Japanese/Chinese/Korean input method (Japanese client libraries) -#WRKSRC= ${WRKDIR}/${DISTNAME}/Xsi -WRKSRC= ${WRKDIR}/FreeWnn-1.1.1-a017-pl4/Xsi +WRKSRC= ${WRKDIR}/FreeWnn-1.10-pl020 ALL_TARGET= includes all INSTALL_TARGET= install install.man GNU_CONFIGURE= yes -USE_AUTOCONF= yes +USE_AUTOCONF_VER= 213 USE_LIBTOOL= yes +MAKE_ARGS= CDEBUGFLAGS="${CFLAGS}" INSTALLS_SHLIB= yes USE_BZIP2= yes -WMMVERSION= 1.1.1-a018 +WMMVERSION= 1.1.1-a020 WNN?= Wnn .if (${PKGNAMESUFFIX} == -lib) @@ -113,11 +113,6 @@ CONFIGURE_ARGS+= --with-libkwnn=-lkwnn --with-kwnn-libraries="${PREFIX}/lib" .endif .endif -post-extract: - ${CP} ${LIBTOOL_SHAREDIR}/libltdl/aclocal.m4 ${WRKSRC} - ${CP} ${AUTOCONF_DIR}/config.sub ${WRKSRC} - ${CP} ${AUTOCONF_DIR}/config.guess ${WRKSRC} - .if (${PKGNAMESUFFIX} == -server) pre-install: ${SETENV} BATCH=${BATCH} \ diff --git a/japanese/FreeWnn-lib/distinfo b/japanese/FreeWnn-lib/distinfo index f5cacd73cc55..64ec4339cd2f 100644 --- a/japanese/FreeWnn-lib/distinfo +++ b/japanese/FreeWnn-lib/distinfo @@ -1 +1 @@ -MD5 (FreeWnn-1.1.1-a018.tar.bz2) = e4a56cd7373736c090c6b93a255b950b +MD5 (FreeWnn-1.1.1-a020.tar.bz2) = c00549415cdb08c1f35240dccf8dab20 diff --git a/japanese/FreeWnn-lib/pkg-plist b/japanese/FreeWnn-lib/pkg-plist index 6dd7181fb7ed..7692b881600c 100644 --- a/japanese/FreeWnn-lib/pkg-plist +++ b/japanese/FreeWnn-lib/pkg-plist @@ -73,9 +73,11 @@ lib/wnn/lt_LN/uumkey lib/wnn/lt_LN/uumkey_e lib/wnn/lt_LN/uumrc lib/libjd.a +lib/libjd.la lib/libjd.so lib/libjd.so.0 lib/libwnn.a +lib/libwnn.la lib/libwnn.so lib/libwnn.so.0 @dirrm lib/wnn/ja_JP/rk diff --git a/japanese/FreeWnn-server/pkg-install b/japanese/FreeWnn-server/pkg-install index 6d9decb4539d..05e26c3c6c44 100644 --- a/japanese/FreeWnn-server/pkg-install +++ b/japanese/FreeWnn-server/pkg-install @@ -48,6 +48,37 @@ yesno() { done } +mk_startup_script() { + echo "Installing ${startup_script} startup file."; + cat << EOF > ${startup_script} +#!/bin/sh +wnnserver=${wnnserver} +case "\$1" in +start) + if [ -x $wnnserver ]; then + ${wnnstat} -L ${wnn_lang} localhost > /dev/null 2>&1 + if [ \$? = 255 ]; then + rm -f ${wnn_socket} + echo -n ' ${wnnname}' + $wnnserver > /dev/null + fi + fi + ;; +stop) + ${wnnkill} -L ${wnn_lang} localhost + ;; +*) + echo "Usage: \`basename \$0\` {start|stop}" >&2 + exit 64 + ;; +esac + +exit 0 + +EOF + +} + case $2 in PRE-INSTALL) @@ -103,6 +134,7 @@ POST-INSTALL) 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 @@ -113,6 +145,7 @@ POST-INSTALL) 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 @@ -123,6 +156,7 @@ POST-INSTALL) 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 @@ -143,33 +177,21 @@ POST-INSTALL) ## create a startup script ## startup_script=${PKG_PREFIX}/etc/rc.d/${wnnname}.sh if [ ! -f ${startup_script} ]; then - echo "Installing ${startup_script} startup file."; - echo '#!/bin/sh' > ${startup_script}; - echo "wnn=${wnnserver}" >> ${startup_script}; - echo 'if [ -x $wnn ]; then' >> ${startup_script}; - echo " ${wnnstat} -L ${wnn_lang} localhost > /dev/null 2>&1" >> ${startup_script}; - echo ' if [ $? = 255 ]; then' >> ${startup_script}; - echo " rm -f ${wnn_socket}" >> ${startup_script}; - echo " echo -n ' ${wnnname}'" >> ${startup_script}; - echo ' $wnn' >> ${startup_script}; - echo " fi" >> ${startup_script}; - echo "fi" >> ${startup_script}; - if [ $1 = zh-Wnn-4.2 ]; then - wnnserver=${PKG_PREFIX}/bin/cWnn4/tserver - wnn_lang=zh_TW - wnn_socket=/tmp/td_sockV4 - echo "wnn=${wnnserver}" >> ${startup_script}; - echo 'if [ -x $wnn ]; then' >> ${startup_script}; - echo " ${wnnstat} -L ${wnn_lang} localhost > /dev/null 2>&1" >> ${startup_script}; - echo ' if [ $? = 255 ]; then' >> ${startup_script}; - echo " rm -f ${wnn_socket}" >> ${startup_script}; - echo " echo -n ' ${wnnname}'" >> ${startup_script}; - echo ' $wnn' >> ${startup_script}; - echo " fi" >> ${startup_script}; - echo "fi" >> ${startup_script}; - fi - chmod 755 ${startup_script}; - chown bin:bin ${startup_script}; + mk_startup_script + chmod 755 ${startup_script}; + chown bin:bin ${startup_script}; + case "$1" in + zh-FreeWnn-*) + wnnname=tWnn + startup_script=${PKG_PREFIX}/etc/rc.d/${wnnname}.sh + wnnserver=${PKG_PREFIX}/bin/cWnn4/tserver + wnn_lang=zh_TW + wnn_socket=/tmp/td_sockV4 + mk_startup_script + chmod 755 ${startup_script}; + chown bin:bin ${startup_script}; + ;; + esac fi ;; esac diff --git a/korean/FreeWnn-lib/pkg-plist b/korean/FreeWnn-lib/pkg-plist index 3e358522b2cc..5af466cf7805 100644 --- a/korean/FreeWnn-lib/pkg-plist +++ b/korean/FreeWnn-lib/pkg-plist @@ -33,6 +33,7 @@ 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 @dirrm lib/wnn/ko_KR/rk |