From nobody@FreeBSD.org  Fri May 16 11:30:52 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4D70F106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 16 May 2008 11:30:52 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 3CC738FC26
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 16 May 2008 11:30:52 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m4GBTdpD091572
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 16 May 2008 11:29:39 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m4GBTd4j091571;
	Fri, 16 May 2008 11:29:39 GMT
	(envelope-from nobody)
Message-Id: <200805161129.m4GBTd4j091571@www.freebsd.org>
Date: Fri, 16 May 2008 11:29:39 GMT
From: Vladimir Ermakov <samflanker@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] update net-mgmt/netxms to 0.2.21
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         123732
>Category:       ports
>Synopsis:       [patch] update net-mgmt/netxms to 0.2.21
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 16 11:40:00 UTC 2008
>Closed-Date:    Sun Jun 08 11:49:26 UTC 2008
>Last-Modified:  Sun Jun  8 11:50:01 UTC 2008
>Originator:     Vladimir Ermakov
>Release:        7.0-STABLE
>Organization:
>Environment:
FreeBSD damascus 7.0-STABLE FreeBSD 7.0-STABLE #14: Thu Apr 17 13:57:20 MSD 2008     root@damascus:/usr/obj/usr/src/sys/DAMASCUS  i386

>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN netxms.bak/Makefile netxms/Makefile
--- netxms.bak/Makefile	2007-12-14 02:34:21.000000000 +0300
+++ netxms/Makefile	2008-05-16 14:46:20.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
@@ -23,8 +24,8 @@
 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 @@
 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-16 12:42:49.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) = b89b6479f253d27b6aa4056705247f4f
+SHA256 (netxms-0.2.21.tar.gz) = 9d8d0ebe9353fc897745379f99a85ae6d0adc0235ade4baf33bf8975c11cc9b2
+SIZE (netxms-0.2.21.tar.gz) = 4759980
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/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


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Fri May 16 19:17:18 UTC 2008 
State-Changed-Why:  

Hi, The port does not build. Can you take a look at it? 

http://head.miwibox.org/tb2/index.php?action=describe_port&id=847 
http://amd64.miwibox.org/tb2/index.php?action=describe_port&id=846 




http://www.freebsd.org/cgi/query-pr.cgi?pr=123732 

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: Mon, 19 May 2008 12:28:34 +0400

 This is a multi-part message in MIME format.
 --------------090106000103020303000606
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 trouble is fixed
 please try a new patch
 
 /Vladimir Ermakov
 
 
 
 --------------090106000103020303000606
 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-16 12:42:49.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) = b89b6479f253d27b6aa4056705247f4f
 +SHA256 (netxms-0.2.21.tar.gz) = 9d8d0ebe9353fc897745379f99a85ae6d0adc0235ade4baf33bf8975c11cc9b2
 +SIZE (netxms-0.2.21.tar.gz) = 4759980
 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/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
 
 --------------090106000103020303000606--

From: "=?KOI8-R?B?98HT0SDw1dDLyc4=?=" <freebsdstuff@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/123732: [patch] update net-mgmt/netxms to 0.2.21
Date: Thu, 22 May 2008 12:38:39 +0400

 ------=_Part_8942_11886300.1211445520065
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Hello.
 
 I'm chechecked this, it's work. Commit please.
 
 Vladimir.Pal
 
 ------=_Part_8942_11886300.1211445520065
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 <p></p><p>Hello.</p><p>I&#39;m chechecked this, it&#39;s work. Commit please.</p><p></p><p></p><p>Vladimir.Pal</p>
 
 ------=_Part_8942_11886300.1211445520065--

From: Edwin Groothuis <edwin@mavetju.org>
To: FreeBSD Gnats Submit <freebsd-gnats-submit@freebsd.org>
Cc:  
Subject: Re: ports/123732: [patch] update net-mgmt/netxms to 0.2.21
Date: Sat, 24 May 2008 15:20:59 +1000

 I was trying to get it commited, but:
 
 [~/cvs/ports/net-mgmt/netxms] root@build5>make
 => netxms-0.2.21.tar.gz doesn't seem to exist in /var/ports/distfiles/.
 => Attempting to fetch from http://nchc.dl.sourceforge.net/sourceforge/netxms/.
 fetch: http://nchc.dl.sourceforge.net/sourceforge/netxms/netxms-0.2.21.tar.gz: size mismatch: expected 4759980, actual 5338241
 
 Any chance that you can find out what goes wrong here?
 
 -- 
 Edwin Groothuis      |            Personal website: http://www.mavetju.org
 edwin@mavetju.org    |              Weblog: http://www.mavetju.org/weblog/

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--
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Sun Jun 8 06:18:13 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=123732 
State-Changed-From-To: feedback->closed 
State-Changed-By: rafan 
State-Changed-When: Sun Jun 8 11:49:26 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=123732 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/123732: commit references a PR
Date: Sun,  8 Jun 2008 11:48:19 +0000 (UTC)

 rafan       2008-06-08 11:48:14 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/netxms      Makefile distinfo pkg-plist 
     net-mgmt/netxms/files netxmsd.in 
   Added files:
     net-mgmt/netxms/files patch-bsdsa 
   Log:
   - Update to 0.2.21
   
   PR:             ports/123732
   Submitted by:   Vladimir Ermakov <samflanker at gmail.com> (maintainer)
   
   Revision  Changes    Path
   1.4       +6 -4      ports/net-mgmt/netxms/Makefile
   1.3       +3 -3      ports/net-mgmt/netxms/distinfo
   1.3       +2 -2      ports/net-mgmt/netxms/files/netxmsd.in
   1.1       +25 -0     ports/net-mgmt/netxms/files/patch-bsdsa (new)
   1.3       +6 -0      ports/net-mgmt/netxms/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
