4 files changed, 19 insertions, 37 deletions

diff --git a/editors/2bsd-vi/Makefile b/editors/2bsd-vi/Makefile
index bd1ef39da03c..7503a2134cc9 100644
--- a/editors/2bsd-vi/Makefile
+++ b/editors/2bsd-vi/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vi
-PORTVERSION=	040605
-PORTREVISION=	1
+PORTVERSION=	041202
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ex-vi/
@@ -17,6 +16,9 @@ DISTNAME=	ex-${PORTVERSION}
 MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	The original vi editor, updated to run on modern OSes
 
+USE_BZIP2=	yes
+USE_REINPLACE=	yes
+
 MAN1=	ex.1 vi.1
 MLINKS=	ex.1 edit.1  vi.1 vedit.1  vi.1 view.1
 
@@ -26,4 +28,9 @@ MLINKS=	ex.1 edit.1  vi.1 vedit.1  vi.1 view.1
 EXTRA_PATCHES+=	${FILESDIR}/stable-Makefile.patch
 .endif
 
+post-patch:
+.if ${OSVERSION} < 500000
+	@${REINPLACE_CMD} -e 's|-DMB||g' ${WRKSRC}/Makefile
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/editors/2bsd-vi/distinfo b/editors/2bsd-vi/distinfo
index d345305fae7a..340c9cac17b7 100644
--- a/editors/2bsd-vi/distinfo
+++ b/editors/2bsd-vi/distinfo
@@ -1,2 +1,2 @@
-MD5 (ex-040605.tar.gz) = f4b9473c6a771b94ff2e605c53310908
-SIZE (ex-040605.tar.gz) = 265672
+MD5 (ex-041202.tar.bz2) = a3575c35064fec507348d6a1ed10eff5
+SIZE (ex-041202.tar.bz2) = 210929
diff --git a/editors/2bsd-vi/files/patch-Makefile b/editors/2bsd-vi/files/patch-Makefile
index ed606a0f8a75..9afe99556b71 100644
--- a/editors/2bsd-vi/files/patch-Makefile
+++ b/editors/2bsd-vi/files/patch-Makefile
@@ -1,5 +1,5 @@
---- /var/tmp/Makefile.orig	Mon Jul 12 11:06:48 2004
-+++ Makefile	Mon Jul 12 11:29:22 2004
+--- Makefile.old	Wed Jan 19 09:43:24 2005
++++ Makefile	Wed Jan 19 09:43:41 2005
 @@ -79,10 +79,9 @@
  # Destinations for installation. $(PRESERVEDIR) is used for recovery files.
  # It will get mode 1777.
@@ -21,7 +21,7 @@
  
  #
  # Compiler and linker flags.
-@@ -276,13 +275,6 @@
+@@ -292,13 +291,6 @@
  # install in standard place
  
  install-man:
@@ -35,7 +35,7 @@
  	$(INSTALL) -c -m 644 ex.1 $(DESTDIR)$(MANDIR)/man1/ex.1
  	$(INSTALL) -c -m 644 vi.1 $(DESTDIR)$(MANDIR)/man1/vi.1
  	ln -s ex.1 $(DESTDIR)$(MANDIR)/man1/edit.1
-@@ -290,10 +282,6 @@
+@@ -306,10 +298,6 @@
  	ln -s vi.1 $(DESTDIR)$(MANDIR)/man1/view.1
  
  install: all install-man
@@ -46,19 +46,11 @@
  # special provisions for sticky install
  	if test -f $(DESTDIR)$(BINDIR)/ex; \
  	then	test -f $(DESTDIR)$(BINDIR)/ex.old.$$$$ && exit 1; \
-@@ -303,15 +291,12 @@
+@@ -319,7 +307,6 @@
  		rm -f $(DESTDIR)$(BINDIR)/ex.old.$$$$; \
  	fi
- 	$(INSTALL) -c -s -m 1755 ex $(DESTDIR)$(BINDIR)/ex
+ 	$(INSTALL) -c $(STRIP) -m 1755 ex $(DESTDIR)$(BINDIR)/ex
 -	test -d $(DESTDIR)$(LIBEXECDIR) || mkdir -p $(DESTDIR)$(LIBEXECDIR)
- 	$(INSTALL) -c -s exrecover $(DESTDIR)$(LIBEXECDIR)/exrecover
- 	$(INSTALL) -c -s expreserve $(DESTDIR)$(LIBEXECDIR)/expreserve
+ 	$(INSTALL) -c $(STRIP) exrecover $(DESTDIR)$(LIBEXECDIR)/exrecover
+ 	$(INSTALL) -c $(STRIP) expreserve $(DESTDIR)$(LIBEXECDIR)/expreserve
  	ln -s ex $(DESTDIR)$(BINDIR)/edit
- 	ln -s ex $(DESTDIR)$(BINDIR)/vedit
- 	ln -s ex $(DESTDIR)$(BINDIR)/vi
- 	ln -s ex $(DESTDIR)$(BINDIR)/view
--	test -d $(DESTDIR)$(PRESERVEDIR) || mkdir -p $(DESTDIR)$(PRESERVEDIR)
--	chmod 1777 $(DESTDIR)$(PRESERVEDIR)
- 
- ex.o: config.h ex_argv.h ex.h ex_proto.h ex_temp.h ex_tty.h ex_tune.h
- ex.o: ex_vars.h libterm/libterm.h
diff --git a/editors/2bsd-vi/files/patch-mapalloc.c b/editors/2bsd-vi/files/patch-mapalloc.c
deleted file mode 100644
index 0d8513eb31af..000000000000
--- a/editors/2bsd-vi/files/patch-mapalloc.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- /tmp/mapmalloc.c	Mon Jul 12 16:28:16 2004
-+++ mapmalloc.c	Mon Jul 12 16:28:37 2004
-@@ -550,14 +550,6 @@
- 	return NULL;
- }
- 
--/*ARGSUSED*/
--char *
--valloc(size)
--size_t size;
--{
--	return NULL;
--}
--
- char *
- mallinfo()
- {