svn commit: r355566 - in head/lang: perl5.14 perl5.16 perl5.18 perl5.20

[Mathieu Arnold]

Author: mat
Date: Tue May 27 19:41:58 2014
New Revision: 355566
URL: http://svnweb.freebsd.org/changeset/ports/355566
QAT: https://qat.redports.org/buildarchive/r355566/

Log:
  I Forgot to update the CONFLICTS.
  
  Submitted by:	az
  Sponsored by:	Absolight

Modified:
  head/lang/perl5.14/Makefile
  head/lang/perl5.16/Makefile
  head/lang/perl5.18/Makefile
  head/lang/perl5.20/Makefile

Modified: head/lang/perl5.14/Makefile
==============================================================================
--- head/lang/perl5.14/Makefile	Tue May 27 19:41:39 2014	(r355565)
+++ head/lang/perl5.14/Makefile	Tue May 27 19:41:58 2014	(r355566)
@@ -22,7 +22,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/Artistic
 LICENSE_FILE_GPLv1=	${WRKSRC}/Copying
 
-CONFLICTS_INSTALL=	perl5.14-* perl5.16-* perl5.18-*
+CONFLICTS_INSTALL=	perl5.*-*
 
 OPTIONS_DEFINE=	DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \
 		MULTIPLICITY SITECUSTOMIZE USE_PERL

Modified: head/lang/perl5.16/Makefile
==============================================================================
--- head/lang/perl5.16/Makefile	Tue May 27 19:41:39 2014	(r355565)
+++ head/lang/perl5.16/Makefile	Tue May 27 19:41:58 2014	(r355566)
@@ -22,7 +22,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/Artistic
 LICENSE_FILE_GPLv1=	${WRKSRC}/Copying
 
-CONFLICTS_INSTALL=	perl5.14-* perl5.16-* perl5.18-*
+CONFLICTS_INSTALL=	perl5.*-*
 
 OPTIONS_DEFINE=	DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \
 		MULTIPLICITY SITECUSTOMIZE USE_PERL

Modified: head/lang/perl5.18/Makefile
==============================================================================
--- head/lang/perl5.18/Makefile	Tue May 27 19:41:39 2014	(r355565)
+++ head/lang/perl5.18/Makefile	Tue May 27 19:41:58 2014	(r355566)
@@ -22,7 +22,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/Artistic
 LICENSE_FILE_GPLv1=	${WRKSRC}/Copying
 
-CONFLICTS_INSTALL=	perl5.14-* perl5.16-* perl5.18-*
+CONFLICTS_INSTALL=	perl5.*-*
 
 OPTIONS_DEFINE=	DEBUG GDBM PERL_64BITINT PTHREAD \
 		MULTIPLICITY SITECUSTOMIZE USE_PERL

Modified: head/lang/perl5.20/Makefile
==============================================================================
--- head/lang/perl5.20/Makefile	Tue May 27 19:41:39 2014	(r355565)
+++ head/lang/perl5.20/Makefile	Tue May 27 19:41:58 2014	(r355566)
@@ -21,7 +21,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/Artistic
 LICENSE_FILE_GPLv1=	${WRKSRC}/Copying
 
-CONFLICTS_INSTALL=	perl5.14-* perl5.16-* perl5.18-*
+CONFLICTS_INSTALL=	perl5.*-*
 
 OPTIONS_DEFINE=	DEBUG GDBM PERL_64BITINT PTHREAD \
 		MULTIPLICITY SITECUSTOMIZE