CVS commit: pkgsrc/editors/nano

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Mar 15 17:35:50 UTC 2024

Modified Files:
        pkgsrc/editors/nano: Makefile distinfo options.mk
Added Files:
        pkgsrc/editors/nano/patches: patch-src_winio.c

Log Message:
nano: NetBSD curses fix; via RVP

PR pkg/57749


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/editors/nano/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/editors/nano/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/editors/nano/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/nano/patches/patch-src_winio.c

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

Modified files:

Index: pkgsrc/editors/nano/Makefile
diff -u pkgsrc/editors/nano/Makefile:1.107 pkgsrc/editors/nano/Makefile:1.108
--- pkgsrc/editors/nano/Makefile:1.107  Sat Mar  2 10:33:07 2024
+++ pkgsrc/editors/nano/Makefile        Fri Mar 15 17:35:50 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2024/03/02 10:33:07 nia Exp $
+# $NetBSD: Makefile,v 1.108 2024/03/15 17:35:50 nia Exp $
 
 DISTNAME=      nano-7.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    editors
 MASTER_SITES=  https://www.nano-editor.org/dist/v${PKGVERSION_NOREV:C/\..*$//}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/editors/nano/distinfo
diff -u pkgsrc/editors/nano/distinfo:1.76 pkgsrc/editors/nano/distinfo:1.77
--- pkgsrc/editors/nano/distinfo:1.76   Thu Feb  2 16:54:20 2023
+++ pkgsrc/editors/nano/distinfo        Fri Mar 15 17:35:50 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2023/02/02 16:54:20 schwarz Exp $
+$NetBSD: distinfo,v 1.77 2024/03/15 17:35:50 nia Exp $
 
 BLAKE2s (nano-7.2.tar.xz) = 466bde4f9ebb00d9a6e6bf2cb36b2f180d4974a3c8ada9b9f45c2447e502ce2f
 SHA512 (nano-7.2.tar.xz) = a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583
@@ -6,3 +6,4 @@ Size (nano-7.2.tar.xz) = 1608444 bytes
 SHA1 (patch-configure) = 63c7c2b827375e742ef444be847ec5f223bd0855
 SHA1 (patch-doc_nano.1) = 3d160aa6a4324400e79064d22cbd291a0d3de4f9
 SHA1 (patch-doc_nanorc.5) = 4d8af863bfa51eeac2a5e5cd04bd16aba3b6e29a
+SHA1 (patch-src_winio.c) = 0c7b504a0f643e0e3ce9fe8e6b9bfe3cae656e8b

Index: pkgsrc/editors/nano/options.mk
diff -u pkgsrc/editors/nano/options.mk:1.7 pkgsrc/editors/nano/options.mk:1.8
--- pkgsrc/editors/nano/options.mk:1.7  Sat Mar  2 10:33:07 2024
+++ pkgsrc/editors/nano/options.mk      Fri Mar 15 17:35:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2024/03/02 10:33:07 nia Exp $
+# $NetBSD: options.mk,v 1.8 2024/03/15 17:35:50 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.nano
 PKG_SUPPORTED_OPTIONS=         wide-curses
@@ -9,10 +9,7 @@ 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)
-.  include "../../devel/ncursesw/buildlink3.mk"
-.else
-.  include "../../devel/ncurses/buildlink3.mk"
+# Handled by curses.mk.
 .endif

Added files:

Index: pkgsrc/editors/nano/patches/patch-src_winio.c
diff -u /dev/null pkgsrc/editors/nano/patches/patch-src_winio.c:1.1
--- /dev/null   Fri Mar 15 17:35:50 2024
+++ pkgsrc/editors/nano/patches/patch-src_winio.c       Fri Mar 15 17:35:50 2024
@@ -0,0 +1,22 @@
+$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
+