net-mgmt/netxms: Update version 2.0.7=>2.2.2

- Update MASTERSITES
- Remove options SQLITE as it is default now [1]
- Add option SSH

PR:		220204 [1]
Submitted by:	peter@icebear.net [1]

3 files changed, 89 insertions, 29 deletions

diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index 7f118551a6e9..9bb9ad5452aa 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	netxms
-PORTVERSION=	2.0.7
+PORTVERSION=	2.2.2
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://www.netxms.org/download/ \
-		http://www.netxms.org/download/archive/
+MASTER_SITES=	http://www.netxms.org/download/releases/2.2/${PORTVERSION}/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Network monitoring system
@@ -16,12 +15,13 @@ LICENSE_COMB=	multi
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libjansson.so:devel/jansson \
-		libtre.so:textproc/libtre
+		libtre.so:textproc/libtre \
+		libmosquitto.so:net/mosquitto
 
-OPTIONS_DEFINE=	SERVER CLIENT AGENT
-OPTIONS_DEFAULT=	CLIENT AGENT
+OPTIONS_DEFINE=	SERVER CLIENT AGENT SSH
+OPTIONS_DEFAULT=	CLIENT AGENT SSH
 OPTIONS_SINGLE=	SERVER
-OPTIONS_SINGLE_SERVER=	MYSQL PGSQL SQLITE ODBC
+OPTIONS_SINGLE_SERVER=	MYSQL PGSQL ODBC
 OPTIONS_SUB=	yes
 
 SERVER_DESC=	Install NetXMS server & agent
@@ -35,10 +35,10 @@ MYSQL_CONFIGURE_ON=	--with-mysql
 MYSQL_USES=		mysql
 PGSQL_CONFIGURE_ON=	--with-pgsql
 PGSQL_USES=		pgsql
-SQLITE_CONFIGURE_ON=	--with-sqlite
-SQLITE_USES=		sqlite
 ODBC_CONFIGURE_ON=	--with-odbc
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
+SSH_CONFIGURE_OFF=	--disable-ssh
+SSH_LIB_DEPENDS=	libssh.so:security/libssh
 
 USES=		gmake iconv libtool perl5 ssl
 GNU_CONFIGURE=	yes
diff --git a/net-mgmt/netxms/distinfo b/net-mgmt/netxms/distinfo
index cc23b64c61b8..fc63c0923c40 100644
--- a/net-mgmt/netxms/distinfo
+++ b/net-mgmt/netxms/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493479900
-SHA256 (netxms-2.0.7.tar.gz) = ac62fc591b47f3a1ec8adc936bd7bdd8537d34073d4aa0e0b4392bcddacd2c3c
-SIZE (netxms-2.0.7.tar.gz) = 17821575
+TIMESTAMP = 1515588911
+SHA256 (netxms-2.2.2.tar.gz) = a5ac4f90ce96e2da093306ef6f1df070f5465db32ab8b22b56e2cf9afb8d5143
+SIZE (netxms-2.2.2.tar.gz) = 57756785
diff --git a/net-mgmt/netxms/pkg-plist b/net-mgmt/netxms/pkg-plist
index c24d0c1f9abe..6cb78cab4cff 100644
--- a/net-mgmt/netxms/pkg-plist
+++ b/net-mgmt/netxms/pkg-plist
@@ -13,6 +13,7 @@
 %%CLIENT%%bin/nxgenguid
 %%SERVER%%bin/nxget
 %%SERVER%%bin/nxmibc
+%%SERVER%%bin/nxminfo
 %%CLIENT%%bin/nxpush
 %%SERVER%%bin/nxscript
 %%CLIENT%%bin/nxsms
@@ -25,12 +26,14 @@
 lib/libnetxms.so
 lib/libnetxms.so.2
 lib/libnetxms.so.2.0.0
+lib/libnsm_mqtt.so
+%%SSH%%lib/libnsm_ssh.so
+%%SERVER%%%%MYSQL%%lib/libnsm_mysql.so
 %%SERVER%%lib/libnxcc.so
 %%SERVER%%lib/libnxcc.so.2
 %%SERVER%%lib/libnxcc.so.2.0.0
-%%SERVER%%lib/libnxmap.so
-%%SERVER%%lib/libnxmap.so.2
-%%SERVER%%lib/libnxmap.so.2.0.0
+%%SERVER%%lib/libnxsms_anysms.so
+%%SERVER%%lib/libnxsms_dbemu.so
 %%SERVER%%lib/libnxsms_kannel.so
 %%SERVER%%lib/libnxsms_mymobile.so
 %%SERVER%%lib/libnxsms_nexmo.so
@@ -83,7 +86,7 @@ lib/libnetxms.so.2.0.0
 %%MYSQL%%lib/libnxddr_mysql.so
 %%ODBC%%lib/libnxddr_odbc.so
 %%PGSQL%%lib/libnxddr_pgsql.so
-%%SQLITE%%lib/libnxddr_sqlite.so
+lib/libnxddr_sqlite.so
 %%NXCP%%lib/libnxlp.so
 %%NXCP%%lib/libnxlp.so.2
 %%AGENT%%lib/libnxlp.so.2.0.0
@@ -99,20 +102,19 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%lib/libnxsrv.so
 %%SERVER%%lib/libnxsrv.so.2
 %%SERVER%%lib/libnxsrv.so.2.0.0
+%%MYSQL%%lib/netxms/dbdrv/mysql.ddr
+%%PGSQL%%lib/netxms/dbdrv/pgsql.ddr
+lib/netxms/dbdrv/sqlite.ddr
+%%ODBC%%lib/netxms/dbdrv/odbc.ddr
 %%NXCP%%lib/netxms/dbquery.nsm
 %%NXCP%%lib/netxms/ecs.nsm
+%%SERVER%%lib/netxms/filemgr.nsm
 %%NXCP%%lib/netxms/freebsd.nsm
 %%SERVER%%lib/netxms/jira.hdlink
 %%NXCP%%lib/netxms/logwatch.nsm
-%%SERVER%%lib/netxms/ndd/hpsw.ndd
-%%SERVER%%lib/netxms/ndd/qtech-olt.ndd
-%%SERVER%%lib/netxms/ndd/tb.ndd
-%%NXCP%%lib/netxms/netsvc.nsm
-%%NXCP%%lib/netxms/ping.nsm
-%%NXCP%%lib/netxms/portcheck.nsm
-%%NXCP%%lib/netxms/sms.nsm
-%%NXCP%%lib/netxms/ups.nsm
-%%SERVER%%lib/netxms/filemgr.nsm
+lib/netxms/mqtt.nsm
+%%SERVER%%%%MYSQL%%lib/netxms/mysql.nsm
+%%SSH%%lib/netxms/ssh.nsm
 %%SERVER%%lib/netxms/ndd/airespace.ndd
 %%SERVER%%lib/netxms/ndd/at.ndd
 %%SERVER%%lib/netxms/ndd/baystack.ndd
@@ -123,18 +125,30 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%lib/netxms/ndd/dell-pwc.ndd
 %%SERVER%%lib/netxms/ndd/dlink.ndd
 %%SERVER%%lib/netxms/ndd/ers8000.ndd
+%%SERVER%%lib/netxms/ndd/extreme.ndd
 %%SERVER%%lib/netxms/ndd/h3c.ndd
+%%SERVER%%lib/netxms/ndd/hpsw.ndd
+%%SERVER%%lib/netxms/ndd/ignitenet.ndd
+%%SERVER%%lib/netxms/ndd/juniper.ndd
 %%SERVER%%lib/netxms/ndd/mikrotik.ndd
+%%SERVER%%lib/netxms/ndd/net-snmp.ndd
+%%SERVER%%lib/netxms/ndd/netonix.ndd
 %%SERVER%%lib/netxms/ndd/netscreen.ndd
 %%SERVER%%lib/netxms/ndd/ntws.ndd
 %%SERVER%%lib/netxms/ndd/ping3.ndd
 %%SERVER%%lib/netxms/ndd/procurve.ndd
+%%SERVER%%lib/netxms/ndd/qtech-olt.ndd
+%%SERVER%%lib/netxms/ndd/rittal.ndd
 %%SERVER%%lib/netxms/ndd/symbol_ws.ndd
+%%SERVER%%lib/netxms/ndd/tb.ndd
 %%SERVER%%lib/netxms/ndd/ubnt.ndd
-%%MYSQL%%lib/netxms/dbdrv/mysql.ddr
-%%PGSQL%%lib/netxms/dbdrv/pgsql.ddr
-%%SQLITE%%lib/netxms/dbdrv/sqlite.ddr
-%%ODBC%%lib/netxms/dbdrv/odbc.ddr
+%%NXCP%%lib/netxms/netsvc.nsm
+%%NXCP%%lib/netxms/ping.nsm
+%%NXCP%%lib/netxms/portcheck.nsm
+%%SERVER%%lib/netxms/redmine.hdlink
+%%NXCP%%lib/netxms/sms.nsm
+%%SERVER%%lib/netxms/smsdrv/anysms.sms
+%%SERVER%%lib/netxms/smsdrv/dbemu.sms
 %%SERVER%%lib/netxms/smsdrv/dummy.sms
 %%SERVER%%lib/netxms/smsdrv/generic.sms
 %%SERVER%%lib/netxms/smsdrv/kannel.sms
@@ -146,6 +160,7 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%lib/netxms/smsdrv/smseagle.sms
 %%SERVER%%lib/netxms/smsdrv/text2reach.sms
 %%SERVER%%lib/netxms/smsdrv/websms.sms
+%%NXCP%%lib/netxms/ups.nsm
 @owner netxms
 @group netxms
 %%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-COMMON-MIB.txt
@@ -196,13 +211,18 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%%%DATADIR%%/mibs/BAY-STACK-SOURCE-GUARD-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BAY-STACK-STATS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BAY-STACK-VRRP-EXT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/BD-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BGP4-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BN-IF-EXTENSIONS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BPDU-PROTECTION-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BPDU-TUNNELING-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BRIDGE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/BRCD-FCIP-EXT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/Brcm-BSAPTrap-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/Brcm-adapterInfo-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/BROCADE-MAPS-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/Brocade-REG-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/Brocade-TC.txt
 %%SERVER%%%%DATADIR%%/mibs/CABLE-DIAG-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CDX-6500-COMMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CFMEXTENSION-MIB.txt
@@ -346,8 +366,20 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%%%DATADIR%%/mibs/ERPS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/ES-1000-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/EtherLike-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/EXTREME-BASE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/EXTREME-EDP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/EXTREME-ENTITY-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/EXTREME-ESRP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/EXTREME-FDB-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/EXTREME-PORT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/EXTREME-STACKING-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/EXTREME-SYSTEM-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/EXTREME-TRAP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/EXTREME-VLAN-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/FA-EXT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FAN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FC-MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/FCMGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FDDI-SMT73-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FIBRE-CHANNEL-FE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FILE-SYSTEM-MIB.txt
@@ -376,6 +408,7 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%%%DATADIR%%/mibs/H3C-SYS-MAN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/H3C-SYSLOG-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/H3C-TRAP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HA-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/HC-RMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/HCNUM-TC.txt
 %%SERVER%%%%DATADIR%%/mibs/HH3C-CFCARD-MIB.txt
@@ -473,13 +506,17 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%%%DATADIR%%/mibs/IBMCPU-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/ICF-ETWIST.txt
 %%SERVER%%%%DATADIR%%/mibs/IEEE8021-CFM-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/IEEE8021-MSTP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IEEE8021-PAE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/IEEE8021-SPANNING-TREE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/IEEE8021-TC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IEEE8023-LAG-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IEEE802dot11-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IF-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IGMP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IGMPV3-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/INET-ADDRESS-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/INFOSEC-UPS.txt
 %%SERVER%%%%DATADIR%%/mibs/INTEGRATED-SERVICES-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IOMEGANAS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IP-MIB.txt
@@ -492,12 +529,24 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%%%DATADIR%%/mibs/IPV6-STATIC-ROUTE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IPV6-TC.txt
 %%SERVER%%%%DATADIR%%/mibs/IPX.txt
+%%SERVER%%%%DATADIR%%/mibs/JUNIPER-ALARM-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/JUNIPER-CHASSIS-DEFINES-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/JUNIPER-EX-SMI.txt
+%%SERVER%%%%DATADIR%%/mibs/JUNIPER-FABRIC-CHASSIS.txt
+%%SERVER%%%%DATADIR%%/mibs/JUNIPER-FABRIC-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/JUNIPER-IF-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/JUNIPER-IVE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/JUNIPER-MAC-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/JUNIPER-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/JUNIPER-POWER-SUPPLY-UNIT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/JUNIPER-SMI.txt
+%%SERVER%%%%DATADIR%%/mibs/JUNIPER-VLAN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/JVM-MANAGEMENT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/JWAC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/L2PROTOCOL-TUNNEL-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LAG-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LANNET-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/LINK-INCIDENT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LINKSYS-MODEL-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LLDP-EXT-DOT1-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LLDP-EXT-DOT3-MIB.txt
@@ -516,6 +565,7 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%%%DATADIR%%/mibs/MCAST-VLAN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MIKROTIK-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MLD-SNOOPING-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/MQX-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MSSQLSERVER-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MSTP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MTA-MIB.txt
@@ -526,6 +576,7 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%%%DATADIR%%/mibs/NET-SNMP-MONITOR-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NET-SNMP-SYSTEM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NET-SNMP-TC.txt
+%%SERVER%%%%DATADIR%%/mibs/NETONIX-SWITCH-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NETSCREEN-ADDR-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NETSCREEN-INTERFACE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NETSCREEN-NAT-MIB.txt
@@ -622,6 +673,11 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%%%DATADIR%%/mibs/RFC1354-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RIPNG-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RIPv2-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/RITTAL-CMC-III-CAPABILITY-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/RITTAL-CMC-III-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/RITTAL-CMC-III-PRODUCTS-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/RITTAL-CMC-TC-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/RITTAL-SMI-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RMON2-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RS-232-MIB.txt
@@ -767,6 +823,7 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%%%DATADIR%%/mibs/ZONE-DEFENSE-MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/ZYXEL-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/ZYXEL-ZYWALL-ZLD-COMMON-MIB.txt
+%%SERVER%%%%DATADIR%%/radius.dict
 %%SERVER%%%%DATADIR%%/sql/dbinit_db2.sql
 %%SERVER%%%%DATADIR%%/sql/dbinit_mssql.sql
 %%SERVER%%%%DATADIR%%/sql/dbinit_mysql.sql
@@ -781,7 +838,10 @@ lib/libnetxms.so.2.0.0
 %%SERVER%%%%DATADIR%%/sql/dbschema_sqlite.sql
 %%SERVER%%%%DATADIR%%/templates/aix.xml
 %%SERVER%%%%DATADIR%%/templates/generic_unix.xml
+%%SERVER%%%%DATADIR%%/templates/hpux.xml
+%%SERVER%%%%DATADIR%%/templates/linux.xml
 %%SERVER%%%%DATADIR%%/templates/netxms_server.xml
+%%SERVER%%%%DATADIR%%/templates/windows.xml
 @owner
 @group
 %%SERVER%%/var/lib/netxms/backgrounds/.keep