diff options
| author | taca <taca@pkgsrc.org> | 2012-01-29 22:27:27 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2012-01-29 22:27:27 +0000 |
| commit | 514fe772c5e8ce8dc9a96bc6714e94fc4c3ff064 (patch) | |
| tree | ef8613787c2cf1571ad82c0d0b795b7228d46df0 | |
| parent | 9f9a8967fcc4786c33cd6cfb8aa23719091e5be9 (diff) | |
| download | pkgsrc-514fe772c5e8ce8dc9a96bc6714e94fc4c3ff064.tar.gz | |
Remove CONFLICTS since these pacakges have the same PKGBASE.
Bump PKGREVISION of www/drupal and www/drupal6 to reflect this change.
| -rw-r--r-- | www/drupal/Makefile | 6 | ||||
| -rw-r--r-- | www/drupal6/Makefile | 6 | ||||
| -rw-r--r-- | www/drupal7/Makefile | 4 |
3 files changed, 5 insertions, 11 deletions
diff --git a/www/drupal/Makefile b/www/drupal/Makefile index 97032ac12bf..92b1e59a201 100644 --- a/www/drupal/Makefile +++ b/www/drupal/Makefile @@ -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 @@ HOMEPAGE= http://drupal.org/ COMMENT= Open source content management system LICENSE= gnu-gpl-v2 -CONFLICTS+= drupal-6.*{,nb*} - PKG_DESTDIR_SUPPORT= user-destdir .include "../../mk/apachever.mk" diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile index fd3b3b3e53d..b788a5619ef 100644 --- a/www/drupal6/Makefile +++ b/www/drupal6/Makefile @@ -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 @@ HOMEPAGE= http://drupal.org/ 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 --git a/www/drupal7/Makefile b/www/drupal7/Makefile index e6c2775c356..1537ac958c9 100644 --- a/www/drupal7/Makefile +++ b/www/drupal7/Makefile @@ -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 @@ HOMEPAGE= http://drupal.org/ 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" |