Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1709648670120150"
MIME-Version: 1.0
Date: Tue, 5 Mar 2024 14:24:30 +0000
From: "Benny Siegert" <bsiegert@netbsd.org>
Subject: CVS commit: [pkgsrc-2023Q4] pkgsrc/editors/nano
To: pkgsrc-changes@NetBSD.org
Reply-To: bsiegert@netbsd.org
Message-Id: <20240305142430.20BCEFA29@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1709648670120150
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	bsiegert
Date:		Tue Mar  5 14:24:30 UTC 2024

Modified Files:
	pkgsrc/editors/nano [pkgsrc-2023Q4]: Makefile options.mk

Log Message:
Pullup ticket #6839 - requested by nia
editors/nano: build fix

Revisions pulled up:
- editors/nano/Makefile                                         1.107
- editors/nano/options.mk                                       1.7

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sat Mar  2 10:33:07 UTC 2024

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

   Log Message:
   nano: force use of ncurses until PR pkg/57749 is resolved


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.106.8.1 pkgsrc/editors/nano/Makefile
cvs rdiff -u -r1.6 -r1.6.26.1 pkgsrc/editors/nano/options.mk

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


--_----------=_1709648670120150
Content-Disposition: inline
Content-Length: 1656
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/editors/nano/Makefile
diff -u pkgsrc/editors/nano/Makefile:1.106 pkgsrc/editors/nano/Makefile:1.106.8.1
--- pkgsrc/editors/nano/Makefile:1.106	Thu Feb  2 16:54:20 2023
+++ pkgsrc/editors/nano/Makefile	Tue Mar  5 14:24:29 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.106 2023/02/02 16:54:20 schwarz Exp $
+# $NetBSD: Makefile,v 1.106.8.1 2024/03/05 14:24:29 bsiegert Exp $
 
 DISTNAME=	nano-7.2
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	https://www.nano-editor.org/dist/v${PKGVERSION_NOREV:C/\..*$//}/
 EXTRACT_SUFX=	.tar.xz
@@ -44,5 +45,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/sample.nanorc ${DESTDIR}${PREFIX}/share/examples/nano/nanorc
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/editors/nano/options.mk
diff -u pkgsrc/editors/nano/options.mk:1.6 pkgsrc/editors/nano/options.mk:1.6.26.1
--- pkgsrc/editors/nano/options.mk:1.6	Tue Nov 24 18:21:38 2020
+++ pkgsrc/editors/nano/options.mk	Tue Mar  5 14:24:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2020/11/24 18:21:38 nia Exp $
+# $NetBSD: options.mk,v 1.6.26.1 2024/03/05 14:24:29 bsiegert Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.nano
 PKG_SUPPORTED_OPTIONS=		wide-curses
@@ -9,7 +9,10 @@ PKG_OPTIONS_LEGACY_OPTS+=	ncursesw:wide-
 
 ###
 ### Wide curses support; otherwise, default to using narrow curses.
+### XXX netbsd curses is unacceptable due to PR pkg/57749
 ###
 .if !empty(PKG_OPTIONS:Mwide-curses)
-# Handled by curses.mk.
+.  include "../../devel/ncursesw/buildlink3.mk"
+.else
+.  include "../../devel/ncurses/buildlink3.mk"
 .endif


--_----------=_1709648670120150--