svn commit: r321675 - in head/net-mgmt/netdisco: . files
William Grzybowski
wg at FreeBSD.org
Mon Jun 24 11:19:04 UTC 2013
Author: wg
Date: Mon Jun 24 11:19:03 2013
New Revision: 321675
URL: http://svnweb.freebsd.org/changeset/ports/321675
Log:
net-mgmt/netdisco: update to 1.3
- Update to 1.3
- Add DOCS option
- Change pkg-message to tell about db migration
Changes:
http://sourceforge.net/p/netdisco/code/ci/ver_1_3/tree/ChangeLog
PR: ports/179805
Submitted by: Geoffroy Desvernay <dgeo at centrale-marseille.fr> (maintainer)
Modified:
head/net-mgmt/netdisco/Makefile
head/net-mgmt/netdisco/distinfo
head/net-mgmt/netdisco/files/netdisco.in
head/net-mgmt/netdisco/files/pkg-message.in
head/net-mgmt/netdisco/pkg-plist
Modified: head/net-mgmt/netdisco/Makefile
==============================================================================
--- head/net-mgmt/netdisco/Makefile Mon Jun 24 10:54:32 2013 (r321674)
+++ head/net-mgmt/netdisco/Makefile Mon Jun 24 11:19:03 2013 (r321675)
@@ -2,15 +2,15 @@
# $FreeBSD$
PORTNAME= netdisco
-PORTVERSION= 1.2
+PORTVERSION= 1.3
CATEGORIES= net-mgmt www
MASTER_SITES= SF
MAINTAINER= dgeo at centrale-marseille.fr
COMMENT= Web-based network management tool for moderate to large networks
-OPTIONS_DEFINE= GRAPHVIZ MIBS
-OPTIONS_DEFAULT=GRAPHVIZ MIBS
+OPTIONS_DEFINE= DOCS GRAPHVIZ MIBS
+OPTIONS_DEFAULT=DOCS GRAPHVIZ MIBS
MIBS_DESC= Depend on net-mgmt/netdisco-mibs
GRAPHVIZ_DESC= Install GraphViz for network map support
@@ -54,7 +54,7 @@ ALTER_FILES= netdisco netdisco.conf netd
CONFIG_FILES= netdisco.conf netdisco.crontab netdisco-topology.txt \
netdisco_apache.conf netdisco_apache_dir.conf
-DOCS= doc/*.pod doc/*.html INSTALL README* UPGRADE
+DOCFILES= ChangeLog doc/*.pod INSTALL README* UPGRADE
.include <bsd.port.pre.mk>
@@ -86,6 +86,7 @@ pre-install:
${REINPLACE_CMD} -e 's#%%WWWDIR%%#${WWWDIR}#g' \
-e 's#%%PREFIX%%#${PREFIX}#g' \
-e 's#%%DATADIR%%#${DATADIR}#g' \
+ -e 's#%%DOCSDIR%%#${DOCSDIR}#g' \
-e 's#%%NETDISCO_RUNDIR%%#${NETDISCO_RUNDIR}#g' \
-e 's#%%NETDISCO_USER%%#${USERS}#g' \
-e 's#%%NETDISCO_GROUP%%#${GROUPS}#g' \
@@ -145,6 +146,10 @@ do-install:
. endif
post-install:
+. if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${DOCSDIR}
+ (cd ${WRKSRC} && ${INSTALL_MAN} ${DOCFILES} ${DOCSDIR})
+. endif
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
Modified: head/net-mgmt/netdisco/distinfo
==============================================================================
--- head/net-mgmt/netdisco/distinfo Mon Jun 24 10:54:32 2013 (r321674)
+++ head/net-mgmt/netdisco/distinfo Mon Jun 24 11:19:03 2013 (r321675)
@@ -1,2 +1,2 @@
-SHA256 (netdisco-1.2.tar.gz) = 18af19b5753eb752edf9d4fb7e8865628ac35cf7b60266c7d50da020e9994a1f
-SIZE (netdisco-1.2.tar.gz) = 1349238
+SHA256 (netdisco-1.3.tar.gz) = 8d69caa95ec3f62ca2ed886883447b9cfa63908188a2fe20bfefb27b860c2d72
+SIZE (netdisco-1.3.tar.gz) = 1350999
Modified: head/net-mgmt/netdisco/files/netdisco.in
==============================================================================
--- head/net-mgmt/netdisco/files/netdisco.in Mon Jun 24 10:54:32 2013 (r321674)
+++ head/net-mgmt/netdisco/files/netdisco.in Mon Jun 24 11:19:03 2013 (r321675)
@@ -25,13 +25,12 @@ status_cmd=${name}_status
command="%%PREFIX%%/bin/netdisco"
command_interpreter="/usr/bin/perl"
netdisco_config="%%ETCDIR%%/netdisco.conf"
-pidfile=$(grep ^daemon_pid $netdisco_config | sed -E 's/.*=\s+//')
+pidfile=$(grep ^daemon_pid $netdisco_config | cut -d= -f2 | tail -1)
flags="-p start"
required_files="$netdisco_config"
netdisco_prestart() {
- 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%%
}
Modified: head/net-mgmt/netdisco/files/pkg-message.in
==============================================================================
--- head/net-mgmt/netdisco/files/pkg-message.in Mon Jun 24 10:54:32 2013 (r321674)
+++ head/net-mgmt/netdisco/files/pkg-message.in Mon Jun 24 11:19:03 2013 (r321675)
@@ -4,13 +4,18 @@ Netdisco has been installed.
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.
+ and modify them to suit your needs.
+ (check diff to the .sample if upgrading)
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
+ OR (if upgrading)
+ 3bis) Check %%DOCSDIR%%/ChangeLog and
+ %%DOCSDIR%%/UPGRADE%% and act accordingly
+ (databases upgrades are in %%DATADIR%%/sql)
4) Add an initial admin user:
# su %%NETDISCO_USER%% -c "netdisco -u"
Modified: head/net-mgmt/netdisco/pkg-plist
==============================================================================
--- head/net-mgmt/netdisco/pkg-plist Mon Jun 24 10:54:32 2013 (r321674)
+++ head/net-mgmt/netdisco/pkg-plist Mon Jun 24 11:19:03 2013 (r321675)
@@ -34,6 +34,7 @@ bin/port_control
%%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/upgrade-1.2-to-1.3.sql
%%DATADIR%%/sql/user_log.sql
%%DATADIR%%/sql/users.sql
%%DATADIR%%/Makefile
@@ -57,7 +58,6 @@ bin/port_control
%%WWWDIR%%/device_module_search.html
%%WWWDIR%%/device_search.html
%%WWWDIR%%/discoball2.gif
-%%WWWDIR%%/doc/ChangeLog.txt
%%WWWDIR%%/doc/index.html
%%WWWDIR%%/doc/netdisco-api-backend.html
%%WWWDIR%%/doc/netdisco-api-shared.html
@@ -100,6 +100,18 @@ bin/port_control
%%WWWDIR%%/traffic.png
%%WWWDIR%%/graphs_sample.mas
%%WWWDIR%%/port_search.html
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/DiscoveryDatabase.pod
+%%DOCSDIR%%/INSTALL.pod
+%%DOCSDIR%%/IPv6ArpNip.pod
+%%DOCSDIR%%/README.pod
+%%DOCSDIR%%/UPGRADE.pod
+%%DOCSDIR%%/WISHLIST.pod
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/README
+%%DOCSDIR%%/README-API-BACKEND
+%%DOCSDIR%%/README-API-SHARED
+%%DOCSDIR%%/UPGRADE
@unexec d="%D/%%ETCDIR%%"; f="netdisco.conf"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
%%ETCDIR%%/netdisco.conf.sample
@exec if [ ! -f %%ETCDIR%%/netdisco.conf ] ; then cp -p %%ETCDIR%%/netdisco.conf.sample %%ETCDIR%%/netdisco.conf; fi
@@ -123,4 +135,5 @@ bin/port_control
@dirrm %%DATADIR%%/sql
@dirrmtry %%DATADIR%%
@dirrmtry %%ETCDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@exec mkdir -p %D/%%WWWDIR%%/mason
More information about the svn-ports-head
mailing list