CVS commit: pkgsrc/net/telescope

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Oct 12 10:07:00 UTC 2025

Modified Files:
        pkgsrc/net/telescope: Makefile distinfo
        pkgsrc/net/telescope/patches: patch-ui.c
Removed Files:
        pkgsrc/net/telescope/patches: patch-dprintf.h

Log Message:
net/telescope: simplify dprintf() patch for SunOS

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/telescope/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/telescope/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/telescope/patches/patch-dprintf.h
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/telescope/patches/patch-ui.c

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

Modified files:

Index: pkgsrc/net/telescope/Makefile
diff -u pkgsrc/net/telescope/Makefile:1.5 pkgsrc/net/telescope/Makefile:1.6
--- pkgsrc/net/telescope/Makefile:1.5   Tue Sep  9 15:22:06 2025
+++ pkgsrc/net/telescope/Makefile       Sun Oct 12 10:06:59 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2025/09/09 15:22:06 vins Exp $
+# $NetBSD: Makefile,v 1.6 2025/10/12 10:06:59 vins Exp $
 
 DISTNAME=      telescope-0.11
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    net
 MASTER_SITES=  https://ftp.telescope-browser.org/
 

Index: pkgsrc/net/telescope/distinfo
diff -u pkgsrc/net/telescope/distinfo:1.4 pkgsrc/net/telescope/distinfo:1.5
--- pkgsrc/net/telescope/distinfo:1.4   Tue Sep  9 15:22:06 2025
+++ pkgsrc/net/telescope/distinfo       Sun Oct 12 10:06:59 2025
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.4 2025/09/09 15:22:06 vins Exp $
+$NetBSD: distinfo,v 1.5 2025/10/12 10:06:59 vins Exp $
 
 BLAKE2s (telescope-0.11.tar.gz) = a94ae8dae9f95ba47d17d6a5a081cb55dce9167ada16cba46b110cfd00bbae95
 SHA512 (telescope-0.11.tar.gz) = d00b94b3f31e05d0ad2223e79c1259786fc722adab38978ce4dbd0c4e99d3a3e5ef605037a0104cebb438779c0accaebfcc52c5e27c77b87a8095e26486d5d93
 Size (telescope-0.11.tar.gz) = 1159443 bytes
 SHA1 (patch-certs.c) = 23e400841e53d4b42f4b4825d101aac099f1f3b2
 SHA1 (patch-control.c) = d90efd407d5e5b72726ace34510df23cbc806db7
-SHA1 (patch-dprintf.h) = e94f6b8916b8b052939d4d239065e9cad75e6acb
 SHA1 (patch-fs.c) = 80ed55e5632839bfd4ccd06f6b3503ee47b20459
 SHA1 (patch-telescope.c) = 9a3f75c9414eab042cb41dc4ad6537d867551d34
-SHA1 (patch-ui.c) = ef8d7b4dcb940bfcba1d43eefa85dbf1bd071670
+SHA1 (patch-ui.c) = 51a478188b5dd20d71645bc07878ed9616b640fb

Index: pkgsrc/net/telescope/patches/patch-ui.c
diff -u pkgsrc/net/telescope/patches/patch-ui.c:1.2 pkgsrc/net/telescope/patches/patch-ui.c:1.3
--- pkgsrc/net/telescope/patches/patch-ui.c:1.2 Tue Sep  9 15:22:06 2025
+++ pkgsrc/net/telescope/patches/patch-ui.c     Sun Oct 12 10:07:00 2025
@@ -1,44 +1,20 @@
-$NetBSD: patch-ui.c,v 1.2 2025/09/09 15:22:06 vins Exp $
+$NetBSD: patch-ui.c,v 1.3 2025/10/12 10:07:00 vins Exp $
 
-Support dprintf() on SunOS.
-Note that illumos supports dprintf() in UNIX V7 compliance.
+Use printf instead of dprintf, for SunOS compat.
 
 --- ui.c.orig  2024-12-30 09:09:40.000000000 +0000
 +++ ui.c
-@@ -30,6 +30,12 @@
-  *
-  */
+@@ -1072,9 +1072,11 @@ redraw_tab(struct tab *tab)
  
-+#if defined(__illumos__)
-+#define _XPG7 1
-+#elif defined(__sun)
-+#include "dprintf.h"
-+#endif
-+
- #include "compat.h"
+       doupdate();
  
- #include <sys/time.h>
-@@ -122,6 +128,23 @@ static struct timeval     loading_tv = { 0,
- 
- static char   keybuf[64];
- 
-+#if defined(__sun) && !defined(__illumos__)
-+int
-+dprintf(int fd, const char *restrict format, ...)
-+{
-+      va_list ap;
-+      FILE *f = fdopen(fd, "w");
-+      if (!f) {
-+          return -1;
+-      if (set_title)
+-              dprintf(1, "\033]2;%s - Telescope\a",
++      if (set_title) {
++              printf("\033]2;%s - Telescope\a",
+                   current_tab->buffer.title);
++              fflush(stdout);
 +      }
-+      va_start(ap, format);
-+      int result = fprintf(f, format, ap);
-+      va_end(ap);
-+
-+      return result;
-+}
-+#endif
-+
- /* XXX: don't forget to init these in main() */
- struct kmap global_map,
-       minibuffer_map,
+ }
+ 
+ void