CVS commit: pkgsrc/chat/catgirl

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Fri Jul 25 19:30:09 UTC 2025

Modified Files:
        pkgsrc/chat/catgirl: Makefile distinfo
        pkgsrc/chat/catgirl/patches: patch-configure
Added Files:
        pkgsrc/chat/catgirl/patches: patch-chat.c

Log Message:
chat/catgirl: fix build on SunOS

Bump revision and take maintainership.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/chat/catgirl/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/catgirl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/catgirl/patches/patch-chat.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/catgirl/patches/patch-configure

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

Modified files:

Index: pkgsrc/chat/catgirl/Makefile
diff -u pkgsrc/chat/catgirl/Makefile:1.7 pkgsrc/chat/catgirl/Makefile:1.8
--- pkgsrc/chat/catgirl/Makefile:1.7    Fri Jul 25 18:41:27 2025
+++ pkgsrc/chat/catgirl/Makefile        Fri Jul 25 19:30:09 2025
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2025/07/25 18:41:27 vins Exp $
+# $NetBSD: Makefile,v 1.8 2025/07/25 19:30:09 vins Exp $
 
 DISTNAME=      catgirl-2.2a
+PKGREVISION=   1
 CATEGORIES=    chat
 MASTER_SITES=  https://git.causal.agency/catgirl/snapshot/
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://git.causal.agency/catgirl/about/
 COMMENT=       TLS-only terminal IRC client
 LICENSE=       gnu-gpl-v3

Index: pkgsrc/chat/catgirl/distinfo
diff -u pkgsrc/chat/catgirl/distinfo:1.3 pkgsrc/chat/catgirl/distinfo:1.4
--- pkgsrc/chat/catgirl/distinfo:1.3    Fri Jul 25 18:41:27 2025
+++ pkgsrc/chat/catgirl/distinfo        Fri Jul 25 19:30:09 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2025/07/25 18:41:27 vins Exp $
+$NetBSD: distinfo,v 1.4 2025/07/25 19:30:09 vins Exp $
 
 BLAKE2s (catgirl-2.2a.tar.gz) = 1eb55626f1732e24beec306ef55d508a1f66e1db11299b63b6faadd10007eb33
 SHA512 (catgirl-2.2a.tar.gz) = 988750c960630ec8314ebde7b9802f8b6a3087f733359f61f49c4f83cb6e327c03cde9ad88f2cb535d56ead1376cd121a7124c367c90394a6d4d7f80b25e329f
 Size (catgirl-2.2a.tar.gz) = 69660 bytes
-SHA1 (patch-configure) = 2cb05f06685e2790002ec9b90e7f1621468f2cb4
+SHA1 (patch-chat.c) = 5360774b099892b2f0c90f1cd026113772633448
+SHA1 (patch-configure) = 1d3c3815393d8c2943325bf16dbdfb02b82b096e

Index: pkgsrc/chat/catgirl/patches/patch-configure
diff -u pkgsrc/chat/catgirl/patches/patch-configure:1.2 pkgsrc/chat/catgirl/patches/patch-configure:1.3
--- pkgsrc/chat/catgirl/patches/patch-configure:1.2     Fri Jul 25 18:41:27 2025
+++ pkgsrc/chat/catgirl/patches/patch-configure Fri Jul 25 19:30:09 2025
@@ -1,10 +1,20 @@
-$NetBSD: patch-configure,v 1.2 2025/07/25 18:41:27 vins Exp $
+$NetBSD: patch-configure,v 1.3 2025/07/25 19:30:09 vins Exp $
 
 NetBSD support. Note that native curses does not work.
 
 --- configure.orig     2024-03-22 01:38:43.000000000 +0000
 +++ configure
-@@ -54,6 +54,12 @@ case "$(uname)" in
+@@ -6,6 +6,9 @@ set -eu
+ cflags() {
+       echo "CFLAGS += $*"
+ }
++ldflags() {
++        echo "LDFLAGS += $*"
++}
+ defstr() {
+       cflags "-D'$1=\"$2\"'"
+ }
+@@ -54,6 +57,19 @@ case "$(uname)" in
                config libtls ncursesw
                defvar OPENSSL_BIN openssl exec_prefix /bin/openssl
                ;;
@@ -14,6 +24,13 @@ NetBSD support. Note that native curses 
 +              echo 'OBJS += compat_readpassphrase.o'
 +              defstr OPENSSL_BIN /usr/bin/openssl
 +              ;;
++      (SunOS)
++              cflags -Wno-pedantic
++              ldflags -lsocket
++              config libtls ncursesw
++              echo 'OBJS += compat_readpassphrase.o'
++              defstr OPENSSL_BIN /usr/bin/openssl
++              ;;
        (*)
                config libtls ncursesw
                defvar OPENSSL_BIN openssl exec_prefix /bin/openssl

Added files:

Index: pkgsrc/chat/catgirl/patches/patch-chat.c
diff -u /dev/null pkgsrc/chat/catgirl/patches/patch-chat.c:1.1
--- /dev/null   Fri Jul 25 19:30:09 2025
+++ pkgsrc/chat/catgirl/patches/patch-chat.c    Fri Jul 25 19:30:09 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-chat.c,v 1.1 2025/07/25 19:30:09 vins Exp $
+
+Support sig_t on SunOS. 
+
+--- chat.c.orig        2024-03-22 01:38:43.000000000 +0000
++++ chat.c
+@@ -50,6 +50,10 @@
+ #include <capsicum_helpers.h>
+ #endif
+ 
++#ifdef __sun
++typedef void (*sig_t)();
++#endif
++
+ char *readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags);
+ 
+ #include "chat.h"