diff options
Diffstat (limited to 'inputmethod/ja-freewnn-lib')
| -rw-r--r-- | inputmethod/ja-freewnn-lib/Makefile.common | 7 | ||||
| -rw-r--r-- | inputmethod/ja-freewnn-lib/files/INSTALL | 26 |
2 files changed, 2 insertions, 31 deletions
diff --git a/inputmethod/ja-freewnn-lib/Makefile.common b/inputmethod/ja-freewnn-lib/Makefile.common index 63988ea4d14..89aebcbdcdd 100644 --- a/inputmethod/ja-freewnn-lib/Makefile.common +++ b/inputmethod/ja-freewnn-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2006/03/10 22:29:08 jlam Exp $ +# $NetBSD: Makefile.common,v 1.12 2006/07/05 06:53:13 jlam Exp $ # DISTNAME= FreeWnn-1.10 @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/Xsi INSTALL_TARGET= install install.man .include "../../mk/bsd.prefs.mk" -WNNOWNER?= wnn +WNNOWNER?= ${FREEWNN_USER} SEDSCRIPT+= -e 's|\(WNNOWNER = \).*|\1${WNNOWNER}|' SEDSCRIPT+= -e 's|\([JCKT]\)\(WNNDICDIR = \).*|\1\2${IMDICTDIR}/wnn/$$(\1WNNLANG)|' @@ -27,9 +27,6 @@ SEDSCRIPT+= -e 's|$$([CK]*WNNJLIBSRC)/lib\([ck]*wnn\).a|-l\1|' SEDSCRIPT+= -e 's|\(:.*\)$$(WNNJLIB)|\1|' .elif defined(WNN_TARGET) && (${WNN_TARGET} == "DICT") MAKE_ENV+= "WNN_TARGET=DICT" -DEINSTALL_SRC= # empty -INSTALL_SRC= ${FILESDIR}/INSTALL -FILES_SUBST+= WNNOWNER=${WNNOWNER} .else MAKE_ENV+= "WNN_TARGET=LIBRARY" .endif diff --git a/inputmethod/ja-freewnn-lib/files/INSTALL b/inputmethod/ja-freewnn-lib/files/INSTALL deleted file mode 100644 index 3515ca59305..00000000000 --- a/inputmethod/ja-freewnn-lib/files/INSTALL +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -WNNOWNER="@WNNOWNER@" - -case $2 in -PRE-INSTALL) - uid=`id -u ${WNNOWNER} 2> /dev/null` - if [ X"$uid" != X ]; then - exit 0 - fi - - wnn_uid=69 - uid=`id -u $wnn_uid 2> /dev/null` - if [ X"$uid" != X ]; then - wnn_uid=32768 - while id -u $wnn_uid > /dev/null 2>&1; do - wnn_uid=`echo $wnn_uid+1|bc` - if [ $wnn_uid = 65536 ]; then - exit 1 - fi - done - fi - chpass -l -a "${WNNOWNER}:*:$wnn_uid:1::0:0:User Wnn:/nonexistent:/sbin/nologin" - exit $? - ;; -esac |