pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors/nvi Update to 1.81.6:
details: https://anonhg.NetBSD.org/pkgsrc/rev/f891ea6fc3f0
branches: trunk
changeset: 541097:f891ea6fc3f0
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Apr 15 11:58:12 2008 +0000
description:
Update to 1.81.6:
Changes since 1.81.5
* various compilation fixes
* support for newer DBs
* tcl support compiles again
diffstat:
editors/nvi/Makefile | 5 +-
editors/nvi/distinfo | 18 ++--------
editors/nvi/patches/patch-ab | 13 -------
editors/nvi/patches/patch-ac | 13 -------
editors/nvi/patches/patch-ad | 13 -------
editors/nvi/patches/patch-ae | 16 ---------
editors/nvi/patches/patch-af | 76 --------------------------------------------
editors/nvi/patches/patch-ag | 34 -------------------
editors/nvi/patches/patch-ah | 13 -------
editors/nvi/patches/patch-ai | 23 -------------
editors/nvi/patches/patch-aj | 20 -----------
editors/nvi/patches/patch-ak | 16 ---------
12 files changed, 6 insertions(+), 254 deletions(-)
diffs (truncated from 314 to 300 lines):
diff -r 8a44b2c40ad9 -r f891ea6fc3f0 editors/nvi/Makefile
--- a/editors/nvi/Makefile Tue Apr 15 11:09:58 2008 +0000
+++ b/editors/nvi/Makefile Tue Apr 15 11:58:12 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2008/02/21 21:20:12 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2008/04/15 11:58:12 wiz Exp $
#
-DISTNAME= nvi-1.81.5
-PKGREVISION= 6
+DISTNAME= nvi-1.81.6
CATEGORIES= editors
MASTER_SITES= ${HOMEPAGE}
EXTRACT_SUFX= .tar.bz2
diff -r 8a44b2c40ad9 -r f891ea6fc3f0 editors/nvi/distinfo
--- a/editors/nvi/distinfo Tue Apr 15 11:09:58 2008 +0000
+++ b/editors/nvi/distinfo Tue Apr 15 11:58:12 2008 +0000
@@ -1,15 +1,5 @@
-$NetBSD: distinfo,v 1.8 2008/02/21 21:17:45 jlam Exp $
+$NetBSD: distinfo,v 1.9 2008/04/15 11:58:12 wiz Exp $
-SHA1 (nvi-1.81.5.tar.bz2) = 63a5837cf9e726c10a9927323b451390e267765e
-RMD160 (nvi-1.81.5.tar.bz2) = a3c37e0e2bb87353547af37d6f736d1dd1d3c6ad
-Size (nvi-1.81.5.tar.bz2) = 1274353 bytes
-SHA1 (patch-ab) = d5cb1cccb2799bb21822dcd0e11d7208c60f40b6
-SHA1 (patch-ac) = 239764397e64323edfba6fcf4ae99846cebbdbe1
-SHA1 (patch-ad) = 3cdd8ea5ad6c9c4e6a2d1f77d0b28f80fae44fd0
-SHA1 (patch-ae) = 28441e05bd1bbaa89a1df516decc583898eb1a23
-SHA1 (patch-af) = 63ad95807e1d0011f82df0bf602330aa0204cf9b
-SHA1 (patch-ag) = decdf31882e718441f59e024ca1a8dcc5e469a62
-SHA1 (patch-ah) = c0c0feaacab0b88afe0a101bc70e25b3e772b280
-SHA1 (patch-ai) = 01ec27bb9313e98503f650630cf868745098ea32
-SHA1 (patch-aj) = 4ef7015132c4b7d30548f6a37ec8e221e47d4ee8
-SHA1 (patch-ak) = a0cb43f9077a58538401d1ca25f03919168b950e
+SHA1 (nvi-1.81.6.tar.bz2) = d3445ed69166102735335a2ff60d092d9a9143c6
+RMD160 (nvi-1.81.6.tar.bz2) = 0db8568bea96392d9a027044177c60317c8ade36
+Size (nvi-1.81.6.tar.bz2) = 1758309 bytes
diff -r 8a44b2c40ad9 -r f891ea6fc3f0 editors/nvi/patches/patch-ab
--- a/editors/nvi/patches/patch-ab Tue Apr 15 11:09:58 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$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 -r 8a44b2c40ad9 -r f891ea6fc3f0 editors/nvi/patches/patch-ac
--- a/editors/nvi/patches/patch-ac Tue Apr 15 11:09:58 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$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 -r 8a44b2c40ad9 -r f891ea6fc3f0 editors/nvi/patches/patch-ad
--- a/editors/nvi/patches/patch-ad Tue Apr 15 11:09:58 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$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;;) {
diff -r 8a44b2c40ad9 -r f891ea6fc3f0 editors/nvi/patches/patch-ae
--- a/editors/nvi/patches/patch-ae Tue Apr 15 11:09:58 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2006/09/16 15:29:35 hira Exp $
-
---- ../common/common.h.orig Tue Apr 24 08:46:55 2001
-+++ ../common/common.h Sat Jan 7 01:36:53 2006
-@@ -16,6 +16,11 @@
- #include <sys/queue.h>
- #include <bitstring.h>
- /*
-+ * include ctype very early to avoid real functions being run over by
-+ * macros.
-+ */
-+#include <ctype.h>
-+/*
- * Porting information built at configuration time. Included before
- * any of nvi's include files.
- */
diff -r 8a44b2c40ad9 -r f891ea6fc3f0 editors/nvi/patches/patch-af
--- a/editors/nvi/patches/patch-af Tue Apr 15 11:09:58 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/12/12 03:37:30 dogcow Exp $
-
---- ../common/mem.h.orig 2000-08-20 19:12:59.000000000 +1000
-+++ ../common/mem.h 2006-12-03 15:21:22.000000000 +1000
-@@ -26,8 +26,9 @@
- } \
- }
- #define BINC_GOTOW(sp, lp, llen, nlen) { \
-- CHAR_T *L__bp = lp; \
-- BINC_GOTO(sp, (char *)lp, llen, (nlen) * sizeof(CHAR_T)) \
-+ char *L__lp = (char *)lp; \
-+ BINC_GOTO(sp, L__lp, llen, (nlen) * sizeof(CHAR_T)) \
-+ lp = (CHAR_T *) L__lp; \
- }
- #define BINC_RET(sp, lp, llen, nlen) { \
- char *L__p = lp; \
-@@ -43,8 +44,9 @@
- } \
- }
- #define BINC_RETW(sp, lp, llen, nlen) { \
-- CHAR_T *L__bp = lp; \
-- BINC_RET(sp, (char *)lp, llen, (nlen) * sizeof(CHAR_T)) \
-+ char *L__lp = (char *)lp; \
-+ BINC_RET(sp, L__lp, llen, (nlen) * sizeof(CHAR_T)) \
-+ lp = (CHAR_T *) L__lp; \
- }
-
- /*
-@@ -66,8 +68,9 @@
- } \
- }
- #define GET_SPACE_GOTOW(sp, bp, blen, nlen) { \
-- CHAR_T *L__bp = bp; \
-- GET_SPACE_GOTO(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T)) \
-+ char *L__bp = (char *)bp; \
-+ GET_SPACE_GOTO(sp, L__bp, blen, (nlen) * sizeof(CHAR_T)) \
-+ bp = (CHAR_T *) L__bp; \
- }
- #define GET_SPACE_RET(sp, bp, blen, nlen) { \
- WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp; \
-@@ -83,8 +86,9 @@
- } \
- }
- #define GET_SPACE_RETW(sp, bp, blen, nlen) { \
-- CHAR_T *L__bp = bp; \
-- GET_SPACE_RET(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T)) \
-+ char *L__bp = (char *)bp; \
-+ GET_SPACE_RET(sp, L__bp, blen, (nlen) * sizeof(CHAR_T)) \
-+ bp = (CHAR_T *) L__bp; \
- }
-
- /*
-@@ -103,8 +107,9 @@
- BINC_GOTO(sp, bp, blen, nlen); \
- }
- #define ADD_SPACE_GOTOW(sp, bp, blen, nlen) { \
-- CHAR_T *L__bp = bp; \
-- ADD_SPACE_GOTO(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T)) \
-+ char *L__bp = (char *)bp; \
-+ ADD_SPACE_GOTO(sp, L__bp, blen, (nlen) * sizeof(CHAR_T)) \
-+ bp = (CHAR_T *) L__bp; \
- }
- #define ADD_SPACE_RET(sp, bp, blen, nlen) { \
- WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp; \
-@@ -118,8 +123,9 @@
- BINC_RET(sp, bp, blen, nlen); \
- }
- #define ADD_SPACE_RETW(sp, bp, blen, nlen) { \
-- CHAR_T *L__bp = bp; \
-- ADD_SPACE_RET(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T)) \
-+ char *L__bp = (char *)bp; \
-+ ADD_SPACE_RET(sp, L__bp, blen, (nlen) * sizeof(CHAR_T)) \
-+ bp = (CHAR_T *) L__bp; \
- }
-
- /* Free a GET_SPACE returned buffer. */
diff -r 8a44b2c40ad9 -r f891ea6fc3f0 editors/nvi/patches/patch-ag
--- a/editors/nvi/patches/patch-ag Tue Apr 15 11:09:58 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/12/12 03:37:30 dogcow Exp $
-
---- ../cl/cl_funcs.c.orig 2001-06-26 01:19:05.000000000 +1000
-+++ ../cl/cl_funcs.c 2006-12-03 15:21:22.000000000 +1000
-@@ -381,7 +381,7 @@
-
- if (CLSP(discardp)) {
- delwin(CLSP(discardp));
-- CLSP(discardp) = NULL;
-+ discardp->cl_private = NULL;
- }
- }
-
-@@ -395,7 +395,7 @@
-
- if (CLSP(tsp))
- delwin(CLSP(tsp));
-- CLSP(tsp) = subwin(stdscr, tsp->rows, tsp->cols,
-+ tsp->cl_private = subwin(stdscr, tsp->rows, tsp->cols,
- tsp->roff, tsp->coff);
- }
-
-@@ -716,9 +716,9 @@
- if (CLSP(origp))
- delwin(CLSP(origp));
-
-- CLSP(origp) = subwin(stdscr, origp->rows, origp->cols,
-+ origp->cl_private = subwin(stdscr, origp->rows, origp->cols,
- origp->roff, origp->coff);
-- CLSP(newp) = subwin(stdscr, newp->rows, newp->cols,
-+ newp->cl_private = subwin(stdscr, newp->rows, newp->cols,
- newp->roff, newp->coff);
-
- /* origp is the original screen, giving up space to newp. */
diff -r 8a44b2c40ad9 -r f891ea6fc3f0 editors/nvi/patches/patch-ah
--- a/editors/nvi/patches/patch-ah Tue Apr 15 11:09:58 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/12/12 03:37:30 dogcow Exp $
-
---- ../cl/cl_screen.c.orig 2001-06-26 01:19:06.000000000 +1000
-+++ ../cl/cl_screen.c 2006-12-03 15:21:22.000000000 +1000
-@@ -56,7 +56,7 @@
- if (F_ISSET(gp, G_SRESTART)) {
- if (CLSP(sp)) {
- delwin(CLSP(sp));
-- CLSP(sp) = NULL;
-+ sp->cl_private = NULL;
- }
- if (cl_quit(gp))
- return (1);
diff -r 8a44b2c40ad9 -r f891ea6fc3f0 editors/nvi/patches/patch-ai
--- a/editors/nvi/patches/patch-ai Tue Apr 15 11:09:58 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/12/12 03:37:30 dogcow Exp $
-
---- ../common/db.c.orig 2001-08-19 07:52:00.000000000 +1000
-+++ ../common/db.c 2006-12-03 15:21:22.000000000 +1000
-@@ -94,6 +94,7 @@
- CHAR_T *wp;
- size_t wlen;
- size_t nlen;
-+ char *c_lp;
-
- /*
- * The underlying recno stuff handles zero by returning NULL, but
-@@ -164,7 +165,9 @@
- nlen = 1024;
- retry:
- /* data.size contains length in bytes */
-- BINC_GOTO(sp, (char *)ep->c_lp, ep->c_blen, nlen);
-+ c_lp = (char *) ep->c_lp;
-+ BINC_GOTO(sp, c_lp, ep->c_blen, nlen);
-+ ep->c_lp = (CHAR_T *) c_lp;
-
- /* Get the line from the underlying database. */
- memset(&key, 0, sizeof(key));
diff -r 8a44b2c40ad9 -r f891ea6fc3f0 editors/nvi/patches/patch-aj
--- a/editors/nvi/patches/patch-aj Tue Apr 15 11:09:58 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/12/12 03:37:30 dogcow Exp $
-
---- ../common/key.c.orig 2001-06-26 01:19:10.000000000 +1000
-+++ ../common/key.c 2006-12-03 15:21:22.000000000 +1000
-@@ -829,11 +829,14 @@
- {
- WIN *wp;
- size_t new_nelem, olen;
-+ char *i_event;
-
- wp = sp->wp;
- new_nelem = wp->i_nelem + add;
- olen = wp->i_nelem * sizeof(wp->i_event[0]);
-- BINC_RET(sp, (char *)wp->i_event, olen, new_nelem * sizeof(wp->i_event[0]));
-+ i_event = (char *)wp->i_event;
-+ BINC_RET(sp, i_event, olen, new_nelem * sizeof(wp->i_event[0]));
-+ wp->i_event = (EVENT *) i_event;
- wp->i_nelem = olen / sizeof(wp->i_event[0]);
- return (0);
- }
diff -r 8a44b2c40ad9 -r f891ea6fc3f0 editors/nvi/patches/patch-ak
--- a/editors/nvi/patches/patch-ak Tue Apr 15 11:09:58 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/12/12 03:37:30 dogcow Exp $
-
Home |
Main Index |
Thread Index |
Old Index