Mon Jun 29 19:30:04 2020 UTC ()
nvi: Always depends on curses

nvi is unconditionally linked against the curses library.


(leot)
diff -r1.55 -r1.56 pkgsrc/editors/nvi/Makefile
diff -r1.5 -r1.6 pkgsrc/editors/nvi/options.mk
cvs diff -r1.55 -r1.56 pkgsrc/editors/nvi/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/nvi/Makefile 2020/05/31 16:29:54 1.55
+++ pkgsrc/editors/nvi/Makefile 2020/06/29 19:30:04 1.56
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.55 2020/05/31 16:29:54 rillig Exp $ 1# $NetBSD: Makefile,v 1.56 2020/06/29 19:30:04 leot Exp $
2 2
3DISTNAME= nvi-1.81.6 3DISTNAME= nvi-1.81.6
4PKGREVISION= 13 4PKGREVISION= 13
5CATEGORIES= editors 5CATEGORIES= editors
6MASTER_SITES= ${HOMEPAGE} 6MASTER_SITES= ${HOMEPAGE}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10#HOMEPAGE= http://www.kotnet.org/~skimo/nvi/devel/ 10#HOMEPAGE= http://www.kotnet.org/~skimo/nvi/devel/
11COMMENT= Berkeley nvi with additional features 11COMMENT= Berkeley nvi with additional features
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14.include "options.mk" 14.include "options.mk"
@@ -38,14 +38,15 @@ BDB_ACCEPTED= db3 db4 @@ -38,14 +38,15 @@ BDB_ACCEPTED= db3 db4
38.include "../../mk/bdb.buildlink3.mk" 38.include "../../mk/bdb.buildlink3.mk"
39.if ${BDB_TYPE} == "db1" 39.if ${BDB_TYPE} == "db1"
40CONFIGURE_ARGS+= --with-db_type=db1 40CONFIGURE_ARGS+= --with-db_type=db1
41.else 41.else
42CONFIGURE_ARGS+= --with-db-prefix=${BDBBASE} 42CONFIGURE_ARGS+= --with-db-prefix=${BDBBASE}
43BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} 43BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE}
44.endif 44.endif
45 45
46pre-configure: 46pre-configure:
47 ${RUN} cd ${WRKSRC}/dist && \ 47 ${RUN} cd ${WRKSRC}/dist && \
48 ${CHMOD} 755 configure && \ 48 ${CHMOD} 755 configure && \
49 aclocal -I m4 && autoheader && autoconf 49 aclocal -I m4 && autoheader && autoconf
50 50
 51.include "../../mk/curses.buildlink3.mk"
51.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/editors/nvi/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/nvi/options.mk 2020/06/29 18:53:26 1.5
+++ pkgsrc/editors/nvi/options.mk 2020/06/29 19:30:04 1.6
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: options.mk,v 1.5 2020/06/29 18:53:26 leot Exp $ 1# $NetBSD: options.mk,v 1.6 2020/06/29 19:30:04 leot Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nvi 3PKG_OPTIONS_VAR= PKG_OPTIONS.nvi
4PKG_SUPPORTED_OPTIONS+= wide-curses 4PKG_SUPPORTED_OPTIONS+= wide-curses
5PKG_SUGGESTED_OPTIONS+= wide-curses 5PKG_SUGGESTED_OPTIONS+= wide-curses
6PKG_LEGACY_OPTS+= ncursesw:wide-curses 6PKG_LEGACY_OPTS+= ncursesw:wide-curses
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10### 10###
11### Wide curses support 11### Wide curses support
12### 12###
13.if !empty(PKG_OPTIONS:Mwide-curses) 13.if !empty(PKG_OPTIONS:Mwide-curses)
14. include "../../mk/curses.buildlink3.mk" 
15CONFIGURE_ARGS+= --enable-widechar 14CONFIGURE_ARGS+= --enable-widechar
16.endif 15.endif