3 files changed, 37 insertions, 40 deletions

diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index 07fef8de5430..de3e29bd4684 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	netxms
-PORTVERSION=	2.2.2
+PORTVERSION=	3.0.2357
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://www.netxms.org/download/releases/${PORTVERSION:R}/${PORTVERSION}/
+MASTER_SITES=	http://www.netxms.org/download/releases/${PORTVERSION:R}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network monitoring system
@@ -10,13 +10,13 @@ WWW=		https://www.netxms.org/
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BROKEN_FreeBSD_12=	'net/iso88025.h' file not found
-BROKEN_FreeBSD_13=	'net/iso88025.h' file not found
-BROKEN_FreeBSD_14=	'net/iso88025.h' file not found
+BROKEN_FreeBSD_13=	error: conflicting types for 'qsort_s'
+BROKEN_FreeBSD_14=	error: conflicting types for 'qsort_s'
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libjansson.so:devel/jansson \
+		libpcre.so:devel/pcre \
 		libtre.so:textproc/libtre \
 		libmosquitto.so:net/mosquitto
 
@@ -42,13 +42,12 @@ 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
+USES=		gmake iconv libtool localbase perl5 ssl
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-ljansson
 
 USERS=		netxms
 GROUPS=		netxms
@@ -82,15 +81,15 @@ post-patch:
 	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
 
 post-install:
-.if ${PORT_OPTIONS:MSERVER}
-.if !exists(${STAGEDIR}${PREFIX}/etc/netxmsd.conf.sample)
-	${CP} ${WRKSRC}/contrib/netxmsd.conf-dist ${STAGEDIR}${PREFIX}/etc/netxmsd.conf.sample
-.endif
-.endif
 .if ${PORT_OPTIONS:MSERVER} || ${PORT_OPTIONS:MAGENT}
 .if !exists(${STAGEDIR}${PREFIX}/etc/nxagentd.conf.sample)
 	${CP} ${WRKSRC}/contrib/nxagentd.conf-dist ${STAGEDIR}${PREFIX}/etc/nxagentd.conf.sample
 .endif
 .endif
 
+post-install-SERVER-on:
+.if !exists(${STAGEDIR}${PREFIX}/etc/netxmsd.conf.sample)
+	${CP} ${WRKSRC}/contrib/netxmsd.conf-dist ${STAGEDIR}${PREFIX}/etc/netxmsd.conf.sample
+.endif
+
 .include <bsd.port.mk>
diff --git a/net-mgmt/netxms/distinfo b/net-mgmt/netxms/distinfo
index fc63c0923c40..8cd667fcbf0e 100644
--- a/net-mgmt/netxms/distinfo
+++ b/net-mgmt/netxms/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515588911
-SHA256 (netxms-2.2.2.tar.gz) = a5ac4f90ce96e2da093306ef6f1df070f5465db32ab8b22b56e2cf9afb8d5143
-SIZE (netxms-2.2.2.tar.gz) = 57756785
+TIMESTAMP = 1683132237
+SHA256 (netxms-3.0.2357.tar.gz) = 523f24fa48f10f586575fd1e880f0861c147a63dc412904b22e20042d6d9329d
+SIZE (netxms-3.0.2357.tar.gz) = 58995608
diff --git a/net-mgmt/netxms/pkg-plist b/net-mgmt/netxms/pkg-plist
index 6cb78cab4cff..299459902660 100644
--- a/net-mgmt/netxms/pkg-plist
+++ b/net-mgmt/netxms/pkg-plist
@@ -6,32 +6,35 @@
 %%SERVER%%bin/netxmsd
 %%NXCP%%bin/nxagentd
 %%CLIENT%%bin/nxalarm
+%%CLIENT%%bin/nxcsum
 %%CLIENT%%bin/nxdevcfg
 %%SERVER%%bin/nxdbmgr
 %%NXCP%%bin/nxencpasswd
 %%CLIENT%%bin/nxevent
 %%CLIENT%%bin/nxgenguid
 %%SERVER%%bin/nxget
+%%CLIENT%%bin/nxlptest
 %%SERVER%%bin/nxmibc
 %%SERVER%%bin/nxminfo
+%%CLIENT%%bin/nxnotify
 %%CLIENT%%bin/nxpush
 %%SERVER%%bin/nxscript
-%%CLIENT%%bin/nxsms
 %%SERVER%%bin/nxsnmpget
 %%SERVER%%bin/nxsnmpset
 %%SERVER%%bin/nxsnmpwalk
 %%SERVER%%bin/nxupload
 %%SERVER%%@sample etc/netxmsd.conf.sample
 %%NXCP%%@sample etc/nxagentd.conf.sample
+include/netxms-build-tag.h
 lib/libnetxms.so
-lib/libnetxms.so.2
-lib/libnetxms.so.2.0.0
+lib/libnetxms-3.0.2357.so
+lib/libnsm_lorawan.so
 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/libnxcc.so.3.0.2357
 %%SERVER%%lib/libnxsms_anysms.so
 %%SERVER%%lib/libnxsms_dbemu.so
 %%SERVER%%lib/libnxsms_kannel.so
@@ -41,36 +44,30 @@ lib/libnsm_mqtt.so
 %%SERVER%%lib/libnxsms_smseagle.so
 %%SERVER%%lib/libnxsms_text2reach.so
 %%NXCP%%lib/libnxsqlite.so
-%%NXCP%%lib/libnxsqlite.so.2
-%%AGENT%%lib/libnxsqlite.so.2.0.0
+%%NXCP%%lib/libnxsqlite.so.3
+%%AGENT%%lib/libnxsqlite.so.3.0.22
 %%NXCP%%lib/libnxdb.so
-%%NXCP%%lib/libnxdb.so.2
-%%AGENT%%lib/libnxdb.so.2.0.0
+%%AGENT%%lib/libnxdb-3.0.2357.so
 %%AGENT%%lib/netxms/devemu.nsm
 %%NXCP%%lib/libappagent.so
-%%NXCP%%lib/libappagent.so.2
-%%AGENT%%lib/libappagent.so.2.0.0
+%%AGENT%%lib/libappagent-3.0.2357.so
 %%SERVER%%lib/libavaya-ers.so
 %%SERVER%%lib/libcisco.so
 %%NXCP%%lib/libnsm_dbquery.so
 %%AGENT%%lib/libnsm_gps.so
 %%AGENT%%lib/libnxagent.so
-%%AGENT%%lib/libnxagent.so.2
-%%AGENT%%lib/libnxagent.so.2.0.0
+%%AGENT%%lib/libnxagent-3.0.2357.so
 %%AGENT%%lib/libnxappc.a
 %%AGENT%%lib/netxms/gps.nsm
 %%SERVER%%lib/libnsm_filemgr.so
 %%NXCP%%lib/libnsm_portcheck.so
 %%AGENT%%lib/libnsm_devemu.so
 %%NXCP%%lib/libnsm_netsvc.so
-%%NXCP%%lib/libnxsd.so
-%%NXCP%%lib/libnxsd.so.2
-%%AGENT%%lib/libnxsd.so.2.0.0
 %%SERVER%%lib/libnxsms_dummy.so
 %%SERVER%%lib/libnxsms_portech.so
 %%SERVER%%lib/libstrophe.so
 %%SERVER%%lib/libstrophe.so.2
-%%SERVER%%lib/libstrophe.so.2.0.0
+%%SERVER%%lib/libstrophe.so.3.0.2357
 %%NXCP%%lib/libnsm_ecs.so
 %%NXCP%%lib/libnsm_freebsd.so
 %%NXCP%%lib/libnsm_logwatch.so
@@ -78,30 +75,30 @@ lib/libnsm_mqtt.so
 %%NXCP%%lib/libnsm_sms.so
 %%NXCP%%lib/libnsm_ups.so
 %%CLIENT%%lib/libnxclient.so
-%%CLIENT%%lib/libnxclient.so.2
-%%CLIENT%%lib/libnxclient.so.2.0.0
+%%CLIENT%%lib/libnxclient-3.0.2357.so
 %%SERVER%%lib/libnxcore.so
 %%SERVER%%lib/libnxcore.so.2
-%%SERVER%%lib/libnxcore.so.2.0.0
+%%SERVER%%lib/libnxcore.so.3.0.2357
 %%MYSQL%%lib/libnxddr_mysql.so
 %%ODBC%%lib/libnxddr_odbc.so
 %%PGSQL%%lib/libnxddr_pgsql.so
 lib/libnxddr_sqlite.so
 %%NXCP%%lib/libnxlp.so
-%%NXCP%%lib/libnxlp.so.2
-%%AGENT%%lib/libnxlp.so.2.0.0
+%%AGENT%%lib/libnxlp-3.0.2357.so
+lib/libnxmb-3.0.2357.so
+lib/libnxmb.so
 %%SERVER%%lib/libnxsl.so
 %%SERVER%%lib/libnxsl.so.2
-%%SERVER%%lib/libnxsl.so.2.0.0
+%%SERVER%%lib/libnxsl.so.3.0.2357
 %%SERVER%%lib/libnxsms_generic.so
 %%SERVER%%lib/libnxsms_nxagent.so
 %%SERVER%%lib/libnxsms_websms.so
 %%SERVER%%lib/libnxsnmp.so
 %%SERVER%%lib/libnxsnmp.so.2
-%%SERVER%%lib/libnxsnmp.so.2.0.0
+%%SERVER%%lib/libnxsnmp-3.0.2357.so
 %%SERVER%%lib/libnxsrv.so
 %%SERVER%%lib/libnxsrv.so.2
-%%SERVER%%lib/libnxsrv.so.2.0.0
+%%SERVER%%lib/libnxsrv.so.3.0.2357
 %%MYSQL%%lib/netxms/dbdrv/mysql.ddr
 %%PGSQL%%lib/netxms/dbdrv/pgsql.ddr
 lib/netxms/dbdrv/sqlite.ddr
@@ -112,6 +109,7 @@ lib/netxms/dbdrv/sqlite.ddr
 %%NXCP%%lib/netxms/freebsd.nsm
 %%SERVER%%lib/netxms/jira.hdlink
 %%NXCP%%lib/netxms/logwatch.nsm
+lib/netxms/lorawan.nsm
 lib/netxms/mqtt.nsm
 %%SERVER%%%%MYSQL%%lib/netxms/mysql.nsm
 %%SSH%%lib/netxms/ssh.nsm