[resending to ports@] On Sat, Feb 19, 2022 at 02:40:24AM -0700, Kurt Mosiejczuk wrote: > http://build-failures.rhaalovely.net/sparc64/2022-02-16/net/zabbix,sqlite3,-main.log
> In file included from duktape.h:196, > from duktape.c:189: > duk_config.h:1981:2: error: #error cannot determine intptr type Zabbix already has defines for sparc and sparc64 but this particular code ignored them. I bumped all revisions just to be sure, but there's PLIST churn anyway, so now they're justified ;) Only build-tested on sparc64. Feedback? OK? Index: Makefile =================================================================== RCS file: /home/cvs/ports/net/zabbix/Makefile,v retrieving revision 1.180 diff -u -p -r1.180 Makefile --- Makefile 18 Feb 2022 06:42:35 -0000 1.180 +++ Makefile 19 Feb 2022 20:09:14 -0000 @@ -15,8 +15,10 @@ FULLPKGNAME-web = zabbix-web-${VERSION} FULLPKGPATH-web = net/zabbix,-web CATEGORIES = net -REVISION-main = 1 -REVISION-server = 0 +REVISION-main = 2 +REVISION-server = 1 +REVISION-proxy = 0 +REVISION-web = 0 MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/} Index: patches/patch-src_libs_zbxembed_duk_config_h =================================================================== RCS file: patches/patch-src_libs_zbxembed_duk_config_h diff -N patches/patch-src_libs_zbxembed_duk_config_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_libs_zbxembed_duk_config_h 19 Feb 2022 20:14:49 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ + +Fix sparc and sparc64 detection for intptr type + +Index: src/libs/zbxembed/duk_config.h +--- src/libs/zbxembed/duk_config.h.orig ++++ src/libs/zbxembed/duk_config.h +@@ -1617,7 +1617,7 @@ + */ + #if defined(DUK_F_X86) || defined(DUK_F_X32) || \ + defined(DUK_F_M68K) || defined(DUK_F_PPC32) || \ +- defined(DUK_F_BCC) || \ ++ defined(DUK_F_BCC) || defined(DUK_F_SPARC32) || \ + (defined(__WORDSIZE) && (__WORDSIZE == 32)) || \ + ((defined(DUK_F_OLD_SOLARIS) || defined(DUK_F_AIX) || \ + defined(DUK_F_HPUX)) && defined(_ILP32)) || \ +@@ -1627,7 +1627,7 @@ + (defined(__WORDSIZE) && (__WORDSIZE == 64)) || \ + ((defined(DUK_F_OLD_SOLARIS) || defined(DUK_F_AIX) || \ + defined(DUK_F_HPUX)) && defined(_LP64)) || \ +- defined(DUK_F_ARM64) ++ defined(DUK_F_ARM64) || defined(DUK_F_SPARC64) + #define DUK_F_64BIT_PTRS + #else + /* not sure, not needed with C99 anyway */ Index: pkg/PLIST-main =================================================================== RCS file: /home/cvs/ports/net/zabbix/pkg/PLIST-main,v retrieving revision 1.14 diff -u -p -r1.14 PLIST-main --- pkg/PLIST-main 18 Feb 2022 06:42:35 -0000 1.14 +++ pkg/PLIST-main 19 Feb 2022 20:24:47 -0000 @@ -7,24 +7,45 @@ @newgroup _zabbix:623 @newuser _zabbix:623:_zabbix::zabbix user:/nonexistent:/sbin/nologin @extraunexec rm -rf /var/log/zabbix/* +@rcscript ${RCDIR}/zabbix_agentd +@rcscript ${RCDIR}/zabbix_server +@sample ${SYSCONFDIR}/zabbix/ @bin bin/zabbix_get +@bin bin/zabbix_js @bin bin/zabbix_sender +lib/modules/ @man man/man1/zabbix_get.1 @man man/man1/zabbix_sender.1 @man man/man8/zabbix_agentd.8 @bin sbin/zabbix_agentd +share/doc/zabbix/ share/examples/zabbix/ -@sample ${SYSCONFDIR}/zabbix/ share/examples/zabbix/zabbix_agentd.conf @mode 640 @group _zabbix @sample ${SYSCONFDIR}/zabbix/zabbix_agentd.conf -@comment share/examples/zabbix/zabbix_agentd.win.conf -@mode -@group @mode 0755 @owner _zabbix +@group @sample /var/log/zabbix/ -@owner +@comment share/examples/zabbix/zabbix_agentd.win.conf @mode -@rcscript ${RCDIR}/zabbix_agentd +@owner +share/examples/zabbix/zabbix_server.conf +share/zabbix-proxy/schema/mysql/Makefile +share/zabbix-proxy/schema/mysql/Makefile.am +share/zabbix-proxy/schema/mysql/Makefile.in +share/zabbix-proxy/schema/mysql/data.sql +share/zabbix-proxy/schema/mysql/double.sql +share/zabbix-proxy/schema/mysql/images.sql +share/zabbix-proxy/schema/mysql/schema.sql +share/zabbix-proxy/schema/postgresql/ +share/zabbix-proxy/schema/postgresql/Makefile +share/zabbix-proxy/schema/postgresql/Makefile.am +share/zabbix-proxy/schema/postgresql/Makefile.in +share/zabbix-proxy/schema/postgresql/data.sql +share/zabbix-proxy/schema/postgresql/double.sql +share/zabbix-proxy/schema/postgresql/images.sql +share/zabbix-proxy/schema/postgresql/schema.sql +share/zabbix-proxy/schema/postgresql/timescaledb.sql +share/zabbix-server/ Index: pkg/PLIST-proxy =================================================================== RCS file: /home/cvs/ports/net/zabbix/pkg/PLIST-proxy,v retrieving revision 1.7 diff -u -p -r1.7 PLIST-proxy --- pkg/PLIST-proxy 27 Jul 2020 14:32:03 -0000 1.7 +++ pkg/PLIST-proxy 19 Feb 2022 20:24:50 -0000 @@ -1,9 +1,10 @@ @comment $OpenBSD: PLIST-proxy,v 1.7 2020/07/27 14:32:03 jasper Exp $ @pkgpath net/zabbix,-proxy @extraunexec rm -rf /var/log/zabbix/* +@rcscript ${RCDIR}/zabbix_proxy +@sample ${SYSCONFDIR}/zabbix/ @man man/man8/zabbix_proxy.8 @bin sbin/zabbix_proxy -@sample ${SYSCONFDIR}/zabbix/ share/examples/zabbix/zabbix_proxy.conf @mode 640 @group _zabbix @@ -13,6 +14,24 @@ share/examples/zabbix/zabbix_proxy.conf share/zabbix-proxy/ share/zabbix-proxy/schema/ share/zabbix-proxy/schema/mysql/ +share/zabbix-proxy/schema/sqlite3/ +@comment share/zabbix-proxy/schema/sqlite3/Makefile +@comment share/zabbix-proxy/schema/sqlite3/Makefile.am +@comment share/zabbix-proxy/schema/sqlite3/Makefile.in +share/zabbix-proxy/schema/sqlite3/data.sql +share/zabbix-proxy/schema/sqlite3/images.sql +share/zabbix-proxy/schema/sqlite3/schema.sql +@mode 750 +@owner _zabbix +@group _zabbix +@sample /var/db/zabbix/ +@mode 0755 +@group +@sample /var/log/zabbix/ +@mode +@owner +share/zabbix-server/schema/ +share/zabbix-server/schema/mysql/ @comment share/zabbix-server/schema/mysql/Makefile @comment share/zabbix-server/schema/mysql/Makefile.am @comment share/zabbix-server/schema/mysql/Makefile.in @@ -29,21 +48,3 @@ share/zabbix-server/schema/postgresql/do share/zabbix-server/schema/postgresql/images.sql share/zabbix-server/schema/postgresql/schema.sql share/zabbix-server/schema/postgresql/timescaledb.sql -share/zabbix-proxy/schema/sqlite3/ -@comment share/zabbix-proxy/schema/sqlite3/Makefile -@comment share/zabbix-proxy/schema/sqlite3/Makefile.am -@comment share/zabbix-proxy/schema/sqlite3/Makefile.in -share/zabbix-proxy/schema/sqlite3/data.sql -share/zabbix-proxy/schema/sqlite3/images.sql -share/zabbix-proxy/schema/sqlite3/schema.sql -@mode 750 -@owner _zabbix -@group _zabbix -@sample /var/db/zabbix/ -@mode -@group -@mode 0755 -@sample /var/log/zabbix/ -@owner -@mode -@rcscript ${RCDIR}/zabbix_proxy Index: pkg/PLIST-web =================================================================== RCS file: /home/cvs/ports/net/zabbix/pkg/PLIST-web,v retrieving revision 1.43 diff -u -p -r1.43 PLIST-web --- pkg/PLIST-web 13 Sep 2021 08:51:22 -0000 1.43 +++ pkg/PLIST-web 19 Feb 2022 20:24:50 -0000 @@ -1361,9 +1361,8 @@ zabbix/vendor/xmlseclibs/src/XMLSecurity zabbix/vendor/xmlseclibs/src/XMLSecurityKey.php zabbix/vendor/xmlseclibs/xmlseclibs.php zabbix/zabbix.php +@cwd ${LOCALBASE}/share/doc/pkg-readmes +${PKGSTEM} @cwd ${LOCALBASE} -share/examples/php-${MODPHP_VERSION}/ share/examples/php-${MODPHP_VERSION}/zabbix.ini @sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/zabbix.ini -@cwd ${LOCALBASE}/share/doc/pkg-readmes -${PKGSTEM}