summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorobache <obache>2007-11-19 12:24:06 +0000
committerobache <obache>2007-11-19 12:24:06 +0000
commita71311d8db365d64cad7b070d9320dbcaccfd810 (patch)
treef0a5c7f55c8abe40216ba03eb0715c41dc63f16f /editors
parenteaeb448b1d37be4dc4fcb28d2304bccf5ebc4501 (diff)
downloadpkgsrc-a71311d8db365d64cad7b070d9320dbcaccfd810.tar.gz
Improve wrapper script, closing to usual behavior.
* Pass settings to nvi with env NEXINIT instead of EXINIT, to avoid affect of env NEXINIT. * Honor NEXINIT, EXINIT environment variable. * Pass all setting in ~/.{n}exrc by using source command. Fixes PR 13677. Bump PKGREVISION.
Diffstat (limited to 'editors')
-rw-r--r--editors/nvi-m17n/Makefile4
-rwxr-xr-xeditors/nvi-m17n/files/nvi-m17n17
2 files changed, 15 insertions, 6 deletions
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index ddc2f3a069b..dd1a1bd0086 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2007/11/17 13:40:15 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/11/19 12:24:06 obache Exp $
DISTNAME= nvi-1.79
PKGNAME= nvi-m17n-1.79.20040401
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= editors
MASTER_SITES= ftp://ftp.sleepycat.com/pub/ \
ftp://ftp.foretune.co.jp/pub/tools/nvi/
diff --git a/editors/nvi-m17n/files/nvi-m17n b/editors/nvi-m17n/files/nvi-m17n
index b977641b370..6b8370e4103 100755
--- a/editors/nvi-m17n/files/nvi-m17n
+++ b/editors/nvi-m17n/files/nvi-m17n
@@ -1,9 +1,18 @@
#! /bin/sh
EXINIT0="set ${CANNA_OPT} autodetect=${AUTODETECT} fileencoding=${ENCODING} displayencoding=${ENCODING} inputencoding=${ENCODING} noskipdisplay"
-if [ -f ~/.exrc ]; then
- EXINIT="$EXINIT0 `sed -e '/^set /!d' -e 's/^set //' < ~/.exrc | tr '\012' ' '`"
+if [ "x$NEXINIT" != "x" -a "${NEXINIT-UNSET}" != "UNSET" ]; then
+ EXINIT1="$NEXINIT"
+elif [ "x$EXINIT" != "x" -a "${EXINIT-UNSET}" != "UNSET" ]; then
+ EXINIT1="$EXINIT"
else
- EXINIT=$EXINIT0
+ ecfile="/dev/null"
+ if [ -f "${HOME}/.nexrc" ]; then
+ rcfile="$HOME/.nexrc"
+ elif [ -f "${HOME}/.exrc" ]; then
+ rcfile="$HOME/.exrc"
+ fi
+ EXINIT1="source $rcfile"
fi
-export EXINIT
+NEXINIT="$EXINIT0|$EXINIT1"
+export NEXINIT
exec ${PREFIX}/bin/nvi "$@"