Hi
The following diff should fix this, by installing the schemas to their
specific sub-directory. The server package does not need the sqlite3
schemas anyway as it does not support sqlite3..
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.164
diff -u -p -u -r1.164 Makefile
--- Makefile 14 Apr 2020 14:47:24 -0000 1.164
+++ Makefile 14 Apr 2020 21:54:48 -0000
@@ -16,6 +16,9 @@ FULLPKGNAME-web = zabbix-web-${VERSION}
FULLPKGPATH-web = net/zabbix,-web
CATEGORIES = net
+REVISION-proxy = 0
+REVISION-server = 0
+
MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
HOMEPAGE = http://www.zabbix.com/
@@ -145,17 +148,21 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php-${MODPHP_VERSION}
${SUBST_DATA} ${FILESDIR}/zabbix.ini \
${PREFIX}/share/examples/php-${MODPHP_VERSION}/zabbix.ini
- ${INSTALL_DATA_DIR} ${PREFIX}/share/zabbix/schema
- ${INSTALL_DATA_DIR} ${PREFIX}/share/zabbix/data
- ${INSTALL_DATA_DIR} ${PREFIX}/share/zabbix/data/images
+.for _n in proxy server
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/zabbix-${_n}/schema
+
+ # Database schemas. The proxy needs sqlite3 as well.
+ cd ${WRKSRC}/database/ && tar -cf - mysql postgresql | \
+ tar -C ${PREFIX}/share/zabbix-${_n}/schema -xf -
+. if "${_n}" == "proxy"
+ cd ${WRKSRC}/database/ && tar -cf - sqlite3 | \
+ tar -C ${PREFIX}/share/zabbix-${_n}/schema -xf -
+. endif
+ @find ${PREFIX}/share/zabbix-${_n}/schema -name data.sql -exec \
+ perl -pi -e
"s,/bin/ping,/sbin/ping,g;s,/usr/bin/traceroute,/usr/sbin/traceroute,g" {} \;
+.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/zabbix
${INSTALL_DATA} ${WRKBUILD}/conf/*.conf \
${PREFIX}/share/examples/zabbix
- # Database schemas
- cd ${WRKSRC}/database/ && tar -cf - mysql postgresql sqlite3 | \
- tar -C ${PREFIX}/share/zabbix/schema -xf -
-
- @find ${PREFIX}/share/zabbix/schema -name data.sql -exec \
- perl -pi -e
"s,/bin/ping,/sbin/ping,g;s,/usr/bin/traceroute,/usr/sbin/traceroute,g" {} \;
.include <bsd.port.mk>
Index: pkg/PLIST-proxy
===================================================================
RCS file: /cvs/ports/net/zabbix/pkg/PLIST-proxy,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST-proxy
--- pkg/PLIST-proxy 22 Aug 2018 19:57:59 -0000 1.4
+++ pkg/PLIST-proxy 14 Apr 2020 21:54:48 -0000
@@ -9,6 +9,20 @@ share/examples/zabbix/zabbix_proxy.conf
@sample ${SYSCONFDIR}/zabbix/zabbix_proxy.conf
@mode
@group
+share/zabbix-proxy/
+share/zabbix-proxy/schema/
+share/zabbix-proxy/schema/mysql/
+share/zabbix-proxy/schema/mysql/data.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/data.sql
+share/zabbix-proxy/schema/postgresql/images.sql
+share/zabbix-proxy/schema/postgresql/schema.sql
+share/zabbix-proxy/schema/sqlite3/
+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
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/net/zabbix/pkg/PLIST-server,v
retrieving revision 1.22
diff -u -p -u -r1.22 PLIST-server
--- pkg/PLIST-server 26 Oct 2018 06:57:21 -0000 1.22
+++ pkg/PLIST-server 14 Apr 2020 21:54:48 -0000
@@ -12,22 +12,16 @@ share/examples/zabbix/zabbix_server.conf
@sample ${SYSCONFDIR}/zabbix/zabbix_server.conf
@mode
@group
-share/zabbix/
-share/zabbix/data/
-share/zabbix/data/images/
-share/zabbix/schema/
-share/zabbix/schema/mysql/
-share/zabbix/schema/mysql/data.sql
-share/zabbix/schema/mysql/images.sql
-share/zabbix/schema/mysql/schema.sql
-share/zabbix/schema/postgresql/
-share/zabbix/schema/postgresql/data.sql
-share/zabbix/schema/postgresql/images.sql
-share/zabbix/schema/postgresql/schema.sql
-share/zabbix/schema/sqlite3/
-share/zabbix/schema/sqlite3/data.sql
-share/zabbix/schema/sqlite3/images.sql
-share/zabbix/schema/sqlite3/schema.sql
+share/zabbix-server/
+share/zabbix-server/schema/
+share/zabbix-server/schema/mysql/
+share/zabbix-server/schema/mysql/data.sql
+share/zabbix-server/schema/mysql/images.sql
+share/zabbix-server/schema/mysql/schema.sql
+share/zabbix-server/schema/postgresql/
+share/zabbix-server/schema/postgresql/data.sql
+share/zabbix-server/schema/postgresql/images.sql
+share/zabbix-server/schema/postgresql/schema.sql
@mode 0755
@owner _zabbix
@sample /var/log/zabbix/
Index: pkg/README-server
===================================================================
RCS file: /cvs/ports/net/zabbix/pkg/README-server,v
retrieving revision 1.14
diff -u -p -u -r1.14 README-server
--- pkg/README-server 4 Sep 2018 12:46:19 -0000 1.14
+++ pkg/README-server 14 Apr 2020 21:54:48 -0000
@@ -66,7 +66,7 @@ Connect to MariaDB, and create a user an
Then initialize the database from the files installed in
${TRUEPREFIX}/share/examples/zabbix:
- $ cd ${TRUEPREFIX}/share/zabbix/schema/mysql
+ $ cd ${TRUEPREFIX}/share/zabbix-server/schema/mysql
$ mysql -uzabbix -p[password] zabbix < schema.sql
The following steps are not required for setting up a Zabbix Proxy.
$ mysql -uzabbix -p[password] zabbix < images.sql
@@ -84,7 +84,7 @@ you can create the 'zabbix' user and dat
And initialize the database:
- $ cd ${TRUEPREFIX}/share/zabbix/schema/postgresql
+ $ cd ${TRUEPREFIX}/share/zabbix-server/schema/postgresql
$ cat schema.sql | psql -U zabbix zabbix
The following steps are not required for setting up a Zabbix Proxy.
$ cat images.sql | psql -U zabbix zabbix
@@ -104,7 +104,7 @@ automatically created and initialized if
for obvious performance reasons, it is NOT encouraged to use the SQLite
backend for a server.
- # cd ${TRUEPREFIX}/share/zabbix/schema/sqlite3
+ # cd ${TRUEPREFIX}/share/zabbix-server/schema/sqlite3
# su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < schema.sql"
The following steps are not required for setting up a Zabbix Proxy.
# su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < images.sql"
