CVS commit: pkgsrc/x11/xphoon

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/xphoon
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Fri, 14 Feb 2025 07:00:15 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Fri Feb 14 07:00:15 UTC 2025

Modified Files:
        pkgsrc/x11/xphoon: Makefile PLIST distinfo
        pkgsrc/x11/xphoon/patches: patch-Imakefile patch-xphoon.c
Added Files:
        pkgsrc/x11/xphoon/patches: patch-stddef.h patch-xphoon.man
Removed Files:
        pkgsrc/x11/xphoon/patches: patch-Makefile

Log Message:
x11/xphoon: package revision

* Silence makedepend warnings.
* Fix hard-coded paths.
* Provide a simplified install target.
* Move man page to games section.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/xphoon/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xphoon/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/xphoon/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xphoon/patches/patch-Imakefile \
    pkgsrc/x11/xphoon/patches/patch-xphoon.c
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xphoon/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xphoon/patches/patch-stddef.h \
    pkgsrc/x11/xphoon/patches/patch-xphoon.man

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.30 pkgsrc/x11/xphoon/Makefile:1.31
--- pkgsrc/x11/xphoon/Makefile:1.30     Thu Feb 13 21:09:01 2025
+++ pkgsrc/x11/xphoon/Makefile  Fri Feb 14 07:00:15 2025
@@ -1,18 +1,26 @@
-# $NetBSD: Makefile,v 1.30 2025/02/13 21:09:01 vins Exp $
+# $NetBSD: Makefile,v 1.31 2025/02/14 07:00:15 vins Exp $
 #
 
 DISTNAME=      xphoon_14Aug2014
 PKGNAME=       xphoon-20140814
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  https://www.acme.com/software/xphoon/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+#HOMEPAGE=     https://xphoon.sourceforge.net/
 HOMEPAGE=      https://www.acme.com/software/xphoon/
 COMMENT=       Set the root window to the moon in its current phase
 LICENSE=       2-clause-bsd
 
 USE_IMAKE=     yes
 
+SUBST_CLASSES+=                pkgsrc
+SUBST_STAGE.pkgsrc=    pre-configure
+SUBST_FILES.pkgsrc=    Imakefile
+SUBST_VARS.pkgsrc=     PREFIX PKGMANDIR X11BASE
+SUBST_MESSAGE.pkgsrc=  Replacing pkgsrc placeholders
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Linux"
@@ -28,6 +36,8 @@ MAKE_FLAGS+=  LOCAL_LDFLAGS=${LDFLAGS:Q}
 
 WRKSRC=        ${WRKDIR}/${PKGBASE}
 
+INSTALL_TARGET=        install install-man
+
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"

Index: pkgsrc/x11/xphoon/PLIST
diff -u pkgsrc/x11/xphoon/PLIST:1.3 pkgsrc/x11/xphoon/PLIST:1.4
--- pkgsrc/x11/xphoon/PLIST:1.3 Mon Jul 30 03:50:21 2012
+++ pkgsrc/x11/xphoon/PLIST     Fri Feb 14 07:00:15 2025
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2012/07/30 03:50:21 dholland Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/02/14 07:00:15 vins Exp $
 bin/xphoon
-${IMAKE_MAN_DIR}/xphoon.${IMAKE_MAN_SUFFIX}
+man/man6/xphoon.6

Index: pkgsrc/x11/xphoon/distinfo
diff -u pkgsrc/x11/xphoon/distinfo:1.7 pkgsrc/x11/xphoon/distinfo:1.8
--- pkgsrc/x11/xphoon/distinfo:1.7      Thu Feb 13 21:09:01 2025
+++ pkgsrc/x11/xphoon/distinfo  Fri Feb 14 07:00:15 2025
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.7 2025/02/13 21:09:01 vins Exp $
+$NetBSD: distinfo,v 1.8 2025/02/14 07:00:15 vins Exp $
 
 BLAKE2s (xphoon_14Aug2014.tar.gz) = 9f6df7ff034315dfc08dba667c57c2377b494217a9c82d47c4d1e04c6bfd3a1f
 SHA512 (xphoon_14Aug2014.tar.gz) = 6f0cf53b305cbf15d3b28fdfbcf49ff78689d49fb7b95815b590f3d42f43bda31df1bfd515eefa849579f9055f004cc7bf901741d98e2a10ac4841cc4ed95a00
 Size (xphoon_14Aug2014.tar.gz) = 103903 bytes
-SHA1 (patch-Imakefile) = cc9091b8bbec7bfd7029c5b8179e0e9064596349
-SHA1 (patch-Makefile) = 154cb0169f81817e8f60719d077c40d6a031ad90
+SHA1 (patch-Imakefile) = 1561cc1342b5a9f379117cd72f5cf9b5b8419bb2
+SHA1 (patch-stddef.h) = f910a3720d4bbc2e27a4f8d0369b560006414db7
 SHA1 (patch-vroot.h) = e06529cf5a373e3f87f0a825dec28545e5aaae6d
-SHA1 (patch-xphoon.c) = 981c2adbb0e9c5e82a898c68c41c1cc4a0b67ad6
+SHA1 (patch-xphoon.c) = 59562e7a9ccc385c698d4abd8b68529af954c37d
+SHA1 (patch-xphoon.man) = c5734b40672aec092302d4a141e390fb3cced0ce

Index: pkgsrc/x11/xphoon/patches/patch-Imakefile
diff -u pkgsrc/x11/xphoon/patches/patch-Imakefile:1.1 pkgsrc/x11/xphoon/patches/patch-Imakefile:1.2
--- pkgsrc/x11/xphoon/patches/patch-Imakefile:1.1       Thu Feb 13 21:09:01 2025
+++ pkgsrc/x11/xphoon/patches/patch-Imakefile   Fri Feb 14 07:00:15 2025
@@ -1,16 +1,38 @@
-$NetBSD: patch-Imakefile,v 1.1 2025/02/13 21:09:01 vins Exp $
+$NetBSD: patch-Imakefile,v 1.2 2025/02/14 07:00:15 vins Exp $
 
-Link with libXrandr.
+* Fix hard-coded paths.
+* Do not override CCOPTIONS.
+* Link with libXrandr.
+* Provide a simplified install target.
 
 --- Imakefile.orig     2014-08-11 19:15:00.000000000 +0000
 +++ Imakefile
-@@ -1,7 +1,7 @@
- CCOPTIONS =           -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls 
-Wno-long-long
- INCLUDES =            -I. -I$(TOP) -I$(TOP)/X11 -I$(TOP)/X11/bitmaps
+@@ -1,10 +1,24 @@
+-CCOPTIONS =           -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls 
-Wno-long-long
+-INCLUDES =            -I. -I$(TOP) -I$(TOP)/X11 -I$(TOP)/X11/bitmaps
 -LOCAL_LIBRARIES =     $(XLIB)
 -DEPLIBS =             $(DEPXLIB)
++
++BINDIR =              @PREFIX@/bin
++MANDIR =              @PREFIX@/@PKGMANDIR@/man6
++
++XRANDRLIB =           -lXrandr
++
++CCOPTIONS ?=          -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls 
-Wno-long-long
++INCLUDES =            -I. -I/usr/include -I@X11BASE@/include/X11 -I@X11BASE@/include/X11/bitmaps
 +LOCAL_LIBRARIES =     $(XLIB) $(XRANDRLIB)
 +DEPLIBS =             $(DEPXLIB) $(DEPXRANDRLIB)
  LDLIBS =              -lm
  
  SRCS =                        xphoon.c moon.c astro.c date_parse.c
+ OBJS =                        xphoon.o moon.o astro.o date_parse.o
+ 
+ ComplexProgramTarget(xphoon)
++
++install:: all
++      ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}$(BINDIR)
++      ${BSD_INSTALL_PROGRAM} xphoon ${DESTDIR}$(BINDIR)
++
++install-man:: install
++      ${BSD_INSTALL_MAN_DIR} ${DESTDIR}$(MANDIR)
++      ${BSD_INSTALL_MAN} xphoon.man ${DESTDIR}$(MANDIR)/xphoon.6
Index: pkgsrc/x11/xphoon/patches/patch-xphoon.c
diff -u pkgsrc/x11/xphoon/patches/patch-xphoon.c:1.1 pkgsrc/x11/xphoon/patches/patch-xphoon.c:1.2
--- pkgsrc/x11/xphoon/patches/patch-xphoon.c:1.1        Thu Feb 13 21:09:02 2025
+++ pkgsrc/x11/xphoon/patches/patch-xphoon.c    Fri Feb 14 07:00:15 2025
@@ -1,11 +1,18 @@
-$NetBSD: patch-xphoon.c,v 1.1 2025/02/13 21:09:02 vins Exp $
+$NetBSD: patch-xphoon.c,v 1.2 2025/02/14 07:00:15 vins Exp $
 
 * Add Xrandr support.
+* Silence warnings about missing preprocessor defined macros.
 * Do not require a tty when forking to background.
 
 --- xphoon.c.orig      2014-08-04 21:57:59.000000000 +0000
 +++ xphoon.c
-@@ -27,11 +27,13 @@
+@@ -23,15 +23,19 @@
+ ** SUCH DAMAGE.
+ */
+ 
++#include "stddef.h"
++
+ #include <stdlib.h>
  #include <stdio.h>
  #include <time.h>
  #include <math.h>
@@ -19,7 +26,7 @@ $NetBSD: patch-xphoon.c,v 1.1 2025/02/13
  #include "vroot.h"
  #include "astro.h"
  #include "date_parse.h"
-@@ -190,13 +192,20 @@ usage:
+@@ -190,13 +194,20 @@ usage:
        (void) fflush( stdout );
  
        /* Go stealth (ditch our controlling tty). */
@@ -44,7 +51,7 @@ $NetBSD: patch-xphoon.c,v 1.1 2025/02/13
        else
            {
            if ( ioctl( tty, TIOCNOTTY, 0 ) < 0 )
-@@ -236,6 +245,10 @@ usage:
+@@ -236,6 +247,10 @@ usage:
  
  /* xinit - initialize X stuff */
  
@@ -55,7 +62,7 @@ $NetBSD: patch-xphoon.c,v 1.1 2025/02/13
  static Display* display;
  static int screen;
  static Window root;
-@@ -244,11 +257,14 @@ static GC onegc;
+@@ -244,11 +259,14 @@ static GC onegc;
  static GC zerogc;
  static GC copygc;
  static GC clipgc;
@@ -70,7 +77,7 @@ $NetBSD: patch-xphoon.c,v 1.1 2025/02/13
  
      display = XOpenDisplay( display_name );
      if ( display == (Display*) 0 )
-@@ -260,8 +276,23 @@ xinit( char* display_name )
+@@ -260,8 +278,23 @@ xinit( char* display_name )
        }
      screen = DefaultScreen( display );
      root = DefaultRootWindow( display );
@@ -96,7 +103,7 @@ $NetBSD: patch-xphoon.c,v 1.1 2025/02/13
      temp_pixmap = XCreatePixmap( display, root, 1, 1, 1 );
      onegc = XCreateGC( display, temp_pixmap, 0, (XGCValues*) 0 );
      XSetForeground( display, onegc, 1L );
-@@ -278,6 +309,52 @@ xinit( char* display_name )
+@@ -278,6 +311,52 @@ xinit( char* display_name )
      XSetBackground( display, clipgc, WhitePixel( display, screen ) );
      }
  
@@ -149,7 +156,7 @@ $NetBSD: patch-xphoon.c,v 1.1 2025/02/13
  
  /* make_star_tiles - make random star tiles */
  
-@@ -518,6 +595,8 @@ set_root( int bits_w, int bits_h, unsign
+@@ -518,6 +597,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 );
  
@@ -158,7 +165,7 @@ $NetBSD: patch-xphoon.c,v 1.1 2025/02/13
      /* Make the root pixmap. */
      root_pixmap = XCreatePixmap(
        display, root, root_w, root_h, DefaultDepth( display, screen ) );
-@@ -545,13 +624,20 @@ set_root( int bits_w, int bits_h, unsign
+@@ -545,13 +626,20 @@ set_root( int bits_w, int bits_h, unsign
        }
  
      /* Put the moon into the stars. */
@@ -186,7 +193,7 @@ $NetBSD: patch-xphoon.c,v 1.1 2025/02/13
  
      /* And set the root. */
      XSetWindowBackgroundPixmap( display, root, root_pixmap );
-@@ -585,6 +671,8 @@ cleanup( void )
+@@ -585,6 +673,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-stddef.h
diff -u /dev/null pkgsrc/x11/xphoon/patches/patch-stddef.h:1.1
--- /dev/null   Fri Feb 14 07:00:15 2025
+++ pkgsrc/x11/xphoon/patches/patch-stddef.h    Fri Feb 14 07:00:15 2025
@@ -0,0 +1,38 @@
+$NetBSD: patch-stddef.h,v 1.1 2025/02/14 07:00:15 vins Exp $
+
+Silence makedepend warnings:
+`#error __PTRDIFF_TYPE__ not present'
+
+--- stddef.h.orig      2025-02-14 05:27:20.805605781 +0000
++++ stddef.h
+@@ -0,0 +1,30 @@
++/*
++ * stddef.h
++ *
++ * Prepocessor defined type definitions.
++ *
++ */
++
++#ifndef __PTRDIFF_TYPE__
++#define __PTRDIFF_TYPE__ long int
++#endif
++typedef __PTRDIFF_TYPE__ ptrdiff_t;
++
++#ifndef __SIZE_TYPE__
++#define __SIZE_TYPE__ long unsigned int
++#endif
++#if !(defined (__GNUG__) && defined (size_t))
++typedef __SIZE_TYPE__ size_t;
++#endif
++
++#ifndef __WCHAR_TYPE__
++#define __WCHAR_TYPE__ int
++#endif
++#ifndef __cplusplus
++typedef __WCHAR_TYPE__ wchar_t;
++#endif
++
++#ifndef __WINT_TYPE__
++#define __WINT_TYPE__ unsigned int
++#endif
++typedef __WINT_TYPE__ wint_t;
Index: pkgsrc/x11/xphoon/patches/patch-xphoon.man
diff -u /dev/null pkgsrc/x11/xphoon/patches/patch-xphoon.man:1.1
--- /dev/null   Fri Feb 14 07:00:15 2025
+++ pkgsrc/x11/xphoon/patches/patch-xphoon.man  Fri Feb 14 07:00:15 2025
@@ -0,0 +1,12 @@
+$NetBSD: patch-xphoon.man,v 1.1 2025/02/14 07:00:15 vins Exp $
+
+Move xphoon manual to `games' section. 
+
+--- xphoon.man.orig    2025-02-14 06:38:53.024138069 +0000
++++ xphoon.man
+@@ -1,4 +1,4 @@
+-.TH xphoon 1 "14 September 1991"
++.TH xphoon 6 "14 September 1991"
+ .SH NAME
+ xphoon - displays the PHase of the mOON on the root window
+ .SH SYNOPSIS

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/www/reader
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/www/reader
Indexes:

Home | Main Index | Thread Index | Old Index