From root@ec-m.fr  Thu Apr 18 14:47:11 2013
Return-Path: <root@ec-m.fr>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id A39A5818
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 Apr 2013 14:47:11 +0000 (UTC)
	(envelope-from root@ec-m.fr)
Received: from melo.ec-m.fr (melo.ec-m.fr [147.94.19.139])
	by mx1.freebsd.org (Postfix) with ESMTP id 4ED57344
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 Apr 2013 14:47:10 +0000 (UTC)
Received: from amavis4.serv.int (amavis4.serv.int [10.3.0.48])
	by melo.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id 38987ACB53
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 Apr 2013 16:47:10 +0200 (CEST)
Received: from melo.ec-m.fr ([10.3.0.13])
	by amavis4.serv.int (amavis4.serv.int [10.3.0.48]) (amavisd-new, port 10024)
	with LMTP id Ap3F-31nt1xn for <FreeBSD-gnats-submit@freebsd.org>;
	Thu, 18 Apr 2013 16:47:08 +0200 (CEST)
Received: from dgeo.sysadm.ec-m.fr (dgeo.sysadm.ec-m.fr [147.94.19.169])
	by melo.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id B20ADACAFA
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 Apr 2013 16:47:08 +0200 (CEST)
Received: by dgeo.sysadm.ec-m.fr (Postfix, from userid 0)
	id 9936D1CCC7; Thu, 18 Apr 2013 16:47:08 +0200 (CEST)
Message-Id: <20130418144708.9936D1CCC7@dgeo.sysadm.ec-m.fr>
Date: Thu, 18 Apr 2013 16:47:08 +0200 (CEST)
From: Geoffroy Desvernay <dgeo@centrale-marseille.fr>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] net-mgmt/netdisco: update to 1.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         177956
>Category:       ports
>Synopsis:       [MAINTAINER] net-mgmt/netdisco: update to 1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 18 14:50:00 UTC 2013
>Closed-Date:    Thu Jun 13 11:48:17 UTC 2013
>Last-Modified:  Thu Jun 13 11:50:00 UTC 2013
>Originator:     Geoffroy Desvernay
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
Ecole Centrale de Marseille
>Environment:
System: FreeBSD dgeo.sysadm.ec-m.fr 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Tue Dec 18 11:55:35 CET 2012
>Description:
- Update to 1.2
- removed option to fetch oui.txt while building the port (let the user read pkg-message)

Generated with FreeBSD Port Tools 0.99_7 (mode: update, diff: SVN)
>How-To-Repeat:
>Fix:

--- netdisco-1.2.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 316041)
+++ Makefile	(working copy)
@@ -1,22 +1,18 @@
-# New ports collection makefile for:	netdisco
-# Date created:				2006-04-08
-# Whom:					Shaun Amott <shaun@inerd.com>
-#
+# Created by: Shaun Amott <shaun@inerd.com>
 # $FreeBSD$
 #
 
 PORTNAME=	netdisco
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF
 
 MAINTAINER=	dgeo@centrale-marseille.fr
 COMMENT=	Web-based network management tool for moderate to large networks
 
-OPTIONS_DEFINE=	GRAPHVIZ OUIDL MIBS
+OPTIONS_DEFINE=	GRAPHVIZ MIBS
 OPTIONS_DEFAULT=GRAPHVIZ MIBS
 MIBS_DESC=	Depend on net-mgmt/netdisco-mibs
-OUIDL_DESC=	Download oui.txt file
 GRAPHVIZ_DESC=	Install GraphViz for network map support
 
 RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
@@ -48,7 +44,7 @@
 NETDISCO_DBDIR=	/var/db/netdisco
 
 SUB_FILES=	pkg-message
-SUB_LIST=	NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${USERS}
+SUB_LIST=	NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${USERS} NETDISCO_GROUP=${GROUPS}
 PLIST_SUB=	NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -90,12 +86,6 @@
 		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
 .endif
 
-.if ${PORT_OPTIONS:MOUIDL}
-PLIST_SUB+=	OUIDL=""
-.else
-PLIST_SUB+=	OUIDL="@comment "
-.endif
-
 pre-install:
 .	for i in ${ALTER_FILES}
 		@(${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} 2>/dev/null || ${TRUE})
@@ -163,10 +153,6 @@
 		fi)
 .	endif
 
-.	if ${PORT_OPTIONS:MOUIDL}
-		${FETCH_CMD} -q -o ${DATADIR}/oui.txt http://standards.ieee.org/develop/regauth/oui/oui.txt
-.	endif
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
Index: distinfo
===================================================================
--- distinfo	(revision 316041)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (netdisco-1.1.tar.gz) = 849e9f80a0833af3f4eb8a114c629fa43c238b244cf41d63ef9063d5ef169151
-SIZE (netdisco-1.1.tar.gz) = 1403579
+SHA256 (netdisco-1.2.tar.gz) = 18af19b5753eb752edf9d4fb7e8865628ac35cf7b60266c7d50da020e9994a1f
+SIZE (netdisco-1.2.tar.gz) = 1349238
Index: files/netdisco.in
===================================================================
--- files/netdisco.in	(revision 316041)
+++ files/netdisco.in	(working copy)
@@ -18,36 +18,34 @@
 : ${netdisco_group="%%NETDISCO_GROUP%%"}
 
 start_precmd=${name}_prestart
-start_cmd=${name}_start
 stop_cmd=${name}_stop
 restart_cmd=${name}_restart
 status_cmd=${name}_status
 
 command="%%PREFIX%%/bin/netdisco"
 command_interpreter="/usr/bin/perl"
-pidfile=%%NETDISCO_RUNDIR%%/netdisco_daemon.pid
+netdisco_config="%%ETCDIR%%/netdisco.conf"
+pidfile=$(grep ^daemon_pid $netdisco_config | sed -E 's/.*=\s+//')
+flags="-p start"
 
-required_files="%%ETCDIR%%/netdisco.conf"
+required_files="$netdisco_config"
 
 netdisco_prestart() {
-	test -d %%NETDISCO_RUNDIR%% || install -d -m 0700 -o $netdisco_user -g $netdisco_group %%NETDISCO_RUNDIR%%
+	test -d ${pidfile%/*} || install -d -m 0700 -o $netdisco_user -g $netdisco_group ${pidfile%/*}
+	touch $pidfile && chown $netdisco_user $pidfile
 	test -d %%NETDISCO_DBDIR%% || install -d -m 0700 -o $netdisco_user -g $netdisco_group %%NETDISCO_DBDIR%%
 }
 
-netdisco_start() {
-	$command -p start
-}
-
 netdisco_stop() {
-	$command -p stop
+	su -m "$netdisco_user" -c "$command -p stop"
 }
 
 netdisco_restart() {
-	$command -p restart
+	su -m "$netdisco_user" -c "$command -p restart"
 }
 
 netdisco_status() {
-	$command -p status
+	su -m "$netdisco_user" -c "$command -p status"
 }
 
 run_rc_command "$1"
Index: files/patch-netdisco.conf
===================================================================
--- files/patch-netdisco.conf	(revision 316041)
+++ files/patch-netdisco.conf	(working copy)
@@ -1,5 +1,5 @@
---- netdisco.conf.orig	2010-08-03 15:35:43.000000000 +0200
-+++ netdisco.conf	2012-02-16 13:10:38.000000000 +0100
+--- netdisco.conf.orig	2013-04-13 12:30:38.000000000 +0200
++++ netdisco.conf	2013-04-18 16:25:10.000000000 +0200
 @@ -13,11 +13,11 @@
  
  # ---- General Settings ----
@@ -14,7 +14,7 @@
  timeout             = 180
  macsuck_timeout     = 240
  #macsuck_all_vlans  = true
-@@ -65,7 +65,7 @@
+@@ -67,7 +67,7 @@
  
  # ---- Admin Panel Daemon Settings ----
  daemon_bg       = true
@@ -23,7 +23,7 @@
  daemon_poll     = 2
  
  # ---- Port Control Settings ---
-@@ -80,7 +80,7 @@
+@@ -82,7 +82,7 @@
  # Data Archiving and Logging
  compresslogs    = true
  compress        = /usr/bin/gzip -f
@@ -32,12 +32,13 @@
  logextension    = txt
  #nmis_dump       = netdisco_nmis
  
-@@ -131,24 +131,7 @@
- # snmptimeout in micro-seconds before retry, 1000000 micro-seconds = 1 second
- snmptimeout     = 1000000 
+@@ -136,25 +136,7 @@
  snmpretries     = 3
+ #If you want to use a Net-SNMP configuration file uncomment and set to 0
+ #ignoresnmpconf = 1
 -mibdirs         = \
 -    $home/mibs/allied, \
+-    $home/mibs/apc, \
 -    $home/mibs/arista, \
 -    $home/mibs/aruba, \
 -    $home/mibs/asante, \
Index: files/pkg-message.in
===================================================================
--- files/pkg-message.in	(revision 316041)
+++ files/pkg-message.in	(working copy)
@@ -7,7 +7,7 @@
        and modify them to suit your needs.
 
     2) if you didn't use the port's option for that (OUIDL), 
-       # fetch -o %%DATADIR%%/oui.txt http://standards.ieee.org/regauth/oui/oui.txt
+       # fetch -o %%DATADIR%%/oui.txt http://standards.ieee.org/develop/regauth/oui/oui.txt
 
     3) Run the following to create and initialise the netdisco database:
        # perl %%DATADIR%%/sql/pg --init
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 316041)
+++ pkg-plist	(working copy)
@@ -21,7 +21,9 @@
 %%DATADIR%%/sql/node_ip.sql
 %%DATADIR%%/sql/node_monitor.sql
 %%DATADIR%%/sql/node_nbt.sql
+%%DATADIR%%/sql/node_vlan.sql
 %%DATADIR%%/sql/node_wireless.sql
+%%DATADIR%%/sql/node_wireless_ssid.sql
 %%DATADIR%%/sql/oui.sql
 %%DATADIR%%/sql/pg
 %%DATADIR%%/sql/process.sql
@@ -32,6 +34,7 @@
 %%DATADIR%%/sql/upgrade-0.94-to-0.95.sql
 %%DATADIR%%/sql/upgrade-0.95-to-1.0.sql
 %%DATADIR%%/sql/upgrade-1.0-to-1.1.sql
+%%DATADIR%%/sql/upgrade-1.1-to-1.2.sql
 %%DATADIR%%/sql/user_log.sql
 %%DATADIR%%/sql/users.sql
 %%DATADIR%%/Makefile
@@ -56,7 +59,6 @@
 %%WWWDIR%%/device_search.html
 %%WWWDIR%%/discoball2.gif
 %%WWWDIR%%/doc/ChangeLog.txt
-%%WWWDIR%%/doc/README.html
 %%WWWDIR%%/doc/index.html
 %%WWWDIR%%/doc/netdisco-api-backend.html
 %%WWWDIR%%/doc/netdisco-api-shared.html
--- netdisco-1.2.patch ends here ---

>Release-Note:
>Audit-Trail:

From: geoffroy desvernay <dgeo@centrale-marseille.fr>
To: bug-followup@FreeBSD.org, dgeo@centrale-marseille.fr
Cc:  
Subject: Re: ports/177956: [MAINTAINER] net-mgmt/netdisco: update to 1.2
Date: Mon, 06 May 2013 14:21:35 +0200

 This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
 ------enig2UWIVXHUKESWOOBLJCETB
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
  - correct startup script (did chmod /var/run itself beacause of a
 syntax error)
  - Depends SNMP::Info >=3D 3.01 (as the code does) - See pr ports/178367
 before this one
  - please have a look at ports/177958 too :)
 
 --=20
 *geoffroy desvernay*
 C.R.I - Administration syst=E8mes et r=E9seaux
 Ecole Centrale de Marseille
 Tel: (+33|0)4 91 05 45 24
 Fax: (+33|0)4 91 05 45 98
 dgeo@centrale-marseille.fr
 
 
 
 ------enig2UWIVXHUKESWOOBLJCETB
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (FreeBSD)
 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
 
 iQEcBAEBAgAGBQJRh6BoAAoJEC0NWrh8JT1SYLMIAJl5kG2PHhTB9UF6WE2/7fy6
 supNPnTAuhIQrln3tYKpstzVd172bGY4wPoa3yobXGxu1ubvnn/ekQlu7yoahSY5
 N+hML73QvqLo6dPECtUSXHyPBMmZuaP5B/wMnCTs1mg97goueuaTH1F7HY0H9TMl
 0BaO38GxQWbCR7ROW1LEoX7SeAdtEV7MauUTGhhfiom1TrK+B0RKw2UzSCXXaLvT
 tFN1t1/CgjjIBCAKaA2Z710x0h6a/GgJcDF8LzyYwcSrupX3gs5Sl1v3Dfcr42QO
 Lyt7oY4gpINVUZxuAMSlm+tjJIOvd0crr93rcLUaP8qAfCXoGBNwQMgjafvCEzo=
 =c4Ri
 -----END PGP SIGNATURE-----
 
 ------enig2UWIVXHUKESWOOBLJCETB--

From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc: Geoffroy Desvernay <dgeo@centrale-marseille.fr>
Subject: Re: ports/177956: [MAINTAINER] net-mgmt/netdisco: update to 1.2
Date: Wed, 12 Jun 2013 00:39:56 +0300

 You seem to have missed the attachment in your mail from May 6. Can you
 send it again?

From: geoffroy desvernay <dgeo@centrale-marseille.fr>
To: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/177956: [MAINTAINER] net-mgmt/netdisco: update to 1.2
Date: Wed, 12 Jun 2013 18:23:14 +0200

 This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
 ------enig2KWKIPLXCICFNLHBPUASP
 Content-Type: multipart/mixed;
  boundary="------------070507020503040708050502"
 
 This is a multi-part message in MIME format.
 --------------070507020503040708050502
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 Le 06/11/2013 23:39, Raphael Kubo da Costa a =E9crit :
 > You seem to have missed the attachment in your mail from May 6. Can you=
 
 > send it again?
 >=20
 Of course, sorry for the delay, and Thank you for taking care !
 --=20
 *geoffroy desvernay*
 C.R.I - Administration syst=E8mes et r=E9seaux
 Ecole Centrale de Marseille
 
 
 --------------070507020503040708050502
 Content-Type: text/x-patch;
  name="netdisco.diff"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
  filename="netdisco.diff"
 
 =3D=3D=3D> Updating from SVN
 Updating '.':
 At revision 320703.
 =3D=3D=3D> Generating patch
 =3D=3D=3D> Viewing diff with more
 Index: Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- Makefile	(revision 320703)
 +++ Makefile	(working copy)
 @@ -2,24 +2,23 @@
  # $FreeBSD$
 =20
  PORTNAME=3D	netdisco
 -PORTVERSION=3D	1.1
 +PORTVERSION=3D	1.2
  CATEGORIES=3D	net-mgmt www
  MASTER_SITES=3D	SF
 =20
  MAINTAINER=3D	dgeo@centrale-marseille.fr
  COMMENT=3D	Web-based network management tool for moderate to large netwo=
 rks
 =20
 -OPTIONS_DEFINE=3D	GRAPHVIZ OUIDL MIBS
 +OPTIONS_DEFINE=3D	GRAPHVIZ MIBS
  OPTIONS_DEFAULT=3DGRAPHVIZ MIBS
  MIBS_DESC=3D	Depend on net-mgmt/netdisco-mibs
 -OUIDL_DESC=3D	Download oui.txt file
  GRAPHVIZ_DESC=3D	Install GraphViz for network map support
 =20
  RUN_DEPENDS+=3D	${APACHE_PKGNAMEPREFIX}mod_perl2>=3D0:${PORTSDIR}/www/mo=
 d_perl2 \
  		p5-Apache-DBI>=3D0:${PORTSDIR}/www/p5-Apache-DBI	\
  		p5-libapreq2>=3D0:${PORTSDIR}/www/p5-libapreq2 \
  		p5-Net-SNMP>=3D0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
 -		p5-SNMP-Info>=3D0:${PORTSDIR}/net-mgmt/p5-SNMP-Info \
 +		p5-SNMP-Info>=3D3.01:${PORTSDIR}/net-mgmt/p5-SNMP-Info \
  		p5-HTML-Mason>=3D0:${PORTSDIR}/www/p5-HTML-Mason \
  		p5-DB_File-Lock>=3D0:${PORTSDIR}/devel/p5-DB_File-Lock \
  		p5-Apache-Session>=3D0:${PORTSDIR}/www/p5-Apache-Session \
 @@ -44,7 +43,7 @@
  NETDISCO_DBDIR=3D	/var/db/netdisco
 =20
  SUB_FILES=3D	pkg-message
 -SUB_LIST=3D	NETDISCO_DBDIR=3D${NETDISCO_DBDIR} NETDISCO_RUNDIR=3D${NETDI=
 SCO_RUNDIR} NETDISCO_USER=3D${USERS}
 +SUB_LIST=3D	NETDISCO_DBDIR=3D${NETDISCO_DBDIR} NETDISCO_RUNDIR=3D${NETDI=
 SCO_RUNDIR} NETDISCO_USER=3D${USERS} NETDISCO_GROUP=3D${GROUPS}
  PLIST_SUB=3D	NETDISCO_DBDIR=3D${NETDISCO_DBDIR} NETDISCO_RUNDIR=3D${NETD=
 ISCO_RUNDIR}
 =20
  WRKSRC=3D		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 @@ -86,12 +85,6 @@
  		p5-GraphViz>=3D0:${PORTSDIR}/graphics/p5-GraphViz
  .endif
 =20
 -.if ${PORT_OPTIONS:MOUIDL}
 -PLIST_SUB+=3D	OUIDL=3D""
 -.else
 -PLIST_SUB+=3D	OUIDL=3D"@comment "
 -.endif
 -
  pre-install:
  .	for i in ${ALTER_FILES}
  		@(${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} 2>/dev/null || ${TRUE})
 @@ -159,10 +152,6 @@
  		fi)
  .	endif
 =20
 -.	if ${PORT_OPTIONS:MOUIDL}
 -		${FETCH_CMD} -q -o ${DATADIR}/oui.txt http://standards.ieee.org/develo=
 p/regauth/oui/oui.txt
 -.	endif
 -
  post-install:
  	@${CAT} ${PKGMESSAGE}
 =20
 Index: distinfo
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- distinfo	(revision 320703)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (netdisco-1.1.tar.gz) =3D 849e9f80a0833af3f4eb8a114c629fa43c238b2=
 44cf41d63ef9063d5ef169151
 -SIZE (netdisco-1.1.tar.gz) =3D 1403579
 +SHA256 (netdisco-1.2.tar.gz) =3D 18af19b5753eb752edf9d4fb7e8865628ac35cf=
 7b60266c7d50da020e9994a1f
 +SIZE (netdisco-1.2.tar.gz) =3D 1349238
 Index: files/patch-netdisco.conf
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-netdisco.conf	(revision 320703)
 +++ files/patch-netdisco.conf	(working copy)
 @@ -1,5 +1,5 @@
 ---- netdisco.conf.orig	2010-08-03 15:35:43.000000000 +0200
 -+++ netdisco.conf	2012-02-16 13:10:38.000000000 +0100
 +--- netdisco.conf.orig	2013-04-13 12:30:38.000000000 +0200
 ++++ netdisco.conf	2013-04-18 16:25:10.000000000 +0200
  @@ -13,11 +13,11 @@
  =20
   # ---- General Settings ----
 @@ -14,7 +14,7 @@
   timeout             =3D 180
   macsuck_timeout     =3D 240
   #macsuck_all_vlans  =3D true
 -@@ -65,7 +65,7 @@
 +@@ -67,7 +67,7 @@
  =20
   # ---- Admin Panel Daemon Settings ----
   daemon_bg       =3D true
 @@ -23,7 +23,7 @@
   daemon_poll     =3D 2
  =20
   # ---- Port Control Settings ---
 -@@ -80,7 +80,7 @@
 +@@ -82,7 +82,7 @@
   # Data Archiving and Logging
   compresslogs    =3D true
   compress        =3D /usr/bin/gzip -f
 @@ -32,12 +32,13 @@
   logextension    =3D txt
   #nmis_dump       =3D netdisco_nmis
  =20
 -@@ -131,24 +131,7 @@
 - # snmptimeout in micro-seconds before retry, 1000000 micro-seconds =3D =
 1 second
 - snmptimeout     =3D 1000000=20
 +@@ -136,25 +136,7 @@
   snmpretries     =3D 3
 + #If you want to use a Net-SNMP configuration file uncomment and set to =
 0
 + #ignoresnmpconf =3D 1
  -mibdirs         =3D \
  -    $home/mibs/allied, \
 +-    $home/mibs/apc, \
  -    $home/mibs/arista, \
  -    $home/mibs/aruba, \
  -    $home/mibs/asante, \
 Index: files/pkg-message.in
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/pkg-message.in	(revision 320703)
 +++ files/pkg-message.in	(working copy)
 @@ -7,7 +7,7 @@
         and modify them to suit your needs.
 =20
      2) if you didn't use the port's option for that (OUIDL),=20
 -       # fetch -o %%DATADIR%%/oui.txt http://standards.ieee.org/regauth/=
 oui/oui.txt
 +       # fetch -o %%DATADIR%%/oui.txt http://standards.ieee.org/develop/=
 regauth/oui/oui.txt
 =20
      3) Run the following to create and initialise the netdisco database:=
 
         # perl %%DATADIR%%/sql/pg --init
 Index: pkg-plist
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- pkg-plist	(revision 320703)
 +++ pkg-plist	(working copy)
 @@ -21,7 +21,9 @@
  %%DATADIR%%/sql/node_ip.sql
  %%DATADIR%%/sql/node_monitor.sql
  %%DATADIR%%/sql/node_nbt.sql
 +%%DATADIR%%/sql/node_vlan.sql
  %%DATADIR%%/sql/node_wireless.sql
 +%%DATADIR%%/sql/node_wireless_ssid.sql
  %%DATADIR%%/sql/oui.sql
  %%DATADIR%%/sql/pg
  %%DATADIR%%/sql/process.sql
 @@ -32,6 +34,7 @@
  %%DATADIR%%/sql/upgrade-0.94-to-0.95.sql
  %%DATADIR%%/sql/upgrade-0.95-to-1.0.sql
  %%DATADIR%%/sql/upgrade-1.0-to-1.1.sql
 +%%DATADIR%%/sql/upgrade-1.1-to-1.2.sql
  %%DATADIR%%/sql/user_log.sql
  %%DATADIR%%/sql/users.sql
  %%DATADIR%%/Makefile
 @@ -56,7 +59,6 @@
  %%WWWDIR%%/device_search.html
  %%WWWDIR%%/discoball2.gif
  %%WWWDIR%%/doc/ChangeLog.txt
 -%%WWWDIR%%/doc/README.html
  %%WWWDIR%%/doc/index.html
  %%WWWDIR%%/doc/netdisco-api-backend.html
  %%WWWDIR%%/doc/netdisco-api-shared.html
 =3D=3D=3D> Done
 
 --------------070507020503040708050502--
 
 ------enig2KWKIPLXCICFNLHBPUASP
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (FreeBSD)
 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
 
 iQEcBAEBAgAGBQJRuKBzAAoJEC0NWrh8JT1SDSoIAJD6Fd0rQ7+QEMDWwDeKuxbU
 ml2yC+LFXWH6RLF8gNbNdhWlt+y4G5cKwAI1Sa5yp0D4PuphqBHj0yaM6EBy30/E
 4Zjf/RQB7GXkbWv47CYA16WBhxLxLWdgoKFfiZgFqUVbXFGkr9a/nWGx0Ma6o5EO
 a2n94YpPZdQbqgMUcBDxSAtIgfB+hni6zRgZ7/Kwjkp68j3zl/OlGv60CayZ53wF
 XqzUC17+HGNyLiInG1nRbpRD2hAovKds/b6JYrCCLyvIkKC0Y9+fnAGsOhb7tGTU
 PvpY/oaQBSMliTgTZNou+hHtw9bE5PtHuZ8rNPixRxbmtkillTbej0+bfFsRxMc=
 =ZFlm
 -----END PGP SIGNATURE-----
 
 ------enig2KWKIPLXCICFNLHBPUASP--

From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
To: geoffroy desvernay <dgeo@centrale-marseille.fr>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/177956: [MAINTAINER] net-mgmt/netdisco: update to 1.2
Date: Wed, 12 Jun 2013 22:35:29 +0300

 geoffroy desvernay <dgeo@centrale-marseille.fr> writes:
 
 > Le 06/11/2013 23:39, Raphael Kubo da Costa a =C3=A9crit :
 >> You seem to have missed the attachment in your mail from May 6. Can you
 >> send it again?
 >>=20
 > Of course, sorry for the delay, and Thank you for taking care !
 
 I've noticed a few problems after build the port here with the default
 options.
 
  - %%OUIDL%%%%DATADIR%%/oui.txt is not installed but is in the plist.
  - The pkg-deinstall script failed because there was no apxs here. I
    guess it should be a dependency?

From: geoffroy desvernay <dgeo@centrale-marseille.fr>
To: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/177956: [MAINTAINER] net-mgmt/netdisco: update to 1.2
Date: Thu, 13 Jun 2013 10:11:49 +0200

 This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
 ------enig2CWMWVBNBNIRRSGWTGXXQ
 Content-Type: multipart/mixed;
  boundary="------------010807040500040705040503"
 
 This is a multi-part message in MIME format.
 --------------010807040500040705040503
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 Le 06/12/2013 21:35, Raphael Kubo da Costa a =C3=A9crit :
 > geoffroy desvernay <dgeo@centrale-marseille.fr> writes:
 >=20
 >> Le 06/11/2013 23:39, Raphael Kubo da Costa a =C3=A9crit :
 >>> You seem to have missed the attachment in your mail from May 6. Can y=
 ou
 >>> send it again?
 >>>
 >> Of course, sorry for the delay, and Thank you for taking care !
 >=20
 > I've noticed a few problems after build the port here with the default
 > options.
 >=20
 >  - %%OUIDL%%%%DATADIR%%/oui.txt is not installed but is in the plist.
 Corrected, I forgot this one...
 
 >  - The pkg-deinstall script failed because there was no apxs here. I
 >    guess it should be a dependency?
 apache is already a 'run' dependency=E2=80=A6 and apxs is only used to gu=
 ess
 apache's conf dir.: I made it non-fatal (if apxs is not present,
 apache's config should not be critical :)
 
 Thank you for your tests.
 
 Geoffroy.
 --=20
 *geoffroy desvernay*
 C.R.I - Administration syst=C3=A8mes et r=C3=A9seaux
 Ecole Centrale de Marseille
 
 
 --------------010807040500040705040503
 Content-Type: text/x-patch;
  name="netdisco.diff"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
  filename="netdisco.diff"
 
 =3D=3D=3D> Updating from SVN
 Updating '.':
 At revision 320739.
 =3D=3D=3D> Generating patch
 =3D=3D=3D> Viewing diff with more
 Index: Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- Makefile	(revision 320739)
 +++ Makefile	(working copy)
 @@ -2,24 +2,23 @@
  # $FreeBSD$
 =20
  PORTNAME=3D	netdisco
 -PORTVERSION=3D	1.1
 +PORTVERSION=3D	1.2
  CATEGORIES=3D	net-mgmt www
  MASTER_SITES=3D	SF
 =20
  MAINTAINER=3D	dgeo@centrale-marseille.fr
  COMMENT=3D	Web-based network management tool for moderate to large netwo=
 rks
 =20
 -OPTIONS_DEFINE=3D	GRAPHVIZ OUIDL MIBS
 +OPTIONS_DEFINE=3D	GRAPHVIZ MIBS
  OPTIONS_DEFAULT=3DGRAPHVIZ MIBS
  MIBS_DESC=3D	Depend on net-mgmt/netdisco-mibs
 -OUIDL_DESC=3D	Download oui.txt file
  GRAPHVIZ_DESC=3D	Install GraphViz for network map support
 =20
  RUN_DEPENDS+=3D	${APACHE_PKGNAMEPREFIX}mod_perl2>=3D0:${PORTSDIR}/www/mo=
 d_perl2 \
  		p5-Apache-DBI>=3D0:${PORTSDIR}/www/p5-Apache-DBI	\
  		p5-libapreq2>=3D0:${PORTSDIR}/www/p5-libapreq2 \
  		p5-Net-SNMP>=3D0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
 -		p5-SNMP-Info>=3D0:${PORTSDIR}/net-mgmt/p5-SNMP-Info \
 +		p5-SNMP-Info>=3D3.01:${PORTSDIR}/net-mgmt/p5-SNMP-Info \
  		p5-HTML-Mason>=3D0:${PORTSDIR}/www/p5-HTML-Mason \
  		p5-DB_File-Lock>=3D0:${PORTSDIR}/devel/p5-DB_File-Lock \
  		p5-Apache-Session>=3D0:${PORTSDIR}/www/p5-Apache-Session \
 @@ -44,7 +43,7 @@
  NETDISCO_DBDIR=3D	/var/db/netdisco
 =20
  SUB_FILES=3D	pkg-message
 -SUB_LIST=3D	NETDISCO_DBDIR=3D${NETDISCO_DBDIR} NETDISCO_RUNDIR=3D${NETDI=
 SCO_RUNDIR} NETDISCO_USER=3D${USERS}
 +SUB_LIST=3D	NETDISCO_DBDIR=3D${NETDISCO_DBDIR} NETDISCO_RUNDIR=3D${NETDI=
 SCO_RUNDIR} NETDISCO_USER=3D${USERS} NETDISCO_GROUP=3D${GROUPS}
  PLIST_SUB=3D	NETDISCO_DBDIR=3D${NETDISCO_DBDIR} NETDISCO_RUNDIR=3D${NETD=
 ISCO_RUNDIR}
 =20
  WRKSRC=3D		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 @@ -86,12 +85,6 @@
  		p5-GraphViz>=3D0:${PORTSDIR}/graphics/p5-GraphViz
  .endif
 =20
 -.if ${PORT_OPTIONS:MOUIDL}
 -PLIST_SUB+=3D	OUIDL=3D""
 -.else
 -PLIST_SUB+=3D	OUIDL=3D"@comment "
 -.endif
 -
  pre-install:
  .	for i in ${ALTER_FILES}
  		@(${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} 2>/dev/null || ${TRUE})
 @@ -159,10 +152,6 @@
  		fi)
  .	endif
 =20
 -.	if ${PORT_OPTIONS:MOUIDL}
 -		${FETCH_CMD} -q -o ${DATADIR}/oui.txt http://standards.ieee.org/develo=
 p/regauth/oui/oui.txt
 -.	endif
 -
  post-install:
  	@${CAT} ${PKGMESSAGE}
 =20
 Index: distinfo
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- distinfo	(revision 320739)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (netdisco-1.1.tar.gz) =3D 849e9f80a0833af3f4eb8a114c629fa43c238b2=
 44cf41d63ef9063d5ef169151
 -SIZE (netdisco-1.1.tar.gz) =3D 1403579
 +SHA256 (netdisco-1.2.tar.gz) =3D 18af19b5753eb752edf9d4fb7e8865628ac35cf=
 7b60266c7d50da020e9994a1f
 +SIZE (netdisco-1.2.tar.gz) =3D 1349238
 Index: files/patch-netdisco.conf
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-netdisco.conf	(revision 320739)
 +++ files/patch-netdisco.conf	(working copy)
 @@ -1,5 +1,5 @@
 ---- netdisco.conf.orig	2010-08-03 15:35:43.000000000 +0200
 -+++ netdisco.conf	2012-02-16 13:10:38.000000000 +0100
 +--- netdisco.conf.orig	2013-04-13 12:30:38.000000000 +0200
 ++++ netdisco.conf	2013-04-18 16:25:10.000000000 +0200
  @@ -13,11 +13,11 @@
  =20
   # ---- General Settings ----
 @@ -14,7 +14,7 @@
   timeout             =3D 180
   macsuck_timeout     =3D 240
   #macsuck_all_vlans  =3D true
 -@@ -65,7 +65,7 @@
 +@@ -67,7 +67,7 @@
  =20
   # ---- Admin Panel Daemon Settings ----
   daemon_bg       =3D true
 @@ -23,7 +23,7 @@
   daemon_poll     =3D 2
  =20
   # ---- Port Control Settings ---
 -@@ -80,7 +80,7 @@
 +@@ -82,7 +82,7 @@
   # Data Archiving and Logging
   compresslogs    =3D true
   compress        =3D /usr/bin/gzip -f
 @@ -32,12 +32,13 @@
   logextension    =3D txt
   #nmis_dump       =3D netdisco_nmis
  =20
 -@@ -131,24 +131,7 @@
 - # snmptimeout in micro-seconds before retry, 1000000 micro-seconds =3D =
 1 second
 - snmptimeout     =3D 1000000=20
 +@@ -136,25 +136,7 @@
   snmpretries     =3D 3
 + #If you want to use a Net-SNMP configuration file uncomment and set to =
 0
 + #ignoresnmpconf =3D 1
  -mibdirs         =3D \
  -    $home/mibs/allied, \
 +-    $home/mibs/apc, \
  -    $home/mibs/arista, \
  -    $home/mibs/aruba, \
  -    $home/mibs/asante, \
 Index: files/pkg-message.in
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/pkg-message.in	(revision 320739)
 +++ files/pkg-message.in	(working copy)
 @@ -6,8 +6,8 @@
      1) Examine all the configuration files in %%ETCDIR%%,
         and modify them to suit your needs.
 =20
 -    2) if you didn't use the port's option for that (OUIDL),=20
 -       # fetch -o %%DATADIR%%/oui.txt http://standards.ieee.org/regauth/=
 oui/oui.txt
 +    2) You should consider downloading a fresh OUI database
 +       # fetch -o %%DATADIR%%/oui.txt http://standards.ieee.org/develop/=
 regauth/oui/oui.txt
 =20
      3) Run the following to create and initialise the netdisco database:=
 
         # perl %%DATADIR%%/sql/pg --init
 Index: pkg-deinstall
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- pkg-deinstall	(revision 320739)
 +++ pkg-deinstall	(working copy)
 @@ -12,7 +12,8 @@
 =20
  if [ ! -x ${apxscmd} ]; then
          echo Can\'t find the apxs program: ${apxscmd}.
 -        exit 1
 +	echo Don\'t forget to update apache config manually
 +        exit 0
  fi
 =20
  confdir=3D`${apxscmd} -q SYSCONFDIR`
 Index: pkg-plist
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- pkg-plist	(revision 320739)
 +++ pkg-plist	(working copy)
 @@ -3,7 +3,6 @@
  bin/parse_mac
  bin/port_control
  %%SITE_PERL%%/netdisco.pm
 -%%OUIDL%%%%DATADIR%%/oui.txt
  %%DATADIR%%/sql/admin.sql
  %%DATADIR%%/sql/device.sql
  %%DATADIR%%/sql/device_ip.sql
 @@ -21,7 +20,9 @@
  %%DATADIR%%/sql/node_ip.sql
  %%DATADIR%%/sql/node_monitor.sql
  %%DATADIR%%/sql/node_nbt.sql
 +%%DATADIR%%/sql/node_vlan.sql
  %%DATADIR%%/sql/node_wireless.sql
 +%%DATADIR%%/sql/node_wireless_ssid.sql
  %%DATADIR%%/sql/oui.sql
  %%DATADIR%%/sql/pg
  %%DATADIR%%/sql/process.sql
 @@ -32,6 +33,7 @@
  %%DATADIR%%/sql/upgrade-0.94-to-0.95.sql
  %%DATADIR%%/sql/upgrade-0.95-to-1.0.sql
  %%DATADIR%%/sql/upgrade-1.0-to-1.1.sql
 +%%DATADIR%%/sql/upgrade-1.1-to-1.2.sql
  %%DATADIR%%/sql/user_log.sql
  %%DATADIR%%/sql/users.sql
  %%DATADIR%%/Makefile
 @@ -56,7 +58,6 @@
  %%WWWDIR%%/device_search.html
  %%WWWDIR%%/discoball2.gif
  %%WWWDIR%%/doc/ChangeLog.txt
 -%%WWWDIR%%/doc/README.html
  %%WWWDIR%%/doc/index.html
  %%WWWDIR%%/doc/netdisco-api-backend.html
  %%WWWDIR%%/doc/netdisco-api-shared.html
 =3D=3D=3D> Done
 
 --------------010807040500040705040503--
 
 ------enig2CWMWVBNBNIRRSGWTGXXQ
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (FreeBSD)
 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
 
 iQEcBAEBAgAGBQJRuX7FAAoJEC0NWrh8JT1S+zAIAK7PQLFz651SuacKHvfnwDOR
 7c3wLWoREPmtxmSg7k3+40qqmcuPvsFtYtK6TYHTAWwweHcrGlFskOnHOxfjDwnP
 yDQ3dQNZDppARqICXxQ7JSORuTId4ZkhWJaZVX2/SGtA2D6Uu6tesG10aAtFiqfb
 67ya8NnttfidnIbjAANF4K16BLRAJC2InEXpjGnHTUFUa5w+FlDQDGC19S8BN7Lg
 0BmewHQ91g/94vVeE8pH1uYjZCSEXIDs79bov4ObvlajXYAHdnw6skJeaO4ZisxH
 YNkFzzI6ZTQkZCYp6UqJuZBDplrSI8yyjp4Tr2w6I8JzYB1MPVFqXQVmSzA9ctA=
 =qcFD
 -----END PGP SIGNATURE-----
 
 ------enig2CWMWVBNBNIRRSGWTGXXQ--
State-Changed-From-To: open->closed 
State-Changed-By: rakuco 
State-Changed-When: Thu Jun 13 11:48:17 UTC 2013 
State-Changed-Why:  
Committed, thanks for the work! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177956: commit references a PR
Date: Thu, 13 Jun 2013 11:43:21 +0000 (UTC)

 Author: rakuco
 Date: Thu Jun 13 11:43:07 2013
 New Revision: 320758
 URL: http://svnweb.freebsd.org/changeset/ports/320758
 
 Log:
   - Update to 1.2.
   - Removed option to fetch oui.txt while building the port (let the user read
     pkg-message).
   
   PR:		ports/177956
   Submitted by:	Geoffroy Desvernay <dgeo@centrale-marseille.fr> (maintainer)
 
 Modified:
   head/net-mgmt/netdisco/Makefile
   head/net-mgmt/netdisco/distinfo
   head/net-mgmt/netdisco/files/patch-netdisco.conf
   head/net-mgmt/netdisco/files/pkg-message.in
   head/net-mgmt/netdisco/pkg-deinstall
   head/net-mgmt/netdisco/pkg-plist
 
 Modified: head/net-mgmt/netdisco/Makefile
 ==============================================================================
 --- head/net-mgmt/netdisco/Makefile	Thu Jun 13 11:25:14 2013	(r320757)
 +++ head/net-mgmt/netdisco/Makefile	Thu Jun 13 11:43:07 2013	(r320758)
 @@ -2,24 +2,23 @@
  # $FreeBSD$
  
  PORTNAME=	netdisco
 -PORTVERSION=	1.1
 +PORTVERSION=	1.2
  CATEGORIES=	net-mgmt www
  MASTER_SITES=	SF
  
  MAINTAINER=	dgeo@centrale-marseille.fr
  COMMENT=	Web-based network management tool for moderate to large networks
  
 -OPTIONS_DEFINE=	GRAPHVIZ OUIDL MIBS
 +OPTIONS_DEFINE=	GRAPHVIZ MIBS
  OPTIONS_DEFAULT=GRAPHVIZ MIBS
  MIBS_DESC=	Depend on net-mgmt/netdisco-mibs
 -OUIDL_DESC=	Download oui.txt file
  GRAPHVIZ_DESC=	Install GraphViz for network map support
  
  RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
  		p5-Apache-DBI>=0:${PORTSDIR}/www/p5-Apache-DBI	\
  		p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \
  		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
 -		p5-SNMP-Info>=0:${PORTSDIR}/net-mgmt/p5-SNMP-Info \
 +		p5-SNMP-Info>=3.01:${PORTSDIR}/net-mgmt/p5-SNMP-Info \
  		p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason \
  		p5-DB_File-Lock>=0:${PORTSDIR}/devel/p5-DB_File-Lock \
  		p5-Apache-Session>=0:${PORTSDIR}/www/p5-Apache-Session \
 @@ -44,7 +43,7 @@ NETDISCO_RUNDIR=/var/run
  NETDISCO_DBDIR=	/var/db/netdisco
  
  SUB_FILES=	pkg-message
 -SUB_LIST=	NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${USERS}
 +SUB_LIST=	NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${USERS} NETDISCO_GROUP=${GROUPS}
  PLIST_SUB=	NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR}
  
  WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 @@ -86,12 +85,6 @@ RUN_DEPENDS+=	p5-Graph>=0:${PORTSDIR}/ma
  		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
  .endif
  
 -.if ${PORT_OPTIONS:MOUIDL}
 -PLIST_SUB+=	OUIDL=""
 -.else
 -PLIST_SUB+=	OUIDL="@comment "
 -.endif
 -
  pre-install:
  .	for i in ${ALTER_FILES}
  		@(${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} 2>/dev/null || ${TRUE})
 @@ -159,10 +152,6 @@ do-install:
  		fi)
  .	endif
  
 -.	if ${PORT_OPTIONS:MOUIDL}
 -		${FETCH_CMD} -q -o ${DATADIR}/oui.txt http://standards.ieee.org/develop/regauth/oui/oui.txt
 -.	endif
 -
  post-install:
  	@${CAT} ${PKGMESSAGE}
  
 
 Modified: head/net-mgmt/netdisco/distinfo
 ==============================================================================
 --- head/net-mgmt/netdisco/distinfo	Thu Jun 13 11:25:14 2013	(r320757)
 +++ head/net-mgmt/netdisco/distinfo	Thu Jun 13 11:43:07 2013	(r320758)
 @@ -1,2 +1,2 @@
 -SHA256 (netdisco-1.1.tar.gz) = 849e9f80a0833af3f4eb8a114c629fa43c238b244cf41d63ef9063d5ef169151
 -SIZE (netdisco-1.1.tar.gz) = 1403579
 +SHA256 (netdisco-1.2.tar.gz) = 18af19b5753eb752edf9d4fb7e8865628ac35cf7b60266c7d50da020e9994a1f
 +SIZE (netdisco-1.2.tar.gz) = 1349238
 
 Modified: head/net-mgmt/netdisco/files/patch-netdisco.conf
 ==============================================================================
 --- head/net-mgmt/netdisco/files/patch-netdisco.conf	Thu Jun 13 11:25:14 2013	(r320757)
 +++ head/net-mgmt/netdisco/files/patch-netdisco.conf	Thu Jun 13 11:43:07 2013	(r320758)
 @@ -1,5 +1,5 @@
 ---- netdisco.conf.orig	2010-08-03 15:35:43.000000000 +0200
 -+++ netdisco.conf	2012-02-16 13:10:38.000000000 +0100
 +--- netdisco.conf.orig	2013-04-13 12:30:38.000000000 +0200
 ++++ netdisco.conf	2013-04-18 16:25:10.000000000 +0200
  @@ -13,11 +13,11 @@
   
   # ---- General Settings ----
 @@ -14,7 +14,7 @@
   timeout             = 180
   macsuck_timeout     = 240
   #macsuck_all_vlans  = true
 -@@ -65,7 +65,7 @@
 +@@ -67,7 +67,7 @@
   
   # ---- Admin Panel Daemon Settings ----
   daemon_bg       = true
 @@ -23,7 +23,7 @@
   daemon_poll     = 2
   
   # ---- Port Control Settings ---
 -@@ -80,7 +80,7 @@
 +@@ -82,7 +82,7 @@
   # Data Archiving and Logging
   compresslogs    = true
   compress        = /usr/bin/gzip -f
 @@ -32,12 +32,13 @@
   logextension    = txt
   #nmis_dump       = netdisco_nmis
   
 -@@ -131,24 +131,7 @@
 - # snmptimeout in micro-seconds before retry, 1000000 micro-seconds = 1 second
 - snmptimeout     = 1000000 
 +@@ -136,25 +136,7 @@
   snmpretries     = 3
 + #If you want to use a Net-SNMP configuration file uncomment and set to 0
 + #ignoresnmpconf = 1
  -mibdirs         = \
  -    $home/mibs/allied, \
 +-    $home/mibs/apc, \
  -    $home/mibs/arista, \
  -    $home/mibs/aruba, \
  -    $home/mibs/asante, \
 
 Modified: head/net-mgmt/netdisco/files/pkg-message.in
 ==============================================================================
 --- head/net-mgmt/netdisco/files/pkg-message.in	Thu Jun 13 11:25:14 2013	(r320757)
 +++ head/net-mgmt/netdisco/files/pkg-message.in	Thu Jun 13 11:43:07 2013	(r320758)
 @@ -6,8 +6,8 @@ In order to get up and running, there ar
      1) Examine all the configuration files in %%ETCDIR%%,
         and modify them to suit your needs.
  
 -    2) if you didn't use the port's option for that (OUIDL), 
 -       # fetch -o %%DATADIR%%/oui.txt http://standards.ieee.org/regauth/oui/oui.txt
 +    2) You should consider downloading a fresh OUI database
 +       # fetch -o %%DATADIR%%/oui.txt http://standards.ieee.org/develop/regauth/oui/oui.txt
  
      3) Run the following to create and initialise the netdisco database:
         # perl %%DATADIR%%/sql/pg --init
 
 Modified: head/net-mgmt/netdisco/pkg-deinstall
 ==============================================================================
 --- head/net-mgmt/netdisco/pkg-deinstall	Thu Jun 13 11:25:14 2013	(r320757)
 +++ head/net-mgmt/netdisco/pkg-deinstall	Thu Jun 13 11:43:07 2013	(r320758)
 @@ -12,7 +12,8 @@ tmpdir=${PKG_TMPDIR}/deinst_netdisco.$$
  
  if [ ! -x ${apxscmd} ]; then
          echo Can\'t find the apxs program: ${apxscmd}.
 -        exit 1
 +	echo Don\'t forget to update apache config manually
 +        exit 0
  fi
  
  confdir=`${apxscmd} -q SYSCONFDIR`
 
 Modified: head/net-mgmt/netdisco/pkg-plist
 ==============================================================================
 --- head/net-mgmt/netdisco/pkg-plist	Thu Jun 13 11:25:14 2013	(r320757)
 +++ head/net-mgmt/netdisco/pkg-plist	Thu Jun 13 11:43:07 2013	(r320758)
 @@ -3,7 +3,6 @@ bin/parse_kismet_ap
  bin/parse_mac
  bin/port_control
  %%SITE_PERL%%/netdisco.pm
 -%%OUIDL%%%%DATADIR%%/oui.txt
  %%DATADIR%%/sql/admin.sql
  %%DATADIR%%/sql/device.sql
  %%DATADIR%%/sql/device_ip.sql
 @@ -21,7 +20,9 @@ bin/port_control
  %%DATADIR%%/sql/node_ip.sql
  %%DATADIR%%/sql/node_monitor.sql
  %%DATADIR%%/sql/node_nbt.sql
 +%%DATADIR%%/sql/node_vlan.sql
  %%DATADIR%%/sql/node_wireless.sql
 +%%DATADIR%%/sql/node_wireless_ssid.sql
  %%DATADIR%%/sql/oui.sql
  %%DATADIR%%/sql/pg
  %%DATADIR%%/sql/process.sql
 @@ -32,6 +33,7 @@ bin/port_control
  %%DATADIR%%/sql/upgrade-0.94-to-0.95.sql
  %%DATADIR%%/sql/upgrade-0.95-to-1.0.sql
  %%DATADIR%%/sql/upgrade-1.0-to-1.1.sql
 +%%DATADIR%%/sql/upgrade-1.1-to-1.2.sql
  %%DATADIR%%/sql/user_log.sql
  %%DATADIR%%/sql/users.sql
  %%DATADIR%%/Makefile
 @@ -56,7 +58,6 @@ bin/port_control
  %%WWWDIR%%/device_search.html
  %%WWWDIR%%/discoball2.gif
  %%WWWDIR%%/doc/ChangeLog.txt
 -%%WWWDIR%%/doc/README.html
  %%WWWDIR%%/doc/index.html
  %%WWWDIR%%/doc/netdisco-api-backend.html
  %%WWWDIR%%/doc/netdisco-api-shared.html
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
