Sun Jan 29 22:27:27 2012 UTC ()
Remove CONFLICTS since these pacakges have the same PKGBASE.

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


(taca)
diff -r1.48 -r1.49 pkgsrc/www/drupal/Makefile
diff -r1.29 -r1.30 pkgsrc/www/drupal6/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/www/drupal7/Makefile
cvs diff -r1.48 -r1.49 pkgsrc/www/drupal/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/drupal/Attic/Makefile 2011/09/16 05:46:26 1.48
+++ pkgsrc/www/drupal/Attic/Makefile 2012/01/29 22:27:27 1.49
@@ -1,27 +1,25 @@ @@ -1,27 +1,25 @@
1# $NetBSD: Makefile,v 1.48 2011/09/16 05:46:26 obache Exp $ 1# $NetBSD: Makefile,v 1.49 2012/01/29 22:27:27 taca Exp $
2 2
3DISTNAME= drupal-5.22 3DISTNAME= drupal-5.22
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://drupal.org/files/projects/ 6MASTER_SITES= http://drupal.org/files/projects/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://drupal.org/ 9HOMEPAGE= http://drupal.org/
10COMMENT= Open source content management system 10COMMENT= Open source content management system
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13CONFLICTS+= drupal-6.*{,nb*} 
14 
15PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
16 14
17.include "../../mk/apachever.mk" 15.include "../../mk/apachever.mk"
18.include "../../lang/php/phpversion.mk" 16.include "../../lang/php/phpversion.mk"
19 17
20DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php 18DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
21DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd 19DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd
22.if ${PKG_PHP_VERSION} == "5" 20.if ${PKG_PHP_VERSION} == "5"
23DEPENDS+= php>=5.2.4<5.3:../../lang/php5 21DEPENDS+= php>=5.2.4<5.3:../../lang/php5
24.endif 22.endif
25 23
26NO_BUILD= YES 24NO_BUILD= YES
27DRUPAL= ${PREFIX}/share/drupal 25DRUPAL= ${PREFIX}/share/drupal
cvs diff -r1.29 -r1.30 pkgsrc/www/drupal6/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/drupal6/Attic/Makefile 2011/09/16 05:46:26 1.29
+++ pkgsrc/www/drupal6/Attic/Makefile 2012/01/29 22:27:27 1.30
@@ -1,27 +1,25 @@ @@ -1,27 +1,25 @@
1# $NetBSD: Makefile,v 1.29 2011/09/16 05:46:26 obache Exp $ 1# $NetBSD: Makefile,v 1.30 2012/01/29 22:27:27 taca Exp $
2 2
3DISTNAME= drupal-6.22 3DISTNAME= drupal-6.22
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://drupal.org/files/projects/ 6MASTER_SITES= http://drupal.org/files/projects/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://drupal.org/ 9HOMEPAGE= http://drupal.org/
10COMMENT= Open source content management system 10COMMENT= Open source content management system
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13CONFLICTS+= drupal-5.*{,nb*} 
14 
15PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
16 14
17.include "../../lang/php/phpversion.mk" 15.include "../../lang/php/phpversion.mk"
18 16
19.if ${PKG_PHP_VERSION} == "5" 17.if ${PKG_PHP_VERSION} == "5"
20DEPENDS+= php>=5.2.0<5.3:../../lang/php5 18DEPENDS+= php>=5.2.0<5.3:../../lang/php5
21.endif 19.endif
22DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.5:../../graphics/php-gd 20DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.5:../../graphics/php-gd
23 21
24NO_BUILD= YES 22NO_BUILD= YES
25DRUPAL= share/drupal 23DRUPAL= share/drupal
26PAX_DIRS= includes misc modules scripts themes 24PAX_DIRS= includes misc modules scripts themes
27DOCS= CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt \ 25DOCS= CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt \
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/drupal7/Makefile (expand / switch to unified diff)

--- pkgsrc/www/drupal7/Makefile 2011/12/16 12:57:06 1.1.1.1
+++ pkgsrc/www/drupal7/Makefile 2012/01/29 22:27:27 1.2
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile,v 1.1.1.1 2011/12/16 12:57:06 taca Exp $ 1# $NetBSD: Makefile,v 1.2 2012/01/29 22:27:27 taca Exp $
2 2
3DISTNAME= drupal-7.10 3DISTNAME= drupal-7.10
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= http://drupal.org/files/projects/ 5MASTER_SITES= http://drupal.org/files/projects/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://drupal.org/ 8HOMEPAGE= http://drupal.org/
9COMMENT= Open source content management system 9COMMENT= Open source content management system
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12CONFLICTS+= drupal-[1-9].*{,nb*} 
13 
14PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
15 13
16.include "../../lang/php/phpversion.mk" 14.include "../../lang/php/phpversion.mk"
17 15
18.if ${PKG_PHP_VERSION} == "5" 16.if ${PKG_PHP_VERSION} == "5"
19DEPENDS+= php>=5.2.0<5.3:../../lang/php5 17DEPENDS+= php>=5.2.0<5.3:../../lang/php5
20.endif 18.endif
21DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd 19DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
22DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.2.0:../../textproc/php-json 20DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.2.0:../../textproc/php-json
23 21
24NO_BUILD= YES 22NO_BUILD= YES
25DRUPAL= share/drupal 23DRUPAL= share/drupal
26PAX_DIRS= includes misc modules profiles scripts themes 24PAX_DIRS= includes misc modules profiles scripts themes