From 7e76f0df09f2ec40f95270188eff4cd8eefa5cac Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sun, 19 Jun 2016 16:55:28 +0000 Subject: Update bvi to 1.4.0. Upstream CHANGES: http://bvi.sourceforge.net/new140.html bvi 1.4.0 - stable release * Minor fixes bvi 1.4.0rc2 * Ubuntu bug #252604 fixed * set scroll fixed * adding ASCII_DEL 0x7f for backspace bvi 1.4.0rc * b B w W commands behave equally now (SF bug #5) * .bvirc empty line bug fixed (SF bug #6) * g-command bug fixed (SF bug #7) * several minor fixes bvi 1.4.0beta * ~ - bug fixed (by elo3456) * debian bug #469704 fixed (bmore) * debian bug #715687 fixed (bmore) * red hat bug #925119 fixed bvi 1.4.0alpha * Highlighting of search results * Large File Support added * Binary representation of current byte in status line added * command line options renamed for compability with hexdump * Offset handling fixed (Bug item #3036881) * noshowmode: fix length of statusline * bmore: 'b' bug fixed * ';' bug fixed * ZZ write bug fixed (ZZ ignores readonly) * Buffer overflow if terminal > 255 columns fixed * configure fixed * ncurses with tinfo fixed --- editors/bvi/Makefile | 11 ++++------- editors/bvi/PLIST | 4 ++-- editors/bvi/distinfo | 14 +++++++------- editors/bvi/patches/patch-aa | 21 --------------------- editors/bvi/patches/patch-ab | 20 -------------------- editors/bvi/patches/patch-bm__unix.c | 22 ++++++++++++++++++++++ editors/bvi/patches/patch-comm.c | 23 +++++++++++++++++++++++ 7 files changed, 58 insertions(+), 57 deletions(-) delete mode 100644 editors/bvi/patches/patch-aa delete mode 100644 editors/bvi/patches/patch-ab create mode 100644 editors/bvi/patches/patch-bm__unix.c create mode 100644 editors/bvi/patches/patch-comm.c (limited to 'editors') diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile index 0cd3e9f33ee..b883ec45dd7 100644 --- a/editors/bvi/Makefile +++ b/editors/bvi/Makefile @@ -1,21 +1,18 @@ -# $NetBSD: Makefile,v 1.27 2015/08/18 07:31:05 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2016/06/19 16:55:28 tsutsui Exp $ # -DISTNAME= bvi-1.3.2.src -PKGNAME= bvi-1.3.2 -PKGREVISION= 3 +DISTNAME= bvi-1.4.0.src +PKGNAME= bvi-1.4.0 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bvi/} -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= tsutsui@NetBSD.org HOMEPAGE= http://bvi.sourceforge.net/ COMMENT= Vi-like editor for binary files WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= YES -LIBS+= ${BUILDLINK_LDADD.termcap} MAKE_ENV+= SHELL=${SH:Q} .include "../../mk/curses.buildlink3.mk" -.include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/bvi/PLIST b/editors/bvi/PLIST index 1f6cf989f6a..498ed18dddd 100644 --- a/editors/bvi/PLIST +++ b/editors/bvi/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2004/03/03 21:30:08 ben Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/06/19 16:55:28 tsutsui Exp $ bin/bmore bin/bvedit bin/bvi bin/bview man/man1/bmore.1 man/man1/bvi.1 -lib/bmore.help +share/bvi/bmore.help diff --git a/editors/bvi/distinfo b/editors/bvi/distinfo index 9b8a74cf609..cdeff077922 100644 --- a/editors/bvi/distinfo +++ b/editors/bvi/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2015/11/03 03:32:14 agc Exp $ +$NetBSD: distinfo,v 1.8 2016/06/19 16:55:28 tsutsui Exp $ -SHA1 (bvi-1.3.2.src.tar.gz) = 0ff213ebb5cd0993c5d1f7c8d4172aaec709aac1 -RMD160 (bvi-1.3.2.src.tar.gz) = d50aa06d5c978026d363002fee194802b2096cbc -SHA512 (bvi-1.3.2.src.tar.gz) = eb8a01602751b61c471207124c90346375ccf34ba85e661143f6da8f113f48070d132e98213484bd16d0b6b4c8d0fa27776d36f18cac21336076ca35bcfcb58c -Size (bvi-1.3.2.src.tar.gz) = 170444 bytes -SHA1 (patch-aa) = e62f72fd84d03a0109a0b02950aff468ba5639b6 -SHA1 (patch-ab) = b3aa82a7fea3122328a2bee8e532684bf7f306c2 +SHA1 (bvi-1.4.0.src.tar.gz) = 7b3c0760f0779dba920e08eafcf2fe23a09d70da +RMD160 (bvi-1.4.0.src.tar.gz) = f1b3822cbaef7dfc078629819a0eefda6e82e15f +SHA512 (bvi-1.4.0.src.tar.gz) = 119cfc7350f81c324e77243f948cfb91cd9a3122fef307616e4756a99732f69131aed2a26ebe48048698b9c211a0214255f3e6605ad2cbf479a14a4a0f88923c +Size (bvi-1.4.0.src.tar.gz) = 139202 bytes +SHA1 (patch-bm__unix.c) = 87720c17e7369f123c86c840f8111b7d9ba5ed73 +SHA1 (patch-comm.c) = d86849d41e2387514ea0c222b06400ed14a4ca36 diff --git a/editors/bvi/patches/patch-aa b/editors/bvi/patches/patch-aa deleted file mode 100644 index 0cf5348be36..00000000000 --- a/editors/bvi/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2005/12/09 13:47:58 joerg Exp $ - ---- comm.c.orig 2005-12-09 13:37:50.000000000 +0000 -+++ comm.c -@@ -32,6 +32,8 @@ - #include "bvi.h" - #include "set.h" - -+#include -+ - #ifdef HAVE_UNISTD_H - # include - #endif -@@ -81,7 +83,6 @@ PTR end_addr; - extern char *name; /* actual filename */ - extern char **files; /* used for "next" and "rewind" */ - extern int numfiles, curfile; --extern int errno; - - static char oldbuf[CMDSZ]; /** for :!! command **/ - diff --git a/editors/bvi/patches/patch-ab b/editors/bvi/patches/patch-ab deleted file mode 100644 index 7ca125fa115..00000000000 --- a/editors/bvi/patches/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2005/12/09 13:47:58 joerg Exp $ - ---- bm_unix.c.orig 2005-12-09 13:38:29.000000000 +0000 -+++ bm_unix.c -@@ -25,6 +25,7 @@ - - - #include "bmore.h" -+#include - #include - - #define TBUFSIZ 1024 -@@ -257,7 +258,6 @@ int - vgetc() - { - char cha; -- extern int errno; - - errno = 0; - if (read(2, &cha, 1) <= 0) { diff --git a/editors/bvi/patches/patch-bm__unix.c b/editors/bvi/patches/patch-bm__unix.c new file mode 100644 index 00000000000..83bcd3ac471 --- /dev/null +++ b/editors/bvi/patches/patch-bm__unix.c @@ -0,0 +1,22 @@ +$NetBSD: patch-bm__unix.c,v 1.1 2016/06/19 16:55:28 tsutsui Exp $ + +- use for errno. + +--- bm_unix.c.orig 2013-08-25 18:59:33.000000000 +0000 ++++ bm_unix.c +@@ -27,6 +27,7 @@ + + + #include "bmore.h" ++#include + #include + + #define TBUFSIZ 1024 +@@ -260,7 +261,6 @@ int + vgetc() + { + char cha; +- extern int errno; + + errno = 0; + if (read(2, &cha, 1) <= 0) { diff --git a/editors/bvi/patches/patch-comm.c b/editors/bvi/patches/patch-comm.c new file mode 100644 index 00000000000..3a29e3d5973 --- /dev/null +++ b/editors/bvi/patches/patch-comm.c @@ -0,0 +1,23 @@ +$NetBSD: patch-comm.c,v 1.1 2016/06/19 16:55:28 tsutsui Exp $ + +- use for errno. + +--- comm.c.orig 2014-01-29 14:54:53.000000000 +0000 ++++ comm.c +@@ -35,6 +35,8 @@ + #include "bvi.h" + #include "set.h" + ++#include ++ + #ifdef HAVE_UNISTD_H + # include + #endif +@@ -84,7 +86,6 @@ PTR end_addr; + extern char *name; /* actual filename */ + extern char **files; /* used for "next" and "rewind" */ + extern int numfiles, curfile; +-extern int errno; + + static char oldbuf[CMDSZ]; /** for :!! command **/ + -- cgit v1.2.3