CVS commit: pkgsrc/devel/ncurses

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Fri Sep  4 10:33:14 UTC 2020

Modified Files:
        pkgsrc/devel/ncurses: distinfo
Added Files:
        pkgsrc/devel/ncurses/patches: patch-ncurses_base_lib_initscr.c
            patch-ncurses_tinfo_lib_raw.c

Log Message:
[devel/ncurses] Work around #error due to include order on QNX

Still doesn't link, yet.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/ncurses/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/ncurses/patches/patch-ncurses_base_lib_initscr.c \
    pkgsrc/devel/ncurses/patches/patch-ncurses_tinfo_lib_raw.c

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

Modified files:

Index: pkgsrc/devel/ncurses/distinfo
diff -u pkgsrc/devel/ncurses/distinfo:1.44 pkgsrc/devel/ncurses/distinfo:1.45
--- pkgsrc/devel/ncurses/distinfo:1.44  Mon Mar 30 08:53:42 2020
+++ pkgsrc/devel/ncurses/distinfo       Fri Sep  4 10:33:14 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2020/03/30 08:53:42 jperkin Exp $
+$NetBSD: distinfo,v 1.45 2020/09/04 10:33:14 js Exp $
 
 SHA1 (ncurses-6.2.tar.gz) = 56e410fb77f2b5501a0b2f6a995376f3cefe1097
 RMD160 (ncurses-6.2.tar.gz) = bedfe81f33b3e55e44d14126c9c2821d7f222701
@@ -8,3 +8,5 @@ SHA1 (patch-c++_Makefile.in) = 32611b5fe
 SHA1 (patch-configure) = c0074d959a9981b3811519328f42a0c18a51c5a4
 SHA1 (patch-misc_terminfo.src) = d9eede4b159358f396693141ed9d9c2a76647917
 SHA1 (patch-mk-1st.awk) = adf9d68ee565da80078cfcfa8969a4ef806d65de
+SHA1 (patch-ncurses_base_lib_initscr.c) = e514e2bb4862a2617b30c6ad715bc1c50cb76f0e
+SHA1 (patch-ncurses_tinfo_lib_raw.c) = 5aa2d439b8f5c3ce87863095396848c923c864d0

Added files:

Index: pkgsrc/devel/ncurses/patches/patch-ncurses_base_lib_initscr.c
diff -u /dev/null pkgsrc/devel/ncurses/patches/patch-ncurses_base_lib_initscr.c:1.1
--- /dev/null   Fri Sep  4 10:33:14 2020
+++ pkgsrc/devel/ncurses/patches/patch-ncurses_base_lib_initscr.c       Fri Sep  4 10:33:14 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-ncurses_base_lib_initscr.c,v 1.1 2020/09/04 10:33:14 js Exp $
+
+--- ncurses/base/lib_initscr.c.orig    2020-02-02 23:34:34.000000000 +0000
++++ ncurses/base/lib_initscr.c
+@@ -42,7 +42,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-#if HAVE_SYS_TERMIO_H
++#if HAVE_SYS_TERMIO_H && !defined(__QNX__)
+ #include <sys/termio.h>               /* needed for ISC */
+ #endif
+ 
Index: pkgsrc/devel/ncurses/patches/patch-ncurses_tinfo_lib_raw.c
diff -u /dev/null pkgsrc/devel/ncurses/patches/patch-ncurses_tinfo_lib_raw.c:1.1
--- /dev/null   Fri Sep  4 10:33:14 2020
+++ pkgsrc/devel/ncurses/patches/patch-ncurses_tinfo_lib_raw.c  Fri Sep  4 10:33:14 2020
@@ -0,0 +1,9 @@
+$NetBSD: patch-ncurses_tinfo_lib_raw.c,v 1.1 2020/09/04 10:33:14 js Exp $
+
+--- ncurses/tinfo/lib_raw.c.orig       2020-02-02 23:34:34.000000000 +0000
++++ ncurses/tinfo/lib_raw.c
+@@ -54,3 +54,3 @@ MODULE_ID("$Id: lib_raw.c,v 1.24 2020/02
+ 
+-#if HAVE_SYS_TERMIO_H
++#if HAVE_SYS_TERMIO_H && !defined(__QNX__)
+ #include <sys/termio.h>               /* needed for ISC */