CVS commit: pkgsrc/editors/nvi

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Mon Jun 29 19:30:04 UTC 2020

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

Log Message:
nvi: Always depends on curses

nvi is unconditionally linked against the curses library.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/editors/nvi/Makefile
cvs rdiff -u -r1.5 -r1.6 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.55 pkgsrc/editors/nvi/Makefile:1.56
--- pkgsrc/editors/nvi/Makefile:1.55    Sun May 31 16:29:54 2020
+++ pkgsrc/editors/nvi/Makefile Mon Jun 29 19:30:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2020/05/31 16:29:54 rillig Exp $
+# $NetBSD: Makefile,v 1.56 2020/06/29 19:30:04 leot Exp $
 
 DISTNAME=      nvi-1.81.6
 PKGREVISION=   13
@@ -48,4 +48,5 @@ pre-configure:
        ${CHMOD} 755 configure && \
        aclocal -I m4 && autoheader && autoconf
 
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/editors/nvi/options.mk
diff -u pkgsrc/editors/nvi/options.mk:1.5 pkgsrc/editors/nvi/options.mk:1.6
--- pkgsrc/editors/nvi/options.mk:1.5   Mon Jun 29 18:53:26 2020
+++ pkgsrc/editors/nvi/options.mk       Mon Jun 29 19:30:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2020/06/29 18:53:26 leot Exp $
+# $NetBSD: options.mk,v 1.6 2020/06/29 19:30:04 leot Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nvi
 PKG_SUPPORTED_OPTIONS+=        wide-curses
@@ -11,6 +11,5 @@ PKG_LEGACY_OPTS+=     ncursesw:wide-curses
 ### Wide curses support
 ###
 .if !empty(PKG_OPTIONS:Mwide-curses)
-.  include "../../mk/curses.buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-widechar
 .endif