net-mgmt/netmagis-* update 2.2.2 -> 2.3.0

Additional changes not in pr:
 - Remove post-install do-nada
 - Set NO_ARCH where appropriate
 - DISTVERSION -> PORTVERSION
 - use /var/netmagis instead of /usr/local/var/netmagis
 - remove @dirrm[try] from pkg-plists
 - remove @exec mkdir -p from pkg-plists
 - sort uses
 - relocate rc scripts to the slave they belong to
 - pull conditional logic out and into the slaves they affect
 - add metro/ws/gengraph to SHEBANG_FILES

UPDATING:
 Upgrading from a previous version requires
 a database schema upgrade.
 See http://netmagis.org/upgrade.html

PR:                201124
Submitted by:      pdagog@gmail.com (maintainer)

6 files changed, 32 insertions, 115 deletions

diff --git a/net-mgmt/netmagis-common/Makefile b/net-mgmt/netmagis-common/Makefile
index 44f2b4e200ff..ba360f573c0f 100644
--- a/net-mgmt/netmagis-common/Makefile
+++ b/net-mgmt/netmagis-common/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	netmagis
-DISTVERSION?=	2.2.2
-PORTREVISION?=	1
+PORTVERSION?=	2.3.0
 CATEGORIES?=	net-mgmt
 MASTER_SITES=	http://netmagis.org/files/
 PKGNAMESUFFIX?=	-common
@@ -11,50 +10,26 @@ PKGNAMESUFFIX?=	-common
 MAINTAINER?=	pdagog@gmail.com
 COMMENT?=	Netmagis common infrastructure
 
-# Portlint barfs about a MASTERDIR variable if the LICENSE block is defined (black magic?)
-#LICENSE=	CECILL-B
-#LICENSE_NAME=	CeCILL-B Free Software License Agreement
-#LICENSE_FILE=	${WRKSRC}/LICENSE
-#LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-USES=		tcl:85+ pgsql:9.1+
-WANT_PGSQL=	pgtcl
+LICENSE=	CECILL-B
+LICENSE_NAME=	CeCILL-B Free Software License Agreement
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS+=	dtplite:${PORTSDIR}/devel/tcllib
 
-.if ${PKGNAMESUFFIX} != -common
-RUN_DEPENDS+=	netmagis-config:${PORTSDIR}/net-mgmt/netmagis-common
-.endif
-
-.if ${PKGNAMESUFFIX} == -database
-RUN_DEPENDS+=	pwgen:${PORTSDIR}/sysutils/pwgen
-WANT_PGSQL+=	server
-.endif
-
-.if ${PKGNAMESUFFIX} == -www
-USE_TEX=	tex
-RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz \
-		pwgen:${PORTSDIR}/sysutils/pwgen
-.endif
-
-.if ${PKGNAMESUFFIX} == -topo
-USE_RC_SUBR=	topographd toposendd
-SUB_LIST=	TCLSH=${TCLSH}
-RUN_DEPENDS+=	rancid-run:${PORTSDIR}/net-mgmt/rancid \
-		fping:${PORTSDIR}/net/fping
-.endif
-
-.if ${PKGNAMESUFFIX} == -metro
-USES+=		perl5
+USES+=		pgsql:9.1+ tcl:85+
+WANT_PGSQL+=	pgtcl
 
-RUN_DEPENDS+=	p5-DBD-Pg>0:${PORTSDIR}/databases/p5-DBD-Pg \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
-		p5-RRDTool-OO>=0:${PORTSDIR}/devel/p5-RRDTool-OO
+SLAVEDIRS= net-mgmt/netmagis-common \
+	net-mgmt/netmagis-database \
+	net-mgmt/netmagis-detecteq \
+	net-mgmt/netmagis-metro \
+	net-mgmt/netmagis-servers \
+	net-mgmt/netmagis-topo \
+	net-mgmt/netmagis-utils \
+	net-mgmt/netmagis-www
 
-USES+=		shebangfix
-SHEBANG_FILES=	metro/bin/metrocreatedb metro/bin/metropoller metro/bin/metropoller-run
-.endif
+NO_ARCH=	yes
 
 # Variables used in netmagis Makefiles
 MAKE_ARGS+=	DESTDIR=${STAGEDIR}${DESTDIR} PREFIX=${PREFIX}
@@ -74,10 +49,6 @@ post-patch:
 		${REINPLACE_CMD} -E 's,cd(.+) (;|&&) make,$$(MAKE) -C\1,'
 	@${REINPLACE_CMD} -E 's,cd (.+) ; (ln -s en ),\2\1/,' \
 		${WRKSRC}/www/Makefile
-
-.if !target(post-install)
-post-install:
-	@${DO_NADA}
-.endif
+	${REINPLACE_CMD} '/NMVARDIR/s/$$(PREFIX)//' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/netmagis-common/distinfo b/net-mgmt/netmagis-common/distinfo
index c91817a6b24f..06b3c56bde4f 100644
--- a/net-mgmt/netmagis-common/distinfo
+++ b/net-mgmt/netmagis-common/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netmagis-2.2.2.tar.gz) = 3e2c2f75c1b5f071f2669cc7daceeecbfa7fe16c5d960a3709203dac2fa165a3
-SIZE (netmagis-2.2.2.tar.gz) = 650355
+SHA256 (netmagis-2.3.0.tar.gz) = f79f15fedab8fbfcfd2cf5dae283d21df522f1b5d7036f82c20ef24f9592af88
+SIZE (netmagis-2.3.0.tar.gz) = 670725
diff --git a/net-mgmt/netmagis-common/files/patch-common_netmagis.conf.sample b/net-mgmt/netmagis-common/files/patch-common_netmagis.conf.sample
new file mode 100644
index 000000000000..817fdc30fcd2
--- /dev/null
+++ b/net-mgmt/netmagis-common/files/patch-common_netmagis.conf.sample
@@ -0,0 +1,11 @@
+--- common/netmagis.conf.sample.orig	2015-07-08 01:06:07 UTC
++++ common/netmagis.conf.sample
+@@ -170,7 +170,7 @@ metrohost	metro.example.com
+ ##############################################################################
+ 
+ rancidcmd	/usr/local/bin/rancid-run
+-ranciddir	/usr/local/var/rancid/mygroup	# group base directory
++ranciddir	/var/rancid/mygroup	# group base directory
+ 
+ # how to send commands on equipments
+ # -u user on equipment (modconf here)
diff --git a/net-mgmt/netmagis-common/files/topographd.in b/net-mgmt/netmagis-common/files/topographd.in
deleted file mode 100644
index b534e55fb919..000000000000
--- a/net-mgmt/netmagis-common/files/topographd.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: topographd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable topographd:
-#
-# topographd_enable="YES"
-#
-# # Optionnal variables:
-# topographd_flags=""
-# topographd_user="rancid"
-#
-
-. /etc/rc.subr
-
-name=topographd
-rcvar=topographd_enable
-
-load_rc_config $name
-
-: ${topographd_enable:=NO}
-: ${topographd_user:=rancid}
-
-command_interpreter=%%TCLSH%%
-
-command=%%PREFIX%%/sbin/topographd
-
-run_rc_command $1
diff --git a/net-mgmt/netmagis-common/files/toposendd.in b/net-mgmt/netmagis-common/files/toposendd.in
deleted file mode 100644
index 6dfde1681a6d..000000000000
--- a/net-mgmt/netmagis-common/files/toposendd.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: toposendd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable toposendd:
-#
-# toposendd_enable="YES"
-#
-# # Optionnal variables:
-# toposendd_flags=""
-# toposendd_user="rancid"
-#
-
-. /etc/rc.subr
-
-name=toposendd
-rcvar=toposendd_enable
-
-load_rc_config $name
-
-: ${toposendd_enable:=NO}
-: ${toposendd_user:=rancid}
-
-command_interpreter=%%TCLSH%%
-command=%%PREFIX%%/sbin/toposendd
-
-run_rc_command $1
diff --git a/net-mgmt/netmagis-common/pkg-message b/net-mgmt/netmagis-common/pkg-message
index b48886352c7d..8a361147e0f1 100644
--- a/net-mgmt/netmagis-common/pkg-message
+++ b/net-mgmt/netmagis-common/pkg-message
@@ -1,5 +1,7 @@
 =================================================================
 
 For installation instructions, see http://www.netmagis.org/doc.html
+If you are upgrading from a previous version, see
+	http://www.netmagis.org/upgrade.html
 
 =================================================================