- Update to 0.2.24

PR:		130057
Submitted by:	Vladimir Ermakov <samflanker at gmail dot com> (maintainer)

3 files changed, 28 insertions, 5 deletions

diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index dc63570b128e..633a3a8f6201 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netxms
-PORTVERSION=	0.2.22
+PORTVERSION=	0.2.24
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.netxms.org/download/
 
@@ -22,7 +22,7 @@ USE_ICONV=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	SERVER "Install NetXMS server & agent" off\
+OPTIONS=	SERVER "Install NetXMS server & agent" off \
 		CLIENT "Install NetXMS client" on \
 		AGENT "Install NetXMS agent" on \
 		NXHTTPD "Install web-interface" off \
@@ -38,6 +38,13 @@ NETXMS_GRP=	netxms
 
 SUB_FILES=	pkg-install	pkg-deinstall
 
+.if defined(WITH_SERVER) || defined(WITH_AGENT) || defined(WITH_CLIENT) || defined(WITH_NXHTTPD)
+PLIST_SUB+=	NXCPTEST=""
+LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
+.else
+PLIST_SUB+=	NXCPTEST="@comment "
+.endif
+
 .if defined(WITH_SERVER) || defined(WITH_CLIENT) || defined(WITH_NXHTTPD)
 PLIST_SUB+=	NXMAP=""
 .else
diff --git a/net-mgmt/netxms/distinfo b/net-mgmt/netxms/distinfo
index 271e45ace81b..344a62ea5f86 100644
--- a/net-mgmt/netxms/distinfo
+++ b/net-mgmt/netxms/distinfo
@@ -1,3 +1,3 @@
-MD5 (netxms-0.2.22.tar.gz) = afa560e9bdc188ad093c37e47eef0d80
-SHA256 (netxms-0.2.22.tar.gz) = d6ced2f83c70ed8abd5c54edd3098b6580306201ec5643932309c5eb8c3ecec7
-SIZE (netxms-0.2.22.tar.gz) = 6285945
+MD5 (netxms-0.2.24.tar.gz) = 24ba08779c0fa74b81678497a3010635
+SHA256 (netxms-0.2.24.tar.gz) = 9df9169aacd350302202f9cf371aad02a7804b72d3c2b9d47cbc1ee08ed8afad
+SIZE (netxms-0.2.24.tar.gz) = 6390751
diff --git a/net-mgmt/netxms/pkg-plist b/net-mgmt/netxms/pkg-plist
index a9150089e50f..b101dbc939d5 100644
--- a/net-mgmt/netxms/pkg-plist
+++ b/net-mgmt/netxms/pkg-plist
@@ -5,6 +5,7 @@
 %%SERVER%%bin/nxagentd
 %%CLIENT%%bin/nxalarm
 %%CLIENT%%bin/nxcmd
+%%NXCPTEST%%bin/nxcptest
 %%SERVER%%bin/nxdbmgr
 %%CLIENT%%bin/nxevent
 %%SERVER%%bin/nxget
@@ -31,6 +32,9 @@ lib/libnetxms.so.0
 %%SERVER%%lib/libnsm_freebsd.la
 %%SERVER%%lib/libnsm_freebsd.so
 %%SERVER%%lib/libnsm_freebsd.so.0
+%%SERVER%%lib/libnsm_logwatch.la
+%%SERVER%%lib/libnsm_logwatch.so
+%%SERVER%%lib/libnsm_logwatch.so.0
 %%SERVER%%lib/libnsm_ping.la
 %%SERVER%%lib/libnsm_ping.so
 %%SERVER%%lib/libnsm_ping.so.0
@@ -52,6 +56,9 @@ lib/libnetxms.so.0
 %%AGENT%%lib/libnsm_freebsd.la
 %%AGENT%%lib/libnsm_freebsd.so
 %%AGENT%%lib/libnsm_freebsd.so.0
+%%AGENT%%lib/libnsm_logwatch.la
+%%AGENT%%lib/libnsm_logwatch.so
+%%AGENT%%lib/libnsm_logwatch.so.0
 %%AGENT%%lib/libnsm_ping.la
 %%AGENT%%lib/libnsm_ping.so
 %%AGENT%%lib/libnsm_ping.so.0
@@ -85,6 +92,12 @@ lib/libnetxms.so.0
 %%SQLITE%%lib/libnxddr_sqlite.la
 %%SQLITE%%lib/libnxddr_sqlite.so
 %%SQLITE%%lib/libnxddr_sqlite.so.0
+%%SERVER%%lib/libnxlp.la
+%%SERVER%%lib/libnxlp.so
+%%SERVER%%lib/libnxlp.so.0
+%%AGENT%%lib/libnxlp.la
+%%AGENT%%lib/libnxlp.so
+%%AGENT%%lib/libnxlp.so.0
 %%NXMAP%%lib/libnxmap.la
 %%NXMAP%%lib/libnxmap.so
 %%NXMAP%%lib/libnxmap.so.0
@@ -164,12 +177,14 @@ lib/libnetxms.so.0
 %%SERVER%%%%DATADIR%%/mibs/HOST-RESOURCES-TYPES.txt
 %%SERVER%%%%DATADIR%%/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IANA-LANGUAGE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/IANA-RTPROTO-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IANAifType-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IEEE8021-PAE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IEEE802dot11-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IF-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/INET-ADDRESS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/IPMROUTE-STD-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LLDP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MAU-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MTA-MIB.txt
@@ -195,6 +210,7 @@ lib/libnetxms.so.0
 %%SERVER%%%%DATADIR%%/mibs/NOKIA-IPSO-SYSTEM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/OPTIMUX-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/OSPF-MIB.txt
+%%SERVER%%%%DATADIR%%/PIM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/P-BRIDGE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/PerfHist-TC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/PowerNet-MIB.txt