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
cvs diff -r1.20 -r1.21 pkgsrc/chat/ctrlproxy/Makefile (expand / switch to unified diff)

--- 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,40 +1,44 @@ @@ -1,40 +1,44 @@
1# $NetBSD: Makefile,v 1.20 2021/12/08 16:03:27 adam Exp $ 1# $NetBSD: Makefile,v 1.21 2022/07/11 12:15:17 jperkin Exp $
2# 2#
3 3
4DISTNAME= ctrlproxy-3.0.8 4DISTNAME= ctrlproxy-3.0.8
5PKGREVISION= 15 5PKGREVISION= 15
6CATEGORIES= chat 6CATEGORIES= chat
7MASTER_SITES= http://www.ctrlproxy.org/releases/ 7MASTER_SITES= http://www.ctrlproxy.org/releases/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.ctrlproxy.org/ 10HOMEPAGE= http://www.ctrlproxy.org/
11COMMENT= Detachable internet relay chat proxy server 11COMMENT= Detachable internet relay chat proxy server
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
15USE_TOOLS+= pkg-config gmake 15USE_TOOLS+= pkg-config gmake
16USE_LANGUAGES= c99 16USE_LANGUAGES= c99
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18PKG_SYSCONFSUBDIR= ctrlproxy 18PKG_SYSCONFSUBDIR= ctrlproxy
19 19
20CONF_FILES= ${PREFIX}/share/examples/ctrlproxy/motd \ 20CONF_FILES= ${PREFIX}/share/examples/ctrlproxy/motd \
21 ${PKG_SYSCONFDIR}/motd 21 ${PKG_SYSCONFDIR}/motd
22CONF_FILES+= ${PREFIX}/share/examples/ctrlproxy/config.default \ 22CONF_FILES+= ${PREFIX}/share/examples/ctrlproxy/config.default \
23 ${PKG_SYSCONFDIR}/config 23 ${PKG_SYSCONFDIR}/config
24 24
25PKGCONFIG_OVERRIDE+= ctrlproxy.pc.in 25PKGCONFIG_OVERRIDE+= ctrlproxy.pc.in
26INSTALLATION_DIRS+= share/examples/ctrlproxy 26INSTALLATION_DIRS+= share/examples/ctrlproxy
27 27
 28BUILDLINK_TRANSFORM+= rm:-ansi
 29
 30LDFLAGS.SunOS+= -lsocket -lnsl
 31
28.include "options.mk" 32.include "options.mk"
29 33
30post-install: 34post-install:
31 cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR} ${MAKE} install 35 cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR} ${MAKE} install
32 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/ctrlproxy/README 36 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/ctrlproxy/README
33 ${INSTALL_DATA} ${WRKSRC}/motd \ 37 ${INSTALL_DATA} ${WRKSRC}/motd \
34 ${DESTDIR}${PREFIX}/share/examples/ctrlproxy/motd 38 ${DESTDIR}${PREFIX}/share/examples/ctrlproxy/motd
35 ${INSTALL_DATA} ${WRKSRC}/config.default \ 39 ${INSTALL_DATA} ${WRKSRC}/config.default \
36 ${DESTDIR}${PREFIX}/share/examples/ctrlproxy/config.default 40 ${DESTDIR}${PREFIX}/share/examples/ctrlproxy/config.default
37 ${INSTALL_DATA} ${WRKSRC}/config.example \ 41 ${INSTALL_DATA} ${WRKSRC}/config.example \
38 ${DESTDIR}${PREFIX}/share/examples/ctrlproxy/config.example 42 ${DESTDIR}${PREFIX}/share/examples/ctrlproxy/config.example
39 43
40.include "../../devel/glib2/buildlink3.mk" 44.include "../../devel/glib2/buildlink3.mk"
cvs diff -r1.5 -r1.6 pkgsrc/chat/ctrlproxy/distinfo (expand / switch to unified diff)

--- 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 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.5 2021/10/26 10:05:12 nia Exp $ 1$NetBSD: distinfo,v 1.6 2022/07/11 12:15:17 jperkin Exp $
2 2
3BLAKE2s (ctrlproxy-3.0.8.tar.gz) = 73d7f41242cac74061d0129b436bcf3a308b951ed6dee5efae5839b76c9b7aa6 3BLAKE2s (ctrlproxy-3.0.8.tar.gz) = 73d7f41242cac74061d0129b436bcf3a308b951ed6dee5efae5839b76c9b7aa6
4SHA512 (ctrlproxy-3.0.8.tar.gz) = 241f227eaae864a43846cf90bb3c41e7ff2423224f92b214d19f681cd1fbdee73c1edfde06ecd6ab0df2061e1386b370c66905a797ab3e3f92382f886698520c 4SHA512 (ctrlproxy-3.0.8.tar.gz) = 241f227eaae864a43846cf90bb3c41e7ff2423224f92b214d19f681cd1fbdee73c1edfde06ecd6ab0df2061e1386b370c66905a797ab3e3f92382f886698520c
5Size (ctrlproxy-3.0.8.tar.gz) = 277083 bytes 5Size (ctrlproxy-3.0.8.tar.gz) = 277083 bytes
6SHA1 (patch-Makefile) = e42074951158b4d35704725c115ad17eee8a8200 6SHA1 (patch-Makefile) = e42074951158b4d35704725c115ad17eee8a8200
7SHA1 (patch-src_gnutls.c) = 735747cf2b344b3821d9d5a32aaf73d0d3586d56 7SHA1 (patch-src_gnutls.c) = 735747cf2b344b3821d9d5a32aaf73d0d3586d56
 8SHA1 (patch-src_settings.c) = 5aca90a41f80bba6d99f89b5a6bc77cf148c7976
File Added: pkgsrc/chat/ctrlproxy/patches/patch-src_settings.c
$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)