Date: Fri, 30 May 2008 10:40:05 GMT From: sam <samflanker@gmail.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/123732: [patch] update net-mgmt/netxms to 0.2.21 Message-ID: <200805301040.m4UAe5ME039616@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/123732; it has been noted by GNATS. From: sam <samflanker@gmail.com> To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/123732: [patch] update net-mgmt/netxms to 0.2.21 Date: Fri, 30 May 2008 14:34:36 +0400 This is a multi-part message in MIME format. --------------010503000104060702040903 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit - checksum trouble - trouble of agent compilation on 8.0-CURRENT is fixed /Vladimir Ermakov --------------010503000104060702040903 Content-Type: text/plain; name="patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch.txt" diff -ruN netxms.bak/Makefile netxms/Makefile --- netxms.bak/Makefile 2007-12-14 02:34:21.000000000 +0300 +++ netxms/Makefile 2008-05-16 16:42:43.000000000 +0400 @@ -2,13 +2,14 @@ # Date created: Jul 9 2007 # Whom: Vladimir Ermakov <samflanker@gmail.com> # -# $FreeBSD: ports/net-mgmt/netxms/Makefile,v 1.3 2007/12/13 23:34:21 pav Exp $ +# $FreeBSD$ # PORTNAME= netxms -PORTVERSION= 0.2.19 +PORTVERSION= 0.2.21 CATEGORIES= net-mgmt -MASTER_SITES= http://www.netxms.org/download/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= netxms MAINTAINER= samflanker@gmail.com COMMENT= NetXMS - network monitoring system @@ -18,13 +19,14 @@ 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 +92,7 @@ CONFIGURE_ARGS+= --with-nxhttpd PLIST_SUB+= NXHTTPD="" LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd +USE_PERL5= yes .else PLIST_SUB+= NXHTTPD="@comment " .endif diff -ruN netxms.bak/distinfo netxms/distinfo --- netxms.bak/distinfo 2007-12-14 02:34:21.000000000 +0300 +++ netxms/distinfo 2008-05-30 13:36:02.000000000 +0400 @@ -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 -ruN netxms.bak/files/netxmsd.in netxms/files/netxmsd.in --- netxms.bak/files/netxmsd.in 2007-12-14 02:34:22.000000000 +0300 +++ netxms/files/netxmsd.in 2008-05-16 14:46:48.000000000 +0400 @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: ports/net-mgmt/netxms/files/netxmsd.in,v 1.2 2007/12/13 23:34:22 pav Exp $ +# $FreeBSD$ # # PROVIDE: netxmsd # REQUIRE: DAEMON @@ -25,6 +25,6 @@ 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 -ruN netxms.bak/files/patch-bsdsa netxms/files/patch-bsdsa --- netxms.bak/files/patch-bsdsa 1970-01-01 03:00:00.000000000 +0300 +++ netxms/files/patch-bsdsa 2008-05-30 13:52:07.000000000 +0400 @@ -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 -ruN netxms.bak/pkg-plist netxms/pkg-plist --- netxms.bak/pkg-plist 2007-12-14 02:34:21.000000000 +0300 +++ netxms/pkg-plist 2008-05-16 12:40:21.000000000 +0400 @@ -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 @@ %%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 @@ %%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 --------------010503000104060702040903--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805301040.m4UAe5ME039616>