CVS commit: pkgsrc/editors/nvi

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun May 24 05:22:01 UTC 2020

Modified Files:
        pkgsrc/editors/nvi: Makefile options.mk

Log Message:
nvi: Drop hacks for ancient NetBSD versions, declare LICENSE


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/editors/nvi/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/nvi/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/nvi/Makefile
diff -u pkgsrc/editors/nvi/Makefile:1.53 pkgsrc/editors/nvi/Makefile:1.54
--- pkgsrc/editors/nvi/Makefile:1.53    Sun May 24 05:00:36 2020
+++ pkgsrc/editors/nvi/Makefile Sun May 24 05:22:01 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2020/05/24 05:00:36 nia Exp $
+# $NetBSD: Makefile,v 1.54 2020/05/24 05:22:01 nia Exp $
 
 DISTNAME=      nvi-1.81.6
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    editors
 MASTER_SITES=  ${HOMEPAGE}
 EXTRACT_SUFX=  .tar.bz2
@@ -9,6 +9,7 @@ EXTRACT_SUFX=   .tar.bz2
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 #HOMEPAGE=     http://www.kotnet.org/~skimo/nvi/devel/
 COMMENT=       Berkeley nvi with additional features
+LICENSE=       modified-bsd
 
 .include "options.mk"
 
@@ -21,9 +22,6 @@ CONFIGURE_ARGS+=      --program-transform-nam
 CONFIGURE_ENV+=                vi_cv_path_shell=${TOOLS_SH}
 
 .if ${OPSYS} == "NetBSD"
-.  if !empty(OS_VERSION:M[2-9].*) || !empty(OS_VERSION:M1.6[A-Z]*)
-CONFIGURE_ENV+=                vi_cv_include_sys_select=no
-.  endif
 # XXX ignore NetBSD 2.0F and later's granpt(2) and SysV pty for just now
 CONFIGURE_ENV+=                vi_cv_sys5_pty=no
 # XXX also ignore it on Darwin (fixes Tiger build)

Index: pkgsrc/editors/nvi/options.mk
diff -u pkgsrc/editors/nvi/options.mk:1.3 pkgsrc/editors/nvi/options.mk:1.4
--- pkgsrc/editors/nvi/options.mk:1.3   Sun May 24 05:00:36 2020
+++ pkgsrc/editors/nvi/options.mk       Sun May 24 05:22:01 2020
@@ -1,34 +1,15 @@
-# $NetBSD: options.mk,v 1.3 2020/05/24 05:00:36 nia Exp $
+# $NetBSD: options.mk,v 1.4 2020/05/24 05:22:01 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nvi
-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_SUGGESTED_OPTIONS+=        wide-curses
 PKG_LEGACY_OPTS+=      ncursesw:wide-curses
-.endif
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### Wide curses support; otherwise, default to using narrow curses.
+### Wide curses support
 ###
 .if !empty(PKG_OPTIONS:Mwide-curses)
-.  include "../../devel/ncursesw/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-widechar
-.else
-.  include "../../mk/curses.buildlink3.mk"
 .endif