- Update to 2.0.0 after repocopy from

net-mgmt/zabbix-{agent,frontend,proxy,server} [1] - Convert to optionsNG - Remove the need for SQL patches by using REINPLACE - Remove manual installation of config files. - Change config include directories from dirrm to dirrmtry in pkg-plist - users may put files there. PR: ports/169153 [1] Submitted by: Pakhom Golynga <pakhom706@gmail.com> (maintainer) Approved by: flo (mentor)
svn path=/head/; revision=302580
2024-12-23 04:23:08 +00:00 · 2012-08-15 14:28:31 +00:00 · 2012-08-15 14:28:31 +00:00 · 0b80f7727c · 2021-03-31 03:12:20 +00:00
commit 0b80f7727c
parent 25d6ac2cc7
11 changed files with 967 additions and 582 deletions
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@ -317,6 +317,10 @@
    SUBDIR += zabbix-frontend
    SUBDIR += zabbix-proxy
    SUBDIR += zabbix-server
+    SUBDIR += zabbix2-agent
+    SUBDIR += zabbix2-frontend
+    SUBDIR += zabbix2-proxy
+    SUBDIR += zabbix2-server
    SUBDIR += zenoss
    SUBDIR += zenpack-apachemonitor
    SUBDIR += zenpack-checkping
--- a/net-mgmt/zabbix2-agent/Makefile
+++ b/net-mgmt/zabbix2-agent/Makefile
@ -5,15 +5,16 @@
 # $FreeBSD$
 #

-PORTNAME=	zabbix
+PORTNAME=	zabbix2
 PKGNAMESUFFIX=	-agent

-MASTERDIR=	${.CURDIR}/../zabbix-server
+MASTERDIR=	${.CURDIR}/../zabbix2-server

 PLIST=		${PKGDIR}/pkg-plist.agent

 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
-OPTIONS=	IPV6 "Support for IPv6" on
+OPTIONS_DEFINE=	IPV6
+OPTIONS_DEFAULT=	IPV6

 .include <bsd.port.options.mk>
 .include "${MASTERDIR}/Makefile"
--- a/net-mgmt/zabbix2-frontend/Makefile
+++ b/net-mgmt/zabbix2-frontend/Makefile
@ -5,10 +5,10 @@
 # $FreeBSD$
 #

-PORTNAME=	zabbix
+PORTNAME=	zabbix2
 PKGNAMESUFFIX=	-frontend

-MASTERDIR=	${.CURDIR}/../zabbix-server
+MASTERDIR=	${.CURDIR}/../zabbix2-server

 NO_BUILD=	yes
 PATCHDIR=
@ -20,26 +20,26 @@ IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes

 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
-OPTIONS=	MYSQL "Use MySQL backend" on \
-		PGSQL "Use PostgreSQL backend" off \
-		SQLITE "Use SQLite backend" off
+OPTIONS_DEFINE=	MYSQL MYSQLI PGSQL SQLITE
+OPTIONS_DEFAULT=	MYSQL MYSQLI
+MYSQLI_DESC=	MySQLI backend

 .include <bsd.port.options.mk>

-.ifndef WITHOUT_MYSQL
+.if ${PORT_OPTIONS:MMYSQL}
 USE_PHP+=	mysql
 .endif

-.ifdef WITH_MYSQLI
+.if ${PORT_OPTIONS:MMYSQLI}
 USE_PHP+=	mysqli
 .endif

-.ifdef WITH_PGSQL
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
 .endif

-.ifdef WITH_SQLITE
-RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/sqlite3.so:${PORTSDIR}/databases/php-sqlite3
+.if ${PORT_OPTIONS:MSQLITE}
+USE_PHP+=	sqlite3
 .endif

 do-install:
--- a/net-mgmt/zabbix2-proxy/Makefile
+++ b/net-mgmt/zabbix2-proxy/Makefile
@ -5,9 +5,9 @@
 # $FreeBSD$
 #

-PORTNAME=	zabbix
+PORTNAME=	zabbix2
 PKGNAMESUFFIX=	-proxy

-MASTERDIR=	${.CURDIR}/../zabbix-server
+MASTERDIR=	${.CURDIR}/../zabbix2-server

 .include "${MASTERDIR}/Makefile"
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@ -5,47 +5,55 @@
 # $FreeBSD$
 #

-PORTNAME=	zabbix
-PORTVERSION=	1.8.13
-PORTEPOCH=	2
+PORTNAME=	zabbix2
+PORTVERSION=	2.0.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
 PKGNAMESUFFIX?=	-server
+DISTNAME=	zabbix-${PORTVERSION}

-MAINTAINER=	ports@christianserving.org
+MAINTAINER=	pakhom706@gmail.com
 COMMENT=	Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//})

 LICENSE=	GPLv2

-CONFLICTS=	${PKGBASE}-1.[0-6]*
+CONFLICTS=	${PKGBASE}-1.[0-8]*

 .if ${PKGNAMESUFFIX} != "-agent"
-CONFLICTS+=	${PORTNAME}-1.[0-6]*
+CONFLICTS+=	${PORTNAME}-1.[0-8]*
 .endif

 ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}

 .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
 .if ${ZABBIX_BUILD} != "agent"
-USE_ICONV=	yes
-MAN8+=		${PORTNAME}_${ZABBIX_BUILD}.8
-USE_RC_SUBR=	${PORTNAME}_${ZABBIX_BUILD}
+MAN8+=		zabbix_${ZABBIX_BUILD}.8
+USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}
 .else
-USE_ICONV=	yes
-MAN1+=		${PORTNAME}_get.1 ${PORTNAME}_sender.1
-MAN8+=		${PORTNAME}_${ZABBIX_BUILD}d.8
-USE_RC_SUBR=	${PORTNAME}_${ZABBIX_BUILD}d
+MAN1+=		zabbix_get.1 zabbix_sender.1
+MAN8+=		zabbix_${ZABBIX_BUILD}d.8
+USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}d
 .endif

+USE_ICONV=	yes
+
 USERS=		zabbix
 GROUPS=		zabbix

-PLIST_SUB=	ZABBIX_BUILD=${ZABBIX_BUILD}
+.if ${ZABBIX_BUILD} != "proxy"
+PLIST_SUB=	PROXY="@comment "
+.else
+PLIST_SUB=	PROXY=""
+.endif
+
+PLIST_SUB+=	ZABBIX_BUILD=${ZABBIX_BUILD}
 SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}

 MAKE_ARGS+=	ARCH=freebsd
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD}
+CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD} \
+			--sysconfdir=${ETCDIR} \
+			--datadir=${ETCDIR}

 .if ${ZABBIX_BUILD} != "agent"
 LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
@ -56,108 +64,119 @@ SUB_FILES=	pkg-message
 CONFIGURE_ARGS+=	--with-net-snmp

 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
-OPTIONS=	MYSQL "Use MySQL backend" on \
-		PGSQL "Use PostgreSQL backend" off \
-		SQLITE "Use SQLite backend" off \
-		IPV6 "Support for IPv6" on \
-		FPING "Use fping for pinging hosts" on \
-		JABBER "Support for jabber media type" on \
-		CURL "Support web monitoring with cURL" on \
-		LDAP "Support for checking LDAP servers" on \
-		IPMI "Support for IPMI" off \
-		SSH "Support for SSH-based checks" off \
-		IODBC "Support for iODBC" off \
-		UNIXODBC "Support for unixODBC" off
+
+OPTIONS_DEFINE=	IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC
+OPTIONS_DEFAULT=	MYSQL IPV6 FPING JABBER CURL LDAP
+
+CURL_DESC=	Support for web monitoring
+FPING_DESC=	Build/install fping for ping checks
+IPMI_DESC=	Support for IPMI checks
+JABBER_DESC=	Support for Jabber media type
+LDAP_DESC=	Support for LDAP server checks
+NMAP_DESC=	Build/install nmap for o/s detection
+SSH_DESC=	Support for SSH-based checks
+ODBC_DESC=	Support for database checks via ODBC
+IODBC_DESC=	Use iODBC for ODBC support
+UNIXODBC_DESC=	Use UnixODBC for ODBC support
+
+OPTIONS_SINGLE=	DB ODBC
+OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE
+OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC

 .include <bsd.port.options.mk>

-.ifndef WITHOUT_MYSQL
+.if ${PORT_OPTIONS:MMYSQL}
 ZABBIX_REQUIRE=	" mysql"
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql
-.elifdef WITH_PGSQL
+.endif
+
+.if ${PORT_OPTIONS:MPGSQL}
 ZABBIX_REQUIRE=	" postgresql"
 USE_PGSQL=	yes
-CONFIGURE_ARGS+=	--with-pgsql
-.elifdef WITH_SQLITE
+CONFIGURE_ARGS+=	--with-postgresql
+.endif
+
+.if ${PORT_OPTIONS:MSQLITE}
 ZABBIX_REQUIRE=
 USE_SQLITE=	3
 CONFIGURE_ARGS+=	--with-sqlite3
-.else
-IGNORE=		zabbix requires a database backend
 .endif

-.ifdef WITH_CURL
+.if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--with-libcurl
 .endif

-.ifndef WITHOUT_LDAP
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=	--with-ldap
 .endif

-.ifdef WITH_IPMI
+.if ${PORT_OPTIONS:MIPMI}
 LIB_DEPENDS+=	OpenIPMI:${PORTSDIR}/sysutils/openipmi
 CONFIGURE_ARGS+=	--with-openipmi
 .endif

-.ifndef WITHOUT_JABBER
+.if ${PORT_OPTIONS:MJABBER}
 LIB_DEPENDS+=	iksemel:${PORTSDIR}/textproc/iksemel
 CONFIGURE_ARGS+=	--with-jabber
 .endif

-.ifndef WITHOUT_FPING
+.if ${PORT_OPTIONS:MFPING}
 RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
 .endif

-.ifdef WITH_SSH
+.if ${PORT_OPTIONS:MSSH}
 LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
 CONFIGURE_ARGS+=	--with-ssh2
 .endif

-.if defined(WITH_IODBC) && defined(WITH_UNIXODBC)
-IGNORE=	cannot build with both iODBC and unixODBC
-.endif
-
-.ifdef WITH_IODBC
+.if ${PORT_OPTIONS:MIODBC}
 LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
 CONFIGURE_ARGS+=	--with-iodbc
 .endif

-.ifdef WITH_UNIXODBC
+.if ${PORT_OPTIONS:MUNIXODBC}
 LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-unixodbc
 .endif
 .endif # if ${ZABBIX_BUILD} != "agent"

-.ifdef WITH_IPV6
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif

+.if ${PORT_OPTIONS:MNMAP}
+RUN_DEPENDS+=	nmap:${PORTSDIR}/security/nmap \
+		sudo:${PORTSDIR}/security/sudo
+.endif
+
 post-patch:
 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
-	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/misc/conf/${PORTNAME}_*.conf
+	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/conf/zabbix_*.conf
+
+.if ${ZABBIX_BUILD} != "agent"
+.if empty(PORT_OPTIONS:MFPING)
+	@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/conf/zabbix_${ZABBIX_BUILD}.conf
+.endif
+.for d in mysql oracle postgresql sqlite3
+	@${REINPLACE_CMD} -e 's|/bin/ping|/sbin/ping|g; \
+	                      s|/usr/bin/traceroute|/usr/sbin/traceroute|g; \
+	                      s|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g;' \
+	                      ${WRKSRC}/database/${d}/data.sql
+.endfor
+.endif
+	@${REINPLACE_CMD} -Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \
+		${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in
 	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) -exec ${RM} -f {} +

-.if ${ZABBIX_BUILD} != "agent"
-.ifdef WITHOUT_FPING
-	@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/${PORTNAME}_${ZABBIX_BUILD}.conf
-.endif
-.endif
-
 post-install:
-	@${INSTALL} -d ${ETCDIR}
-	@${INSTALL_DATA} ${WRKSRC}/misc/conf/${PORTNAME}_${ZABBIX_BUILD}.conf ${ETCDIR}/${PORTNAME}_${ZABBIX_BUILD}.conf.sample
-
-.if ${ZABBIX_BUILD} == "agent"
-	@${INSTALL_DATA} ${WRKSRC}/misc/conf/${PORTNAME}_${ZABBIX_BUILD}d.conf ${ETCDIR}/${PORTNAME}_${ZABBIX_BUILD}d.conf.sample
-.endif
-
 .if ${ZABBIX_BUILD} != "agent"
+	@${MKDIR} "${DATADIR}/${ZABBIX_BUILD}/database"
 	@cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${DATADIR}/${ZABBIX_BUILD}/upgrades/
-	@cd ${WRKSRC}/create/ && ${COPYTREE_SHARE} "data schema" ${DATADIR}/${ZABBIX_BUILD}/create/
+	@cd ${WRKSRC}/database/ && ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" ${DATADIR}/${ZABBIX_BUILD}/database/
 	@${CAT} ${PKGMESSAGE}
 .endif
 .endif # if ${ZABBIX_BUILD} != "frontend"
--- a/net-mgmt/zabbix2-server/distinfo
+++ b/net-mgmt/zabbix2-server/distinfo
@ -1,2 +1,2 @@
-SHA256 (zabbix-1.8.13.tar.gz) = ac4497cde031b793e492e874b091d109da7d5410c4ba55f54cad0749ae47e667
-SIZE (zabbix-1.8.13.tar.gz) = 4235482
+SHA256 (zabbix-2.0.0.tar.gz) = 52cc4b8a8624d53ff4591ebf86a92c19230964d46d39e5cccf7b8648fb2ecf4d
+SIZE (zabbix-2.0.0.tar.gz) = 12091622
--- a/net-mgmt/zabbix2-server/files/patch-create-data-data.sql
+++ b/net-mgmt/zabbix2-server/files/patch-create-data-data.sql
@ -1,13 +0,0 @@
--- create/data/data.sql.orig	2011-08-04 09:48:23.785558036 -0500
-+++ create/data/data.sql	2011-08-04 09:48:41.277736192 -0500
-@@ -27,8 +27,8 @@
- -- Dumping data for table `scripts`
- --
- 
-INSERT INTO scripts VALUES (1,'Ping','/bin/ping -c 3 {HOST.CONN}',2,0,0);
-INSERT INTO scripts VALUES (2,'Traceroute','/usr/bin/traceroute {HOST.CONN}',2,0,0);
-+INSERT INTO scripts VALUES (1,'Ping','/sbin/ping -c 3 {HOST.CONN}',2,0,0);
-+INSERT INTO scripts VALUES (2,'Traceroute','/usr/sbin/traceroute {HOST.CONN}',2,0,0);
- 
- --
- -- Dumping data for table `users`
--- a/net-mgmt/zabbix2-server/files/pkg-message.in
+++ b/net-mgmt/zabbix2-server/files/pkg-message.in
@ -1,11 +1,43 @@
 ======================================================================
-Zabbix requires a database.  If you are using SQLite, one will be
-created automatically.  Otherwise you can install one as follows (<db>
-is your database engine and <db_client> is its client program):
+For Zabbix server and proxy daemons, as well as Zabbix frontend, a database is required. It is not needed to run Zabbix agent. 
+% cd %%DATADIR%%/%%ZABBIX_BUILD%%/database
+
+PostgreSQL: 
+shell> psql -U <username>
+psql> create database zabbix; 
+psql> \q 
+shell> cd database/postgresql
+shell> psql -U <username> zabbix < schema.sql
+shell> psql -U <username> zabbix < images.sql
+shell> psql -U <username> zabbix < data.sql
+
+MySQL: 
+shell> mysql -u<username> -p<password>
+mysql> create database zabbix character set utf8;
+mysql> quit;
+shell> mysql -u<username> -p<password> zabbix < database/mysql/schema.sql
+shell> mysql -u<username> -p<password> zabbix < database/mysql/images.sql
+shell> mysql -u<username> -p<password> zabbix < database/mysql/data.sql
+
+SQLite: 
+shell> cd database/sqlite3
+shell> sqlite3 /var/lib/sqlite/zabbix.db < schema.sql
+shell> sqlite3 /var/lib/sqlite/zabbix.db < images.sql
+shell> sqlite3 /var/lib/sqlite/zabbix.db < data.sql
+
+
+IBM DB2: 
+shell> db2 "create database zabbix using codeset utf-8 territory us pagesize 32768"
+shell> cd database/ibm_db2
+shell> db2batch -d zabbix -f schema.sql
+shell> db2batch -d zabbix -f images.sql
+shell> db2batch -d zabbix -f data.sql 

-% cd %%DATADIR%%/%%ZABBIX_BUILD%%/create
-% cat schema/<db>.sql data/data.sql data/images_<db>.sql | <db_client>

 To upgrade an existing database, see the scripts in
 %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades.
+
+Please see http://www.zabbix.com/documentation/2.0/manual/installation/install for installation instructions.
+
+For use NMAP please edit sudoers
 ======================================================================
--- a/net-mgmt/zabbix2-server/pkg-plist
+++ b/net-mgmt/zabbix2-server/pkg-plist
@ -1,47 +1,44 @@
-@comment $FreeBSD$
 %%ETCDIR%%/zabbix_%%ZABBIX_BUILD%%.conf.sample
 sbin/zabbix_%%ZABBIX_BUILD%%
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/data.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Hub.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Hub_small.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Network.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Network_small.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Notebook.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Notebook_small.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Phone.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Phone_small.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Printer.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Printer_small.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Router.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Router_small.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Satellite.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Satellite_small.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Server.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Server_small.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/UPS.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/UPS_small.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Workstation.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Workstation_small.png
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_ibm_db2.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_mysql.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_oracle.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_pgsql.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_sqlite3.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/ibm_db2.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/mysql.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/oracle.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/postgresql.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/sqlite.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql/patch.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle/patch.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql/patch.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/data.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/schema.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/images.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/data.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/images.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/schema.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/images.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/schema.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/data.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/ibm_db2/schema.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/ibm_db2/images.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/ibm_db2/data.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/data.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/images.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/schema.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/ibm_db2/patch.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/ibm_db2/rc4_rc5.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/postgresql/rc4_rc5.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/postgresql/patch.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/oracle/patch.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/oracle/rc4_rc5.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/mysql/rc4_rc5.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/mysql/upgrade
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/mysql/patch.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql/patch.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql/upgrade
-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/oracle/patch.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/postgresql/patch.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/oracle/patch.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql/patch.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle/patch.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql/patch.sql
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/ibm_db2
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/postgresql
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/oracle
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/mysql
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql
@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/postgresql
@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/oracle
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql
@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8
@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql
@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle
@ -49,10 +46,17 @@ sbin/zabbix_%%ZABBIX_BUILD%%
@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6
@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches
@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/create/schema
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/create/data
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/create
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database/ibm_db2
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database
@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%
@dirrmtry %%DATADIR%%
+@dirrmtry %%ETCDIR%%/zabbix/alertscripts
+@dirrmtry %%ETCDIR%%/zabbix/externalscripts
+@dirrmtry %%ETCDIR%%/zabbix
+%%PROXY%%@dirrmtry %%ETCDIR%%/zabbix_proxy.conf.d
+@dirrmtry %%ETCDIR%%/zabbix_server.conf.d
@dirrmtry %%ETCDIR%%
--- a/net-mgmt/zabbix2-server/pkg-plist.agent
+++ b/net-mgmt/zabbix2-server/pkg-plist.agent
@ -1,8 +1,9 @@
-@comment $FreeBSD$
 %%ETCDIR%%/zabbix_agent.conf.sample
 %%ETCDIR%%/zabbix_agentd.conf.sample
 bin/zabbix_get
 bin/zabbix_sender
 sbin/zabbix_agent
 sbin/zabbix_agentd
+@dirrmtry %%ETCDIR%%/zabbix_agentd.conf.d
+@dirrmtry %%ETCDIR%%/zabbix_agent.conf.d
@dirrmtry %%ETCDIR%%
--- a/net-mgmt/zabbix2-server/pkg-plist.frontend
+++ b/net-mgmt/zabbix2-server/pkg-plist.frontend