diff options
| author | jlam <jlam@pkgsrc.org> | 2003-08-30 20:22:49 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-08-30 20:22:49 +0000 |
| commit | 2920a32c71bae3a6a02b2c5c0576d9a60b9a0594 (patch) | |
| tree | d334e2fd95050def4488e848ea48612e6f9103a4 /inputmethod | |
| parent | 2ebf5a7dc8b33d5f29466890b65a69e886f19281 (diff) | |
| download | pkgsrc-2920a32c71bae3a6a02b2c5c0576d9a60b9a0594.tar.gz | |
Prepare for pkgviews by making sure that passing VIEW-INSTALL or
VIEW-DEINSTALL to the INSTALL/DEINSTALL scripts don't cause errors.
Diffstat (limited to 'inputmethod')
| -rw-r--r-- | inputmethod/canna-server-bin/INSTALL | 18 | ||||
| -rw-r--r-- | inputmethod/canna-server-bin/Makefile | 3 | ||||
| -rw-r--r-- | inputmethod/skkserv/INSTALL | 3 | ||||
| -rw-r--r-- | inputmethod/skkserv/Makefile | 3 |
4 files changed, 14 insertions, 13 deletions
diff --git a/inputmethod/canna-server-bin/INSTALL b/inputmethod/canna-server-bin/INSTALL index 1219a0a90cf..2156c4bd109 100644 --- a/inputmethod/canna-server-bin/INSTALL +++ b/inputmethod/canna-server-bin/INSTALL @@ -1,7 +1,11 @@ -#!/bin/sh -if [ "$2" != "POST-INSTALL" ]; then exit 0; fi -(grep -v ^# /etc/services | grep 'canna.*5680' >/dev/null) || \ - (echo "" >> /etc/services; \ - echo "# canna package" >> /etc/services; \ - echo "canna 5680/tcp" >> /etc/services; \ - ) +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:54 jlam Exp $ + +case ${STAGE} in +POST-INSTALL) + (${GREP} -v ^# /etc/services | ${GREP} 'canna.*5680' >/dev/null) || \ + (${ECHO} "" >> /etc/services; \ + ${ECHO} "# canna package" >> /etc/services; \ + ${ECHO} "canna 5680/tcp" >> /etc/services; \ + ) + ;; +esac diff --git a/inputmethod/canna-server-bin/Makefile b/inputmethod/canna-server-bin/Makefile index 2fa0840e195..7bd3924aeab 100644 --- a/inputmethod/canna-server-bin/Makefile +++ b/inputmethod/canna-server-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/29 19:53:20 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2003/08/30 20:22:54 jlam Exp $ # .include "../canna/Makefile.common" @@ -36,7 +36,6 @@ do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF} post-install: - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL @${INSTALL_SCRIPT} ${WRKDIR}/canna ${PREFIX}/etc/rc.d/canna .include "../../devel/nbitools/buildlink2.mk" diff --git a/inputmethod/skkserv/INSTALL b/inputmethod/skkserv/INSTALL index 5adf8d61b41..04074bfa87c 100644 --- a/inputmethod/skkserv/INSTALL +++ b/inputmethod/skkserv/INSTALL @@ -1,5 +1,4 @@ -#! /bin/sh -# $NetBSD: INSTALL,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $ +# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:55 jlam Exp $ case "$2" in POST-INSTALL) diff --git a/inputmethod/skkserv/Makefile b/inputmethod/skkserv/Makefile index eb3a8a2cdc8..c6120ab2d9f 100644 --- a/inputmethod/skkserv/Makefile +++ b/inputmethod/skkserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/29 22:08:28 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2003/08/30 20:22:55 jlam Exp $ DISTNAME= skk9.6 PKGNAME= skkserv-3.9.4 @@ -23,7 +23,6 @@ BUILD_DEFS+= USE_INET6 DIST_SUBDIR= skk GNU_CONFIGURE= YES -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL .include "../../mk/bsd.prefs.mk" |