diff options
author | Dmitry Sivachenko <demon@FreeBSD.org> | 2003-06-07 19:02:05 +0000 |
---|---|---|
committer | Dmitry Sivachenko <demon@FreeBSD.org> | 2003-06-07 19:02:05 +0000 |
commit | 3d0cca017aefde3ed26a2ffb900bca02f566a773 (patch) | |
tree | 836108c8c7469e373a977314d9cc28cf8840013d /net-mgmt | |
parent | 8bb44d482d3a205b33403b833f02d7e204a18ef4 (diff) | |
download | ports-3d0cca017aefde3ed26a2ffb900bca02f566a773.tar.gz ports-3d0cca017aefde3ed26a2ffb900bca02f566a773.zip |
Do not install files which are included into p5-SNMP_Session port.
Rather depend on it. This fixes conflict when both ports are installed.
PR: 50470
Submitted by: Ruben van Staveren <ruben@helium.verweg.com>
Notes
Notes:
svn path=/head/; revision=82464
Diffstat (limited to 'net-mgmt')
-rw-r--r-- | net-mgmt/mrtg/Makefile | 6 | ||||
-rw-r--r-- | net-mgmt/mrtg/pkg-plist | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile index e1747cbe0364..9129659de996 100644 --- a/net-mgmt/mrtg/Makefile +++ b/net-mgmt/mrtg/Makefile @@ -7,6 +7,7 @@ PORTNAME= mrtg PORTVERSION= 2.9.29 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \ @@ -17,6 +18,8 @@ MASTER_SITE_SUBDIR= net/mrtg MAINTAINER= demon@FreeBSD.org COMMENT= The multi-router traffic grapher +RUN_DEPENDS= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session + .if defined(WITH_GD2) LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2 CONFIGURE_ARGS= --with-gd-lib=${LOCALBASE}/lib \ @@ -38,6 +41,9 @@ MAN1= cfgmaker.1 contrib.1 faq.1 forum.1 indexmaker.1 logfile.1 \ mibhelp.1 mrtg.1 mrtg-rrd.1 mrtglib.1 nt-guide.1 reference.1 \ squid.1 unix-guide.1 webserver.1 +post-patch: + ${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm + do-install: ${MKDIR} -m 755 ${PREFIX}/etc/mrtg ${MKDIR} -m 755 ${PREFIX}/lib/perl5/site_perl/${PERL_VER} diff --git a/net-mgmt/mrtg/pkg-plist b/net-mgmt/mrtg/pkg-plist index 8300fdf983a8..6cb012c61cda 100644 --- a/net-mgmt/mrtg/pkg-plist +++ b/net-mgmt/mrtg/pkg-plist @@ -3,15 +3,12 @@ bin/indexmaker bin/mrtg bin/rateup etc/mrtg/mrtg.cfg.sample -lib/perl5/site_perl/%%PERL_VER%%/BER.pm lib/perl5/site_perl/%%PERL_VER%%/MRTG_lib.pm lib/perl5/site_perl/%%PERL_VER%%/Pod/InputObjects.pm lib/perl5/site_perl/%%PERL_VER%%/Pod/Parser.pm lib/perl5/site_perl/%%PERL_VER%%/Pod/PlainText.pm lib/perl5/site_perl/%%PERL_VER%%/Pod/Select.pm lib/perl5/site_perl/%%PERL_VER%%/Pod/Usage.pm -lib/perl5/site_perl/%%PERL_VER%%/SNMP_Session.pm -lib/perl5/site_perl/%%PERL_VER%%/SNMP_util.pm lib/perl5/site_perl/%%PERL_VER%%/locales_mrtg.pm %%PORTDOCS%%share/doc/mrtg/ANNOUNCE %%PORTDOCS%%share/doc/mrtg/CHANGES |