6 files changed, 79 insertions, 91 deletions

diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile
index 9d8d1d72f532..cf6c449b2fad 100644
--- a/editors/nvi-devel/Makefile
+++ b/editors/nvi-devel/Makefile
@@ -6,34 +6,33 @@
 #
 
 PORTNAME=	nvi
-PORTVERSION=	1.81.4
-PORTREVISION=	2
+PORTVERSION=	1.81.5
 CATEGORIES=	editors
-MASTER_SITES=	http://www.kotnet.org/~skimo/nvi/devel/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dd
+MASTER_SITES=	http://www.kotnet.org/~skimo/nvi/devel/
 
 MAINTAINER=	dd@FreeBSD.org
 
 BUILD_DEPENDS=	iconv:${PORTSDIR}/converters/iconv
 LIB_DEPENDS=	db3.2:${PORTSDIR}/databases/db3
 
+USE_BZIP2=		yes
 WRKSRC=			${WRKDIR}/${DISTNAME}/build.unix
-PATCH_WRKSRC=		${WRKDIR}
 GNU_CONFIGURE=		yes
 INSTALLS_SHLIB=		yes
 CONFIGURE_ARGS+=	--with-db3=${PREFIX}
 CONFIGURE_SCRIPT=	../dist/configure
+MAN1=			ex.1 vi.1 view.1
 
-.include <bsd.port.pre.mk>
-
-# We need src/include/wchar.h and friends.  This isn't the exact
-# version we need, but it's close enough.
-.if ${OSVERSION} < 500019
-BROKEN=		"need wide character support"
-.endif
+# XXX: nvi doesn't really need sys/select.h, but I don't think the
+# build should break when it includes it (this happens on RELENG_4;
+# sys/select.h is effectively empty on -current).
+post-configure:
+	${ECHO_CMD} "#undef HAVE_SYS_SELECT_H" >> ${WRKSRC}/config.h
 
 post-install:
-	${MV} ${PREFIX}/bin/vi ${PREFIX}/bin/nvi-devel
+.for __p in ex vi view
+	@# XXX: Hack the Makefile in the distribution so this isn't necessary.
+	${RM} ${PREFIX}/man/cat1/${__p}.0
+.endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/nvi-devel/distinfo b/editors/nvi-devel/distinfo
index 31e74af35959..69c0225f4794 100644
--- a/editors/nvi-devel/distinfo
+++ b/editors/nvi-devel/distinfo
@@ -1 +1 @@
-MD5 (nvi-1.81.4.tar.gz) = 5826bdceb43cb3787ee89ef57de033f6
+MD5 (nvi-1.81.5.tar.bz2) = 82262d08803b364033dd7ab38190305a
diff --git a/editors/nvi-devel/files/patch-configure b/editors/nvi-devel/files/patch-configure
new file mode 100644
index 000000000000..8ee779b5196b
--- /dev/null
+++ b/editors/nvi-devel/files/patch-configure
@@ -0,0 +1,41 @@
+# This patch makes the following changes:
+#
+#	- -ldb -> -ldb3
+#	- db3 include files in include/db3, not include
+#
+# As far as I can tell, both of these are FreeBSDisms, so this patch
+# should not be submitted to the vendor.
+
+--- ../dist/configure~	Sun Feb 10 23:08:14 2002
++++ ../dist/configure	Sun Feb 10 23:08:11 2002
+@@ -10676,17 +10676,17 @@
+ saveLDFLAGS="$LDFLAGS"
+ if test "x$with_db3" != "x"; then
+ 	LDFLAGS="-L$with_db3/lib $LDFLAGS"
+-	CFLAGS="-I$with_db3/include $CFLAGS"
++	CFLAGS="-I$with_db3/include/db3 $CFLAGS"
+ fi;
+ 
+-echo $ac_n "checking for db_create in -ldb""... $ac_c" 1>&6
+-echo "configure:10684: checking for db_create in -ldb" >&5
++echo $ac_n "checking for db_create in -ldb3""... $ac_c" 1>&6
++echo "configure:10684: checking for db_create in -ldb3" >&5
+ ac_lib_var=`echo db'_'db_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-ldb  $LIBS"
++LIBS="-ldb3  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 10692 "configure"
+ #include "confdefs.h"
+@@ -10835,7 +10835,7 @@
+ 	dl_src=../common/dldb.c
+ 	LIBS="-ldl $LIBS"
+ else
+-	LIBS="-ldb $LIBS"
++	LIBS="-ldb3 $LIBS"
+ 	if test "X$with_db3" != "X"; then
+ 		LDFLAGS="`echo $with_db3/lib | sed "$LRscript"` $LDFLAGS"
+ 	fi
diff --git a/editors/nvi-devel/files/patch-configure-incl b/editors/nvi-devel/files/patch-configure-incl
deleted file mode 100644
index 475f48c03463..000000000000
--- a/editors/nvi-devel/files/patch-configure-incl
+++ /dev/null
@@ -1,17 +0,0 @@
-# The db3 port installs its include files into ${PREFIX}/include/db3,
-# but the distfile assumes they're in ${PREFIX}/include.  This seems
-# to be a FreeBSDism, so this patch has not, and probably should not,
-# be submitted to the maintainer.
-
-diff -ru nvi-1.81.4.orig/dist/configure nvi-1.81.4/dist/configure
---- nvi-1.81.4.orig/dist/configure	Mon Jun 18 14:24:37 2001
-+++ nvi-1.81.4/dist/configure	Fri Jul  6 03:27:53 2001
-@@ -6980,7 +6980,7 @@
- saveLDFLAGS="$LDFLAGS"
- if test "x$with_db3" != "x"; then
- 	LDFLAGS="-L$with_db3/lib $LDFLAGS"
--	CFLAGS="-I$with_db3/include $CFLAGS"
-+	CFLAGS="-I$with_db3/include -I$with_db3/include/db3 $CFLAGS"
- fi;
- 
- echo $ac_n "checking for db_create in -ldb""... $ac_c" 1>&6
diff --git a/editors/nvi-devel/files/patch-vi-relative b/editors/nvi-devel/files/patch-vi-relative
deleted file mode 100644
index 735dc464c03d..000000000000
--- a/editors/nvi-devel/files/patch-vi-relative
+++ /dev/null
@@ -1,57 +0,0 @@
-# Vendor patch to fix FreeBSD PR 28687.
-
-diff -ru nvi-1.81.4.orig/vi/vs_relative.c nvi-1.81.4/vi/vs_relative.c
---- nvi-1.81.4.orig/vi/vs_relative.c	Wed Jul 19 10:05:20 2000
-+++ nvi-1.81.4/vi/vs_relative.c	Mon Jul  9 15:26:39 2001
-@@ -10,7 +10,7 @@
- #include "config.h"
- 
- #ifndef lint
--static const char sccsid[] = "$Id: vs_relative.c,v 10.16 2000/07/19 17:05:20 skimo Exp $ (Berkeley) $Date: 2000/07/19 17:05:20 $";
-+static const char sccsid[] = "$Id: vs_relative.c,v 10.18 2001/07/08 13:02:48 skimo Exp $ (Berkeley) $Date: 2001/07/08 13:02:48 $";
- #endif /* not lint */
- 
- #include <sys/types.h>
-@@ -111,6 +111,15 @@
- 	int ch, leftright, listset;
- 	CHAR_T *p;
- 
-+	/*
-+	 * Initialize the screen offset.
-+	 */
-+	scno = 0;
-+
-+	/* Leading number if O_NUMBER option set. */
-+	if (O_ISSET(sp, O_NUMBER))
-+		scno += O_NUMBER_LENGTH;
-+
- 	/* Need the line to go any further. */
- 	if (lp == NULL) {
- 		(void)db_get(sp, lno, 0, &lp, &len);
-@@ -122,7 +131,7 @@
- 	if (lp == NULL) {
- done:		if (diffp != NULL)		/* XXX */
- 			*diffp = 0;
--		return (0);
-+		return scno;
- 	}
- 
- 	/* Store away the values of the list and leftright edit options. */
-@@ -130,15 +139,10 @@
- 	leftright = O_ISSET(sp, O_LEFTRIGHT);
- 
- 	/*
--	 * Initialize the pointer into the buffer and screen and current
--	 * offsets.
-+	 * Initialize the pointer into the buffer and current offset.
- 	 */
- 	p = lp;
--	curoff = scno = 0;
--
--	/* Leading number if O_NUMBER option set. */
--	if (O_ISSET(sp, O_NUMBER))
--		scno += O_NUMBER_LENGTH;
-+	curoff = 0;
- 
- 	/* Macro to return the display length of any signal character. */
- #define	CHLEN(val) (ch = *(UCHAR_T *)p++) == '\t' &&			\
diff --git a/editors/nvi-devel/pkg-plist b/editors/nvi-devel/pkg-plist
index d21a1a2c276f..cd19846aa0dd 100644
--- a/editors/nvi-devel/pkg-plist
+++ b/editors/nvi-devel/pkg-plist
@@ -1,5 +1,27 @@
-bin/nvi-devel
+bin/ex
+bin/vi
+bin/view
 lib/libvi.a
 lib/libvi.la
 lib/libvi.so
 lib/libvi.so.0
+share/vi/catalog/german
+share/vi/catalog/spanish
+share/vi/catalog/ru_SU.KOI8-R
+share/vi/catalog/swedish
+share/vi/catalog/french
+share/vi/catalog/english
+share/vi/catalog/dutch
+@dirrm share/vi/catalog
+share/vi/perl/wc.pl
+share/vi/perl/tk.pl
+share/vi/perl/make.pl
+share/vi/perl/forall.pl
+@dirrm share/vi/perl
+share/vi/tcl/wc.tcl
+share/vi/tcl/mailprocs.tcl
+share/vi/tcl/gnats.tcl
+share/vi/tcl/errors.tcl
+share/vi/recover
+@dirrm share/vi/tcl
+@dirrm share/vi