From 5ebd4be6176a9322a76a50b1a8aa0d4884c8f31a Mon Sep 17 00:00:00 2001 From: Matthew Seaman Date: Fri, 15 Apr 2016 11:36:24 +0000 Subject: [PATCH] Remove CONFLICTS_INSTALL against rt38 which is long gone from ports. Remove a stray ${PORTSDIR} that escaped mat's purge [1] Reported by: garga [1] --- www/rt40/Makefile | 2 +- www/rt40/Makefile.cpan | 2 +- www/rt42/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/rt40/Makefile b/www/rt40/Makefile index 0ee6cb898db1..5cefa42dfb5a 100644 --- a/www/rt40/Makefile +++ b/www/rt40/Makefile @@ -10,7 +10,7 @@ PKGNAMESUFFIX= 40 MAINTAINER= matthew@FreeBSD.org COMMENT= RT is an industrial-grade ticketing system written in Perl -CONFLICTS_INSTALL= rt-3.8* rt42-4.2* rt44-4.4* brlcad-[0-9]* +CONFLICTS_INSTALL= rt42-4.2* rt44-4.4* brlcad-[0-9]* NO_ARCH= yes diff --git a/www/rt40/Makefile.cpan b/www/rt40/Makefile.cpan index 17c93a08c272..db6f65cbb057 100644 --- a/www/rt40/Makefile.cpan +++ b/www/rt40/Makefile.cpan @@ -98,7 +98,7 @@ DEV_DEPS= p5-Email-Abstract>0:mail/p5-Email-Abstract \ p5-Test-MockTime>0:devel/p5-Test-MockTime \ p5-Test-WWW-Mechanize-PSGI>0:devel/p5-Test-WWW-Mechanize-PSGI \ p5-Test-WWW-Mechanize>=1.30:devel/p5-Test-WWW-Mechanize \ - p5-Test-Warn>0:${PORTSDIR}devel/p5-Test-Warn \ + p5-Test-Warn>0:devel/p5-Test-Warn \ p5-WWW-Mechanize>=1.52:www/p5-WWW-Mechanize \ p5-Plack-Middleware-Test-StashWarnings>=0.08:www/p5-Plack-Middleware-Test-StashWarnings \ p5-XML-Simple>0:textproc/p5-XML-Simple diff --git a/www/rt42/Makefile b/www/rt42/Makefile index 6d40102379b7..518a1868c414 100644 --- a/www/rt42/Makefile +++ b/www/rt42/Makefile @@ -10,7 +10,7 @@ PKGNAMESUFFIX= 42 MAINTAINER= matthew@FreeBSD.org COMMENT= RT is an industrial-grade ticketing system written in Perl -CONFLICTS_INSTALL= rt-3.8* rt40-4.0* rt44-4.4* brlcad-[0-9]* +CONFLICTS_INSTALL= rt40-4.0* rt44-4.4* brlcad-[0-9]* NO_ARCH= yes