diff -ruN netxms.bak/Makefile netxms/Makefile
--- netxms.bak/Makefile	2008-09-06 11:12:04.000000000 +0400
+++ netxms/Makefile	2009-01-07 10:12:03.000000000 +0300
@@ -1,12 +1,12 @@
-# Ports collection makefile for:        netxms
-# Date created:         Jul 9 2007
-# Whom:                 Vladimir Ermakov <samflanker@gmail.com>
+# New ports collection makefile for:	netxms
+# Date created:		Jul 9 2007
+# Whom:			Vladimir Ermakov <samflanker@gmail.com>
 #
-# $FreeBSD: ports/net-mgmt/netxms/Makefile,v 1.6 2008/09/06 07:12:04 rafan Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	netxms
-PORTVERSION=	0.2.22
+PORTVERSION=	0.2.24
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.netxms.org/download/
 
@@ -38,6 +38,13 @@
 
 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 -ruN netxms.bak/distinfo netxms/distinfo
--- netxms.bak/distinfo	2008-09-06 11:12:04.000000000 +0400
+++ netxms/distinfo	2008-12-30 17:47:43.000000000 +0300
@@ -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 -ruN netxms.bak/pkg-plist netxms/pkg-plist
--- netxms.bak/pkg-plist	2008-06-08 15:48:14.000000000 +0400
+++ netxms/pkg-plist	2008-12-30 13:45:42.000000000 +0300
@@ -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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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