diff options
| author | seb <seb@pkgsrc.org> | 2002-01-15 21:19:57 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2002-01-15 21:19:57 +0000 |
| commit | a9b999f95f4acfa792ad6e7bf6e0b7da5d69677c (patch) | |
| tree | 20026dac9c1e5b3d0ae29c0543a592d8a47645c1 /editors/nvi | |
| parent | d11840f91322c43314bd2d080ea1abc446980415 (diff) | |
| download | pkgsrc-a9b999f95f4acfa792ad6e7bf6e0b7da5d69677c.tar.gz | |
Add patches to avoid collision between nvi's VI cpp macro and VI external
variable declared in older NetBSD curses.h.
Diffstat (limited to 'editors/nvi')
| -rw-r--r-- | editors/nvi/distinfo | 5 | ||||
| -rw-r--r-- | editors/nvi/patches/patch-ab | 13 | ||||
| -rw-r--r-- | editors/nvi/patches/patch-ac | 13 | ||||
| -rw-r--r-- | editors/nvi/patches/patch-ad | 13 |
4 files changed, 43 insertions, 1 deletions
diff --git a/editors/nvi/distinfo b/editors/nvi/distinfo index 0aed37dc191..7398d4ff776 100644 --- a/editors/nvi/distinfo +++ b/editors/nvi/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/01/12 10:59:30 wiz Exp $ +$NetBSD: distinfo,v 1.2 2002/01/15 21:19:57 seb Exp $ SHA1 (nvi-1.81.5.tar.bz2) = 63a5837cf9e726c10a9927323b451390e267765e Size (nvi-1.81.5.tar.bz2) = 1274353 bytes SHA1 (patch-aa) = 4dcab66a7326e2f25d50bf188d941c7961a5955d +SHA1 (patch-ab) = d5cb1cccb2799bb21822dcd0e11d7208c60f40b6 +SHA1 (patch-ac) = 239764397e64323edfba6fcf4ae99846cebbdbe1 +SHA1 (patch-ad) = 3cdd8ea5ad6c9c4e6a2d1f77d0b28f80fae44fd0 diff --git a/editors/nvi/patches/patch-ab b/editors/nvi/patches/patch-ab new file mode 100644 index 00000000000..0e1fc1c1299 --- /dev/null +++ b/editors/nvi/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2002/01/15 21:19:57 seb Exp $ + +--- ../dist/Makefile.am.orig Mon Jul 16 12:49:10 2001 ++++ ../dist/Makefile.am +@@ -237,7 +237,7 @@ + vi_motif_LDADD = @MOTIFLIBS@ @LIBOBJS@ + vi_motif_CFLAGS = @XINCS@ + +-VI=-DVI=\"$(bindir)/`echo vi-ipc | sed '$(transform)'`\" ++VI=-DVI_CMD=\"$(bindir)/`echo vi-ipc | sed '$(transform)'`\" + CFLAGS= -D__REGEX_PRIVATE $(OPTFLAG) @CFLAGS@ -I. -I$(visrcdir)/include \ + @CPPFLAGS@ $(VI) + PERL= @vi_cv_path_perl@ diff --git a/editors/nvi/patches/patch-ac b/editors/nvi/patches/patch-ac new file mode 100644 index 00000000000..d8d5094823d --- /dev/null +++ b/editors/nvi/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2002/01/15 21:19:58 seb Exp $ + +--- ../dist/Makefile.in.orig Tue Aug 21 14:41:49 2001 ++++ ../dist/Makefile.in +@@ -370,7 +370,7 @@ + vi_motif_LDADD = @MOTIFLIBS@ @LIBOBJS@ + vi_motif_CFLAGS = @XINCS@ + +-VI = -DVI=\"$(bindir)/`echo vi-ipc | sed '$(transform)'`\" ++VI = -DVI_CMD=\"$(bindir)/`echo vi-ipc | sed '$(transform)'`\" + CFLAGS = -D__REGEX_PRIVATE $(OPTFLAG) @CFLAGS@ -I. -I$(visrcdir)/include \ + @CPPFLAGS@ $(VI) + diff --git a/editors/nvi/patches/patch-ad b/editors/nvi/patches/patch-ad new file mode 100644 index 00000000000..a6b4d68d8b0 --- /dev/null +++ b/editors/nvi/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2002/01/15 21:19:58 seb Exp $ + +--- ../ipc/ip_run.c.orig Tue Jul 4 23:48:54 2000 ++++ ../ipc/ip_run.c +@@ -57,7 +57,7 @@ + char *execp, **p_av, **t_av; + + pflag = 0; +- execp = VI; ++ execp = VI_CMD; + + /* Strip out any arguments that vi isn't going to understand. */ + for (p_av = t_av = argv;;) { |