diff options
| -rw-r--r-- | japanese/freewnn-server/Makefile | 6 | ||||
| -rw-r--r-- | japanese/freewnn-server/pkg/PLIST | 3 | ||||
| -rw-r--r-- | misc/freewnn-common/Makefile | 17 | ||||
| -rw-r--r-- | misc/freewnn-common/files/ja-freewnn | 20 |
4 files changed, 27 insertions, 19 deletions
diff --git a/japanese/freewnn-server/Makefile b/japanese/freewnn-server/Makefile index a18da301a2a..f66913f4ef5 100644 --- a/japanese/freewnn-server/Makefile +++ b/japanese/freewnn-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 15:25:15 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/03/16 18:32:47 wiz Exp $ # PKGNAME= ja-FreeWnn-server-1.10 @@ -15,8 +15,4 @@ MASTERDIR= ${.CURDIR}/../../misc/freewnn-common FILESDIR= ${MASTERDIR}/files PATCHDIR= ${MASTERDIR}/patches -STARTUP_SCRIPT= etc/rc.d/ja-freewnn.sh -JSERVER= ${PREFIX}/sbin/jserver -SCTITLE= ja-FreeWnn - .include "${MASTERDIR}/Makefile" diff --git a/japanese/freewnn-server/pkg/PLIST b/japanese/freewnn-server/pkg/PLIST index 6a0f7544ca3..3a86aa8e55c 100644 --- a/japanese/freewnn-server/pkg/PLIST +++ b/japanese/freewnn-server/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 1999/09/03 04:31:46 sakamoto Exp $ +@comment $NetBSD: PLIST,v 1.3 2001/03/16 18:32:48 wiz Exp $ @cwd ${DICT_DIR} @cwd ${DICT_DIR} wnn/ja_JP/pubdic/bio.dic @@ -65,5 +65,6 @@ sbin/wdreg sbin/wnnkill sbin/wnnstat sbin/wnntouch +etc/rc.d/ja-freewnn @exec ln -s ${DICT_DIR}/wnn/ja_JP %D/share/wnn/ja_JP/dic @unexec rm %D/share/wnn/ja_JP/dic diff --git a/misc/freewnn-common/Makefile b/misc/freewnn-common/Makefile index 27b6f9df3e3..3e5454523f8 100644 --- a/misc/freewnn-common/Makefile +++ b/misc/freewnn-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 18:09:03 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/16 18:32:47 wiz Exp $ # DISTNAME= FreeWnn-1.10 @@ -28,10 +28,7 @@ SEDSCRIPT+= -e 's|([CK]*WNNJLIBSRC)/\(lib[ck]*wnn.a\)|{PREFIX}/lib/\1|' SEDSCRIPT+= -e 's|\([JCKT]\)\(WNNDICDIR = \).*|\1\2${DICT_DIR}/wnn/$$(\1WNNLANG)|' INSTALL_FILE= ${WRKDIR}/INSTALL INSTALL_SRC= ${FILESDIR}/INSTALL -PLIST_TMP= ${PKGDIR}/PLIST -PLIST_SRC= ${WRKDIR}/PLIST PLIST_SUBST= DICT_DIR=${DICT_DIR} PREFIX=${PREFIX} WNN_LANG=${WNN_LANG} -STARTUP_SCRIPT_SRC=${WRKDIR}/STARTUP .else MAKE_ENV+= "WNN_TARGET=LIBRARY" .endif @@ -75,14 +72,8 @@ post-patch: post-build: @${SED} -e 's|$${WNNOWNER}|${WNNOWNER}|g' \ ${INSTALL_SRC} > ${INSTALL_FILE} - @${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT_SRC} - @${ECHO} 'freewnn=${JSERVER}' >> ${STARTUP_SCRIPT_SRC} - @${ECHO} 'if [ -f $$freewnn ]; then' >> ${STARTUP_SCRIPT_SRC} - @${ECHO} " echo -n ' ${SCTITLE}'" >> ${STARTUP_SCRIPT_SRC} - @${ECHO} ' $$freewnn' >> ${STARTUP_SCRIPT_SRC} - @${ECHO} "fi" >> ${STARTUP_SCRIPT_SRC} - @${CP} ${PLIST_TMP} ${PLIST_SRC} - @${ECHO} ${STARTUP_SCRIPT} >> ${PLIST_SRC} + @${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/ja-freewnn \ + > ${WRKDIR}/ja-freewnn pre-install: @${SETENV} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL @@ -90,7 +81,7 @@ pre-install: post-install: @${LN} -s ${DICT_DIR}/wnn/${WNN_LANG} \ ${PREFIX}/share/wnn/${WNN_LANG}/dic - @${INSTALL_SCRIPT} ${STARTUP_SCRIPT_SRC} ${PREFIX}/${STARTUP_SCRIPT} + @${INSTALL_SCRIPT} ${WRKDIR}/ja-freewnn ${PREFIX}/etc/rc.d/ja-freewnn .endif .include "../../mk/bsd.pkg.mk" diff --git a/misc/freewnn-common/files/ja-freewnn b/misc/freewnn-common/files/ja-freewnn new file mode 100644 index 00000000000..c61f0b38d89 --- /dev/null +++ b/misc/freewnn-common/files/ja-freewnn @@ -0,0 +1,20 @@ +#!/bin/sh +# +# $NetBSD: ja-freewnn,v 1.1 2001/03/16 18:32:47 wiz Exp $ +# +# PROVIDE: freewnn +# REQUIRE: DAEMON + +. /etc/rc.subr + +name="freewnn" +command_start="@PREFIX@/sbin/jserver" +command_stop="@PREFIX@/sbin/wnnkill" +pidfile="" + +cmd=${1:-start} + +case ${cmd} in +start) + if [ -x ${command_start} ]; then + echo "Start
\ No newline at end of file |