Wed Feb 22 21:45:17 2023 UTC ()
zabbix60: Fix build on NetBSD 9

NetBSD 9 provides its own popcount() that conflicts with zabbix's
function of the same name.

Reported by and workardound suggested by: wiz


(otis)
diff -r1.2 -r1.3 pkgsrc/sysutils/zabbix60-agent/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/zabbix60-proxy/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/zabbix60-server/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/zabbix60-server/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/zabbix60-server/patches/patch-src_zabbix__proxy_Makefile.in
diff -r0 -r1.1 pkgsrc/sysutils/zabbix60-server/patches/patch-src_zabbix__server_Makefile.in
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/zabbix60-agent/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix60-agent/Makefile 2023/02/12 21:03:07 1.2
+++ pkgsrc/sysutils/zabbix60-agent/Makefile 2023/02/22 21:45:17 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2023/02/12 21:03:07 otis Exp $ 1# $NetBSD: Makefile,v 1.3 2023/02/22 21:45:17 otis Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 1
4.include "../../sysutils/zabbix60-server/Makefile.common" 4.include "../../sysutils/zabbix60-server/Makefile.common"
5 5
6PKGNAME= ${DISTNAME:S/-/-agent-/} 6PKGNAME= ${DISTNAME:S/-/-agent-/}
7COMMENT= Enterprise-class Monitoring Solution for Everyone 7COMMENT= Enterprise-class Monitoring Solution for Everyone
8 8
9PATCHDIR= ${.CURDIR}/../../sysutils/zabbix60-server/patches 9PATCHDIR= ${.CURDIR}/../../sysutils/zabbix60-server/patches
10DISTINFO_FILE= ${.CURDIR}/../../sysutils/zabbix60-server/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../sysutils/zabbix60-server/distinfo
11 11
12CONFLICTS+= zabbix-[0-9]* 12CONFLICTS+= zabbix-[0-9]*
13CONFLICTS+= zabbix-agent-[0-9]* 13CONFLICTS+= zabbix-agent-[0-9]*
14 14
@@ -32,23 +32,29 @@ INSTALLATION_DIRS+= ${EGDIR} share/${PKG @@ -32,23 +32,29 @@ INSTALLATION_DIRS+= ${EGDIR} share/${PKG
32SUBST_CLASSES+= fix-paths 32SUBST_CLASSES+= fix-paths
33SUBST_STAGE.fix-paths= pre-configure 33SUBST_STAGE.fix-paths= pre-configure
34SUBST_MESSAGE.fix-paths= Fixing absolute paths. 34SUBST_MESSAGE.fix-paths= Fixing absolute paths.
35SUBST_FILES.fix-paths= conf/*.conf 35SUBST_FILES.fix-paths= conf/*.conf
36SUBST_FILES.fix-paths+= man/*.man 36SUBST_FILES.fix-paths+= man/*.man
37SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g' 37SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g'
38 38
39SUBST_CLASSES+= fix-pkgbase 39SUBST_CLASSES+= fix-pkgbase
40SUBST_STAGE.fix-pkgbase= pre-configure 40SUBST_STAGE.fix-pkgbase= pre-configure
41SUBST_MESSAGE.fix-pkgbase= Fixing PKGBASE. 41SUBST_MESSAGE.fix-pkgbase= Fixing PKGBASE.
42SUBST_FILES.fix-pkgbase= src/zabbix_agent/Makefile.in 42SUBST_FILES.fix-pkgbase= src/zabbix_agent/Makefile.in
43SUBST_SED.fix-pkgbase= -e 's,%%PKGBASE%%,${PKGBASE},g' 43SUBST_SED.fix-pkgbase= -e 's,%%PKGBASE%%,${PKGBASE},g'
44 44
 45SUBST_CLASSES+= fix-popcount
 46SUBST_STAGE.fix-popcount= post-patch
 47SUBST_MESSAGE.fix-popcount= Fix conflict with NetBSD's popcount.
 48SUBST_FILES.fix-popcount+= src/zabbix_server/lld/lld_host.c
 49SUBST_SED.fix-popcount+= -e 's,popcount,zbx_popcount,g'
 50
45PLIST_SUBST+= PKGBASE=${PKGBASE} 51PLIST_SUBST+= PKGBASE=${PKGBASE}
46 52
47.include "../../mk/bsd.prefs.mk" 53.include "../../mk/bsd.prefs.mk"
48 54
49.include "options.mk" 55.include "options.mk"
50 56
51.include "../../security/openssl/buildlink3.mk" 57.include "../../security/openssl/buildlink3.mk"
52.include "../../www/curl/buildlink3.mk" 58.include "../../www/curl/buildlink3.mk"
53.include "../../devel/pcre2/buildlink3.mk" 59.include "../../devel/pcre2/buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 60.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/zabbix60-proxy/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix60-proxy/Makefile 2023/02/12 21:03:07 1.2
+++ pkgsrc/sysutils/zabbix60-proxy/Makefile 2023/02/22 21:45:17 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2023/02/12 21:03:07 otis Exp $ 1# $NetBSD: Makefile,v 1.3 2023/02/22 21:45:17 otis Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 1
4.include "../../sysutils/zabbix60-server/Makefile.common" 4.include "../../sysutils/zabbix60-server/Makefile.common"
5 5
6PKGNAME= ${DISTNAME:S/-/-proxy-${ZABBIX_DB_TYPE}-/} 6PKGNAME= ${DISTNAME:S/-/-proxy-${ZABBIX_DB_TYPE}-/}
7COMMENT= Enterprise-class Monitoring Solution for Everyone 7COMMENT= Enterprise-class Monitoring Solution for Everyone
8 8
9PATCHDIR= ${.CURDIR}/../../sysutils/zabbix60-server/patches 9PATCHDIR= ${.CURDIR}/../../sysutils/zabbix60-server/patches
10DISTINFO_FILE= ${.CURDIR}/../../sysutils/zabbix60-server/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../sysutils/zabbix60-server/distinfo
11 11
12CONFLICTS+= zabbix-[0-9]* 12CONFLICTS+= zabbix-[0-9]*
13CONFLICTS+= zabbix-proxy-[0-9]* 13CONFLICTS+= zabbix-proxy-[0-9]*
14 14
@@ -39,41 +39,45 @@ INSTALLATION_DIRS+= ${EGDIR} share/${PKG @@ -39,41 +39,45 @@ INSTALLATION_DIRS+= ${EGDIR} share/${PKG
39SUBST_CLASSES+= fix-paths 39SUBST_CLASSES+= fix-paths
40SUBST_STAGE.fix-paths= pre-configure 40SUBST_STAGE.fix-paths= pre-configure
41SUBST_MESSAGE.fix-paths= Fixing absolute paths. 41SUBST_MESSAGE.fix-paths= Fixing absolute paths.
42SUBST_FILES.fix-paths= conf/*.conf 42SUBST_FILES.fix-paths= conf/*.conf
43SUBST_FILES.fix-paths+= man/*.man 43SUBST_FILES.fix-paths+= man/*.man
44SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g' 44SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g'
45 45
46SUBST_CLASSES+= fix-pkgbase 46SUBST_CLASSES+= fix-pkgbase
47SUBST_STAGE.fix-pkgbase= pre-configure 47SUBST_STAGE.fix-pkgbase= pre-configure
48SUBST_MESSAGE.fix-pkgbase= Fixing PKGBASE. 48SUBST_MESSAGE.fix-pkgbase= Fixing PKGBASE.
49SUBST_FILES.fix-pkgbase= src/zabbix_proxy/Makefile.* 49SUBST_FILES.fix-pkgbase= src/zabbix_proxy/Makefile.*
50SUBST_SED.fix-pkgbase= -e 's,%%PKGBASE%%,${PKGBASE},g' 50SUBST_SED.fix-pkgbase= -e 's,%%PKGBASE%%,${PKGBASE},g'
51 51
 52SUBST_CLASSES+= fix-popcount
 53SUBST_STAGE.fix-popcount= post-patch
 54SUBST_MESSAGE.fix-popcount= Fix conflict with NetBSD's popcount.
 55SUBST_FILES.fix-popcount+= src/zabbix_server/lld/lld_host.c
 56SUBST_SED.fix-popcount+= -e 's,popcount,zbx_popcount,g'
 57
52PLIST_SUBST+= PKGBASE=${PKGBASE} 58PLIST_SUBST+= PKGBASE=${PKGBASE}
53 59
54CFLAGS.SunOS+= -DDUK_USE_BYTEORDER=1 60CFLAGS.SunOS+= -DDUK_USE_BYTEORDER=1
55 61
56.include "../../mk/bsd.prefs.mk" 62.include "../../mk/bsd.prefs.mk"
57 63
58post-install: 64post-install:
59 cd ${WRKSRC}/database/${ZABBIX_DB_TYPE} && \ 65 cd ${WRKSRC}/database/${ZABBIX_DB_TYPE} && \
60 ${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/ 66 ${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/
61 ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/Makefile* 67 ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/Makefile*
62 ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/data.sql 68 ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/data.sql
63 ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/images.sql 69 ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/images.sql
64 ${MV} ${DESTDIR}${PREFIX}/bin/zabbix_js \ 70 ${MV} ${DESTDIR}${PREFIX}/bin/zabbix_js \
65 ${DESTDIR}${PREFIX}/bin/zabbix_proxy_js 71 ${DESTDIR}${PREFIX}/bin/zabbix_proxy_js
66 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/zabbix_proxy.conf \ 
67 ${DESTDIR}${PREFIX}/${EGDIR}/zabbix_proxy.conf 
68 72
69.include "options.mk" 73.include "options.mk"
70 74
71.include "../../converters/libiconv/buildlink3.mk" 75.include "../../converters/libiconv/buildlink3.mk"
72.include "../../databases/openldap-client/buildlink3.mk" 76.include "../../databases/openldap-client/buildlink3.mk"
73.include "../../devel/libevent/buildlink3.mk" 77.include "../../devel/libevent/buildlink3.mk"
74.include "../../devel/zlib/buildlink3.mk" 78.include "../../devel/zlib/buildlink3.mk"
75.include "../../security/openssl/buildlink3.mk" 79.include "../../security/openssl/buildlink3.mk"
76.include "../../textproc/libxml2/buildlink3.mk" 80.include "../../textproc/libxml2/buildlink3.mk"
77.include "../../www/curl/buildlink3.mk" 81.include "../../www/curl/buildlink3.mk"
78.include "../../devel/pcre2/buildlink3.mk" 82.include "../../devel/pcre2/buildlink3.mk"
79.include "../../mk/bsd.pkg.mk" 83.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/zabbix60-server/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix60-server/Makefile 2023/02/12 21:03:07 1.2
+++ pkgsrc/sysutils/zabbix60-server/Makefile 2023/02/22 21:45:17 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2023/02/12 21:03:07 otis Exp $ 1# $NetBSD: Makefile,v 1.3 2023/02/22 21:45:17 otis Exp $
2# used by sysutils/zabbix60-proxy/Makefile 2# used by sysutils/zabbix60-proxy/Makefile
3# used by sysutils/zabbix60-agent/Makefile 3# used by sysutils/zabbix60-agent/Makefile
4# 4#
5PKGREVISION= 1 5PKGREVISION= 1
6.include "Makefile.common" 6.include "Makefile.common"
7 7
8PKGNAME= ${DISTNAME:S/-/-server-${ZABBIX_DB_TYPE}-/} 8PKGNAME= ${DISTNAME:S/-/-server-${ZABBIX_DB_TYPE}-/}
9COMMENT= Enterprise-class Monitoring Solution for Everyone 9COMMENT= Enterprise-class Monitoring Solution for Everyone
10 10
11CONFLICTS+= zabbix-[0-9]* 11CONFLICTS+= zabbix-[0-9]*
12CONFLICTS+= zabbix-server-[0-9]* 12CONFLICTS+= zabbix-server-[0-9]*
13 13
14DEPENDS+= fping-[0-9]*:../../net/fping 14DEPENDS+= fping-[0-9]*:../../net/fping
@@ -32,56 +32,60 @@ CONF_FILES+= ${EGDIR}/zabbix_server.conf @@ -32,56 +32,60 @@ CONF_FILES+= ${EGDIR}/zabbix_server.conf
32 32
33RCD_SCRIPTS= zabbix_server 33RCD_SCRIPTS= zabbix_server
34SMF_NAME= zabbix-server 34SMF_NAME= zabbix-server
35 35
36MISCDIRS= images snmptrap 36MISCDIRS= images snmptrap
37 37
38INSTALLATION_DIRS+= ${EGDIR} 38INSTALLATION_DIRS+= ${EGDIR}
39INSTALLATION_DIRS+= share/${PKGBASE} 39INSTALLATION_DIRS+= share/${PKGBASE}
40.for miscdir in ${MISCDIRS} 40.for miscdir in ${MISCDIRS}
41INSTALLATION_DIRS+= share/${PKGBASE}/misc/${miscdir} 41INSTALLATION_DIRS+= share/${PKGBASE}/misc/${miscdir}
42.endfor 42.endfor
43 43
44SUBST_CLASSES+= fix-paths 44SUBST_CLASSES+= fix-paths
45SUBST_STAGE.fix-paths= pre-configure 45SUBST_STAGE.fix-paths= post-patch
46SUBST_MESSAGE.fix-paths= Fixing absolute paths. 46SUBST_MESSAGE.fix-paths= Fixing absolute paths.
47SUBST_FILES.fix-paths= conf/*.conf 47SUBST_FILES.fix-paths= conf/*.conf
48SUBST_FILES.fix-paths+= man/*.man 48SUBST_FILES.fix-paths+= man/*.man
49SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g' 49SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g'
50 50
51SUBST_CLASSES+= fix-pkgbase 51SUBST_CLASSES+= fix-pkgbase
52SUBST_STAGE.fix-pkgbase= pre-configure 52SUBST_STAGE.fix-pkgbase= post-patch
53SUBST_MESSAGE.fix-pkgbase= Fixing PKGBASE. 53SUBST_MESSAGE.fix-pkgbase= Fixing PKGBASE.
54SUBST_FILES.fix-pkgbase= src/zabbix_server/Makefile.* 54SUBST_FILES.fix-pkgbase= src/zabbix_server/Makefile.*
55SUBST_SED.fix-pkgbase= -e 's,%%PKGBASE%%,${PKGBASE},g' 55SUBST_SED.fix-pkgbase= -e 's,%%PKGBASE%%,${PKGBASE},g'
56 56
 57SUBST_CLASSES+= fix-popcount
 58SUBST_STAGE.fix-popcount= post-patch
 59SUBST_MESSAGE.fix-popcount= Fix conflict with NetBSD's popcount.
 60SUBST_FILES.fix-popcount+= src/zabbix_server/lld/lld_host.c
 61SUBST_SED.fix-popcount+= -e 's,popcount,zbx_popcount,g'
 62
57PLIST_SUBST+= PKGBASE=${PKGBASE} 63PLIST_SUBST+= PKGBASE=${PKGBASE}
58 64
59CFLAGS.SunOS+= -DDUK_USE_BYTEORDER=1 65CFLAGS.SunOS+= -DDUK_USE_BYTEORDER=1
60 66
61REPLACE_BASH+= misc/snmptrap/snmptrap.sh \ 67REPLACE_BASH+= misc/snmptrap/snmptrap.sh \
62 misc/images/png_to_xml.sh 68 misc/images/png_to_xml.sh
63 69
64.include "../../mk/bsd.prefs.mk" 70.include "../../mk/bsd.prefs.mk"
65 71
66post-install: 72post-install:
67 cd ${WRKSRC}/database/${ZABBIX_DB_TYPE} && \ 73 cd ${WRKSRC}/database/${ZABBIX_DB_TYPE} && \
68 ${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/ 74 ${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/
69.for miscdir in ${MISCDIRS} 75.for miscdir in ${MISCDIRS}
70 cd ${WRKSRC}/misc/${miscdir}; \ 76 cd ${WRKSRC}/misc/${miscdir}; \
71 ${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/misc/${miscdir} 77 ${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/misc/${miscdir}
72.endfor 78.endfor
73 ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/Makefile* 79 ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/Makefile*
74 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/zabbix_server.conf \ 
75 ${DESTDIR}${PREFIX}/${EGDIR}/zabbix_server.conf 
76 80
77.include "options.mk" 81.include "options.mk"
78 82
79.include "../../converters/libiconv/buildlink3.mk" 83.include "../../converters/libiconv/buildlink3.mk"
80.include "../../databases/openldap-client/buildlink3.mk" 84.include "../../databases/openldap-client/buildlink3.mk"
81.include "../../devel/libevent/buildlink3.mk" 85.include "../../devel/libevent/buildlink3.mk"
82.include "../../devel/zlib/buildlink3.mk" 86.include "../../devel/zlib/buildlink3.mk"
83.include "../../security/openssl/buildlink3.mk" 87.include "../../security/openssl/buildlink3.mk"
84.include "../../textproc/libxml2/buildlink3.mk" 88.include "../../textproc/libxml2/buildlink3.mk"
85.include "../../www/curl/buildlink3.mk" 89.include "../../www/curl/buildlink3.mk"
86.include "../../devel/pcre2/buildlink3.mk" 90.include "../../devel/pcre2/buildlink3.mk"
87.include "../../mk/bsd.pkg.mk" 91.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/zabbix60-server/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix60-server/distinfo 2023/02/12 18:37:32 1.1
+++ pkgsrc/sysutils/zabbix60-server/distinfo 2023/02/22 21:45:17 1.2
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: distinfo,v 1.1 2023/02/12 18:37:32 otis Exp $ 1$NetBSD: distinfo,v 1.2 2023/02/22 21:45:17 otis Exp $
2 2
3BLAKE2s (zabbix-6.0.13.tar.gz) = fd8aa1f37b18943b42709d7ead74402bb9637819eb6137ea23c0b2b7cbdca775 3BLAKE2s (zabbix-6.0.13.tar.gz) = fd8aa1f37b18943b42709d7ead74402bb9637819eb6137ea23c0b2b7cbdca775
4SHA512 (zabbix-6.0.13.tar.gz) = 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e 4SHA512 (zabbix-6.0.13.tar.gz) = 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
5Size (zabbix-6.0.13.tar.gz) = 41075557 bytes 5Size (zabbix-6.0.13.tar.gz) = 41075557 bytes
6SHA1 (patch-configure) = a372473051082b7f30846a6efa062ce42e325c30 6SHA1 (patch-configure) = a372473051082b7f30846a6efa062ce42e325c30
7SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc 7SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc
8SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df 8SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df
9SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = bc928301fc099d907b83127e2670abf1d6c33553 9SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = bc928301fc099d907b83127e2670abf1d6c33553
10SHA1 (patch-src_zabbix__agent_Makefile.in) = efbd804ecee4b99db36db5f4fd61583b2ef96a86 10SHA1 (patch-src_zabbix__agent_Makefile.in) = efbd804ecee4b99db36db5f4fd61583b2ef96a86
11SHA1 (patch-src_zabbix__proxy_Makefile.am) = 9d2c3d5ca06e676154653b70f0931ed2ea281cf5 11SHA1 (patch-src_zabbix__proxy_Makefile.am) = 9d2c3d5ca06e676154653b70f0931ed2ea281cf5
 12SHA1 (patch-src_zabbix__proxy_Makefile.in) = 000fe95c07af423feac01a452a564bdc63f008ff
12SHA1 (patch-src_zabbix__server_Makefile.am) = d139b4fedf8f443fbe9966256e98374d5e5cdb67 13SHA1 (patch-src_zabbix__server_Makefile.am) = d139b4fedf8f443fbe9966256e98374d5e5cdb67
 14SHA1 (patch-src_zabbix__server_Makefile.in) = 16c899ed5a53924a351f8c334d4d3bae17490b62
File Added: pkgsrc/sysutils/zabbix60-server/patches/patch-src_zabbix__proxy_Makefile.in
$NetBSD: patch-src_zabbix__proxy_Makefile.in,v 1.1 2023/02/22 21:45:17 otis Exp $

Install config file to component's example directory.

--- src/zabbix_proxy/Makefile.in.orig	2023-02-01 07:20:02.432793641 +0000
+++ src/zabbix_proxy/Makefile.in
@@ -1071,7 +1071,7 @@ install-data-hook:
 	$(MKDIR_P) "$(DESTDIR)$(PROXY_CONFIG_FILE).d"
 	$(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)"
 	$(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)"
-	test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "../../conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)"
+	$(INSTALL_DATA) "../../conf/zabbix_proxy.conf" "$(DESTDIR)/${PREFIX}/share/examples/%%PKGBASE%%"
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
File Added: pkgsrc/sysutils/zabbix60-server/patches/patch-src_zabbix__server_Makefile.in
$NetBSD: patch-src_zabbix__server_Makefile.in,v 1.1 2023/02/22 21:45:17 otis Exp $

Install config file into component's example directory.

--- src/zabbix_server/Makefile.in.orig	2023-02-01 07:20:02.588795121 +0000
+++ src/zabbix_server/Makefile.in
@@ -1136,7 +1136,7 @@ install-data-hook:
 	$(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)"
 	$(MKDIR_P) "$(DESTDIR)$(ALERT_SCRIPTS_PATH)"
 	$(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)"
-	test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "../../conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)"
+	$(INSTALL_DATA) "../../conf/zabbix_server.conf" "$(DESTDIR)/${PREFIX}/share/examples/%%PKGBASE%%"
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.