Updating to zabbix version 3.4.7.

Pkgsrc changes:
 * for zabbix-frontend, adjust PLIST

Upstream changes are lots and lots since the previous 3.2.10 release
we packaged.  Highlights from https://www.zabbix.com/whats_new

 * Dashboards have been re-designed
 * Dependencies between collectd items has been introduced,
   allowing parallel collection in some cases
 * Pre-processing of collectd data has been improved
 * Remote command execution via proxies has been introduced
 * Time periods now have macros for e.g. 30s, 5m, etc.
 * Configurable JMX endpoints have been introduced
 * Efficient network device monitoring via templates has been added
 * Various server-side improvements has been implemented
 * Various frontend improvements have been implemented
 * It's now possible to be notified when ACKs are done
 * Alert processing is now parallelized
 * Scripts and commands now have their exit status checked and handled

There doesn't seem to be a public on-the-web copy of the change log,
so inspect the sources' ChangeLog file for further details.

5 files changed, 115 insertions, 101 deletions

diff --git a/sysutils/zabbix-frontend/PLIST b/sysutils/zabbix-frontend/PLIST
index 0623114005a..a480acab5fd 100644
--- a/sysutils/zabbix-frontend/PLIST
+++ b/sysutils/zabbix-frontend/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/11/16 12:50:34 he Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/03/08 21:05:27 he Exp $
 share/zabbix/php/actionconf.php
 share/zabbix/php/adm.gui.php
 share/zabbix/php/adm.housekeeper.php
@@ -15,10 +15,16 @@ share/zabbix/php/api_jsonrpc.php
 share/zabbix/php/app/.htaccess
 share/zabbix/php/app/controllers/CControllerAcknowledgeCreate.php
 share/zabbix/php/app/controllers/CControllerAcknowledgeEdit.php
-share/zabbix/php/app/controllers/CControllerDashboardFavourite.php
-share/zabbix/php/app/controllers/CControllerDashboardSort.php
+share/zabbix/php/app/controllers/CControllerDashboardAbstract.php
+share/zabbix/php/app/controllers/CControllerDashboardDelete.php
+share/zabbix/php/app/controllers/CControllerDashboardGet.php
+share/zabbix/php/app/controllers/CControllerDashboardList.php
+share/zabbix/php/app/controllers/CControllerDashboardUpdate.php
 share/zabbix/php/app/controllers/CControllerDashboardView.php
-share/zabbix/php/app/controllers/CControllerDashboardWidget.php
+share/zabbix/php/app/controllers/CControllerDashbrdWidgetCheck.php
+share/zabbix/php/app/controllers/CControllerDashbrdWidgetConfig.php
+share/zabbix/php/app/controllers/CControllerDashbrdWidgetRfRate.php
+share/zabbix/php/app/controllers/CControllerDashbrdWidgetUpdate.php
 share/zabbix/php/app/controllers/CControllerDiscoveryView.php
 share/zabbix/php/app/controllers/CControllerFavouriteCreate.php
 share/zabbix/php/app/controllers/CControllerFavouriteDelete.php
@@ -47,12 +53,28 @@ share/zabbix/php/app/controllers/CControllerScriptEdit.php
 share/zabbix/php/app/controllers/CControllerScriptList.php
 share/zabbix/php/app/controllers/CControllerScriptUpdate.php
 share/zabbix/php/app/controllers/CControllerSystemWarning.php
+share/zabbix/php/app/controllers/CControllerTimelineUpdate.php
 share/zabbix/php/app/controllers/CControllerWebView.php
+share/zabbix/php/app/controllers/CControllerWidget.php
+share/zabbix/php/app/controllers/CControllerWidgetActionLogView.php
+share/zabbix/php/app/controllers/CControllerWidgetClockView.php
+share/zabbix/php/app/controllers/CControllerWidgetDataOverView.php
 share/zabbix/php/app/controllers/CControllerWidgetDiscoveryView.php
+share/zabbix/php/app/controllers/CControllerWidgetFavGraphsView.php
+share/zabbix/php/app/controllers/CControllerWidgetFavMapsView.php
+share/zabbix/php/app/controllers/CControllerWidgetFavScreensView.php
+share/zabbix/php/app/controllers/CControllerWidgetGraphView.php
 share/zabbix/php/app/controllers/CControllerWidgetHostsView.php
-share/zabbix/php/app/controllers/CControllerWidgetIssuesView.php
+share/zabbix/php/app/controllers/CControllerWidgetNavigationtreeItemEdit.php
+share/zabbix/php/app/controllers/CControllerWidgetNavigationtreeItemEditDialog.php
+share/zabbix/php/app/controllers/CControllerWidgetNavigationtreeView.php
+share/zabbix/php/app/controllers/CControllerWidgetPlainTextView.php
+share/zabbix/php/app/controllers/CControllerWidgetProblemsView.php
 share/zabbix/php/app/controllers/CControllerWidgetStatusView.php
+share/zabbix/php/app/controllers/CControllerWidgetSysmapView.php
 share/zabbix/php/app/controllers/CControllerWidgetSystemView.php
+share/zabbix/php/app/controllers/CControllerWidgetTrigOverView.php
+share/zabbix/php/app/controllers/CControllerWidgetUrlView.php
 share/zabbix/php/app/controllers/CControllerWidgetWebView.php
 share/zabbix/php/app/views/administration.mediatype.edit.js.php
 share/zabbix/php/app/views/administration.mediatype.edit.php
@@ -74,17 +96,37 @@ share/zabbix/php/app/views/layout.warning.php
 share/zabbix/php/app/views/layout.widget.php
 share/zabbix/php/app/views/monitoring.acknowledge.edit.js.php
 share/zabbix/php/app/views/monitoring.acknowledge.edit.php
+share/zabbix/php/app/views/monitoring.dashboard.breadcrumbs.php
+share/zabbix/php/app/views/monitoring.dashboard.config.php
+share/zabbix/php/app/views/monitoring.dashboard.edit_form.js.php
+share/zabbix/php/app/views/monitoring.dashboard.edit_form.php
+share/zabbix/php/app/views/monitoring.dashboard.list.php
+share/zabbix/php/app/views/monitoring.dashboard.sharing_form.js.php
+share/zabbix/php/app/views/monitoring.dashboard.sharing_form.php
+share/zabbix/php/app/views/monitoring.dashboard.view.js.php
 share/zabbix/php/app/views/monitoring.dashboard.view.php
 share/zabbix/php/app/views/monitoring.discovery.view.php
 share/zabbix/php/app/views/monitoring.map.view.php
 share/zabbix/php/app/views/monitoring.problem.view.js.php
 share/zabbix/php/app/views/monitoring.problem.view.php
 share/zabbix/php/app/views/monitoring.web.view.php
+share/zabbix/php/app/views/monitoring.widget.actionlog.view.php
+share/zabbix/php/app/views/monitoring.widget.clock.view.php
+share/zabbix/php/app/views/monitoring.widget.dataover.view.php
 share/zabbix/php/app/views/monitoring.widget.discovery.view.php
+share/zabbix/php/app/views/monitoring.widget.favgraphs.view.php
+share/zabbix/php/app/views/monitoring.widget.favmaps.view.php
+share/zabbix/php/app/views/monitoring.widget.favscreens.view.php
+share/zabbix/php/app/views/monitoring.widget.graph.view.php
 share/zabbix/php/app/views/monitoring.widget.hosts.view.php
-share/zabbix/php/app/views/monitoring.widget.issues.view.php
+share/zabbix/php/app/views/monitoring.widget.navigationtree.view.php
+share/zabbix/php/app/views/monitoring.widget.plaintext.view.php
+share/zabbix/php/app/views/monitoring.widget.problems.view.php
 share/zabbix/php/app/views/monitoring.widget.status.view.php
+share/zabbix/php/app/views/monitoring.widget.sysmap.view.php
 share/zabbix/php/app/views/monitoring.widget.system.view.php
+share/zabbix/php/app/views/monitoring.widget.trigover.view.php
+share/zabbix/php/app/views/monitoring.widget.url.view.php
 share/zabbix/php/app/views/monitoring.widget.web.view.php
 share/zabbix/php/app/views/report.services.php
 share/zabbix/php/app/views/report.status.php
@@ -114,7 +156,6 @@ share/zabbix/php/conf/.htaccess
 share/zabbix/php/conf/maintenance.inc.php
 share/zabbix/php/conf/zabbix.conf.php.example
 share/zabbix/php/correlation.php
-share/zabbix/php/dashconf.php
 share/zabbix/php/disc_prototypes.php
 share/zabbix/php/discoveryconf.php
 share/zabbix/php/favicon.ico
@@ -158,6 +199,7 @@ share/zabbix/php/include/classes/api/APIException.php
 share/zabbix/php/include/classes/api/CApiClientResponse.php
 share/zabbix/php/include/classes/api/CApiService.php
 share/zabbix/php/include/classes/api/CApiServiceFactory.php
+share/zabbix/php/include/classes/api/CAudit.php
 share/zabbix/php/include/classes/api/CRelationMap.php
 share/zabbix/php/include/classes/api/clients/CApiClient.php
 share/zabbix/php/include/classes/api/clients/CLocalApiClient.php
@@ -174,6 +216,7 @@ share/zabbix/php/include/classes/api/services/CDCheck.php
 share/zabbix/php/include/classes/api/services/CDHost.php
 share/zabbix/php/include/classes/api/services/CDRule.php
 share/zabbix/php/include/classes/api/services/CDService.php
+share/zabbix/php/include/classes/api/services/CDashboard.php
 share/zabbix/php/include/classes/api/services/CDiscoveryRule.php
 share/zabbix/php/include/classes/api/services/CEvent.php
 share/zabbix/php/include/classes/api/services/CGraph.php
@@ -235,7 +278,6 @@ share/zabbix/php/include/classes/db/DbBackend.php
 share/zabbix/php/include/classes/db/MysqlDbBackend.php
 share/zabbix/php/include/classes/db/OracleDbBackend.php
 share/zabbix/php/include/classes/db/PostgresqlDbBackend.php
-share/zabbix/php/include/classes/db/SqliteDbBackend.php
 share/zabbix/php/include/classes/debug/CProfiler.php
 share/zabbix/php/include/classes/export/CConfigurationExport.php
 share/zabbix/php/include/classes/export/CConfigurationExportBuilder.php
@@ -248,8 +290,10 @@ share/zabbix/php/include/classes/graphdraw/CLineGraphDraw.php
 share/zabbix/php/include/classes/graphdraw/CPieGraphDraw.php
 share/zabbix/php/include/classes/helpers/CArrayHelper.php
 share/zabbix/php/include/classes/helpers/CConditionHelper.php
+share/zabbix/php/include/classes/helpers/CElasticsearchHelper.php
 share/zabbix/php/include/classes/helpers/CHtml.php
 share/zabbix/php/include/classes/helpers/CJs.php
+share/zabbix/php/include/classes/helpers/CMapHelper.php
 share/zabbix/php/include/classes/helpers/CMenuPopupHelper.php
 share/zabbix/php/include/classes/helpers/CUploadFile.php
 share/zabbix/php/include/classes/helpers/CViewHelper.php
@@ -269,6 +313,7 @@ share/zabbix/php/include/classes/html/CColor.php
 share/zabbix/php/include/classes/html/CColorCell.php
 share/zabbix/php/include/classes/html/CComboBox.php
 share/zabbix/php/include/classes/html/CComboItem.php
+share/zabbix/php/include/classes/html/CDashboardWidgetMap.php
 share/zabbix/php/include/classes/html/CDiv.php
 share/zabbix/php/include/classes/html/CFile.php
 share/zabbix/php/include/classes/html/CFilter.php
@@ -287,6 +332,7 @@ share/zabbix/php/include/classes/html/CList.php
 share/zabbix/php/include/classes/html/CListBox.php
 share/zabbix/php/include/classes/html/CListItem.php
 share/zabbix/php/include/classes/html/CMultiSelect.php
+share/zabbix/php/include/classes/html/CNavigationTree.php
 share/zabbix/php/include/classes/html/CNumericBox.php
 share/zabbix/php/include/classes/html/CObject.php
 share/zabbix/php/include/classes/html/CParam.php
@@ -328,6 +374,7 @@ share/zabbix/php/include/classes/import/converters/C20ImportConverter.php
 share/zabbix/php/include/classes/import/converters/C20ItemKeyConverter.php
 share/zabbix/php/include/classes/import/converters/C20TriggerConverter.php
 share/zabbix/php/include/classes/import/converters/C30ImportConverter.php
+share/zabbix/php/include/classes/import/converters/C32ImportConverter.php
 share/zabbix/php/include/classes/import/converters/CConverter.php
 share/zabbix/php/include/classes/import/converters/CConverterChain.php
 share/zabbix/php/include/classes/import/converters/CImportConverterFactory.php
@@ -346,6 +393,7 @@ share/zabbix/php/include/classes/import/validators/C10XmlValidator.php
 share/zabbix/php/include/classes/import/validators/C20XmlValidator.php
 share/zabbix/php/include/classes/import/validators/C30XmlValidator.php
 share/zabbix/php/include/classes/import/validators/C32XmlValidator.php
+share/zabbix/php/include/classes/import/validators/C34XmlValidator.php
 share/zabbix/php/include/classes/import/validators/CXmlValidator.php
 share/zabbix/php/include/classes/import/validators/CXmlValidatorGeneral.php
 share/zabbix/php/include/classes/items/CHelpItems.php
@@ -363,10 +411,15 @@ share/zabbix/php/include/classes/mvc/CRouter.php
 share/zabbix/php/include/classes/mvc/CView.php
 share/zabbix/php/include/classes/pagefilter/CPageFilter.php
 share/zabbix/php/include/classes/parsers/CConditionFormula.php
+share/zabbix/php/include/classes/parsers/CDnsParser.php
+share/zabbix/php/include/classes/parsers/CFlexibleIntervalParser.php
 share/zabbix/php/include/classes/parsers/CFunctionIdParser.php
 share/zabbix/php/include/classes/parsers/CFunctionMacroParser.php
 share/zabbix/php/include/classes/parsers/CFunctionParser.php
-share/zabbix/php/include/classes/parsers/CItemDelayFlexParser.php
+share/zabbix/php/include/classes/parsers/CIPParser.php
+share/zabbix/php/include/classes/parsers/CIPRangeParser.php
+share/zabbix/php/include/classes/parsers/CIPv4Parser.php
+share/zabbix/php/include/classes/parsers/CIPv6Parser.php
 share/zabbix/php/include/classes/parsers/CItemKey.php
 share/zabbix/php/include/classes/parsers/CLLDMacroParser.php
 share/zabbix/php/include/classes/parsers/CMacroFunctionParser.php
@@ -374,8 +427,13 @@ share/zabbix/php/include/classes/parsers/CMacroParser.php
 share/zabbix/php/include/classes/parsers/CParser.php
 share/zabbix/php/include/classes/parsers/CReferenceParser.php
 share/zabbix/php/include/classes/parsers/CReplacementParser.php
+share/zabbix/php/include/classes/parsers/CSchedulingIntervalParser.php
 share/zabbix/php/include/classes/parsers/CSetParser.php
+share/zabbix/php/include/classes/parsers/CSimpleIntervalParser.php
+share/zabbix/php/include/classes/parsers/CTimePeriodParser.php
+share/zabbix/php/include/classes/parsers/CTimePeriodsParser.php
 share/zabbix/php/include/classes/parsers/CTriggerExpression.php
+share/zabbix/php/include/classes/parsers/CUpdateIntervalParser.php
 share/zabbix/php/include/classes/parsers/CUserMacroParser.php
 share/zabbix/php/include/classes/parsers/CValidationRule.php
 share/zabbix/php/include/classes/parsers/results/CParserResult.php
@@ -415,8 +473,6 @@ share/zabbix/php/include/classes/server/CZabbixServer.php
 share/zabbix/php/include/classes/services/CServicesSlaCalculator.php
 share/zabbix/php/include/classes/setup/CFrontendSetup.php
 share/zabbix/php/include/classes/setup/CSetupWizard.php
-share/zabbix/php/include/classes/sysmaps/CCanvas.php
-share/zabbix/php/include/classes/sysmaps/CMapPainter.php
 share/zabbix/php/include/classes/tree/CServiceTree.php
 share/zabbix/php/include/classes/tree/CTree.php
 share/zabbix/php/include/classes/triggers/CTextTriggerConstructor.php
@@ -424,23 +480,20 @@ share/zabbix/php/include/classes/user/CFavorite.php
 share/zabbix/php/include/classes/user/CProfile.php
 share/zabbix/php/include/classes/user/CWebUser.php
 share/zabbix/php/include/classes/validators/CActionCondValidator.php
+share/zabbix/php/include/classes/validators/CApiInputValidator.php
 share/zabbix/php/include/classes/validators/CCollectionValidator.php
 share/zabbix/php/include/classes/validators/CColorValidator.php
 share/zabbix/php/include/classes/validators/CDecimalStringValidator.php
 share/zabbix/php/include/classes/validators/CDecimalValidator.php
 share/zabbix/php/include/classes/validators/CFunctionValidator.php
 share/zabbix/php/include/classes/validators/CHtmlUrlValidator.php
-share/zabbix/php/include/classes/validators/CIPRangeValidator.php
-share/zabbix/php/include/classes/validators/CIPValidator.php
 share/zabbix/php/include/classes/validators/CIdValidator.php
-share/zabbix/php/include/classes/validators/CItemDelayFlexValidator.php
 share/zabbix/php/include/classes/validators/CLdapAuthValidator.php
 share/zabbix/php/include/classes/validators/CLimitedSetValidator.php
 share/zabbix/php/include/classes/validators/CNewValidator.php
 share/zabbix/php/include/classes/validators/CPartialValidatorInterface.php
 share/zabbix/php/include/classes/validators/CRegexValidator.php
 share/zabbix/php/include/classes/validators/CStringValidator.php
-share/zabbix/php/include/classes/validators/CTimePeriodValidator.php
 share/zabbix/php/include/classes/validators/CValidator.php
 share/zabbix/php/include/classes/validators/event/CEventSourceObjectValidator.php
 share/zabbix/php/include/classes/validators/host/CHostNormalValidator.php
@@ -451,6 +504,36 @@ share/zabbix/php/include/classes/validators/object/CUpdateDiscoveredValidator.ph
 share/zabbix/php/include/classes/validators/schema/CPartialSchemaValidator.php
 share/zabbix/php/include/classes/validators/schema/CSchemaValidator.php
 share/zabbix/php/include/classes/validators/string/CLldMacroStringValidator.php
+share/zabbix/php/include/classes/widgetfields/CWidgetField.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldCheckBox.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldComboBox.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldGroup.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldHidden.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldHost.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldNumericBox.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldRadioButtonList.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldReference.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldSelectResource.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldSeverities.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldTags.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldTextBox.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldUrl.php
+share/zabbix/php/include/classes/widgetfields/CWidgetFieldWidgetListComboBox.php
+share/zabbix/php/include/classes/widgets/CActionLogWidgetForm.php
+share/zabbix/php/include/classes/widgets/CClockWidgetForm.php
+share/zabbix/php/include/classes/widgets/CDataOverviewWidgetForm.php
+share/zabbix/php/include/classes/widgets/CGraphWidgetForm.php
+share/zabbix/php/include/classes/widgets/CHostsWidgetForm.php
+share/zabbix/php/include/classes/widgets/CNavigationWidgetForm.php
+share/zabbix/php/include/classes/widgets/CPlainTextWidgetForm.php
+share/zabbix/php/include/classes/widgets/CProblemsWidgetForm.php
+share/zabbix/php/include/classes/widgets/CSysmapWidgetForm.php
+share/zabbix/php/include/classes/widgets/CSystemWidgetForm.php
+share/zabbix/php/include/classes/widgets/CTrigOverviewWidgetForm.php
+share/zabbix/php/include/classes/widgets/CUrlWidgetForm.php
+share/zabbix/php/include/classes/widgets/CWebWidgetForm.php
+share/zabbix/php/include/classes/widgets/CWidgetConfig.php
+share/zabbix/php/include/classes/widgets/CWidgetForm.php
 share/zabbix/php/include/config.inc.php
 share/zabbix/php/include/correlation.inc.php
 share/zabbix/php/include/db.inc.php
@@ -463,6 +546,7 @@ share/zabbix/php/include/forms.inc.php
 share/zabbix/php/include/func.inc.php
 share/zabbix/php/include/gettextwrapper.inc.php
 share/zabbix/php/include/graphs.inc.php
+share/zabbix/php/include/hostgroups.inc.php
 share/zabbix/php/include/hosts.inc.php
 share/zabbix/php/include/html.inc.php
 share/zabbix/php/include/httptest.inc.php
@@ -606,7 +690,6 @@ share/zabbix/php/include/views/js/monitoring.sysmaps.js.php
 share/zabbix/php/include/views/js/monitoring.triggerComment.js.php
 share/zabbix/php/include/views/js/reports.toptriggers.js.php
 share/zabbix/php/include/views/monitoring.charts.php
-share/zabbix/php/include/views/monitoring.dashconf.php
 share/zabbix/php/include/views/monitoring.history.php
 share/zabbix/php/include/views/monitoring.hostscreen.php
 share/zabbix/php/include/views/monitoring.overview.items.php
@@ -630,10 +713,12 @@ share/zabbix/php/js/browsers.js
 share/zabbix/php/js/chkbxrange.js
 share/zabbix/php/js/class.bbcode.js
 share/zabbix/php/js/class.calendar.js
+share/zabbix/php/js/class.cclock.js
 share/zabbix/php/js/class.cdate.js
 share/zabbix/php/js/class.cdebug.js
 share/zabbix/php/js/class.cmap.js
 share/zabbix/php/js/class.cmessages.js
+share/zabbix/php/js/class.cnavtree.js
 share/zabbix/php/js/class.cookie.js
 share/zabbix/php/js/class.cscreen.js
 share/zabbix/php/js/class.csuggest.js
@@ -641,9 +726,11 @@ share/zabbix/php/js/class.cswitcher.js
 share/zabbix/php/js/class.ctree.js
 share/zabbix/php/js/class.curl.js
 share/zabbix/php/js/class.cviewswitcher.js
+share/zabbix/php/js/class.mapWidget.js
 share/zabbix/php/js/class.pmaster.js
 share/zabbix/php/js/class.rpc.js
 share/zabbix/php/js/common.js
+share/zabbix/php/js/dashboard.grid.js
 share/zabbix/php/js/flickerfreescreen.js
 share/zabbix/php/js/functions.js
 share/zabbix/php/js/gtlc.js
@@ -654,6 +741,8 @@ share/zabbix/php/js/multiselect.js
 share/zabbix/php/js/pages/items.js
 share/zabbix/php/js/pages/tr_logform.js
 share/zabbix/php/js/servercheck.js
+share/zabbix/php/js/vector/class.svg.canvas.js
+share/zabbix/php/js/vector/class.svg.map.js
 share/zabbix/php/js/vendors/jquery-ui.js
 share/zabbix/php/js/vendors/jquery.js
 share/zabbix/php/js/vendors/prototype.js
diff --git a/sysutils/zabbix/Makefile b/sysutils/zabbix/Makefile
index 1417fef9877..63c56a8f10c 100644
--- a/sysutils/zabbix/Makefile
+++ b/sysutils/zabbix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2018/01/01 21:18:53 adam Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/08 21:05:27 he Exp $
 
-PKGREVISION= 3
+# PKGREVISION= 3
 .include "Makefile.common"
 
 COMMENT=	Enterprise-class Monitoring Solution for Everyone
@@ -56,4 +56,5 @@ post-install:
 .include "../../textproc/iksemel/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/zabbix/Makefile.common b/sysutils/zabbix/Makefile.common
index 8303898eaf4..8e3319babdf 100644
--- a/sysutils/zabbix/Makefile.common
+++ b/sysutils/zabbix/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2017/11/16 12:50:34 he Exp $
+# $NetBSD: Makefile.common,v 1.5 2018/03/08 21:05:27 he Exp $
 # used by sysutils/zabbix/Makefile
 # used by sysutils/zabbix-frontend/Makefile
 
-DISTNAME=	zabbix-3.2.10
+DISTNAME=	zabbix-3.4.7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zabbix/}
 
diff --git a/sysutils/zabbix/distinfo b/sysutils/zabbix/distinfo
index 1aff8297848..5a3aaf587d9 100644
--- a/sysutils/zabbix/distinfo
+++ b/sysutils/zabbix/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.6 2017/11/20 08:09:46 he Exp $
+$NetBSD: distinfo,v 1.7 2018/03/08 21:05:27 he Exp $
 
-SHA1 (zabbix-3.2.10.tar.gz) = 18b99e4df74009a9971d600ea785d4429b312f26
-RMD160 (zabbix-3.2.10.tar.gz) = d8b5f4e19480d58adcf9918b0d7bdd9adee52471
-SHA512 (zabbix-3.2.10.tar.gz) = 6413247ea0f47f410eadd970599dc4a0bfef4202b6f88bcb1636d1fad270a2d5545a90870052af5445a5219dab3b58867c23f3afaddb5d78e200fecbd987e545
-Size (zabbix-3.2.10.tar.gz) = 16089723 bytes
+SHA1 (zabbix-3.4.7.tar.gz) = 118c3d352172c28130ae66822c345793bdb8c559
+RMD160 (zabbix-3.4.7.tar.gz) = 93377b78a411e15389c44dd99f88e262d039e7d1
+SHA512 (zabbix-3.4.7.tar.gz) = 8397ee41c3b4efc2fb66638fd7c554ea668fad0a7c79d8aa3ed442cae065e62355c1e16e2008c7a65def775f23e6dfa1d75bbc682c49a45c9db5d7eddf905140
+Size (zabbix-3.4.7.tar.gz) = 17177022 bytes
 SHA1 (patch-frontends_php_locale_add__new__language.sh) = c187e2b4ae8dd9e409f5c32469cb7b0f02647d8b
 SHA1 (patch-frontends_php_locale_make__mo.sh) = 2f0aaa63e80fcd5d4fa8c507fd764f80070b7864
-SHA1 (patch-src_libs_zbxsysinfo_common_net.c) = 29d0d81b100eb65ea6e96dde08f930e3b834fb3c
 SHA1 (patch-src_zabbix__agent_Makefile.in) = a591c3e831eb34dc10cb5b1078891b5cad53b756
 SHA1 (patch-src_zabbix__proxy_Makefile.in) = 535eccd707a8947903fbec41028b127a3bbbeffc
 SHA1 (patch-src_zabbix__server_Makefile.in) = d297b8c4a940867d0a3eaff7bcb3b178a87dfd49
diff --git a/sysutils/zabbix/patches/patch-src_libs_zbxsysinfo_common_net.c b/sysutils/zabbix/patches/patch-src_libs_zbxsysinfo_common_net.c
deleted file mode 100644
index 3b2f81b8a87..00000000000
--- a/sysutils/zabbix/patches/patch-src_libs_zbxsysinfo_common_net.c
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-src_libs_zbxsysinfo_common_net.c,v 1.2 2017/11/20 08:09:46 he Exp $
-
-Can't portably use _res in a threaded program(!)
-Convert to using res_nsend().
-
---- src/libs/zbxsysinfo/common/net.c.orig	2017-07-18 10:41:07.000000000 +0000
-+++ src/libs/zbxsysinfo/common/net.c
-@@ -236,6 +236,7 @@ static int	dns_query(AGENT_REQUEST *requ
- 	struct servent	*s;
- 	HEADER		*hp;
- 	struct protoent	*pr;
-+	struct __res_state	res_state;
- #if PACKETSZ > 1024
- 	unsigned char	buf[PACKETSZ];
- #else
-@@ -465,13 +466,14 @@ static int	dns_query(AGENT_REQUEST *requ
- 		pDnsRecord = pDnsRecord->pNext;
- 	}
- #else	/* not _WINDOWS */
--	if (-1 == res_init())	/* initialize always, settings might have changed */
-+	memset(&res_state, 0, sizeof(res_state));
-+	if (-1 == res_ninit(&res_state))	/* initialize always, settings might have changed */
- 	{
- 		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot initialize DNS subsystem: %s", zbx_strerror(errno)));
- 		return SYSINFO_RET_FAIL;
- 	}
- 
--	if (-1 == (res = res_mkquery(QUERY, zone, C_IN, type, NULL, 0, NULL, buf, sizeof(buf))))
-+	if (-1 == (res = res_nmkquery(&res_state, QUERY, zone, C_IN, type, NULL, 0, NULL, buf, sizeof(buf))))
- 	{
- 		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot create DNS query: %s", zbx_strerror(errno)));
- 		return SYSINFO_RET_FAIL;
-@@ -488,33 +490,20 @@ static int	dns_query(AGENT_REQUEST *requ
- 		memcpy(&saved_ns, &(_res.nsaddr_list[0]), sizeof(struct sockaddr_in));
- 		saved_nscount = _res.nscount;
- 
--		_res.nsaddr_list[0].sin_addr = inaddr;
--		_res.nsaddr_list[0].sin_family = AF_INET;
--		_res.nsaddr_list[0].sin_port = htons(ZBX_DEFAULT_DNS_PORT);
--		_res.nscount = 1;
-+		res_state.nsaddr_list[0].sin_addr = inaddr;
-+		res_state.nsaddr_list[0].sin_family = AF_INET;
-+		res_state.nsaddr_list[0].sin_port = htons(ZBX_DEFAULT_DNS_PORT);
-+		res_state.nscount = 1;
- 	}
- 
--	saved_options = _res.options;
--	saved_retrans = _res.retrans;
--	saved_retry = _res.retry;
--
- 	if (0 != use_tcp)
--		_res.options |= RES_USEVC;
--
--	_res.retrans = retrans;
--	_res.retry = retry;
--
--	res = res_send(buf, res, answer.buffer, sizeof(answer.buffer));
-+		res_state.options |= RES_USEVC;
- 
--	_res.options = saved_options;
--	_res.retrans = saved_retrans;
--	_res.retry = saved_retry;
-+	res_state.retrans = retrans;
-+	res_state.retry = retry;
- 
--	if (NULL != ip && '\0' != *ip)
--	{
--		memcpy(&(_res.nsaddr_list[0]), &saved_ns, sizeof(struct sockaddr_in));
--		_res.nscount = saved_nscount;
--	}
-+	res = res_nsend(&res_state, buf, res, answer.buffer, sizeof(answer.buffer));
-+	res_ndestroy(&res_state);
- 
- 	hp = (HEADER *)answer.buffer;
-