Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -9389,7 +9389,6 @@
 biology/biojava||2017-08-23|Has expired: Broken for more than 6 months
 java/intellij-pycharm|devel/pycharm-ce|2017-08-23|Renamed to reflect upstream name. Use a more appropriate origin (devel for development tools, IDE)
 www/pyweblib|www/py-pyweblib|2017-08-25|Rename to comply with PyPI scheme
-databases/libzbxpgsql|databases/zabbix3-libzbxpgsql|2017-08-26|Rename to allow multiple versions of libzbxpgsql to coexist
 x11-toolkits/kirigami||2017-08-28|Not needed by anything
 x11-toolkits/kirigami2|x11-toolkits/kf5-kirigami2|2017-08-28|Became an official framework
 www/speedtest-mini||2017-09-03|Has expired: Discontinued upstream (on June 30, 2017)
@@ -10870,6 +10869,7 @@
 www/redaxo||2018-12-30|Has expired: Works only with EOL php 5.6
 www/dotproject||2018-12-30|Has expired: Works only with EOL php 5.6
 www/sitebar||2018-12-30|Has expired: Works only with EOL php 5.6
+www/limesurvey||2018-12-30|Has expired: Works only with EOL php 5.6
 www/mahara||2018-12-30|Has expired: Works only with EOL php 5.6
 www/mysar||2018-12-30|Has expired: Works only with EOL php 5.6
 www/oscommerce||2018-12-30|Has expired: Works only with EOL php 5.6
@@ -16487,3 +16487,4 @@
 net-mgmt/zabbix52-server||2021-09-19|Has expired: Unsupported by upstream
 devel/py-pyyaml-env-tag|devel/py-pyyaml_env_tag|2021-09-28|Renamed to match upstream naming
 mail/opensmtpd-devel|mail/opensmtpd|2021-09-28|Has expired: move to offical releases
+databases/zabbix3-libzbxpgsql|databases/libzbxpgsql|2019-07-03|Switch from separate ports to flavors
Index: databases/libzbxpgsql/Makefile
===================================================================
--- databases/libzbxpgsql/Makefile
+++ databases/libzbxpgsql/Makefile
@@ -5,7 +5,10 @@
 DISTVERSIONPREFIX=	v
 PORTREVISION=	3
 CATEGORIES=	databases
-PKGNAMEPREFIX=	zabbix3-
+
+FLAVORS=        zabbix5 zabbix52 zabbix54 zabbix4 zabbix3
+FLAVOR?=	${FLAVORS:[1]}
+PKGNAMEPREFIX=	${FLAVOR}-
 
 MAINTAINER=	martin@waschbuesch.de
 COMMENT=	Zabbix agent module for comprehensive monitoring of PostgreSQL servers
@@ -17,7 +20,7 @@
 RUN_DEPENDS=	zabbix_agentd:net-mgmt/${PKGNAMEPREFIX}agent
 LIB_DEPENDS=	libconfig.so:devel/libconfig
 
-CONFLICTS=	zabbix[0-9][0-9]-libzbxpgsql
+CONFLICTS=	zabbix[0-9][0-9]?-libzbxpgsql
 
 USES=		autoreconf gmake libtool pgsql
 
@@ -25,7 +28,7 @@
 GH_ACCOUNT=	cavaliercoder
 
 GNU_CONFIGURE=	yes
-GET_ZBX_WRKSRC=	cd ${.CURDIR:H:H}/net-mgmt/${PKGNAMEPREFIX}agent && make -V WRKSRC
+GET_ZBX_WRKSRC=	cd ${.CURDIR:H:H}/net-mgmt/${PKGNAMEPREFIX}agent && ${SETENV} -u FLAVOR make -V WRKSRC
 CONFIGURE_ARGS=	--with-zabbix=$$(${GET_ZBX_WRKSRC})
 
 USE_LDCONFIG=	yes
Index: databases/zabbix3-libzbxpgsql/distinfo
===================================================================
--- /dev/null
+++ databases/zabbix3-libzbxpgsql/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1503755196
-SHA256 (cavaliercoder-libzbxpgsql-v1.1.0_GH0.tar.gz) = 50acc4364241253a013058daf76c4184cc522104f78005d3c4d5e7e09d77571a
-SIZE (cavaliercoder-libzbxpgsql-v1.1.0_GH0.tar.gz) = 61106
Index: databases/zabbix3-libzbxpgsql/files/patch-src_libzbxpgsql.c
===================================================================
--- /dev/null
+++ databases/zabbix3-libzbxpgsql/files/patch-src_libzbxpgsql.c
@@ -1,12 +0,0 @@
---- src/libzbxpgsql.c.orig	2016-06-25 14:18:03 UTC
-+++ src/libzbxpgsql.c
-@@ -24,6 +24,9 @@
-  */
- 
- #include "libzbxpgsql.h"
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- 
- // Define custom keys
- static ZBX_METRIC keys[] =
Index: databases/zabbix3-libzbxpgsql/pkg-descr
===================================================================
--- /dev/null
+++ databases/zabbix3-libzbxpgsql/pkg-descr
@@ -1,7 +0,0 @@
-This project provides comprehensive monitoring of PostgreSQL servers using a
-natively compiled Zabbix agent module, written in C.
-
-The module enables discovery and monitoring of tablespaces, databases,
-namespaces, tables, indexes, etc.
-
-WWW: http://cavaliercoder.com/libzbxpgsql/
Index: databases/zabbix3-libzbxpgsql/pkg-message
===================================================================
--- /dev/null
+++ databases/zabbix3-libzbxpgsql/pkg-message
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-In order to enable the module, add libzbxpgsql.so to the LoadModule=
-line in zabbix_agentd.conf and restart the agent with
-service zabbix_agentd restart
-EOM
-}
-]
Index: databases/zabbix3-libzbxpgsql/pkg-plist
===================================================================
--- /dev/null
+++ databases/zabbix3-libzbxpgsql/pkg-plist
@@ -1,4 +0,0 @@
-lib/libzbxpgsql.so
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Template_PostgreSQL_Server_2.0.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Template_PostgreSQL_Server_2.4.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Template_PostgreSQL_Server_3.0.xml