Log message:
Pullup ticket #3667 - requested by taca
www/drupal6: security update

Revisions pulled up:
- www/drupal/Makefile                                           1.49
- www/drupal6/Makefile                                          1.30-1.31
- www/drupal6/distinfo                                          1.22
- www/drupal7/Makefile                                          1.2

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Jan 29 22:27:27 UTC 2012

   Modified Files:
   	pkgsrc/www/drupal: Makefile
   	pkgsrc/www/drupal6: Makefile
   	pkgsrc/www/drupal7: Makefile

   Log message:
   Remove CONFLICTS since these pacakges have the same PKGBASE.

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

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Feb  1 23:54:40 UTC 2012

   Modified Files:
   	pkgsrc/www/drupal6: Makefile distinfo

   Log message:
   Update drupal6 package to 6.23.

   Drupal 6.23, 2012-02-01
   ----------------------
   - Fixed security issues (Cross site scripting), see SA-CORE-2012-001.