diff options
| author | nia <nia@pkgsrc.org> | 2020-05-24 05:22:01 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-05-24 05:22:01 +0000 |
| commit | cb91305e2b4381234d3118f2a17a8b48854b8642 (patch) | |
| tree | 9122edc0a00692c0f64cdbc9ef6254d719ef340d /editors/nvi | |
| parent | f16001bc3fb421f2b36e69682b8d1857d1c8b619 (diff) | |
| download | pkgsrc-cb91305e2b4381234d3118f2a17a8b48854b8642.tar.gz | |
nvi: Drop hacks for ancient NetBSD versions, declare LICENSE
Diffstat (limited to 'editors/nvi')
| -rw-r--r-- | editors/nvi/Makefile | 8 | ||||
| -rw-r--r-- | editors/nvi/options.mk | 23 |
2 files changed, 5 insertions, 26 deletions
diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile index 8eeab8e1f5e..d8ccd75ac0f 100644 --- a/editors/nvi/Makefile +++ b/editors/nvi/Makefile @@ -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 #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-name='s,^,n,' 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) diff --git a/editors/nvi/options.mk b/editors/nvi/options.mk index d06681d267b..4be9da57382 100644 --- a/editors/nvi/options.mk +++ b/editors/nvi/options.mk @@ -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 |