pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
zabbix50-proxy: Fix PLIST
Module Name: pkgsrc-wip
Committed By: Juraj Lutter <otis%NetBSD.org@localhost>
Pushed By: otis
Date: Tue Aug 18 16:52:52 2020 +0000
Changeset: 28b0ead04b5383a46f2940ce7e51b000b2674dee
Modified Files:
zabbix50-proxy/Makefile
zabbix50-proxy/PLIST
zabbix50-proxy/options.mk
Log Message:
zabbix50-proxy: Fix PLIST
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=28b0ead04b5383a46f2940ce7e51b000b2674dee
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
zabbix50-proxy/Makefile | 9 ---------
zabbix50-proxy/PLIST | 5 +++--
zabbix50-proxy/options.mk | 7 +++++++
3 files changed, 10 insertions(+), 11 deletions(-)
diffs:
diff --git a/zabbix50-proxy/Makefile b/zabbix50-proxy/Makefile
index fc130ac77b..b189677656 100644
--- a/zabbix50-proxy/Makefile
+++ b/zabbix50-proxy/Makefile
@@ -34,15 +34,6 @@ SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g'
.include "../../mk/bsd.prefs.mk"
-ZABBIX_GROUP?= zabbix
-ZABBIX_USER?= zabbix
-PKG_GROUPS+= ${ZABBIX_GROUP}
-PKG_USERS+= ${ZABBIX_USER}:${ZABBIX_GROUP}
-PKG_GECOS.${ZABBIX_USER}= Zabbix user
-
-FILES_SUBST+= ZABBIX_USER=${ZABBIX_USER}
-FILES_SUBST+= ZABBIX_GROUP=${ZABBIX_GROUP}
-
SMF_INSTANCES= proxy
post-install:
diff --git a/zabbix50-proxy/PLIST b/zabbix50-proxy/PLIST
index b4224ea647..85c74f4871 100644
--- a/zabbix50-proxy/PLIST
+++ b/zabbix50-proxy/PLIST
@@ -4,10 +4,11 @@ man/man8/zabbix_proxy.8
sbin/zabbix_proxy
share/examples/zabbix/zabbix_proxy.conf
share/zabbix/data.sql
-share/zabbix/double.sql
share/zabbix/images.sql
share/zabbix/schema.sql
-share/zabbix/timescaledb.sql
+${PLIST.mysql}share/zabbix/double.sql
+${PLIST.pgsql}share/zabbix/double.sql
+${PLIST.pgsql}share/zabbix/timescaledb.sql
@pkgdir share/zabbix/externalscripts
@pkgdir lib/modules
@pkgdir etc/zabbix_proxy.conf.d
diff --git a/zabbix50-proxy/options.mk b/zabbix50-proxy/options.mk
index b9687756dc..0329b1f3e0 100644
--- a/zabbix50-proxy/options.mk
+++ b/zabbix50-proxy/options.mk
@@ -12,6 +12,10 @@ PKG_SUGGESTED_OPTIONS+= inet6
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= mysql
+PLIST_VARS+= pgsql
+PLIST_VARS+= sqlite3
+
.if !empty(PKG_OPTIONS:Minet6)
CONFIGURE_ARGS+= --enable-ipv6
.endif
@@ -30,6 +34,7 @@ CONFIGURE_ARGS+= --with-ssh=${BUILDLINK_PREFIX.libssh}
CONFIGURE_ARGS+= --with-mysql
.include "../../mk/mysql.buildlink3.mk"
ZABBIX_DB_TYPE= mysql
+PLIST.mysql= yes
.endif
.if !empty(PKG_OPTIONS:Msnmp)
@@ -41,10 +46,12 @@ CONFIGURE_ARGS+= --with-net-snmp
CONFIGURE_ARGS+= --with-postgresql
.include "../../mk/pgsql.buildlink3.mk"
ZABBIX_DB_TYPE= postgresql
+PLIST.pgsql= yes
.endif
.if !empty(PKG_OPTIONS:Msqlite3)
CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
.include "../../databases/sqlite3/buildlink3.mk"
ZABBIX_DB_TYPE= sqlite3
+PLIST.sqlite3= yes
.endif
Home |
Main Index |
Thread Index |
Old Index