From 425d0841bbbe9000a2e034a2621aec80f8745545 Mon Sep 17 00:00:00 2001 From: Andrej Zverev Date: Sun, 1 Jul 2012 14:14:22 +0000 Subject: [PATCH] - Remove SITE_PERL from *_DEPENDS Approved by: portmgr@ (bapt@) --- net-mgmt/netdisco/Makefile | 34 ++++++++++++++--------------- sysutils/munin-master/Makefile | 38 ++++++++++++++++----------------- sysutils/munin-node/Makefile | 20 ++++++++--------- sysutils/userneu-devel/Makefile | 4 ++-- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile index e6c3bde6adae..081b1bc12485 100644 --- a/net-mgmt/netdisco/Makefile +++ b/net-mgmt/netdisco/Makefile @@ -13,23 +13,23 @@ MASTER_SITES= SF MAINTAINER= dgeo@centrale-marseille.fr COMMENT= Web-based network management tool for moderate to large networks -OPTIONS= GRAPHVIZ "Install GraphViz for network map support" on \ - OUIDL "Download oui.txt file" off \ +OPTIONS= GRAPHVIZ "Install GraphViz for network map support" on \ + OUIDL "Download oui.txt file" off \ MIBS "depend on net-mgmt/netdisco-mibs" on -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 \ - ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI \ - ${SITE_PERL}/${PERL_ARCH}/APR/Request/Apache2.pm:${PORTSDIR}/www/p5-libapreq2 \ - ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ - ${SITE_PERL}/SNMP/Info.pm:${PORTSDIR}/net-mgmt/p5-SNMP-Info \ - ${SITE_PERL}/HTML/Mason.pm:${PORTSDIR}/www/p5-HTML-Mason \ - ${SITE_PERL}/DB_File/Lock.pm:${PORTSDIR}/devel/p5-DB_File-Lock \ - ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \ - ${SITE_PERL}/Net/NBName.pm:${PORTSDIR}/net/p5-Net-NBName \ - ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg \ - ${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \ - ${SITE_PERL}/MasonX/Request/WithApacheSession.pm:${PORTSDIR}/www/p5-MasonX-Request-WithApacheSession \ - ${SITE_PERL}/Parallel/ForkManager.pm:${PORTSDIR}/devel/p5-Parallel-ForkManager \ +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-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 \ + p5-Net-NBName>=0:${PORTSDIR}/net/p5-Net-NBName \ + p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \ + p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \ + p5-MasonX-Request-WithApacheSession>=0:${PORTSDIR}/www/p5-MasonX-Request-WithApacheSession \ + p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager USERS= netdisco GROUPS= netdisco @@ -84,8 +84,8 @@ RUN_DEPENDS+= p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress .endif .if defined(WITH_GRAPHVIZ) -RUN_DEPENDS+= ${SITE_PERL}/Graph.pm:${PORTSDIR}/math/p5-Graph \ - ${SITE_PERL}/GraphViz.pm:${PORTSDIR}/graphics/p5-GraphViz +RUN_DEPENDS+= p5-Graph>=0:${PORTSDIR}/math/p5-Graph \ + p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz .endif .if defined(WITH_OUIDL) diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile index 1021f74878f8..5e70e0f06394 100644 --- a/sysutils/munin-master/Makefile +++ b/sysutils/munin-master/Makefile @@ -15,25 +15,25 @@ PKGNAMESUFFIX= -master MAINTAINER= flo@FreeBSD.org COMMENT= Collector part of Munin -BUILD_DEPENDS= ${SITE_PERL}/Module/Build.pm:${PORTSDIR}/devel/p5-Module-Build \ - ${SITE_PERL}/Munin/Common/Defaults.pm:${PORTSDIR}/sysutils/munin-common \ - ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \ - ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \ - ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ - ${SITE_PERL}/DateTime/HiRes.pm:${PORTSDIR}/devel/p5-DateTime-HiRes \ - ${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \ - ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \ - ${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl \ - ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced -RUN_DEPENDS= ${SITE_PERL}/Munin/Common/Defaults.pm:${PORTSDIR}/sysutils/munin-common \ - ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/databases/rrdtool \ - ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \ - ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ - ${SITE_PERL}/DateTime/HiRes.pm:${PORTSDIR}/devel/p5-DateTime-HiRes \ - ${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \ - ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \ - ${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl \ - ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced +BUILD_DEPENDS= p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \ + munin-common>=0:${PORTSDIR}/sysutils/munin-common \ + p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \ + rrdtool>=0:${PORTSDIR}/databases/rrdtool \ + p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \ + p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \ + p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \ + p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \ + p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \ + p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced +RUN_DEPENDS= munin-common>=0:${PORTSDIR}/sysutils/munin-common \ + rrdtool>=0:${PORTSDIR}/databases/rrdtool \ + p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \ + p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \ + p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \ + p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \ + p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \ + p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \ + p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced USE_PERL5= yes USE_GMAKE= yes diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile index 06f139231ab0..d52d58514f81 100644 --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -14,17 +14,17 @@ PKGNAMESUFFIX= -node MAINTAINER= flo@FreeBSD.org COMMENT= Node-specific part of Munin -BUILD_DEPENDS= ${SITE_PERL}/Module/Build.pm:${PORTSDIR}/devel/p5-Module-Build \ - ${SITE_PERL}/DateTime/HiRes.pm:${PORTSDIR}/devel/p5-DateTime-HiRes \ - ${SITE_PERL}/Munin/Common/Defaults.pm:${PORTSDIR}/sysutils/munin-common \ - ${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \ - ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ +BUILD_DEPENDS= p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \ + p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \ + munin-common>=0:${PORTSDIR}/sysutils/munin-common \ + p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \ + p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ bash:${PORTSDIR}/shells/bash -RUN_DEPENDS= ${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \ - ${SITE_PERL}/DateTime/HiRes.pm:${PORTSDIR}/devel/p5-DateTime-HiRes \ - ${SITE_PERL}/Munin/Common/Defaults.pm:${PORTSDIR}/sysutils/munin-common \ - ${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \ - ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ +RUN_DEPENDS= p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \ + p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \ + munin-common>=0:${PORTSDIR}/sysutils/munin-common \ + p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \ + p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ bash:${PORTSDIR}/shells/bash USE_PERL5= yes diff --git a/sysutils/userneu-devel/Makefile b/sysutils/userneu-devel/Makefile index e497d7627ec6..725729d8cd5a 100644 --- a/sysutils/userneu-devel/Makefile +++ b/sysutils/userneu-devel/Makefile @@ -19,8 +19,8 @@ MAINTAINER= fehlner@gmx.de COMMENT= Account management and creation tool RUN_DEPENDS= \ - ${SITE_PERL}/Crypt/PasswdMD5.pm:${PORTSDIR}/security/p5-Crypt-PasswdMD5/ \ - ${SITE_PERL}/Crypt/RandPasswd.pm:${PORTSDIR}/security/p5-Crypt-RandPasswd/ + p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \ + p5-Crypt-RandPasswd>=0:${PORTSDIR}/security/p5-Crypt-RandPasswd USE_PERL5_RUN= yes NO_BUILD= yes