diff options
| author | tnn <tnn@pkgsrc.org> | 2008-05-24 13:19:51 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2008-05-24 13:19:51 +0000 |
| commit | 421f80dcb30558edb4865d99c8d2e8257069bedd (patch) | |
| tree | 4ba8e5a07307afb87877c08fcade690f6d51e5d4 | |
| parent | 40597b66e0f2b717ef9e4a164441a43e0cc63a24 (diff) | |
| download | pkgsrc-421f80dcb30558edb4865d99c8d2e8257069bedd.tar.gz | |
Conflicts lines for the same package name but different version are
redundant, so drop them.
XXX: should one of the pkgs be renamed?
| -rw-r--r-- | devel/bugzilla/Makefile | 4 | ||||
| -rw-r--r-- | devel/bugzilla3/Makefile | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile index a35bd97bd37..807e69d5f39 100644 --- a/devel/bugzilla/Makefile +++ b/devel/bugzilla/Makefile @@ -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 @@ MAINTAINER= adrianp@NetBSD.org 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 --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile index c8a40e1cab0..4ca769642eb 100644 --- a/devel/bugzilla3/Makefile +++ b/devel/bugzilla3/Makefile @@ -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 @@ MAINTAINER= adrianp@NetBSD.org 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 |