* Update to 1.4.0 for small fixes & improvements accumulated over ten years.

* Take maintainer.

Approved by:	vd

5 files changed, 18 insertions, 51 deletions

diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index 17313b8dcc3d..44d228c7d13f 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -2,15 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	bvi
-PORTVERSION=	1.3.2
+PORTVERSION=	1.4.0
 CATEGORIES=	editors
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.src.tar.gz
 
-MAINTAINER=	vd@FreeBSD.org
+MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Vi-like binary file (hex)editor
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/editors/bvi/distinfo b/editors/bvi/distinfo
index c482e61a058d..072764171733 100644
--- a/editors/bvi/distinfo
+++ b/editors/bvi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bvi-1.3.2.src.tar.gz) = ff390af1c474bf870b6171332726b93bad8e716ea378827b55d8aae82dee1c84
-SIZE (bvi-1.3.2.src.tar.gz) = 170444
+SHA256 (bvi-1.4.0.src.tar.gz) = 015a3c2832c7c097d98a5527deef882119546287ba8f2a70c736227d764ef802
+SIZE (bvi-1.4.0.src.tar.gz) = 139202
diff --git a/editors/bvi/files/patch-Makefile.in b/editors/bvi/files/patch-Makefile.in
index 7b9b40b2b3b1..dbbcee31ee31 100644
--- a/editors/bvi/files/patch-Makefile.in
+++ b/editors/bvi/files/patch-Makefile.in
@@ -1,36 +1,12 @@
---- Makefile.in.orig	Thu Jul  3 15:55:22 2003
-+++ Makefile.in	Fri Mar 24 09:03:08 2006
-@@ -26,6 +26,7 @@
- bindir = $(DESTDIR)@bindir@
- mandir = $(DESTDIR)@mandir@
- libdir = $(DESTDIR)@libdir@
-+datadir= $(DESTDIR)@datadir@
- 
- man1dir = $(mandir)/man1
- 
-@@ -58,7 +59,7 @@
+--- Makefile.in.orig	2014-10-01 18:59:36 UTC
++++ Makefile.in
+@@ -57,7 +57,8 @@
+ bmore: $(BMOBJ)
+ 	$(CC) $(LDFLAGS) -o bmore $(BMOBJ) $(LIBS)
+ 
+-%.o: %.c $(INCLUDES)
++$(OBJS:.o=.c): $(INCLUDES)
++.c.o:
  	$(CC) $(CFLAGS) $(DEFS) -c $<
  
  bmore.o: bmore.c
--	$(CC) $(CFLAGS) $(DEFS) -DHELPFILE=\"$(libdir)/bmore.help\" -c $<
-+	$(CC) $(CFLAGS) $(DEFS) -DHELPFILE=\"$(datadir)/bmore.help\" -c $<
- 
- 
- install: all installdirs
-@@ -66,14 +67,14 @@
- 	@$(INSTALL_DATA) bvi.1 bmore.1 $(man1dir)
- 	@$(INSTALL_PROGRAM) -s bvi $(bindir)
- 	@$(INSTALL_PROGRAM) -s bmore $(bindir)
--	@$(INSTALL_DATA) bmore.help $(libdir)
-+	@$(INSTALL_DATA) bmore.help $(datadir)
- 	@if [ -f $(bindir)/bview ]; then rm $(bindir)/bview; fi
- 	@if [ -f $(bindir)/bvedit ]; then rm $(bindir)/bvedit; fi
- 	@ln $(bindir)/bvi $(bindir)/bview
- 	@ln $(bindir)/bvi $(bindir)/bvedit
- 
- installdirs:
--	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(libdir) $(man1dir)
-+	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(libdir) $(man1dir) $(datadir)
- 
- uninstall:
- 	@echo "Uninstalling bvi"
diff --git a/editors/bvi/files/patch-io.c b/editors/bvi/files/patch-io.c
deleted file mode 100644
index 2503c09c8149..000000000000
--- a/editors/bvi/files/patch-io.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- io.c.orig	Tue Nov  2 04:44:10 1999
-+++ io.c	Fri Nov 26 18:06:58 1999
-@@ -119,7 +119,7 @@
- 		} else if (S_ISBLK(buf.st_mode)) {
- 			filemode = BLOCK_SPECIAL;
- 		} else if (S_ISREG(buf.st_mode)) {
--			if ((unsigned long)buf.st_size > (unsigned long)SIZE_T_MAX) {
-+			if (buf.st_size > SIZE_T_MAX) {
- 				move(maxy, 0);
- 				endwin();
- 				printf("File too large\n");
diff --git a/editors/bvi/pkg-descr b/editors/bvi/pkg-descr
index 174f3d74693e..9af98942c54a 100644
--- a/editors/bvi/pkg-descr
+++ b/editors/bvi/pkg-descr
@@ -1,4 +1,7 @@
-Bvi is a display oriented (hex)editor for binary
-files based on those of the vi(1) texteditor.
+Bvi stands for "Binary VIsual editor".  Bvi is a screen-oriented
+editor for binary files; its command set is based on that of the
+vi(1) text editor.  As a binary editor does not have the concept
+of "lines", there are differences from vi commands wherever the
+latter are line oriented.
 
 WWW: http://bvi.sourceforge.net/