Update to the 4.7.x branch of drupal

For a full list of changes see: http://drupal.org/drupal-4.7.0
In short:
- Updated Documentation for All Modules
- Auto-complete Fields(AJAX)
- Added Mass Comment Operations
- Easier to Make Menu Items
- RSS Feed Settings
- Better Search Index
- New Forms API

5 files changed, 160 insertions, 27 deletions

diff --git a/www/drupal/Makefile b/www/drupal/Makefile
index 3f5e64bf648..2209072a595 100644
--- a/www/drupal/Makefile
+++ b/www/drupal/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2006/05/27 15:52:54 adrianp Exp $
+# $NetBSD: Makefile,v 1.11 2006/05/28 14:46:47 adrianp Exp $
 
-DISTNAME=	drupal-4.6.7
-PKGREVISION=	1
+DISTNAME=	drupal-4.7.1
 CATEGORIES=	www
 MASTER_SITES=	http://drupal.org/files/projects/
 
@@ -9,6 +8,8 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://drupal.org/
 COMMENT=	Open source content management system
 
+.include "../../lang/php/phpversion.mk"
+
 DEPENDS+=	ap-php>=4.3.3:../../www/ap-php
 DEPENDS+=	php-gd>=4.3.3:../../graphics/php-gd
 
@@ -49,8 +50,6 @@ do-install:
 		${PREFIX}/share/examples/drupal
 	${INSTALL_DATA} ${WRKSRC}/sites/default/settings.php \
 		${DRUPAL}/sites/default/settings.php.example
-	${INSTALL_DATA} ${WRKSRC}/.htaccess ${DRUPAL}
-	${INSTALL_DATA} ${WRKSRC}/*.ico ${DRUPAL}
 	${INSTALL_DATA} ${WRKSRC}/*.php ${DRUPAL}
 
 .	for i in ${PAX_DIRS}
diff --git a/www/drupal/PLIST b/www/drupal/PLIST
index dd40faf02aa..26e27aa3034 100644
--- a/www/drupal/PLIST
+++ b/www/drupal/PLIST
@@ -1,50 +1,75 @@
-@comment $NetBSD: PLIST,v 1.3 2006/05/27 15:52:54 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/05/28 14:46:47 adrianp Exp $
 share/doc/drupal/CHANGELOG.txt
+share/doc/drupal/INSTALL.mysql.txt
+share/doc/drupal/INSTALL.pgsql.txt
 share/doc/drupal/INSTALL.txt
 share/doc/drupal/LICENSE.txt
 share/doc/drupal/MAINTAINERS.txt
-share/drupal/.htaccess
+share/doc/drupal/UPGRADE.txt
 share/drupal/cron.php
-share/drupal/database/database.mysql
+share/drupal/database/database.4.0.mysql
+share/drupal/database/database.4.1.mysql
 share/drupal/database/database.pgsql
 share/drupal/database/updates.inc
-share/drupal/favicon.ico
 share/drupal/includes/bootstrap.inc
 share/drupal/includes/common.inc
 share/drupal/includes/database.inc
 share/drupal/includes/database.mysql.inc
+share/drupal/includes/database.mysqli.inc
 share/drupal/includes/database.pgsql.inc
 share/drupal/includes/file.inc
+share/drupal/includes/form.inc
 share/drupal/includes/image.inc
+share/drupal/includes/install.inc
 share/drupal/includes/locale.inc
 share/drupal/includes/menu.inc
 share/drupal/includes/module.inc
 share/drupal/includes/pager.inc
+share/drupal/includes/path.inc
 share/drupal/includes/session.inc
 share/drupal/includes/tablesort.inc
 share/drupal/includes/theme.inc
+share/drupal/includes/unicode.inc
 share/drupal/includes/xmlrpc.inc
 share/drupal/includes/xmlrpcs.inc
 share/drupal/index.php
 share/drupal/misc/arrow-asc.png
 share/drupal/misc/arrow-desc.png
+share/drupal/misc/autocomplete.js
 share/drupal/misc/blog.png
+share/drupal/misc/collapse.js
 share/drupal/misc/drupal.css
-share/drupal/misc/druplicon-small.png
+share/drupal/misc/drupal.js
 share/drupal/misc/druplicon.png
+share/drupal/misc/favicon.ico
+share/drupal/misc/feed.png
 share/drupal/misc/forum-closed.png
 share/drupal/misc/forum-default.png
 share/drupal/misc/forum-hot-new.png
 share/drupal/misc/forum-hot.png
 share/drupal/misc/forum-new.png
 share/drupal/misc/forum-sticky.png
+share/drupal/misc/grippie.png
+share/drupal/misc/maintenance.css
 share/drupal/misc/menu-collapsed.png
 share/drupal/misc/menu-expanded.png
 share/drupal/misc/menu-leaf.png
-share/drupal/misc/powered-by-drupal-dark.png
-share/drupal/misc/powered-by-drupal-light.png
-share/drupal/misc/powered-by-drupal.png
+share/drupal/misc/powered-black-135x42.png
+share/drupal/misc/powered-black-80x15.png
+share/drupal/misc/powered-black-88x31.png
+share/drupal/misc/powered-blue-135x42.png
+share/drupal/misc/powered-blue-80x15.png
+share/drupal/misc/powered-blue-88x31.png
+share/drupal/misc/powered-gray-135x42.png
+share/drupal/misc/powered-gray-80x15.png
+share/drupal/misc/powered-gray-88x31.png
 share/drupal/misc/print.css
+share/drupal/misc/progress.gif
+share/drupal/misc/progress.js
+share/drupal/misc/textarea.js
+share/drupal/misc/throbber.gif
+share/drupal/misc/update.js
+share/drupal/misc/upload.js
 share/drupal/misc/watchdog-error.png
 share/drupal/misc/watchdog-warning.png
 share/drupal/misc/xml.png
@@ -69,7 +94,6 @@ share/drupal/modules/path.module
 share/drupal/modules/ping.module
 share/drupal/modules/poll.module
 share/drupal/modules/profile.module
-share/drupal/modules/queue.module
 share/drupal/modules/search.module
 share/drupal/modules/statistics.module
 share/drupal/modules/story.module
@@ -86,10 +110,14 @@ share/drupal/scripts/cron-curl.sh
 share/drupal/scripts/cron-lynx.sh
 share/drupal/scripts/prefix.sh
 share/drupal/sites/default/settings.php.example
+share/drupal/themes/bluemarine/block.tpl.php
+share/drupal/themes/bluemarine/box.tpl.php
+share/drupal/themes/bluemarine/comment.tpl.php
 share/drupal/themes/bluemarine/logo.png
+share/drupal/themes/bluemarine/node.tpl.php
+share/drupal/themes/bluemarine/page.tpl.php
 share/drupal/themes/bluemarine/screenshot.png
 share/drupal/themes/bluemarine/style.css
-share/drupal/themes/bluemarine/xtemplate.xtmpl
 share/drupal/themes/chameleon/background.png
 share/drupal/themes/chameleon/chameleon.theme
 share/drupal/themes/chameleon/common.css
@@ -101,8 +129,12 @@ share/drupal/themes/chameleon/marvin/screenshot.png
 share/drupal/themes/chameleon/marvin/style.css
 share/drupal/themes/chameleon/screenshot.png
 share/drupal/themes/chameleon/style.css
-share/drupal/themes/engines/xtemplate/xtemplate.engine
-share/drupal/themes/engines/xtemplate/xtemplate.inc
+share/drupal/themes/engines/phptemplate/block.tpl.php
+share/drupal/themes/engines/phptemplate/box.tpl.php
+share/drupal/themes/engines/phptemplate/comment.tpl.php
+share/drupal/themes/engines/phptemplate/default.tpl.php
+share/drupal/themes/engines/phptemplate/node.tpl.php
+share/drupal/themes/engines/phptemplate/phptemplate.engine
 share/drupal/themes/pushbutton/arrow-next-hover.png
 share/drupal/themes/pushbutton/arrow-next-visited.png
 share/drupal/themes/pushbutton/arrow-next.png
@@ -113,6 +145,9 @@ share/drupal/themes/pushbutton/arrow-up-hover.png
 share/drupal/themes/pushbutton/arrow-up-visited.png
 share/drupal/themes/pushbutton/arrow-up.png
 share/drupal/themes/pushbutton/background.png
+share/drupal/themes/pushbutton/block.tpl.php
+share/drupal/themes/pushbutton/box.tpl.php
+share/drupal/themes/pushbutton/comment.tpl.php
 share/drupal/themes/pushbutton/forum-container.jpg
 share/drupal/themes/pushbutton/forum-link.png
 share/drupal/themes/pushbutton/header-a.jpg
@@ -124,6 +159,8 @@ share/drupal/themes/pushbutton/logo-active.jpg
 share/drupal/themes/pushbutton/logo-background.jpg
 share/drupal/themes/pushbutton/logo-hover.jpg
 share/drupal/themes/pushbutton/logo.png
+share/drupal/themes/pushbutton/node.tpl.php
+share/drupal/themes/pushbutton/page.tpl.php
 share/drupal/themes/pushbutton/screenshot.png
 share/drupal/themes/pushbutton/style.css
 share/drupal/themes/pushbutton/tabs-off.png
@@ -131,14 +168,13 @@ share/drupal/themes/pushbutton/tabs-on.png
 share/drupal/themes/pushbutton/tabs-option-hover.png
 share/drupal/themes/pushbutton/tabs-option-off.png
 share/drupal/themes/pushbutton/tabs-option-on.png
-share/drupal/themes/pushbutton/xtemplate.xtmpl
 share/drupal/update.php
 share/drupal/xmlrpc.php
 share/examples/drupal/drupal.conf
 share/examples/drupal/settings.php
 @dirrm share/doc/drupal
 @dirrm share/drupal/themes/pushbutton
-@dirrm share/drupal/themes/engines/xtemplate
+@dirrm share/drupal/themes/engines/phptemplate
 @dirrm share/drupal/themes/engines
 @dirrm share/drupal/themes/chameleon/marvin
 @dirrm share/drupal/themes/chameleon
diff --git a/www/drupal/distinfo b/www/drupal/distinfo
index 13ee218f9f5..160c32e5bc5 100644
--- a/www/drupal/distinfo
+++ b/www/drupal/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2006/05/26 16:56:19 adrianp Exp $
+$NetBSD: distinfo,v 1.9 2006/05/28 14:46:47 adrianp Exp $
 
-SHA1 (drupal-4.6.7.tar.gz) = 5c45b003ac05eda60af2bb236b3c54746d7ff563
-RMD160 (drupal-4.6.7.tar.gz) = e61528d3284dfbf33b44454441e7d59a02107af4
-Size (drupal-4.6.7.tar.gz) = 457205 bytes
+SHA1 (drupal-4.7.1.tar.gz) = ddf27ea2209c74b3ea806b213962645d19c17650
+RMD160 (drupal-4.7.1.tar.gz) = 8b3d9647a2f75df7d40eb03e7f1a367dac5ae267
+Size (drupal-4.7.1.tar.gz) = 485430 bytes
diff --git a/www/drupal/files/drupal.conf b/www/drupal/files/drupal.conf
index fcbbe64d13a..c2c91e82b99 100644
--- a/www/drupal/files/drupal.conf
+++ b/www/drupal/files/drupal.conf
@@ -1,4 +1,4 @@
-# $NetBSD: drupal.conf,v 1.1.1.1 2006/01/05 00:02:43 adrianp Exp $
+# $NetBSD: drupal.conf,v 1.2 2006/05/28 14:46:47 adrianp Exp $
 #
 # Drupal configuration file fragment for Apache
 
@@ -7,8 +7,93 @@
 </IfModule>
 
 <Directory "@DRUPAL@">
-    DirectoryIndex index.php
     AllowOverride Limit
     Order allow,deny
     Allow from all
+
+    # Protect files and directories from prying eyes.
+    <FilesMatch "(\.(engine|inc|install|module|sh|.*sql|theme|tpl(\.php)?|xtmpl)|code-style\.pl|Entries.*|Repository|Root)$">
+      Order deny,allow
+      Deny from all
+    </FilesMatch>
+
+    # Set some options.
+    Options -Indexes
+    Options +FollowSymLinks
+
+    # Customized error messages.
+    ErrorDocument 404 /index.php
+
+    # Set the default handler.
+    DirectoryIndex index.php
+
+    # Override PHP settings. More in sites/default/settings.php
+    # but the following cannot be changed at runtime.
+
+    # PHP 4, Apache 1
+    <IfModule mod_php4.c>
+      php_value magic_quotes_gpc                0
+      php_value register_globals                0
+      php_value session.auto_start              0
+    </IfModule>
+
+    # PHP 4, Apache 2
+    <IfModule sapi_apache2.c>
+      php_value magic_quotes_gpc                0
+      php_value register_globals                0
+      php_value session.auto_start              0
+    </IfModule>
+
+    # PHP 5, Apache 1 and 2
+    <IfModule mod_php5.c>
+      php_value magic_quotes_gpc                0
+      php_value register_globals                0
+      php_value session.auto_start              0
+    </IfModule>
+
+    # Reduce the time dynamically generated pages are cache-able.
+    <IfModule mod_expires.c>
+      ExpiresByType text/html A1
+    </IfModule>
+
+    # Various rewrite rules.
+    <IfModule mod_rewrite.c>
+      RewriteEngine on
+
+      # If your site can be accessed both with and without the prefix www.
+      # you can use one of the following settings to force user to use
+      # only one option:
+      #
+      # If you want the site to be accessed WITH the www. only, adapt and 
+      # uncomment the following:
+      # RewriteCond %{HTTP_HOST} !^www\.example\.com$ [NC]
+      # RewriteRule .* http://www.example.com/ [L,R=301]
+      #
+      # If you want the site to be accessed only WITHOUT the www. , adapt 
+      # and uncomment the following:
+      # RewriteCond %{HTTP_HOST} !^example\.com$ [NC]
+      # RewriteRule .* http://example.com/ [L,R=301]
+ 
+      # Modify the RewriteBase if you are using Drupal in a subdirectory and
+      # the rewrite rules are not working properly.
+      # RewriteBase /drupal
+
+      # Rewrite old-style URLs of the form 'node.php?id=x'.
+      # RewriteCond %{REQUEST_FILENAME} !-f
+      # RewriteCond %{REQUEST_FILENAME} !-d
+      # RewriteCond %{QUERY_STRING} ^id=([^&]+)$
+      # RewriteRule node.php index.php?q=node/view/%1 [L]
+ 
+      # Rewrite old-style URLs of the form 'module.php?mod=x'.
+      # RewriteCond %{REQUEST_FILENAME} !-f
+      # RewriteCond %{REQUEST_FILENAME} !-d
+      # RewriteCond %{QUERY_STRING} ^mod=([^&]+)$
+      # RewriteRule module.php index.php?q=%1 [L]
+
+      # Rewrite current-style URLs of the form 'index.php?q=x'.
+      RewriteCond %{REQUEST_FILENAME} !-f
+      RewriteCond %{REQUEST_FILENAME} !-d
+      RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
+    </IfModule>
+
 </Directory>
diff --git a/www/drupal/options.mk b/www/drupal/options.mk
index e1f68d31aa3..c057fdea091 100644
--- a/www/drupal/options.mk
+++ b/www/drupal/options.mk
@@ -1,11 +1,12 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/01/05 00:02:43 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2006/05/28 14:46:47 adrianp Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.drupal
 
 PKG_OPTIONS_REQUIRED_GROUPS=	db
 PKG_OPTIONS_GROUP.db=		mysql pgsql
 
-PKG_SUGGESTED_OPTIONS=	mysql
+PKG_SUPPORTED_OPTIONS=	drupal-xmlservices
+PKG_SUGGESTED_OPTIONS=	mysql drupal-xmlservices
 
 .include "../../mk/bsd.options.mk"
 
@@ -22,3 +23,15 @@ DEPENDS+=	php-pgsql-[0-9]*:../../databases/php-pgsql
 .	include "../../mk/mysql.buildlink3.mk"
 DEPENDS+=	php-mysql>=4.3.3:../../databases/php-mysql
 .endif
+
+###
+### Enable XML-based services such as the Blogger API, Jabber and RSS
+### syndication.
+###
+.if !empty(PKG_OPTIONS:Mdrupal-xmlservices)
+.	if ${PKG_PHP_VERSION} == "4"
+DEPENDS+=	php-domxml>=4.3.3:../../textproc/php4-domxml
+.	elif ${PKG_PHP_VERSION} == "5"
+DEPENDS+=	php-dom-[0-9]*:../../textproc/php5-dom
+.	endif
+.endif