+ Rename the "ncursesw" option to "wide-curses". This should be supported

  under NetBSD-current without actually needing ncursesw.

+ Only make "wide-curses" an available option on platforms that have the
  necessary wide-character support.  It turns out NetBSD-3.x is not one
  of them.

+ Use a less patchy way to turn -ldb into -ldb3 by letting the wrappers
  do it.

+ Add full DESTDIR support.

Bump the PKGREVISION to 6.

4 files changed, 31 insertions, 45 deletions

diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index 4971bcb74eb..610d43ab5ff 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2007/11/03 13:23:53 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2008/02/21 21:17:45 jlam Exp $
 #
 
 DISTNAME=	nvi-1.81.5
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	editors
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,9 +11,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.kotnet.org/~skimo/nvi/devel/
 COMMENT=	Berkeley nvi with additional features
 
-.include "options.mk"
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 .if ${OPSYS} == "NetBSD"
 .  if !empty(OS_VERSION:M[2-9].*) || !empty(OS_VERSION:M1.6[A-Z]*)
@@ -38,5 +38,8 @@ CONFIGURE_ENV+=		vi_cv_path_shell=${TOOLS_SH:Q}
 USE_TOOLS+=		sh
 USE_LIBTOOL=		YES
 
+# We need exactly the db3 API.
+BUILDLINK_TRANSFORM+=	l:db:db3
 .include "../../databases/db3/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/nvi/distinfo b/editors/nvi/distinfo
index 9c85488a0ec..d87500e2ae1 100644
--- a/editors/nvi/distinfo
+++ b/editors/nvi/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.7 2006/12/12 03:37:30 dogcow Exp $
+$NetBSD: distinfo,v 1.8 2008/02/21 21:17:45 jlam 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-aa) = 4dcab66a7326e2f25d50bf188d941c7961a5955d
 SHA1 (patch-ab) = d5cb1cccb2799bb21822dcd0e11d7208c60f40b6
 SHA1 (patch-ac) = 239764397e64323edfba6fcf4ae99846cebbdbe1
 SHA1 (patch-ad) = 3cdd8ea5ad6c9c4e6a2d1f77d0b28f80fae44fd0
diff --git a/editors/nvi/options.mk b/editors/nvi/options.mk
index ca764a54897..bfd231e0937 100644
--- a/editors/nvi/options.mk
+++ b/editors/nvi/options.mk
@@ -1,14 +1,33 @@
-# $NetBSD: options.mk,v 1.1 2007/09/05 23:05:13 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2008/02/21 21:17:45 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nvi
-PKG_SUPPORTED_OPTIONS=	ncursesw
+PKG_SUPPORTED_OPTIONS=	# empty
+
+.include "../../mk/bsd.prefs.mk"
+
+NVI_NON_WIDE_PLATFORMS=	NetBSD-[0-3].*-*	# missing swprintf()
+.for _pattern_ in ${NVI_NON_WIDE_PLATFORMS}
+.  if !empty(MACHINE_PLATFORM:M${_pattern_})
+NVI_NON_WIDE_PLATFORM=	yes
+.  endif
+.endfor
+
+# Only support the ``wide-curses'' option on platforms that have the
+# necessary wide character support.
+#
+.if !defined(NVI_NON_WIDE_PLATFORM)
+PKG_SUPPORTED_OPTIONS+=	wide-curses
+PKG_LEGACY_OPTS+=	ncursesw:wide-curses
+.endif
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mncursesw)
+###
+### Wide curses support; otherwise, default to using narrow curses.
+###
+.if !empty(PKG_OPTIONS:Mwide-curses)
 .  include "../../devel/ncursesw/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-widechar
-#CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncursesw}
 .else
 .  include "../../mk/curses.buildlink3.mk"
 .endif
diff --git a/editors/nvi/patches/patch-aa b/editors/nvi/patches/patch-aa
deleted file mode 100644
index f5f3e9a706f..00000000000
--- a/editors/nvi/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/12 10:59:30 wiz Exp $
-
---- ../dist/configure.orig	Tue Aug 21 14:41:01 2001
-+++ ../dist/configure
-@@ -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