6 files changed, 21 insertions, 29 deletions

diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile
index e2c6ce5e80c9..3867bd375047 100644
--- a/net-mgmt/netdisco/Makefile
+++ b/net-mgmt/netdisco/Makefile
@@ -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}/math/p5-Graph	\
 		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}
 
diff --git a/net-mgmt/netdisco/distinfo b/net-mgmt/netdisco/distinfo
index e8bceb1dbedc..03152d68947b 100644
--- a/net-mgmt/netdisco/distinfo
+++ b/net-mgmt/netdisco/distinfo
@@ -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
diff --git a/net-mgmt/netdisco/files/patch-netdisco.conf b/net-mgmt/netdisco/files/patch-netdisco.conf
index c224e7c94591..238f43a04d18 100644
--- a/net-mgmt/netdisco/files/patch-netdisco.conf
+++ b/net-mgmt/netdisco/files/patch-netdisco.conf
@@ -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, \
diff --git a/net-mgmt/netdisco/files/pkg-message.in b/net-mgmt/netdisco/files/pkg-message.in
index 217a51106648..32d44a8a35a8 100644
--- a/net-mgmt/netdisco/files/pkg-message.in
+++ b/net-mgmt/netdisco/files/pkg-message.in
@@ -6,8 +6,8 @@ In order to get up and running, there are a few more steps to complete:
     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
diff --git a/net-mgmt/netdisco/pkg-deinstall b/net-mgmt/netdisco/pkg-deinstall
index 8317c7bb0d17..cfaa7a5c48ca 100644
--- a/net-mgmt/netdisco/pkg-deinstall
+++ b/net-mgmt/netdisco/pkg-deinstall
@@ -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`
diff --git a/net-mgmt/netdisco/pkg-plist b/net-mgmt/netdisco/pkg-plist
index 21a9ac43d52c..927a97c8ed88 100644
--- a/net-mgmt/netdisco/pkg-plist
+++ b/net-mgmt/netdisco/pkg-plist
@@ -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