From 98ea2e3aeda0f3c6ba92afbef39cb63be9be5a50 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sat, 4 Jan 2014 00:51:17 +0000 Subject: [PATCH] Fix pkgname conflicts --- converters/p5-JSON/Makefile | 2 +- converters/p5-JSON1/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/converters/p5-JSON/Makefile b/converters/p5-JSON/Makefile index 3060a277bb79..4ed5363fd43c 100644 --- a/converters/p5-JSON/Makefile +++ b/converters/p5-JSON/Makefile @@ -9,7 +9,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= kuriyama@FreeBSD.org COMMENT= Perl extension to convert to JSON (JavaScript Object Notation) -CONFLICTS= p5-JSON-1.* +CONFLICTS= p5-JSON-1.* p5-JSON1-* USES= perl5 USE_PERL5= configure diff --git a/converters/p5-JSON1/Makefile b/converters/p5-JSON1/Makefile index 59fda83cf67f..08ef4a1e7488 100644 --- a/converters/p5-JSON1/Makefile +++ b/converters/p5-JSON1/Makefile @@ -5,6 +5,7 @@ PORTVERSION= 1.15 CATEGORIES= converters perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- +PKGNAMESUFFIX= 1 MAINTAINER= kuriyama@FreeBSD.org COMMENT= Perl extension to convert to JSON (JavaScript Object Notation) @@ -15,7 +16,6 @@ BUILD_DEPENDS:= ${RUN_DEPENDS} CONFLICTS= p5-JSON-2.* USES= perl5 USE_PERL5= configure -NO_LATEST_LINK= yes MAN3= Apache::JSONRPC.3 JSON.3 JSON::Converter.3 \ JSON::PP.3 JSON::PP5005.3 JSON::PP56.3 JSON::Parser.3 \ JSONRPC.3 JSONRPC::Transport::HTTP.3