From 3ba41e8b0cf81719575381c547a3ec3f4987b846 Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 5 Jul 2006 06:53:12 +0000 Subject: Drop use of INSTALL_SRC and DEINSTALL_SRC and instead set the proper variables so that the default INSTALL/DEINSTALL scripts from the pkginstall framework do the right thing. Where possible, move some post-install directions for package setup into MESSAGE files so that they may be re-inspected by querying the installed package using "pkg_info -D ...". --- inputmethod/ja-freewnn-lib/Makefile.common | 7 ++----- inputmethod/ja-freewnn-lib/files/INSTALL | 26 -------------------------- inputmethod/ja-freewnn-server-bin/Makefile | 4 ++-- inputmethod/skkinput/INSTALL | 14 -------------- inputmethod/skkinput/Makefile | 8 ++------ inputmethod/skkinput/PLIST | 3 +-- 6 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 inputmethod/ja-freewnn-lib/files/INSTALL delete mode 100644 inputmethod/skkinput/INSTALL (limited to 'inputmethod') 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 diff --git a/inputmethod/ja-freewnn-server-bin/Makefile b/inputmethod/ja-freewnn-server-bin/Makefile index 72edda86d23..f233f69ba87 100644 --- a/inputmethod/ja-freewnn-server-bin/Makefile +++ b/inputmethod/ja-freewnn-server-bin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2006/04/23 00:12:37 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/07/05 06:53:13 jlam Exp $ # PKGNAME= ja-FreeWnn-server-bin-1.10 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= japanese inputmethod MAINTAINER= tech-pkg-ja@jp.NetBSD.org diff --git a/inputmethod/skkinput/INSTALL b/inputmethod/skkinput/INSTALL deleted file mode 100644 index 97719dc7c07..00000000000 --- a/inputmethod/skkinput/INSTALL +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh -# $NetBSD: INSTALL,v 1.2 2003/05/31 13:09:00 uebayasi Exp $ - -case "$2" in -POST-INSTALL) - # install skkserv port number - if grep '^skkserv[ ]' /etc/services >/dev/null; then - : - else - echo ' -skkserv 1178/tcp # SKK server' >>/etc/services - fi - ;; -esac diff --git a/inputmethod/skkinput/Makefile b/inputmethod/skkinput/Makefile index f7152cacdaf..398c7b2853e 100644 --- a/inputmethod/skkinput/Makefile +++ b/inputmethod/skkinput/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:29 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2006/07/05 06:53:13 jlam Exp $ DISTNAME= skkinput-2.06.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= japanese inputmethod MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=skkinput2/1815/} @@ -13,10 +13,6 @@ BUILD_DEFS+= USE_INET6 USE_IMAKE= YES -PLIST_SUBST+= PKGBASE=${LOCALBASE:Q} -DEINSTALL_SRC= # empty -INSTALL_SRC= ${PKGDIR}/INSTALL - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/skkinput ${INSTALL_DATA} ${WRKSRC}/README.jis ${PREFIX}/share/doc/skkinput diff --git a/inputmethod/skkinput/PLIST b/inputmethod/skkinput/PLIST index d4d8f2eca61..09ead281d45 100644 --- a/inputmethod/skkinput/PLIST +++ b/inputmethod/skkinput/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2006/01/12 00:29:16 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/07/05 06:53:13 jlam Exp $ bin/skkinput lib/X11/app-defaults/Skkinput ${IMAKE_MAN_DIR}/skkinput.${IMAKE_MAN_SUFFIX} @@ -7,4 +7,3 @@ share/doc/skkinput/BUGS.jis share/doc/skkinput/FAQ.jis share/doc/skkinput/README.jis @dirrm share/doc/skkinput -@unexec if [ -f ${PKGBASE}/etc/skk.conf ]; then echo 'Remove "${PKGBASE}/etc/skk.conf" if you will not use SKK programs any longer.'; fi -- cgit v1.2.3