editors/nvi wide-curses iconv trouble

[Edgar Fuß <ef%math.uni-bonn.de@localhost>]

On macOS 11, in order to compile editors/nvi with the wide-curses option, 
I needed at least a subset of the attached patches or it would fail 
during linking because of missing iconv symbols.

The --with-curses part seems not to be strictly necessary in my case 
(and produces a pkglint warning I don't follow).

The USE_CURSES part is not necessary either for me, but seems apropriate.

The GNU_CONFIGURE_ICONV silences a configure warning.

The CONFIGURE_ENV parts seem gross, but the configure script lacks a 
--with-iconv option or anything similar.

Comments?

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/nvi/Makefile,v
retrieving revision 1.56
diff -u -r1.56 Makefile
--- Makefile	29 Jun 2020 19:30:04 -0000	1.56
+++ Makefile	27 May 2021 17:34:39 -0000
@@ -43,6 +43,8 @@
 BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
 .endif
 
+CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.curses}
+
 pre-configure:
 	${RUN} cd ${WRKSRC}/dist && \
 	${CHMOD} 755 configure && \
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/editors/nvi/options.mk,v
retrieving revision 1.6
diff -u -r1.6 options.mk
--- options.mk	29 Jun 2020 19:30:04 -0000	1.6
+++ options.mk	27 May 2021 17:34:39 -0000
@@ -11,5 +11,11 @@
 ### Wide curses support
 ###
 .if !empty(PKG_OPTIONS:Mwide-curses)
+USE_CURSES+=		wide
+GNU_CONFIGURE_ICONV=	NO
+.include "../../converters/libiconv/buildlink3.mk"
+CONFIGURE_ENV+=		ADDCPPFLAGS=-I${BUILDLINK_PREFIX.iconv}/include
+CONFIGURE_ENV+=		ADDLDFLAGS=-L${BUILDLINK_PREFIX.iconv}/lib
+CONFIGURE_ENV+=		ADDLIBS=-l${BUILDLINK_LIBNAME.iconv}
 CONFIGURE_ARGS+=	--enable-widechar
 .endif