Fri Mar 15 17:35:50 2024 UTC (72d)
nano: NetBSD curses fix; via RVP

PR pkg/57749


(nia)
diff -r1.107 -r1.108 pkgsrc/editors/nano/Makefile
diff -r1.76 -r1.77 pkgsrc/editors/nano/distinfo
diff -r1.7 -r1.8 pkgsrc/editors/nano/options.mk
diff -r0 -r1.1 pkgsrc/editors/nano/patches/patch-src_winio.c
cvs diff -r1.107 -r1.108 pkgsrc/editors/nano/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/nano/Makefile 2024/03/02 10:33:07 1.107
+++ pkgsrc/editors/nano/Makefile 2024/03/15 17:35:50 1.108
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.107 2024/03/02 10:33:07 nia Exp $ 1# $NetBSD: Makefile,v 1.108 2024/03/15 17:35:50 nia Exp $
2 2
3DISTNAME= nano-7.2 3DISTNAME= nano-7.2
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= editors 5CATEGORIES= editors
6MASTER_SITES= https://www.nano-editor.org/dist/v${PKGVERSION_NOREV:C/\..*$//}/ 6MASTER_SITES= https://www.nano-editor.org/dist/v${PKGVERSION_NOREV:C/\..*$//}/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= wiedi@frubar.net 9MAINTAINER= wiedi@frubar.net
10HOMEPAGE= https://www.nano-editor.org/ 10HOMEPAGE= https://www.nano-editor.org/
11COMMENT= Small and friendly text editor (a free replacement for Pico) 11COMMENT= Small and friendly text editor (a free replacement for Pico)
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
15USE_TOOLS+= msgfmt msgmerge xgettext gmake 15USE_TOOLS+= msgfmt msgmerge xgettext gmake
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
cvs diff -r1.76 -r1.77 pkgsrc/editors/nano/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/nano/distinfo 2023/02/02 16:54:20 1.76
+++ pkgsrc/editors/nano/distinfo 2024/03/15 17:35:50 1.77
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.76 2023/02/02 16:54:20 schwarz Exp $ 1$NetBSD: distinfo,v 1.77 2024/03/15 17:35:50 nia Exp $
2 2
3BLAKE2s (nano-7.2.tar.xz) = 466bde4f9ebb00d9a6e6bf2cb36b2f180d4974a3c8ada9b9f45c2447e502ce2f 3BLAKE2s (nano-7.2.tar.xz) = 466bde4f9ebb00d9a6e6bf2cb36b2f180d4974a3c8ada9b9f45c2447e502ce2f
4SHA512 (nano-7.2.tar.xz) = a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583 4SHA512 (nano-7.2.tar.xz) = a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583
5Size (nano-7.2.tar.xz) = 1608444 bytes 5Size (nano-7.2.tar.xz) = 1608444 bytes
6SHA1 (patch-configure) = 63c7c2b827375e742ef444be847ec5f223bd0855 6SHA1 (patch-configure) = 63c7c2b827375e742ef444be847ec5f223bd0855
7SHA1 (patch-doc_nano.1) = 3d160aa6a4324400e79064d22cbd291a0d3de4f9 7SHA1 (patch-doc_nano.1) = 3d160aa6a4324400e79064d22cbd291a0d3de4f9
8SHA1 (patch-doc_nanorc.5) = 4d8af863bfa51eeac2a5e5cd04bd16aba3b6e29a 8SHA1 (patch-doc_nanorc.5) = 4d8af863bfa51eeac2a5e5cd04bd16aba3b6e29a
 9SHA1 (patch-src_winio.c) = 0c7b504a0f643e0e3ce9fe8e6b9bfe3cae656e8b
cvs diff -r1.7 -r1.8 pkgsrc/editors/nano/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/nano/options.mk 2024/03/02 10:33:07 1.7
+++ pkgsrc/editors/nano/options.mk 2024/03/15 17:35:50 1.8
@@ -1,18 +1,15 @@ @@ -1,18 +1,15 @@
1# $NetBSD: options.mk,v 1.7 2024/03/02 10:33:07 nia Exp $ 1# $NetBSD: options.mk,v 1.8 2024/03/15 17:35:50 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nano 3PKG_OPTIONS_VAR= PKG_OPTIONS.nano
4PKG_SUPPORTED_OPTIONS= wide-curses 4PKG_SUPPORTED_OPTIONS= wide-curses
5PKG_SUGGESTED_OPTIONS= wide-curses 5PKG_SUGGESTED_OPTIONS= wide-curses
6PKG_OPTIONS_LEGACY_OPTS+= ncursesw:wide-curses 6PKG_OPTIONS_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; otherwise, default to using narrow curses. 11### Wide curses support; otherwise, default to using narrow curses.
12### XXX netbsd curses is unacceptable due to PR pkg/57749 
13### 12###
14.if !empty(PKG_OPTIONS:Mwide-curses) 13.if !empty(PKG_OPTIONS:Mwide-curses)
15. include "../../devel/ncursesw/buildlink3.mk" 14# Handled by curses.mk.
16.else 
17. include "../../devel/ncurses/buildlink3.mk" 
18.endif 15.endif
File Added: pkgsrc/editors/nano/patches/patch-src_winio.c
$NetBSD: patch-src_winio.c,v 1.1 2024/03/15 17:35:50 nia Exp $

NetBSD curses fix.

https://gnats.netbsd.org/57749

--- src/winio.c.orig	2024-03-15 17:30:32.969607523 +0000
+++ src/winio.c
@@ -2502,10 +2502,11 @@ void place_the_cursor(void)
 		column -= get_page_start(column);
 	}
 
-	if (row < editwinrows)
+	if (row < editwinrows) {
 		wmove(midwin, row, margin + column);
+		wnoutrefresh(midwin);
 #ifndef NANO_TINY
-	else
+	} else
 		statusline(ALERT, "Misplaced cursor -- please report a bug");
 #endif