CVS commit: pkgsrc/wm/afterstep

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Sep  4 22:50:51 UTC 2025

Modified Files:
        pkgsrc/wm/afterstep: Makefile distinfo
Added Files:
        pkgsrc/wm/afterstep/patches: patch-libAfterStep_screen.c
            patch-libAfterStep_session.c

Log Message:
afterstep: fix a build issue and improve some error messages


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/wm/afterstep/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/wm/afterstep/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/wm/afterstep/patches/patch-libAfterStep_screen.c \
    pkgsrc/wm/afterstep/patches/patch-libAfterStep_session.c

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

Modified files:

Index: pkgsrc/wm/afterstep/Makefile
diff -u pkgsrc/wm/afterstep/Makefile:1.112 pkgsrc/wm/afterstep/Makefile:1.113
--- pkgsrc/wm/afterstep/Makefile:1.112  Sat Aug 30 22:46:26 2025
+++ pkgsrc/wm/afterstep/Makefile        Thu Sep  4 22:50:51 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.112 2025/08/30 22:46:26 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2025/09/04 22:50:51 gutteridge Exp $
 
 DISTNAME=      AfterStep-2.2.12
 PKGNAME=       ${DISTNAME:S/AfterStep/afterstep/}
-PKGREVISION=   13
+PKGREVISION=   14
 CATEGORIES=    wm
 MASTER_SITES=  ftp://ftp.afterstep.org/stable/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/wm/afterstep/distinfo
diff -u pkgsrc/wm/afterstep/distinfo:1.28 pkgsrc/wm/afterstep/distinfo:1.29
--- pkgsrc/wm/afterstep/distinfo:1.28   Mon Jul 10 22:18:38 2023
+++ pkgsrc/wm/afterstep/distinfo        Thu Sep  4 22:50:51 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2023/07/10 22:18:38 gutteridge Exp $
+$NetBSD: distinfo,v 1.29 2025/09/04 22:50:51 gutteridge Exp $
 
 BLAKE2s (AfterStep-2.2.12.tar.bz2) = 7805d82301489abce1fb81b73beeff5c2efee85592281578a06c3bcbe1056ac8
 SHA512 (AfterStep-2.2.12.tar.bz2) = 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee
@@ -37,6 +37,8 @@ SHA1 (patch-libAfterStep_mylook.c) = 23d
 SHA1 (patch-libAfterStep_mylook.h) = 0ebab667d7e03f211f9b4e68ccef2452b49ff9db
 SHA1 (patch-libAfterStep_parser.c) = ae7ba594cf19c0001f99567f5c4a9d8754fd4ac4
 SHA1 (patch-libAfterStep_parser__xml.c) = e02a1c2399fceee2cd25e7775f0643d85a5b01c9
+SHA1 (patch-libAfterStep_screen.c) = 18f23efd45e82528c7c12a0ef1aae255b0dfbc56
+SHA1 (patch-libAfterStep_session.c) = 3e3ab5c2db80be7b9b9610a53b48624c9200f936
 SHA1 (patch-src_ASDocGen_Makefile.in) = c879bca9d2e4acf6776dfeef8557b8f72f77ab82
 SHA1 (patch-src_Animate_Makefile.in) = fd5c50d91233e062c05c3bd4abe85741f345dff4
 SHA1 (patch-src_afterstep_asinternals.h) = 46264bce63b9252be0731a2c864e3334ea675af5

Added files:

Index: pkgsrc/wm/afterstep/patches/patch-libAfterStep_screen.c
diff -u /dev/null pkgsrc/wm/afterstep/patches/patch-libAfterStep_screen.c:1.1
--- /dev/null   Thu Sep  4 22:50:51 2025
+++ pkgsrc/wm/afterstep/patches/patch-libAfterStep_screen.c     Thu Sep  4 22:50:51 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-libAfterStep_screen.c,v 1.1 2025/09/04 22:50:51 gutteridge Exp $
+
+Source fcntl.h as per standard, and as is done everywhere else in this
+code base, too. Addresses build issue with SunOS.
+
+--- libAfterStep/screen.c.orig 2013-05-01 13:34:11.000000000 +0000
++++ libAfterStep/screen.c
+@@ -24,7 +24,7 @@
+ #include <signal.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #include <sys/un.h>
+ 
+ #include "afterstep.h"
Index: pkgsrc/wm/afterstep/patches/patch-libAfterStep_session.c
diff -u /dev/null pkgsrc/wm/afterstep/patches/patch-libAfterStep_session.c:1.1
--- /dev/null   Thu Sep  4 22:50:51 2025
+++ pkgsrc/wm/afterstep/patches/patch-libAfterStep_session.c    Thu Sep  4 22:50:51 2025
@@ -0,0 +1,32 @@
+$NetBSD: patch-libAfterStep_session.c,v 1.1 2025/09/04 22:50:51 gutteridge Exp $
+
+Actually provide a useful error state when failing to open files
+or directories.
+
+--- libAfterStep/session.c.orig        2013-05-01 13:34:11.000000000 +0000
++++ libAfterStep/session.c
+@@ -563,8 +563,9 @@ static int MakeASDir (const char *name, 
+       show_progress ("Creating %s ... ", name);
+       if (mkdir (name, perms)) {
+               show_error
+-                              ("AfterStep depends on %s directory !\nPlease check permissions or contact your sysadmin !",
+-                               name);
++                              ("AfterStep depends on the %s directory, error \"%s\"!\n"
++                              " Please check permissions or contact your sysadmin!",
++                               name, strerror(errno));
+               return (-1);
+       }
+       show_progress ("\t created.");
+@@ -577,9 +578,9 @@ static int MakeASFile (const char *name)
+ 
+       show_progress ("Creating %s ... ", name);
+       if ((touch = fopen (name, "w")) == NULL) {
+-              show_error ("Cannot open file %s for writing!\n"
+-                                                              " Please check permissions or contact your sysadmin !",
+-                                                              name);
++              show_error ("Cannot open file %s for writing, error \"%s\"!\n"
++                                      " Please check permissions or contact your sysadmin!",
++                                      name, strerror(errno));
+               return (-1);
+       }
+       fclose (touch);