[pkgsrc/trunk]: pkgsrc/www Remove CONFLICTS since these pacakges have the sam...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1e77faabc0e1
branches:  trunk
changeset: 598778:1e77faabc0e1
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Jan 29 22:27:27 2012 +0000

description:
Remove CONFLICTS since these pacakges have the same PKGBASE.

Bump PKGREVISION of www/drupal and www/drupal6 to reflect this change.

diffstat:

 www/drupal/Makefile  |  6 ++----
 www/drupal6/Makefile |  6 ++----
 www/drupal7/Makefile |  4 +---
 3 files changed, 5 insertions(+), 11 deletions(-)

diffs (62 lines):

diff -r 5b7bd71642e2 -r 1e77faabc0e1 www/drupal/Makefile
--- a/www/drupal/Makefile       Sun Jan 29 22:05:38 2012 +0000
+++ b/www/drupal/Makefile       Sun Jan 29 22:27:27 2012 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2011/09/16 05:46:26 obache Exp $
+# $NetBSD: Makefile,v 1.49 2012/01/29 22:27:27 taca Exp $
 
 DISTNAME=      drupal-5.22
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www
 MASTER_SITES=  http://drupal.org/files/projects/
 
@@ -10,8 +10,6 @@
 COMMENT=       Open source content management system
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    drupal-6.*{,nb*}
-
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../mk/apachever.mk"
diff -r 5b7bd71642e2 -r 1e77faabc0e1 www/drupal6/Makefile
--- a/www/drupal6/Makefile      Sun Jan 29 22:05:38 2012 +0000
+++ b/www/drupal6/Makefile      Sun Jan 29 22:27:27 2012 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2011/09/16 05:46:26 obache Exp $
+# $NetBSD: Makefile,v 1.30 2012/01/29 22:27:27 taca Exp $
 
 DISTNAME=      drupal-6.22
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://drupal.org/files/projects/
 
@@ -10,8 +10,6 @@
 COMMENT=       Open source content management system
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    drupal-5.*{,nb*}
-
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../lang/php/phpversion.mk"
diff -r 5b7bd71642e2 -r 1e77faabc0e1 www/drupal7/Makefile
--- a/www/drupal7/Makefile      Sun Jan 29 22:05:38 2012 +0000
+++ b/www/drupal7/Makefile      Sun Jan 29 22:27:27 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/12/16 12:57:06 taca Exp $
+# $NetBSD: Makefile,v 1.2 2012/01/29 22:27:27 taca Exp $
 
 DISTNAME=      drupal-7.10
 CATEGORIES=    www
@@ -9,8 +9,6 @@
 COMMENT=       Open source content management system
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    drupal-[1-9].*{,nb*}
-
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../lang/php/phpversion.mk"