- Update to 0.2.21

PR:		ports/123732
Submitted by:	Vladimir Ermakov <samflanker at gmail.com> (maintainer)

5 files changed, 41 insertions, 8 deletions

diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index 93b895724971..d5ec3d706a9d 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	netxms
-PORTVERSION=	0.2.19
+PORTVERSION=	0.2.21
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://www.netxms.org/download/
+MASTER_SITES=	SF
 
 MAINTAINER=	samflanker@gmail.com
 COMMENT=	NetXMS - network monitoring system
@@ -18,13 +18,14 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
+USE_ICONV=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	SERVER "Install NetXMS server & agent" off\
-		CLIENT "Install NetXMS client" off \
-		AGENT "Install NetXMS agent" off \
+		CLIENT "Install NetXMS client" on \
+		AGENT "Install NetXMS agent" on \
 		NXHTTPD "Install web-interface" off \
 		MYSQL "Enable MySQL support" off \
 		PGSQL "Enable PostgreSQL support" off \
@@ -90,6 +91,7 @@ USE_RC_SUBR+=	nxhttpd
 CONFIGURE_ARGS+=	--with-nxhttpd
 PLIST_SUB+=	NXHTTPD=""
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
+USE_PERL5=	yes
 .else
 PLIST_SUB+=	NXHTTPD="@comment "
 .endif
diff --git a/net-mgmt/netxms/distinfo b/net-mgmt/netxms/distinfo
index 2fda8ceb427f..4838f081d241 100644
--- a/net-mgmt/netxms/distinfo
+++ b/net-mgmt/netxms/distinfo
@@ -1,3 +1,3 @@
-MD5 (netxms-0.2.19.tar.gz) = 6c5bb9693d4daea491685f13ee056aa6
-SHA256 (netxms-0.2.19.tar.gz) = a183c8a6d4c414cfe8f7eb3703f4b59425ab9f141706a22c166b784660197b3a
-SIZE (netxms-0.2.19.tar.gz) = 5131838
+MD5 (netxms-0.2.21.tar.gz) = 2ddaaf5f0874272f1b577433e1e4500c
+SHA256 (netxms-0.2.21.tar.gz) = 7d9cb4b34b3ec521bf75bd2635080c8fc8d32607e49e3730ed2118d6e537ac94
+SIZE (netxms-0.2.21.tar.gz) = 5338241
diff --git a/net-mgmt/netxms/files/netxmsd.in b/net-mgmt/netxms/files/netxmsd.in
index 20da01fc1e0d..5e066b2d9d73 100644
--- a/net-mgmt/netxms/files/netxmsd.in
+++ b/net-mgmt/netxms/files/netxmsd.in
@@ -25,6 +25,6 @@ load_rc_config $name
 
 command="%%PREFIX%%/bin/netxmsd"
 required_files="%%PREFIX%%/etc/netxmsd.conf"
-command_args="--config %%PREFIX%%/etc/netxmsd.conf --check-db"
+command_args="-c %%PREFIX%%/etc/netxmsd.conf -d -e"
 
 run_rc_command "$1"
diff --git a/net-mgmt/netxms/files/patch-bsdsa b/net-mgmt/netxms/files/patch-bsdsa
new file mode 100644
index 000000000000..f9dffa1b0b82
--- /dev/null
+++ b/net-mgmt/netxms/files/patch-bsdsa
@@ -0,0 +1,25 @@
+--- ./src/agent/subagents/freebsd/system.cpp.bak	2008-05-14 11:48:15.000000000 +0400
++++ ./src/agent/subagents/freebsd/system.cpp	2008-05-30 12:46:14.000000000 +0400
+@@ -21,7 +21,10 @@
+ **/
+ 
+ #undef _XOPEN_SOURCE
++
++#if __FreeBSD__ < 5
+ #define _SYS_LOCK_PROFILE_H_	/* prevent include of sys/lock_profile.h which can be C++ incompatible) */
++#endif
+ 
+ #include <nms_common.h>
+ #include <nms_agent.h>
+@@ -31,7 +34,11 @@
+ #include <sys/sysctl.h>
+ #include <sys/utsname.h>
+ #include <sys/param.h>
++
++#if __FreeBSD__ < 5
+ #include <sys/proc.h>
++#endif
++
+ #include <sys/user.h>
+ #include <fcntl.h>
+ #include <kvm.h>
diff --git a/net-mgmt/netxms/pkg-plist b/net-mgmt/netxms/pkg-plist
index 1a779adb16ac..a9150089e50f 100644
--- a/net-mgmt/netxms/pkg-plist
+++ b/net-mgmt/netxms/pkg-plist
@@ -3,6 +3,7 @@
 %%SERVER%%bin/nxadm
 %%AGENT%%bin/nxagentd
 %%SERVER%%bin/nxagentd
+%%CLIENT%%bin/nxalarm
 %%CLIENT%%bin/nxcmd
 %%SERVER%%bin/nxdbmgr
 %%CLIENT%%bin/nxevent
@@ -12,6 +13,7 @@
 %%CLIENT%%bin/nxpush
 %%CLIENT%%bin/nxreport
 %%SERVER%%bin/nxscript
+%%CLIENT%%bin/nxsms
 %%SERVER%%bin/nxsnmpget
 %%SERVER%%bin/nxsnmpset
 %%SERVER%%bin/nxsnmpwalk
@@ -193,15 +195,18 @@ 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%%/mibs/P-BRIDGE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/PerfHist-TC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/PowerNet-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/Printer-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/Q-BRIDGE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RAPID-CITY.txt
 %%SERVER%%%%DATADIR%%/mibs/RFC-1212.txt
 %%SERVER%%%%DATADIR%%/mibs/RFC-1215.txt
 %%SERVER%%%%DATADIR%%/mibs/RFC1155-SMI.txt
 %%SERVER%%%%DATADIR%%/mibs/RFC1213-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RMON-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/RMON2-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RS-232-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/S5-CHASSIS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/S5-CHASSIS-TRAP-MIB.txt
@@ -229,6 +234,7 @@ lib/libnetxms.so.0
 %%SERVER%%%%DATADIR%%/mibs/SYNOPTICS-COMMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SYNOPTICS-ROOT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/TCP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/TOKEN-RING-RMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/TUNNEL-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/UCD-DISKIO-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/UCD-DLMOD-MIB.txt