- adopt new makefile header (all Makefiles) - netmagis-common - no entries after bsd.port.mk (netmagis-common) - distinfo is out of date (what was changed ? same version mumber) - use LOGIN instead DEAMON in rc scripts (user->rancid) - netmagis-database - is it possible to change /usr/local/var/netmagis to /var/netmagis? - netmagis-www - is it possible to use a common WWWDIR together with netmagis-metro? if yes, we can set a common WWWDIR in netmagis-common and adjust metro. Index: netmagis-common/Makefile =================================================================== --- netmagis-common/Makefile (revision 1) +++ netmagis-common/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Netmagis -# Date created: Nov 10 2011 -# Whom: Pierre David , Jean Benoit -# +# Created by: Pierre David , Jean Benoit # $FreeBSD$ -# PORTNAME?= netmagis DISTVERSION?= 2.1.0 @@ -19,6 +15,7 @@ USE_PGSQL= yes WANT_PGSQL_VER= 91 +WWWDIR?= ${PREFIX}/www/metro RUN_DEPENDS+= dtplite:${PORTSDIR}/devel/tcllib \ ${LOCALBASE}/lib/pgtcl/pkgIndex.tcl:${PORTSDIR}/databases/pgtcl @@ -59,11 +56,6 @@ p5-RRDTool-OO>=0:${PORTSDIR}/devel/p5-RRDTool-OO .endif -post-install: - @if [ -f ${PKGMESSAGE} ] ; then ${CAT} ${PKGMESSAGE} ; fi - -.include - # Variables used in netmagis Makefiles MAKE_ARGS+= DESTDIR=${DESTDIR} PREFIX=${PREFIX} MAKE_ARGS+= TCLSH=${TCLSH} TCLCONF=${TCL_LIBDIR}/tclConfig.sh @@ -75,3 +67,8 @@ .endif INSTALL_TARGET= install${PKGNAMESUFFIX} + +post-install: + @if [ -f ${PKGMESSAGE} ] ; then ${CAT} ${PKGMESSAGE} ; fi + +.include Index: netmagis-common/distinfo =================================================================== --- netmagis-common/distinfo (revision 1) +++ netmagis-common/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (netmagis-2.1.0.tar.gz) = f3cb78e3f76d9f700ded33c3c507304c6a7c03f80e7407f712d8460b7ee2d68d -SIZE (netmagis-2.1.0.tar.gz) = 589567 +SHA256 (netmagis-2.1.0.tar.gz) = 2b6042aa8906ee318987f5604c49dd5bb3554fb06cf7908080d2a4a362216103 +SIZE (netmagis-2.1.0.tar.gz) = 593154 Index: netmagis-common/files/topographd.in =================================================================== --- netmagis-common/files/topographd.in (revision 1) +++ netmagis-common/files/topographd.in (working copy) @@ -1,7 +1,10 @@ #! /bin/sh +# +# $FreeBSD$ +# # PROVIDE: topographd -# REQUIRE: DAEMON +# REQUIRE: LOGIN # KEYWORD: shutdown # Index: netmagis-common/files/toposendd.in =================================================================== --- netmagis-common/files/toposendd.in (revision 1) +++ netmagis-common/files/toposendd.in (working copy) @@ -1,7 +1,10 @@ #! /bin/sh +# +# $FreeBSD$ +# # PROVIDE: toposendd -# REQUIRE: DAEMON +# REQUIRE: LOGIN # KEYWORD: shutdown # Index: netmagis-database/Makefile =================================================================== --- netmagis-database/Makefile (revision 1) +++ netmagis-database/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Netmagis -# Date created: Nov 10 2011 -# Whom: Pierre David , Jean Benoit -# +# Created by: Pierre David , Jean Benoit # $FreeBSD$ -# PORTNAME= netmagis PKGNAMESUFFIX= -database Index: netmagis-detecteq/Makefile =================================================================== --- netmagis-detecteq/Makefile (revision 1) +++ netmagis-detecteq/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Netmagis -# Date created: Nov 10 2011 -# Whom: Pierre David , Jean Benoit -# +# Created by: Pierre David , Jean Benoit # $FreeBSD$ -# PORTNAME= netmagis PKGNAMESUFFIX= -detecteq Index: netmagis-metro/Makefile =================================================================== --- netmagis-metro/Makefile (revision 1) +++ netmagis-metro/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Netmagis -# Date created: Nov 10 2011 -# Whom: Pierre David , Jean Benoit -# +# Created by: Pierre David , Jean Benoit # $FreeBSD$ -# PORTNAME= netmagis PKGNAMESUFFIX= -metro Index: netmagis-metro/pkg-plist =================================================================== --- netmagis-metro/pkg-plist (revision 1) +++ netmagis-metro/pkg-plist (working copy) @@ -21,27 +21,27 @@ lib/netmagis/probes/sensor-stp-catalyst.pl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache-metro.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/crontab.metro -www/metro/gengraph -@dirrm www/metro +%%WWWDIR%%/gengraph +@dirrm %%WWWDIR%% @dirrm var/netmagis/metro/wifi -@dirrm var/netmagis/metro/spool -@dirrm var/netmagis/metro/report -@dirrm var/netmagis/metro/log -@dirrm var/netmagis/metro/lock -@dirrm var/netmagis/metro/graph -@dirrm var/netmagis/metro/db -@dirrm var/netmagis/metro/cache -@dirrm var/netmagis/metro -@dirrm var/netmagis -@dirrm var +@dirrmtry var/netmagis/metro/spool +@dirrmtry var/netmagis/metro/report +@dirrmtry var/netmagis/metro/log +@dirrmtry var/netmagis/metro/lock +@dirrmtry var/netmagis/metro/graph +@dirrmtry var/netmagis/metro/db +@dirrmtry var/netmagis/metro/cache +@dirrmtry var/netmagis/metro +@dirrmtry var/netmagis +@dirrmtry var %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% @dirrm lib/netmagis/tmp/netmagis/lib/netmagis @dirrm lib/netmagis/tmp/netmagis/lib -@dirrm lib/netmagis/tmp/netmagis -@dirrm lib/netmagis/tmp -@dirrm lib/netmagis/probes -@dirrm lib/netmagis/plugins -@dirrm lib/netmagis +@dirrmtry lib/netmagis/tmp/netmagis +@dirrmtry lib/netmagis/tmp +@dirrmtry lib/netmagis/probes +@dirrmtry lib/netmagis/plugins +@dirrmtry lib/netmagis @exec mkdir -p %D/var/netmagis/metro/wifi @exec mkdir -p %D/var/netmagis/metro/spool @exec mkdir -p %D/var/netmagis/metro/report Index: netmagis-servers/Makefile =================================================================== --- netmagis-servers/Makefile (revision 1) +++ netmagis-servers/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Netmagis -# Date created: Nov 10 2011 -# Whom: Pierre David , Jean Benoit -# +# Created by: Pierre David , Jean Benoit # $FreeBSD$ -# PORTNAME= netmagis PKGNAMESUFFIX= -servers Index: netmagis-topo/Makefile =================================================================== --- netmagis-topo/Makefile (revision 1) +++ netmagis-topo/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Netmagis -# Date created: Nov 10 2011 -# Whom: Pierre David , Jean Benoit -# +# Created by: Pierre David , Jean Benoit # $FreeBSD$ -# PORTNAME= netmagis PKGNAMESUFFIX= -topo Index: netmagis-utils/Makefile =================================================================== --- netmagis-utils/Makefile (revision 1) +++ netmagis-utils/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Netmagis -# Date created: Nov 10 2011 -# Whom: Pierre David , Jean Benoit -# +# Created by: Pierre David , Jean Benoit # $FreeBSD$ -# PORTNAME= netmagis PKGNAMESUFFIX= -utils Index: netmagis-www/Makefile =================================================================== --- netmagis-www/Makefile (revision 1) +++ netmagis-www/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Netmagis -# Date created: Nov 10 2011 -# Whom: Pierre David , Jean Benoit -# +# Created by: Pierre David , Jean Benoit # $FreeBSD$ -# PORTNAME= netmagis PKGNAMESUFFIX= -www