zabbix50-server: Fix PLIST

diff --git a/zabbix50-server/Makefile b/zabbix50-server/Makefile
index 68bbb6fd7e53c9dfd0d0d5492fdef2752749e0a5..46ac013e751e1c15361e41e5ca6be2d101cd91de 100644 (file)
--- a/zabbix50-server/Makefile
+++ b/zabbix50-server/Makefile
@@ -5,6 +5,9 @@
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 COMMENT=       Enterprise-class Monitoring Solution for Everyone
 
+CONFLICTS+=     zabbix-server-[3-4]*
+CONFLICTS+=     zabbix-proxy-*
+
 DEPENDS+=      fping-[0-9]*:../../net/fping
 
 USE_TOOLS+=            pax pkg-config

diff --git a/zabbix50-server/PLIST b/zabbix50-server/PLIST
index 6e7b0240668ec57be76ab635682e44e2fd158b24..33f9b829a47f59843624051507f0dab6701ecc95 100644 (file)
--- a/zabbix50-server/PLIST
+++ b/zabbix50-server/PLIST
@@ -7,7 +7,7 @@ share/zabbix/data.sql
 share/zabbix/double.sql
 share/zabbix/images.sql
 share/zabbix/schema.sql
-share/zabbix/timescaledb.sql
+${PLIST.pgsql}share/zabbix/timescaledb.sql
 @pkgdir share/zabbix/externalscripts
 @pkgdir share/zabbix/alertscripts
 @pkgdir lib/modules

diff --git a/zabbix50-server/options.mk b/zabbix50-server/options.mk
index 5a6e484f5e75a2e19dae2fd2e9ca10037d24d8b9..c048b7847b1fd96fd166916ed6c8144b82034d7e 100644 (file)
--- a/zabbix50-server/options.mk
+++ b/zabbix50-server/options.mk
@@ -3,7 +3,7 @@
 PKG_OPTIONS_VAR=               PKG_OPTIONS.zabbix50-server
 PKG_SUPPORTED_OPTIONS+=                inet6 libssh libssh2 snmp
 PKG_OPTIONS_OPTIONAL_GROUPS=   database
-PKG_OPTIONS_GROUP.database=    mysql pgsql sqlite3
+PKG_OPTIONS_GROUP.database=    mysql pgsql 
 PKG_SUGGESTED_OPTIONS+=                libssh snmp pgsql
 
 .if empty(MISSING_FEATURES:Minet6)
@@ -12,6 +12,9 @@ PKG_SUGGESTED_OPTIONS+=               inet6
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=           mysql
+PLIST_VARS+=           pgsql
+
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=       --enable-ipv6
 .endif
@@ -30,6 +33,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 +45,5 @@ CONFIGURE_ARGS+=     --with-net-snmp
 CONFIGURE_ARGS+=       --with-postgresql
 .include "../../mk/pgsql.buildlink3.mk"
 ZABBIX_DB_TYPE=                postgresql
-.endif
-
-.if !empty(PKG_OPTIONS:Msqlite3)
-CONFIGURE_ARGS+=       --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
-.include "../../databases/sqlite3/buildlink3.mk"
-ZABBIX_DB_TYPE=                sqlite3
+PLIST.pgsql=           yes
 .endif