CVS commit: pkgsrc/time/xbeats

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jul  7 08:25:38 UTC 2023

Modified Files:
        pkgsrc/time/xbeats: Makefile distinfo
Added Files:
        pkgsrc/time/xbeats/patches: patch-parser.c patch-xbeats.c

Log Message:
xbeats: Bring package kicking and screaming into the 21st century.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/time/xbeats/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/time/xbeats/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/time/xbeats/patches/patch-parser.c \
    pkgsrc/time/xbeats/patches/patch-xbeats.c

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

Modified files:

Index: pkgsrc/time/xbeats/Makefile
diff -u pkgsrc/time/xbeats/Makefile:1.17 pkgsrc/time/xbeats/Makefile:1.18
--- pkgsrc/time/xbeats/Makefile:1.17    Thu Sep 25 19:43:06 2014
+++ pkgsrc/time/xbeats/Makefile Fri Jul  7 08:25:37 2023
@@ -1,19 +1,23 @@
-# $NetBSD: Makefile,v 1.17 2014/09/25 19:43:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2023/07/07 08:25:37 nia Exp $
 #
 
 DISTNAME=      xbeats-0.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11 time
-MASTER_SITES=  http://iznogood.bohemians.org/xbeats/
+MASTER_SITES=  https://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://iznogood.bohemians.org/
+HOMEPAGE=      https://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html
 COMMENT=       Beats clock dockable in both Window Maker and AfterStep
+LICENSE=       gnu-gpl-v1
 
 GNU_CONFIGURE= YES
 
 LDFLAGS.SunOS+=        -lX11
 
+CONFIGURE_ARGS+=       --x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=       --x-libraries=${X11BASE}/lib
+
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/time/xbeats/distinfo
diff -u pkgsrc/time/xbeats/distinfo:1.6 pkgsrc/time/xbeats/distinfo:1.7
--- pkgsrc/time/xbeats/distinfo:1.6     Tue Oct 26 11:24:46 2021
+++ pkgsrc/time/xbeats/distinfo Fri Jul  7 08:25:37 2023
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:24:46 nia Exp $
+$NetBSD: distinfo,v 1.7 2023/07/07 08:25:37 nia Exp $
 
 BLAKE2s (xbeats-0.4.tar.gz) = 3d20da62c10d512680cc858601a298b3b8bd383771a535bfa8ad26de58a028ea
 SHA512 (xbeats-0.4.tar.gz) = d2b7ff29278b4088483f7283c18fd56bafc0ccf966aa9ca3ee9c5e6501130e3efa096af8c4524eee07c103927972091b24d135538c2012de059aa8acb1a4b25a
 Size (xbeats-0.4.tar.gz) = 37526 bytes
 SHA1 (patch-aa) = 79226edb7949514983c6c83f13e2056cac3f0c51
+SHA1 (patch-parser.c) = 681d7e057bad0017015ae9af5264ab33636d2554
+SHA1 (patch-xbeats.c) = 2aca5752d8a5f585fbe9b2fd705fd54b89f676e4

Added files:

Index: pkgsrc/time/xbeats/patches/patch-parser.c
diff -u /dev/null pkgsrc/time/xbeats/patches/patch-parser.c:1.1
--- /dev/null   Fri Jul  7 08:25:38 2023
+++ pkgsrc/time/xbeats/patches/patch-parser.c   Fri Jul  7 08:25:37 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-parser.c,v 1.1 2023/07/07 08:25:37 nia Exp $
+
+Fix incompatible declaration of exit(3).
+
+--- parser.c.orig      1999-01-25 16:13:46.000000000 +0000
++++ parser.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include "xbeats.h"
+ 
Index: pkgsrc/time/xbeats/patches/patch-xbeats.c
diff -u /dev/null pkgsrc/time/xbeats/patches/patch-xbeats.c:1.1
--- /dev/null   Fri Jul  7 08:25:38 2023
+++ pkgsrc/time/xbeats/patches/patch-xbeats.c   Fri Jul  7 08:25:37 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-xbeats.c,v 1.1 2023/07/07 08:25:37 nia Exp $
+
+Make it not immediately trigger the stack protector and segfault.
+
+--- xbeats.c.orig      1999-01-25 16:13:27.000000000 +0000
++++ xbeats.c
+@@ -54,6 +54,7 @@ struct timezone *tz;
+ #define MW_EVENTS     (ExposureMask | ButtonPressMask | StructureNotifyMask)
+ 
+ int main(int argc, char *argv[]);
++void parser(int, char **);
+ void GetXPM(void);
+ int flush_expose(Window w);
+ void RedrawWindow(XpmIcon *v);
+@@ -208,8 +209,8 @@ void GetXPM(void)
+ {
+       XColor col;
+       XWindowAttributes attributes;
+-      char led1[22];
+-      char led2[22];
++      char led1[23];
++      char led2[23];
+       int ret;
+       XGetWindowAttributes(dpy,Root,&attributes);
+       if(!XParseColor(dpy,attributes.colormap,LedColor,&col))