svn commit: r338612 - in head/converters: p5-JSON p5-JSON1

[Baptiste Daroussin]

Author: bapt
Date: Sat Jan  4 00:51:17 2014
New Revision: 338612
URL: http://svnweb.freebsd.org/changeset/ports/338612

Log:
  Fix pkgname conflicts

Modified:
  head/converters/p5-JSON/Makefile
  head/converters/p5-JSON1/Makefile

Modified: head/converters/p5-JSON/Makefile
==============================================================================
--- head/converters/p5-JSON/Makefile	Sat Jan  4 00:50:03 2014	(r338611)
+++ head/converters/p5-JSON/Makefile	Sat Jan  4 00:51:17 2014	(r338612)
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama at 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
 

Modified: head/converters/p5-JSON1/Makefile
==============================================================================
--- head/converters/p5-JSON1/Makefile	Sat Jan  4 00:50:03 2014	(r338611)
+++ head/converters/p5-JSON1/Makefile	Sat Jan  4 00:51:17 2014	(r338612)
@@ -5,6 +5,7 @@ PORTVERSION=	1.15
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
+PKGNAMESUFFIX=	1
 
 MAINTAINER=	kuriyama at 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