CVS commit: pkgsrc/devel/editline

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Jun  1 14:14:35 UTC 2025

Modified Files:
        pkgsrc/devel/editline: Makefile distinfo
Added Files:
        pkgsrc/devel/editline/patches: patch-src_terminal.c


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/editline/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/editline/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/editline/patches/patch-src_terminal.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/editline/Makefile
diff -u pkgsrc/devel/editline/Makefile:1.17 pkgsrc/devel/editline/Makefile:1.18
--- pkgsrc/devel/editline/Makefile:1.17 Mon Apr 28 20:14:59 2025
+++ pkgsrc/devel/editline/Makefile      Sun Jun  1 14:14:35 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2025/04/28 20:14:59 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2025/06/01 14:14:35 vins Exp $
 
 DISTNAME=              libedit-20250104-3.1
+PKGREVISION=   1
 PKGNAME=               editline-3.1.20250104
 CATEGORIES=            devel
 MASTER_SITES=          https://thrysoee.dk/editline/

Index: pkgsrc/devel/editline/distinfo
diff -u pkgsrc/devel/editline/distinfo:1.21 pkgsrc/devel/editline/distinfo:1.22
--- pkgsrc/devel/editline/distinfo:1.21 Mon Apr 28 20:14:59 2025
+++ pkgsrc/devel/editline/distinfo      Sun Jun  1 14:14:35 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.21 2025/04/28 20:14:59 tnn Exp $
+$NetBSD: distinfo,v 1.22 2025/06/01 14:14:35 vins Exp $
 
 BLAKE2s (libedit-20250104-3.1.tar.gz) = 459c6801dc8baa7498865b932a39da055de7c21286da78ccd6b019c1d4339f8f
 SHA512 (libedit-20250104-3.1.tar.gz) = 4b4a8b4b1f2cb952bbb3d128605eba9bc7cd0ad35c44b2c099f067c8bea69455bd11faae4ff20384bbe0ea901b25a1249d8323dea4ccd6141a17393f62bb8df2
 Size (libedit-20250104-3.1.tar.gz) = 546745 bytes
 SHA1 (patch-libedit.pc.in) = c2c810ab2c9c7b9d1862abc7bdca53fda5732119
 SHA1 (patch-src_sys.h) = dacabbcf6347dfae5f9deabe9c7288e4aeb620b5
+SHA1 (patch-src_terminal.c) = 6e572ea7aa291e29c3546b542f592aa7adc07c4a
 SHA1 (patch-src_terminal.h) = 5d658f7b7c3b88c0c3122a1be740f3a72d7d2370

Added files:

Index: pkgsrc/devel/editline/patches/patch-src_terminal.c
diff -u /dev/null pkgsrc/devel/editline/patches/patch-src_terminal.c:1.1
--- /dev/null   Sun Jun  1 14:14:35 2025
+++ pkgsrc/devel/editline/patches/patch-src_terminal.c  Sun Jun  1 14:14:35 2025
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_terminal.c,v 1.1 2025/06/01 14:14:35 vins Exp $
+
+Prevent type clash with illumos termcap and/or ncurses.
+
+--- src/terminal.c.orig        2023-08-27 07:25:53.000000000 +0000
++++ src/terminal.c
+@@ -64,10 +64,7 @@ __RCSID("$NetBSD: terminal.c,v 1.46 2023
+ #endif
+ 
+ /* Solaris's term.h does horrid things. */
+-#if defined(HAVE_TERM_H) && !defined(__sun) && !defined(HAVE_TERMCAP_H)
+-#include <term.h>
+-#endif
+-
++#ifndef HAVE_TERMCAP_H
+ #if defined(__sun)
+ extern int tgetent(char *, const char *);
+ extern int tgetflag(char *);
+@@ -75,7 +72,10 @@ extern int tgetnum(char *);
+ extern int tputs(const char *, int, int (*)(int));
+ extern char* tgoto(const char*, int, int);
+ extern char* tgetstr(char*, char**);
++#elif defined(HAVE_TERM_H)
++#include <term.h>
+ #endif
++#endif /* HAVE_TERMCAP_H */
+ 
+ #ifdef _REENTRANT
+ #include <pthread.h>