Tue Dec 18 13:27:54 2018 UTC ()
zabbix: Ensure zlib can be found correctly.


(jperkin)
diff -r1.18 -r1.19 pkgsrc/sysutils/zabbix/Makefile
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/zabbix/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix/Makefile 2018/12/13 19:52:23 1.18
+++ pkgsrc/sysutils/zabbix/Makefile 2018/12/18 13:27:54 1.19
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1# $NetBSD: Makefile,v 1.18 2018/12/13 19:52:23 adam Exp $ 1# $NetBSD: Makefile,v 1.19 2018/12/18 13:27:54 jperkin Exp $
2 2
3PKGREVISION= 2 3PKGREVISION= 2
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6COMMENT= Enterprise-class Monitoring Solution for Everyone 6COMMENT= Enterprise-class Monitoring Solution for Everyone
7 7
8DEPENDS+= fping-[0-9]*:../../net/fping 8DEPENDS+= fping-[0-9]*:../../net/fping
9 9
10USE_TOOLS+= pax pkg-config 10USE_TOOLS+= pax pkg-config
11GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
12CONFIGURE_ARGS+= --enable-agent 12CONFIGURE_ARGS+= --enable-agent
13CONFIGURE_ARGS+= --enable-proxy 13CONFIGURE_ARGS+= --enable-proxy
14CONFIGURE_ARGS+= --enable-server 14CONFIGURE_ARGS+= --enable-server
15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
16CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv} 16CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
17CONFIGURE_ARGS+= --with-jabber 17CONFIGURE_ARGS+= --with-jabber
18CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} 18CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client}
19CONFIGURE_ARGS+= --with-libcurl 19CONFIGURE_ARGS+= --with-libcurl
20CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent} 20CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent}
21CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} 21CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre}
22CONFIGURE_ARGS+= --with-libxml2 22CONFIGURE_ARGS+= --with-libxml2
23CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 23CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
 24CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
24 25
25EGDIR= share/examples/zabbix 26EGDIR= share/examples/zabbix
26CONF_FILES+= ${EGDIR}/zabbix_agentd.conf ${PKG_SYSCONFDIR}/zabbix_agentd.conf 27CONF_FILES+= ${EGDIR}/zabbix_agentd.conf ${PKG_SYSCONFDIR}/zabbix_agentd.conf
27CONF_FILES+= ${EGDIR}/zabbix_proxy.conf ${PKG_SYSCONFDIR}/zabbix_proxy.conf 28CONF_FILES+= ${EGDIR}/zabbix_proxy.conf ${PKG_SYSCONFDIR}/zabbix_proxy.conf
28CONF_FILES+= ${EGDIR}/zabbix_server.conf ${PKG_SYSCONFDIR}/zabbix_server.conf 29CONF_FILES+= ${EGDIR}/zabbix_server.conf ${PKG_SYSCONFDIR}/zabbix_server.conf
29 30
30RCD_SCRIPTS= zabbix_agentd zabbix_proxy zabbix_server 31RCD_SCRIPTS= zabbix_agentd zabbix_proxy zabbix_server
31 32
32INSTALLATION_DIRS+= ${EGDIR} share/zabbix 33INSTALLATION_DIRS+= ${EGDIR} share/zabbix
33 34
34SUBST_CLASSES+= fix-paths 35SUBST_CLASSES+= fix-paths
35SUBST_STAGE.fix-paths= pre-configure 36SUBST_STAGE.fix-paths= pre-configure
36SUBST_MESSAGE.fix-paths=Fixing absolute paths. 37SUBST_MESSAGE.fix-paths=Fixing absolute paths.
@@ -46,19 +47,20 @@ PKG_GROUPS+= ${ZABBIX_GROUP} @@ -46,19 +47,20 @@ PKG_GROUPS+= ${ZABBIX_GROUP}
46PKG_USERS+= ${ZABBIX_USER}:${ZABBIX_GROUP} 47PKG_USERS+= ${ZABBIX_USER}:${ZABBIX_GROUP}
47PKG_GECOS.${ZABBIX_USER}=Zabbix user 48PKG_GECOS.${ZABBIX_USER}=Zabbix user
48 49
49post-install: 50post-install:
50 cd ${WRKSRC}/database/${ZABBIX_DB_TYPE}; \ 51 cd ${WRKSRC}/database/${ZABBIX_DB_TYPE}; \
51 ${PAX} -rw . ${DESTDIR}${PREFIX}/share/zabbix/ 52 ${PAX} -rw . ${DESTDIR}${PREFIX}/share/zabbix/
52 rm ${DESTDIR}${PREFIX}/share/zabbix/Makefile* 53 rm ${DESTDIR}${PREFIX}/share/zabbix/Makefile*
53 54
54.include "options.mk" 55.include "options.mk"
55 56
56.include "../../converters/libiconv/buildlink3.mk" 57.include "../../converters/libiconv/buildlink3.mk"
57.include "../../databases/openldap-client/buildlink3.mk" 58.include "../../databases/openldap-client/buildlink3.mk"
58.include "../../devel/libevent/buildlink3.mk" 59.include "../../devel/libevent/buildlink3.mk"
 60.include "../../devel/zlib/buildlink3.mk"
59.include "../../security/openssl/buildlink3.mk" 61.include "../../security/openssl/buildlink3.mk"
60.include "../../textproc/iksemel/buildlink3.mk" 62.include "../../textproc/iksemel/buildlink3.mk"
61.include "../../textproc/libxml2/buildlink3.mk" 63.include "../../textproc/libxml2/buildlink3.mk"
62.include "../../www/curl/buildlink3.mk" 64.include "../../www/curl/buildlink3.mk"
63.include "../../devel/pcre/buildlink3.mk" 65.include "../../devel/pcre/buildlink3.mk"
64.include "../../mk/bsd.pkg.mk" 66.include "../../mk/bsd.pkg.mk"