just match the first 2 chars of EDITOR to recognize vi mode, this way

a value of 'vim' works as expected
sync patches while here

from mfriedl@ who is too shy to commit to ports
This commit is contained in:
sturm 2007-07-04 16:39:41 +00:00
parent 3e151172e1
commit 18a9741557
6 changed files with 31 additions and 19 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.29 2005/02/21 20:49:25 alek Exp $
# $OpenBSD: Makefile,v 1.30 2007/07/04 16:39:41 sturm Exp $
COMMENT= "gid/lid tools for looking up variables in code"
DISTNAME= id-utils-3.2d
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= devel
# License: GPL

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2005/02/21 20:49:26 alek Exp $
--- configure.orig Mon Feb 21 21:29:38 2005
+++ configure Mon Feb 21 21:30:02 2005
@@ -3545,7 +3545,7 @@ if eval "test \"\${ac_cv_lib_$ac_lib_var
$OpenBSD: patch-configure,v 1.2 2007/07/04 16:39:41 sturm Exp $
--- configure.orig Sun Apr 4 11:52:55 1999
+++ configure Wed Jul 4 18:32:54 2007
@@ -3545,7 +3545,7 @@ if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.1 2005/02/21 20:49:26 alek Exp $
cat > conftest.$ac_ext <<EOF
#line 3551 "configure"
#include "confdefs.h"
@@ -3585,7 +3585,7 @@ if eval "test \"\${ac_cv_lib_$ac_lib_var
@@ -3585,7 +3585,7 @@ if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2005/02/21 20:49:26 alek Exp $
--- lib/Makefile.in.orig Mon Feb 21 21:38:37 2005
+++ lib/Makefile.in Mon Feb 21 21:38:41 2005
@@ -105,7 +105,7 @@ libsys_a_SOURCES = xgetcwd.c xmalloc.c g
$OpenBSD: patch-lib_Makefile_in,v 1.2 2007/07/04 16:39:41 sturm Exp $
--- lib/Makefile.in.orig Tue Apr 6 10:28:36 1999
+++ lib/Makefile.in Wed Jul 4 18:32:54 2007
@@ -105,7 +105,7 @@ libsys_a_SOURCES = xgetcwd.c xmalloc.c getopt.c getopt
noinst_HEADERS = ansidecl.h error.h fnmatch.h getopt.h obstack.h pathmax.h regex.h xalloca.h xdirent.h xfnmatch.h xmalloc.h xobstack.h xstddef.h xstdlib.h xstring.h xsysstat.h xunistd.h

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-m4_Makefile_in,v 1.1 2004/07/19 16:12:36 espie Exp $
--- m4/Makefile.in.orig Mon Jul 19 18:02:05 2004
+++ m4/Makefile.in Mon Jul 19 18:02:28 2004
@@ -194,14 +194,14 @@ distclean-generic clean-generic maintain
$OpenBSD: patch-m4_Makefile_in,v 1.2 2007/07/04 16:39:41 sturm Exp $
--- m4/Makefile.in.orig Tue Apr 6 10:28:40 1999
+++ m4/Makefile.in Wed Jul 4 18:32:54 2007
@@ -194,14 +194,14 @@ distclean-generic clean-generic maintainer-clean-gener
mostlyclean distclean maintainer-clean

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2005/02/21 20:49:26 alek Exp $
--- src/Makefile.in.orig Mon Feb 21 21:38:11 2005
+++ src/Makefile.in Mon Feb 21 21:38:20 2005
@@ -102,7 +102,7 @@ EXTRA_DIST = ansi2knr.1 ansi2knr.c $(bin
$OpenBSD: patch-src_Makefile_in,v 1.2 2007/07/04 16:39:41 sturm Exp $
--- src/Makefile.in.orig Tue Apr 6 10:28:38 1999
+++ src/Makefile.in Wed Jul 4 18:32:54 2007
@@ -102,7 +102,7 @@ EXTRA_DIST = ansi2knr.1 ansi2knr.c $(bin_SCRIPTS)
localedir = $(datadir)/locale

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_lid_c,v 1.1 2007/07/04 16:39:41 sturm Exp $
--- src/lid.c.orig Wed Jul 4 18:33:25 2007
+++ src/lid.c Wed Jul 4 18:33:45 2007
@@ -609,7 +609,7 @@ report_edit (char const *name, struct file_link **flin
if (eid_arg == 0)
{
- int using_vi = strequ ("vi", basename (editor));
+ int using_vi = strnequ ("vi", basename (editor), 2);
eid_arg = getenv ("EIDARG");
if (eid_arg == 0)