Date: Sat, 12 Jul 2014 06:57:47 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361601 - in head/net-mgmt: netmagis-common netmagis-detecteq netmagis-metro netmagis-topo netmagis-www Message-ID: <201407120657.s6C6vlCP091104@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sat Jul 12 06:57:47 2014 New Revision: 361601 URL: http://svnweb.freebsd.org/changeset/ports/361601 QAT: https://qat.redports.org/buildarchive/r361601/ Log: net-mgmt/netmagis-*: support staging PR: 191408 Submitted by: pdagog@gmail.com (maintainer) Modified: head/net-mgmt/netmagis-common/Makefile head/net-mgmt/netmagis-detecteq/pkg-plist head/net-mgmt/netmagis-metro/Makefile head/net-mgmt/netmagis-metro/pkg-plist head/net-mgmt/netmagis-topo/pkg-plist head/net-mgmt/netmagis-www/Makefile Modified: head/net-mgmt/netmagis-common/Makefile ============================================================================== --- head/net-mgmt/netmagis-common/Makefile Sat Jul 12 06:13:11 2014 (r361600) +++ head/net-mgmt/netmagis-common/Makefile Sat Jul 12 06:57:47 2014 (r361601) @@ -11,6 +11,12 @@ 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+ USE_PGSQL= pgtcl @@ -28,13 +34,9 @@ USE_PGSQL+= server pltcl .endif .if ${PKGNAMESUFFIX} == -www -USE_APACHE= 22+ USE_TEX= tex RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz \ - pwgen:${PORTSDIR}/sysutils/pwgen \ - ${LOCALBASE}/libexec/apache22/mod_auth_pgsql.so:${PORTSDIR}/www/mod_auth_pgsql2 -# FIXME compile apache22 with option mod_auth_ldap -# FIXME add ap22-mod_auth_cas + pwgen:${PORTSDIR}/sysutils/pwgen .endif .if ${PKGNAMESUFFIX} == -topo @@ -51,10 +53,13 @@ RUN_DEPENDS+= p5-DBD-Pg>0:${PORTSDIR}/da 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 + +USES+= shebangfix +SHEBANG_FILES= metro/bin/metrocreatedb metro/bin/metropoller metro/bin/metropoller-run .endif # Variables used in netmagis Makefiles -MAKE_ARGS+= DESTDIR=${DESTDIR} PREFIX=${PREFIX} +MAKE_ARGS+= DESTDIR=${STAGEDIR}${DESTDIR} PREFIX=${PREFIX} MAKE_ARGS+= TCLSH=${TCLSH} TCLCONF=${TCL_LIBDIR}/tclConfig.sh .if ${PKGNAMESUFFIX} == -topo || ${PKGNAMESUFFIX} == -www Modified: head/net-mgmt/netmagis-detecteq/pkg-plist ============================================================================== --- head/net-mgmt/netmagis-detecteq/pkg-plist Sat Jul 12 06:13:11 2014 (r361600) +++ head/net-mgmt/netmagis-detecteq/pkg-plist Sat Jul 12 06:57:47 2014 (r361601) @@ -3,4 +3,4 @@ sbin/detectconfmod %%PORTEXAMPLES%%%%EXAMPLESDIR%%/radius/server.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/radius/topo.conf %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/radius -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% Modified: head/net-mgmt/netmagis-metro/Makefile ============================================================================== --- head/net-mgmt/netmagis-metro/Makefile Sat Jul 12 06:13:11 2014 (r361600) +++ head/net-mgmt/netmagis-metro/Makefile Sat Jul 12 06:57:47 2014 (r361601) @@ -6,12 +6,9 @@ PKGNAMESUFFIX= -metro COMMENT= Netmagis metrology module -MANUAL_PACKAGE_BUILD= Uses non-default version of PostgreSQL - MASTERDIR= ${.CURDIR}/../netmagis-common PKGMESSAGE= ${.CURDIR}/pkg-message PLIST= ${.CURDIR}/pkg-plist -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/net-mgmt/netmagis-metro/pkg-plist ============================================================================== --- head/net-mgmt/netmagis-metro/pkg-plist Sat Jul 12 06:13:11 2014 (r361600) +++ head/net-mgmt/netmagis-metro/pkg-plist Sat Jul 12 06:57:47 2014 (r361601) @@ -34,11 +34,7 @@ www/metro/gengraph @dirrmtry var/netmagis/metro @dirrmtry var/netmagis @dirrmtry var -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -@dirrmtry lib/netmagis/tmp/netmagis/lib/netmagis -@dirrmtry lib/netmagis/tmp/netmagis/lib -@dirrmtry lib/netmagis/tmp/netmagis -@dirrmtry lib/netmagis/tmp +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% @dirrm lib/netmagis/probes @dirrm lib/netmagis/plugins @exec mkdir -p %D/var/netmagis/metro/wifi @@ -49,4 +45,3 @@ www/metro/gengraph @exec mkdir -p %D/var/netmagis/metro/graph @exec mkdir -p %D/var/netmagis/metro/db @exec mkdir -p %D/var/netmagis/metro/cache -@exec mkdir -p %D/lib/netmagis/tmp/netmagis/lib/netmagis Modified: head/net-mgmt/netmagis-topo/pkg-plist ============================================================================== --- head/net-mgmt/netmagis-topo/pkg-plist Sat Jul 12 06:13:11 2014 (r361600) +++ head/net-mgmt/netmagis-topo/pkg-plist Sat Jul 12 06:57:47 2014 (r361601) @@ -31,8 +31,8 @@ sbin/toposendd @dirrmtry var/netmagis @dirrmtry var %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/eqvirt -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% @dirrm lib/netmagis/topo -@dirrm lib/netmagis +@dirrmtry lib/netmagis @exec mkdir -p %D/var/netmagis/eqvirt @exec mkdir -p %D/var/netmagis/eqgen Modified: head/net-mgmt/netmagis-www/Makefile ============================================================================== --- head/net-mgmt/netmagis-www/Makefile Sat Jul 12 06:13:11 2014 (r361600) +++ head/net-mgmt/netmagis-www/Makefile Sat Jul 12 06:57:47 2014 (r361601) @@ -6,12 +6,9 @@ PKGNAMESUFFIX= -www COMMENT= Netmagis web module -MANUAL_PACKAGE_BUILD= Requires non-default version of PostgreSQL - MASTERDIR= ${.CURDIR}/../netmagis-common PKGMESSAGE= ${.CURDIR}/pkg-message PLIST= ${.CURDIR}/pkg-plist -NO_STAGE= yes .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407120657.s6C6vlCP091104>