3 files changed, 157 insertions, 155 deletions

diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index bb38519b5cc0..afd3be1e8652 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	drupal
-PORTVERSION=	4.6.0
+PORTVERSION=	4.6.2
 CATEGORIES=	www
 MASTER_SITES=	http://drupal.org/files/projects/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -23,9 +23,9 @@ RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 NO_BUILD=	yes
 DRUPDIR=	www/data/drupal
 DOCS=		CHANGELOG.txt INSTALL.txt LICENSE.txt MAINTAINERS.txt
+PLIST_SUB+=	DRUPDIR=${DRUPDIR}
 
 do-install:
-
 	${MKDIR} ${PREFIX}/${DRUPDIR}
 	${CP} ${WRKSRC}/.htaccess ${PREFIX}/${DRUPDIR}
 	${CP} ${WRKSRC}/cron.php ${PREFIX}/${DRUPDIR}
@@ -40,10 +40,12 @@ do-install:
 	${CP} -R ${WRKSRC}/themes ${PREFIX}/${DRUPDIR}
 	${CP} ${WRKSRC}/update.php ${PREFIX}/${DRUPDIR}
 	${CP} ${WRKSRC}/xmlrpc.php ${PREFIX}/${DRUPDIR}
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/${DRUPDIR}/doc
 .for FILE in ${DOCS}
 	${CP} ${WRKSRC}/${FILE} ${PREFIX}/${DRUPDIR}/doc
 .endfor
+.endif
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DRUPDIR}
 
 	@${ECHO_MSG} ""
diff --git a/www/drupal7/distinfo b/www/drupal7/distinfo
index 9d24fd30556d..c362ed55bcfb 100644
--- a/www/drupal7/distinfo
+++ b/www/drupal7/distinfo
@@ -1,2 +1,2 @@
-MD5 (drupal-4.6.0.tar.gz) = cba80c4f511284b09d6a0a2def5cb250
-SIZE (drupal-4.6.0.tar.gz) = 462780
+MD5 (drupal-4.6.2.tar.gz) = 7bbee605d6b57052e27adb1a61685ec1
+SIZE (drupal-4.6.2.tar.gz) = 464682
diff --git a/www/drupal7/pkg-plist b/www/drupal7/pkg-plist
index 0498884b7c2a..eced86429aa2 100644
--- a/www/drupal7/pkg-plist
+++ b/www/drupal7/pkg-plist
@@ -1,151 +1,151 @@
-www/data/drupal/.htaccess
-www/data/drupal/cron.php
-www/data/drupal/database/database.mysql
-www/data/drupal/database/database.pgsql
-www/data/drupal/database/updates.inc
-www/data/drupal/doc/CHANGELOG.txt
-www/data/drupal/doc/INSTALL.txt
-www/data/drupal/doc/LICENSE.txt
-www/data/drupal/doc/MAINTAINERS.txt
-www/data/drupal/favicon.ico
-www/data/drupal/includes/bootstrap.inc
-www/data/drupal/includes/common.inc
-www/data/drupal/includes/database.inc
-www/data/drupal/includes/database.mysql.inc
-www/data/drupal/includes/database.pgsql.inc
-www/data/drupal/includes/file.inc
-www/data/drupal/includes/image.inc
-www/data/drupal/includes/locale.inc
-www/data/drupal/includes/menu.inc
-www/data/drupal/includes/module.inc
-www/data/drupal/includes/pager.inc
-www/data/drupal/includes/session.inc
-www/data/drupal/includes/tablesort.inc
-www/data/drupal/includes/theme.inc
-www/data/drupal/includes/xmlrpc.inc
-www/data/drupal/includes/xmlrpcs.inc
-www/data/drupal/index.php
-www/data/drupal/misc/arrow-asc.png
-www/data/drupal/misc/arrow-desc.png
-www/data/drupal/misc/blog.png
-www/data/drupal/misc/drupal.css
-www/data/drupal/misc/druplicon-small.png
-www/data/drupal/misc/druplicon.png
-www/data/drupal/misc/forum-closed.png
-www/data/drupal/misc/forum-default.png
-www/data/drupal/misc/forum-hot-new.png
-www/data/drupal/misc/forum-hot.png
-www/data/drupal/misc/forum-new.png
-www/data/drupal/misc/forum-sticky.png
-www/data/drupal/misc/menu-collapsed.png
-www/data/drupal/misc/menu-expanded.png
-www/data/drupal/misc/menu-leaf.png
-www/data/drupal/misc/powered-by-drupal-dark.png
-www/data/drupal/misc/powered-by-drupal-light.png
-www/data/drupal/misc/powered-by-drupal.png
-www/data/drupal/misc/print.css
-www/data/drupal/misc/watchdog-error.png
-www/data/drupal/misc/watchdog-warning.png
-www/data/drupal/misc/xml.png
-www/data/drupal/modules/aggregator.module
-www/data/drupal/modules/archive.module
-www/data/drupal/modules/block.module
-www/data/drupal/modules/blog.module
-www/data/drupal/modules/blogapi.module
-www/data/drupal/modules/book.module
-www/data/drupal/modules/comment.module
-www/data/drupal/modules/contact.module
-www/data/drupal/modules/drupal.module
-www/data/drupal/modules/filter.module
-www/data/drupal/modules/forum.module
-www/data/drupal/modules/help.module
-www/data/drupal/modules/legacy.module
-www/data/drupal/modules/locale.module
-www/data/drupal/modules/menu.module
-www/data/drupal/modules/node.module
-www/data/drupal/modules/page.module
-www/data/drupal/modules/path.module
-www/data/drupal/modules/ping.module
-www/data/drupal/modules/poll.module
-www/data/drupal/modules/profile.module
-www/data/drupal/modules/queue.module
-www/data/drupal/modules/search.module
-www/data/drupal/modules/statistics.module
-www/data/drupal/modules/story.module
-www/data/drupal/modules/system.module
-www/data/drupal/modules/taxonomy.module
-www/data/drupal/modules/throttle.module
-www/data/drupal/modules/tracker.module
-www/data/drupal/modules/upload.module
-www/data/drupal/modules/user.module
-www/data/drupal/modules/watchdog.module
-www/data/drupal/scripts/code-clean.sh
-www/data/drupal/scripts/code-style.pl
-www/data/drupal/scripts/cron-curl.sh
-www/data/drupal/scripts/cron-lynx.sh
-www/data/drupal/scripts/prefix.sh
-www/data/drupal/sites/default/settings.php
-www/data/drupal/themes/bluemarine/logo.png
-www/data/drupal/themes/bluemarine/screenshot.png
-www/data/drupal/themes/bluemarine/style.css
-www/data/drupal/themes/bluemarine/xtemplate.xtmpl
-www/data/drupal/themes/chameleon/background.png
-www/data/drupal/themes/chameleon/chameleon.theme
-www/data/drupal/themes/chameleon/common.css
-www/data/drupal/themes/chameleon/logo.png
-www/data/drupal/themes/chameleon/marvin/bullet.png
-www/data/drupal/themes/chameleon/marvin/druplicon-watermark.png
-www/data/drupal/themes/chameleon/marvin/logo.png
-www/data/drupal/themes/chameleon/marvin/screenshot.png
-www/data/drupal/themes/chameleon/marvin/style.css
-www/data/drupal/themes/chameleon/screenshot.png
-www/data/drupal/themes/chameleon/style.css
-www/data/drupal/themes/engines/xtemplate/xtemplate.engine
-www/data/drupal/themes/engines/xtemplate/xtemplate.inc
-www/data/drupal/themes/pushbutton/arrow-next-hover.png
-www/data/drupal/themes/pushbutton/arrow-next-visited.png
-www/data/drupal/themes/pushbutton/arrow-next.png
-www/data/drupal/themes/pushbutton/arrow-prev-hover.png
-www/data/drupal/themes/pushbutton/arrow-prev-visited.png
-www/data/drupal/themes/pushbutton/arrow-prev.png
-www/data/drupal/themes/pushbutton/arrow-up-hover.png
-www/data/drupal/themes/pushbutton/arrow-up-visited.png
-www/data/drupal/themes/pushbutton/arrow-up.png
-www/data/drupal/themes/pushbutton/background.png
-www/data/drupal/themes/pushbutton/forum-container.jpg
-www/data/drupal/themes/pushbutton/forum-link.png
-www/data/drupal/themes/pushbutton/header-a.jpg
-www/data/drupal/themes/pushbutton/header-b.jpg
-www/data/drupal/themes/pushbutton/header-c.png
-www/data/drupal/themes/pushbutton/icon-block.png
-www/data/drupal/themes/pushbutton/icon-comment.png
-www/data/drupal/themes/pushbutton/logo-active.jpg
-www/data/drupal/themes/pushbutton/logo-background.jpg
-www/data/drupal/themes/pushbutton/logo-hover.jpg
-www/data/drupal/themes/pushbutton/logo.png
-www/data/drupal/themes/pushbutton/screenshot.png
-www/data/drupal/themes/pushbutton/style.css
-www/data/drupal/themes/pushbutton/tabs-off.png
-www/data/drupal/themes/pushbutton/tabs-on.png
-www/data/drupal/themes/pushbutton/tabs-option-hover.png
-www/data/drupal/themes/pushbutton/tabs-option-off.png
-www/data/drupal/themes/pushbutton/tabs-option-on.png
-www/data/drupal/themes/pushbutton/xtemplate.xtmpl
-www/data/drupal/update.php
-www/data/drupal/xmlrpc.php
-@dirrm www/data/drupal/themes/pushbutton
-@dirrm www/data/drupal/themes/engines/xtemplate
-@dirrm www/data/drupal/themes/engines
-@dirrm www/data/drupal/themes/chameleon/marvin
-@dirrm www/data/drupal/themes/chameleon
-@dirrm www/data/drupal/themes/bluemarine
-@dirrm www/data/drupal/themes
-@dirrm www/data/drupal/sites/default
-@dirrm www/data/drupal/sites
-@dirrm www/data/drupal/scripts
-@dirrm www/data/drupal/modules
-@dirrm www/data/drupal/misc
-@dirrm www/data/drupal/includes
-@dirrm www/data/drupal/doc
-@dirrm www/data/drupal/database
-@dirrm www/data/drupal
+%%DRUPDIR%%/.htaccess
+%%DRUPDIR%%/cron.php
+%%DRUPDIR%%/database/database.mysql
+%%DRUPDIR%%/database/database.pgsql
+%%DRUPDIR%%/database/updates.inc
+%%PORTDOCS%%%%DRUPDIR%%/doc/CHANGELOG.txt
+%%PORTDOCS%%%%DRUPDIR%%/doc/INSTALL.txt
+%%PORTDOCS%%%%DRUPDIR%%/doc/LICENSE.txt
+%%PORTDOCS%%%%DRUPDIR%%/doc/MAINTAINERS.txt
+%%DRUPDIR%%/favicon.ico
+%%DRUPDIR%%/includes/bootstrap.inc
+%%DRUPDIR%%/includes/common.inc
+%%DRUPDIR%%/includes/database.inc
+%%DRUPDIR%%/includes/database.mysql.inc
+%%DRUPDIR%%/includes/database.pgsql.inc
+%%DRUPDIR%%/includes/file.inc
+%%DRUPDIR%%/includes/image.inc
+%%DRUPDIR%%/includes/locale.inc
+%%DRUPDIR%%/includes/menu.inc
+%%DRUPDIR%%/includes/module.inc
+%%DRUPDIR%%/includes/pager.inc
+%%DRUPDIR%%/includes/session.inc
+%%DRUPDIR%%/includes/tablesort.inc
+%%DRUPDIR%%/includes/theme.inc
+%%DRUPDIR%%/includes/xmlrpc.inc
+%%DRUPDIR%%/includes/xmlrpcs.inc
+%%DRUPDIR%%/index.php
+%%DRUPDIR%%/misc/arrow-asc.png
+%%DRUPDIR%%/misc/arrow-desc.png
+%%DRUPDIR%%/misc/blog.png
+%%DRUPDIR%%/misc/drupal.css
+%%DRUPDIR%%/misc/druplicon-small.png
+%%DRUPDIR%%/misc/druplicon.png
+%%DRUPDIR%%/misc/forum-closed.png
+%%DRUPDIR%%/misc/forum-default.png
+%%DRUPDIR%%/misc/forum-hot-new.png
+%%DRUPDIR%%/misc/forum-hot.png
+%%DRUPDIR%%/misc/forum-new.png
+%%DRUPDIR%%/misc/forum-sticky.png
+%%DRUPDIR%%/misc/menu-collapsed.png
+%%DRUPDIR%%/misc/menu-expanded.png
+%%DRUPDIR%%/misc/menu-leaf.png
+%%DRUPDIR%%/misc/powered-by-drupal-dark.png
+%%DRUPDIR%%/misc/powered-by-drupal-light.png
+%%DRUPDIR%%/misc/powered-by-drupal.png
+%%DRUPDIR%%/misc/print.css
+%%DRUPDIR%%/misc/watchdog-error.png
+%%DRUPDIR%%/misc/watchdog-warning.png
+%%DRUPDIR%%/misc/xml.png
+%%DRUPDIR%%/modules/aggregator.module
+%%DRUPDIR%%/modules/archive.module
+%%DRUPDIR%%/modules/block.module
+%%DRUPDIR%%/modules/blog.module
+%%DRUPDIR%%/modules/blogapi.module
+%%DRUPDIR%%/modules/book.module
+%%DRUPDIR%%/modules/comment.module
+%%DRUPDIR%%/modules/contact.module
+%%DRUPDIR%%/modules/drupal.module
+%%DRUPDIR%%/modules/filter.module
+%%DRUPDIR%%/modules/forum.module
+%%DRUPDIR%%/modules/help.module
+%%DRUPDIR%%/modules/legacy.module
+%%DRUPDIR%%/modules/locale.module
+%%DRUPDIR%%/modules/menu.module
+%%DRUPDIR%%/modules/node.module
+%%DRUPDIR%%/modules/page.module
+%%DRUPDIR%%/modules/path.module
+%%DRUPDIR%%/modules/ping.module
+%%DRUPDIR%%/modules/poll.module
+%%DRUPDIR%%/modules/profile.module
+%%DRUPDIR%%/modules/queue.module
+%%DRUPDIR%%/modules/search.module
+%%DRUPDIR%%/modules/statistics.module
+%%DRUPDIR%%/modules/story.module
+%%DRUPDIR%%/modules/system.module
+%%DRUPDIR%%/modules/taxonomy.module
+%%DRUPDIR%%/modules/throttle.module
+%%DRUPDIR%%/modules/tracker.module
+%%DRUPDIR%%/modules/upload.module
+%%DRUPDIR%%/modules/user.module
+%%DRUPDIR%%/modules/watchdog.module
+%%DRUPDIR%%/scripts/code-clean.sh
+%%DRUPDIR%%/scripts/code-style.pl
+%%DRUPDIR%%/scripts/cron-curl.sh
+%%DRUPDIR%%/scripts/cron-lynx.sh
+%%DRUPDIR%%/scripts/prefix.sh
+%%DRUPDIR%%/sites/default/settings.php
+%%DRUPDIR%%/themes/bluemarine/logo.png
+%%DRUPDIR%%/themes/bluemarine/screenshot.png
+%%DRUPDIR%%/themes/bluemarine/style.css
+%%DRUPDIR%%/themes/bluemarine/xtemplate.xtmpl
+%%DRUPDIR%%/themes/chameleon/background.png
+%%DRUPDIR%%/themes/chameleon/chameleon.theme
+%%DRUPDIR%%/themes/chameleon/common.css
+%%DRUPDIR%%/themes/chameleon/logo.png
+%%DRUPDIR%%/themes/chameleon/marvin/bullet.png
+%%DRUPDIR%%/themes/chameleon/marvin/druplicon-watermark.png
+%%DRUPDIR%%/themes/chameleon/marvin/logo.png
+%%DRUPDIR%%/themes/chameleon/marvin/screenshot.png
+%%DRUPDIR%%/themes/chameleon/marvin/style.css
+%%DRUPDIR%%/themes/chameleon/screenshot.png
+%%DRUPDIR%%/themes/chameleon/style.css
+%%DRUPDIR%%/themes/engines/xtemplate/xtemplate.engine
+%%DRUPDIR%%/themes/engines/xtemplate/xtemplate.inc
+%%DRUPDIR%%/themes/pushbutton/arrow-next-hover.png
+%%DRUPDIR%%/themes/pushbutton/arrow-next-visited.png
+%%DRUPDIR%%/themes/pushbutton/arrow-next.png
+%%DRUPDIR%%/themes/pushbutton/arrow-prev-hover.png
+%%DRUPDIR%%/themes/pushbutton/arrow-prev-visited.png
+%%DRUPDIR%%/themes/pushbutton/arrow-prev.png
+%%DRUPDIR%%/themes/pushbutton/arrow-up-hover.png
+%%DRUPDIR%%/themes/pushbutton/arrow-up-visited.png
+%%DRUPDIR%%/themes/pushbutton/arrow-up.png
+%%DRUPDIR%%/themes/pushbutton/background.png
+%%DRUPDIR%%/themes/pushbutton/forum-container.jpg
+%%DRUPDIR%%/themes/pushbutton/forum-link.png
+%%DRUPDIR%%/themes/pushbutton/header-a.jpg
+%%DRUPDIR%%/themes/pushbutton/header-b.jpg
+%%DRUPDIR%%/themes/pushbutton/header-c.png
+%%DRUPDIR%%/themes/pushbutton/icon-block.png
+%%DRUPDIR%%/themes/pushbutton/icon-comment.png
+%%DRUPDIR%%/themes/pushbutton/logo-active.jpg
+%%DRUPDIR%%/themes/pushbutton/logo-background.jpg
+%%DRUPDIR%%/themes/pushbutton/logo-hover.jpg
+%%DRUPDIR%%/themes/pushbutton/logo.png
+%%DRUPDIR%%/themes/pushbutton/screenshot.png
+%%DRUPDIR%%/themes/pushbutton/style.css
+%%DRUPDIR%%/themes/pushbutton/tabs-off.png
+%%DRUPDIR%%/themes/pushbutton/tabs-on.png
+%%DRUPDIR%%/themes/pushbutton/tabs-option-hover.png
+%%DRUPDIR%%/themes/pushbutton/tabs-option-off.png
+%%DRUPDIR%%/themes/pushbutton/tabs-option-on.png
+%%DRUPDIR%%/themes/pushbutton/xtemplate.xtmpl
+%%DRUPDIR%%/update.php
+%%DRUPDIR%%/xmlrpc.php
+@dirrm %%DRUPDIR%%/themes/pushbutton
+@dirrm %%DRUPDIR%%/themes/engines/xtemplate
+@dirrm %%DRUPDIR%%/themes/engines
+@dirrm %%DRUPDIR%%/themes/chameleon/marvin
+@dirrm %%DRUPDIR%%/themes/chameleon
+@dirrm %%DRUPDIR%%/themes/bluemarine
+@dirrm %%DRUPDIR%%/themes
+@dirrm %%DRUPDIR%%/sites/default
+@dirrm %%DRUPDIR%%/sites
+@dirrm %%DRUPDIR%%/scripts
+@dirrm %%DRUPDIR%%/modules
+@dirrm %%DRUPDIR%%/misc
+@dirrm %%DRUPDIR%%/includes
+%%PORTDOCS%%@dirrm %%DRUPDIR%%/doc
+@dirrm %%DRUPDIR%%/database
+@dirrm %%DRUPDIR%%