Mon Jul 11 12:15:17 2022 UTC ()
ctrlproxy: Various build fixes.
(jperkin)
diff -r1.20 -r1.21 pkgsrc/chat/ctrlproxy/Makefile
diff -r1.5 -r1.6 pkgsrc/chat/ctrlproxy/distinfo
diff -r0 -r1.1 pkgsrc/chat/ctrlproxy/patches/patch-src_settings.c
--- pkgsrc/chat/ctrlproxy/Makefile 2021/12/08 16:03:27 1.20
+++ pkgsrc/chat/ctrlproxy/Makefile 2022/07/11 12:15:17 1.21
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/12/08 16:03:27 adam Exp $
+# $NetBSD: Makefile,v 1.21 2022/07/11 12:15:17 jperkin Exp $
#
DISTNAME= ctrlproxy-3.0.8
@@ -24,6 +24,10 @@
PKGCONFIG_OVERRIDE+= ctrlproxy.pc.in
INSTALLATION_DIRS+= share/examples/ctrlproxy
+
+BUILDLINK_TRANSFORM+= rm:-ansi
+
+LDFLAGS.SunOS+= -lsocket -lnsl
.include "options.mk"
--- pkgsrc/chat/ctrlproxy/distinfo 2021/10/26 10:05:12 1.5
+++ pkgsrc/chat/ctrlproxy/distinfo 2022/07/11 12:15:17 1.6
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:05:12 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/07/11 12:15:17 jperkin Exp $
BLAKE2s (ctrlproxy-3.0.8.tar.gz) = 73d7f41242cac74061d0129b436bcf3a308b951ed6dee5efae5839b76c9b7aa6
SHA512 (ctrlproxy-3.0.8.tar.gz) = 241f227eaae864a43846cf90bb3c41e7ff2423224f92b214d19f681cd1fbdee73c1edfde06ecd6ab0df2061e1386b370c66905a797ab3e3f92382f886698520c
Size (ctrlproxy-3.0.8.tar.gz) = 277083 bytes
SHA1 (patch-Makefile) = e42074951158b4d35704725c115ad17eee8a8200
SHA1 (patch-src_gnutls.c) = 735747cf2b344b3821d9d5a32aaf73d0d3586d56
+SHA1 (patch-src_settings.c) = 5aca90a41f80bba6d99f89b5a6bc77cf148c7976
$NetBSD: patch-src_settings.c,v 1.1 2022/07/11 12:15:17 jperkin Exp $
Provide compat for non-standard __STRING() macro.
--- src/settings.c.orig 2008-12-06 17:36:34.000000000 +0000
+++ src/settings.c
@@ -1009,6 +1009,10 @@ static void config_load_networks(struct
g_strfreev(groups);
}
+#ifndef __STRING
+#define __STRING(x) #x
+#endif
+
#define FETCH_SETTING(data, kf, section, prefix, name) (data)->name = g_key_file_get_string((kf), (section), prefix __STRING(name), NULL)
#define STORE_SETTING(data, kf, section, prefix, name) g_key_file_set_string((kf), (section), prefix __STRING(name), (data)->name)