CVS commit: pkgsrc/x11/xphoon

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Fri Feb 14 08:07:18 UTC 2025

Modified Files:
        pkgsrc/x11/xphoon: Makefile distinfo
        pkgsrc/x11/xphoon/patches: patch-xphoon.c
Added Files:
        pkgsrc/x11/xphoon/patches: patch-date__parse.c

Log Message:
x11/xphoon: fix build on SunOS

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/xphoon/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xphoon/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xphoon/patches/patch-date__parse.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xphoon/patches/patch-xphoon.c

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

Modified files:

Index: pkgsrc/x11/xphoon/Makefile
diff -u pkgsrc/x11/xphoon/Makefile:1.31 pkgsrc/x11/xphoon/Makefile:1.32
--- pkgsrc/x11/xphoon/Makefile:1.31     Fri Feb 14 07:00:15 2025
+++ pkgsrc/x11/xphoon/Makefile  Fri Feb 14 08:07:18 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2025/02/14 07:00:15 vins Exp $
+# $NetBSD: Makefile,v 1.32 2025/02/14 08:07:18 vins Exp $
 #
 
 DISTNAME=      xphoon_14Aug2014
 PKGNAME=       xphoon-20140814
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  https://www.acme.com/software/xphoon/
 

Index: pkgsrc/x11/xphoon/distinfo
diff -u pkgsrc/x11/xphoon/distinfo:1.8 pkgsrc/x11/xphoon/distinfo:1.9
--- pkgsrc/x11/xphoon/distinfo:1.8      Fri Feb 14 07:00:15 2025
+++ pkgsrc/x11/xphoon/distinfo  Fri Feb 14 08:07:18 2025
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.8 2025/02/14 07:00:15 vins Exp $
+$NetBSD: distinfo,v 1.9 2025/02/14 08:07:18 vins Exp $
 
 BLAKE2s (xphoon_14Aug2014.tar.gz) = 9f6df7ff034315dfc08dba667c57c2377b494217a9c82d47c4d1e04c6bfd3a1f
 SHA512 (xphoon_14Aug2014.tar.gz) = 6f0cf53b305cbf15d3b28fdfbcf49ff78689d49fb7b95815b590f3d42f43bda31df1bfd515eefa849579f9055f004cc7bf901741d98e2a10ac4841cc4ed95a00
 Size (xphoon_14Aug2014.tar.gz) = 103903 bytes
 SHA1 (patch-Imakefile) = 1561cc1342b5a9f379117cd72f5cf9b5b8419bb2
+SHA1 (patch-date__parse.c) = a13e0118ae2009e2f9876446ca83ad325b10007d
 SHA1 (patch-stddef.h) = f910a3720d4bbc2e27a4f8d0369b560006414db7
 SHA1 (patch-vroot.h) = e06529cf5a373e3f87f0a825dec28545e5aaae6d
-SHA1 (patch-xphoon.c) = 59562e7a9ccc385c698d4abd8b68529af954c37d
+SHA1 (patch-xphoon.c) = 82f620cb875dc9dbc88cfc561402895b63c00af1
 SHA1 (patch-xphoon.man) = c5734b40672aec092302d4a141e390fb3cced0ce

Index: pkgsrc/x11/xphoon/patches/patch-xphoon.c
diff -u pkgsrc/x11/xphoon/patches/patch-xphoon.c:1.2 pkgsrc/x11/xphoon/patches/patch-xphoon.c:1.3
--- pkgsrc/x11/xphoon/patches/patch-xphoon.c:1.2        Fri Feb 14 07:00:15 2025
+++ pkgsrc/x11/xphoon/patches/patch-xphoon.c    Fri Feb 14 08:07:18 2025
@@ -1,12 +1,13 @@
-$NetBSD: patch-xphoon.c,v 1.2 2025/02/14 07:00:15 vins Exp $
+$NetBSD: patch-xphoon.c,v 1.3 2025/02/14 08:07:18 vins Exp $
 
 * Add Xrandr support.
 * Silence warnings about missing preprocessor defined macros.
 * Do not require a tty when forking to background.
+* Use ttcompat(7M) on SunOS for TIOCNOTTY. 
 
 --- xphoon.c.orig      2014-08-04 21:57:59.000000000 +0000
 +++ xphoon.c
-@@ -23,15 +23,19 @@
+@@ -23,15 +23,22 @@
  ** SUCH DAMAGE.
  */
  
@@ -18,6 +19,9 @@ $NetBSD: patch-xphoon.c,v 1.2 2025/02/14
  #include <math.h>
 +#include <errno.h>
  #include <sys/ioctl.h>
++#ifdef __sun
++#include <sys/ttold.h>
++#endif
  #include <X11/Xos.h>
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
@@ -26,7 +30,7 @@ $NetBSD: patch-xphoon.c,v 1.2 2025/02/14
  #include "vroot.h"
  #include "astro.h"
  #include "date_parse.h"
-@@ -190,13 +194,20 @@ usage:
+@@ -190,13 +197,20 @@ usage:
        (void) fflush( stdout );
  
        /* Go stealth (ditch our controlling tty). */
@@ -51,7 +55,7 @@ $NetBSD: patch-xphoon.c,v 1.2 2025/02/14
        else
            {
            if ( ioctl( tty, TIOCNOTTY, 0 ) < 0 )
-@@ -236,6 +247,10 @@ usage:
+@@ -236,6 +250,10 @@ usage:
  
  /* xinit - initialize X stuff */
  
@@ -62,7 +66,7 @@ $NetBSD: patch-xphoon.c,v 1.2 2025/02/14
  static Display* display;
  static int screen;
  static Window root;
-@@ -244,11 +259,14 @@ static GC onegc;
+@@ -244,11 +262,14 @@ static GC onegc;
  static GC zerogc;
  static GC copygc;
  static GC clipgc;
@@ -77,7 +81,7 @@ $NetBSD: patch-xphoon.c,v 1.2 2025/02/14
  
      display = XOpenDisplay( display_name );
      if ( display == (Display*) 0 )
-@@ -260,8 +278,23 @@ xinit( char* display_name )
+@@ -260,8 +281,23 @@ xinit( char* display_name )
        }
      screen = DefaultScreen( display );
      root = DefaultRootWindow( display );
@@ -103,7 +107,7 @@ $NetBSD: patch-xphoon.c,v 1.2 2025/02/14
      temp_pixmap = XCreatePixmap( display, root, 1, 1, 1 );
      onegc = XCreateGC( display, temp_pixmap, 0, (XGCValues*) 0 );
      XSetForeground( display, onegc, 1L );
-@@ -278,6 +311,52 @@ xinit( char* display_name )
+@@ -278,6 +314,52 @@ xinit( char* display_name )
      XSetBackground( display, clipgc, WhitePixel( display, screen ) );
      }
  
@@ -156,7 +160,7 @@ $NetBSD: patch-xphoon.c,v 1.2 2025/02/14
  
  /* make_star_tiles - make random star tiles */
  
-@@ -518,6 +597,8 @@ set_root( int bits_w, int bits_h, unsign
+@@ -518,6 +600,8 @@ set_root( int bits_w, int bits_h, unsign
        display, mask_bitmap, onegc, cx - r + 2, cy - r + 2,
        r * 2 - 3, r * 2 - 3, 0, 360 * 64 );
  
@@ -165,7 +169,7 @@ $NetBSD: patch-xphoon.c,v 1.2 2025/02/14
      /* Make the root pixmap. */
      root_pixmap = XCreatePixmap(
        display, root, root_w, root_h, DefaultDepth( display, screen ) );
-@@ -545,13 +626,20 @@ set_root( int bits_w, int bits_h, unsign
+@@ -545,13 +629,20 @@ set_root( int bits_w, int bits_h, unsign
        }
  
      /* Put the moon into the stars. */
@@ -193,7 +197,7 @@ $NetBSD: patch-xphoon.c,v 1.2 2025/02/14
  
      /* And set the root. */
      XSetWindowBackgroundPixmap( display, root, root_pixmap );
-@@ -585,6 +673,8 @@ cleanup( void )
+@@ -585,6 +676,8 @@ cleanup( void )
      if ( star_tiles_made )
        for ( i = 0; i < NUM_TILES; ++i )
            XFreePixmap( display, star_tile[i] );

Added files:

Index: pkgsrc/x11/xphoon/patches/patch-date__parse.c
diff -u /dev/null pkgsrc/x11/xphoon/patches/patch-date__parse.c:1.1
--- /dev/null   Fri Feb 14 08:07:18 2025
+++ pkgsrc/x11/xphoon/patches/patch-date__parse.c       Fri Feb 14 08:07:18 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-date__parse.c,v 1.1 2025/02/14 08:07:18 vins Exp $
+
+Field `tm_gmtoff' is a BSD extension.
+
+--- date_parse.c.orig  2025-02-14 07:52:15.250712065 +0000
++++ date_parse.c
+@@ -117,7 +117,7 @@ date_parse( char* str )
+     ** non-portability, and it's only used for local times that don't
+     ** specify a zone - those don't occur in email and netnews.
+     */
+-#ifdef OS_SYSV
++#if defined(OS_SYSV) || defined(__sun)
+     tzset();
+     gmtoff = -timezone;
+ #else /* OS_SYSV */