[pkgsrc/trunk]: pkgsrc/devel Conflicts lines for the same package name but di...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2eaf45af8468
branches:  trunk
changeset: 542651:2eaf45af8468
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat May 24 13:19:51 2008 +0000

description:
Conflicts lines for the same package name but different version are
redundant, so drop them.
XXX: should one of the pkgs be renamed?

diffstat:

 devel/bugzilla/Makefile  |  4 +---
 devel/bugzilla3/Makefile |  4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 7b3e71518314 -r 2eaf45af8468 devel/bugzilla/Makefile
--- a/devel/bugzilla/Makefile   Sat May 24 10:45:28 2008 +0000
+++ b/devel/bugzilla/Makefile   Sat May 24 13:19:51 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/05/06 19:36:39 adrianp Exp $
+# $NetBSD: Makefile,v 1.30 2008/05/24 13:19:51 tnn Exp $
 #
 
 DISTNAME=      bugzilla-2.22.4
@@ -9,8 +9,6 @@
 HOMEPAGE=      http://www.bugzilla.org/
 COMMENT=       Web based bug tracking system
 
-CONFLICTS+=    bugzilla-3.[0-9]*
-
 DEPENDS+=      p5-AppConfig>=1.52:../../devel/p5-AppConfig
 DEPENDS+=      p5-CGI>=2.93:../../www/p5-CGI
 DEPENDS+=      p5-DBI>=1.38:../../databases/p5-DBI
diff -r 7b3e71518314 -r 2eaf45af8468 devel/bugzilla3/Makefile
--- a/devel/bugzilla3/Makefile  Sat May 24 10:45:28 2008 +0000
+++ b/devel/bugzilla3/Makefile  Sat May 24 13:19:51 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/05/06 19:45:54 adrianp Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 13:19:51 tnn Exp $
 #
 
 DISTNAME=      bugzilla-3.0.4
@@ -9,8 +9,6 @@
 HOMEPAGE=      http://www.bugzilla.org/
 COMMENT=       Web based bug tracking system
 
-CONFLICTS+=    bugzilla-2.[0-9]*
-
 DEPENDS+=      p5-CGI>=2.93:../../www/p5-CGI
 DEPENDS+=      p5-DBI>=1.41:../../databases/p5-DBI
 DEPENDS+=      p5-Template-Toolkit>=2.12:../../www/p5-Template-Toolkit