3 files changed, 3 insertions, 144 deletions

diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index d854e2322511..a506042c8054 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	drupal7
-PORTVERSION=	7.28
-PORTREVISION=	1
+PORTVERSION=	7.31
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.drupal.org/files/projects/
 DISTNAME=	drupal-${PORTVERSION}
diff --git a/www/drupal7/distinfo b/www/drupal7/distinfo
index ce99f96fa11e..f81ab86efac7 100644
--- a/www/drupal7/distinfo
+++ b/www/drupal7/distinfo
@@ -1,2 +1,2 @@
-SHA256 (drupal/drupal-7.28.tar.gz) = 941b6de8978d215c95fe6f8466e3cb212f16647de93b38bbc41df020fd6e5eaa
-SIZE (drupal/drupal-7.28.tar.gz) = 3212823
+SHA256 (drupal/drupal-7.31.tar.gz) = 6af4849fd2e1fd0a186a5264de10613e57b84c69dbe7dec0754472d27f37af40
+SIZE (drupal/drupal-7.31.tar.gz) = 3216766
diff --git a/www/drupal7/pkg-plist b/www/drupal7/pkg-plist
index 3c58d1df95f8..1dfe74a833b2 100644
--- a/www/drupal7/pkg-plist
+++ b/www/drupal7/pkg-plist
@@ -423,7 +423,6 @@
 %%DRUPAL_BASE%%/modules/forum/forums.tpl.php
 %%DRUPAL_BASE%%/modules/help/help-rtl.css
 %%DRUPAL_BASE%%/modules/help/help.admin.inc
-%%DRUPAL_BASE%%/modules/help/help.api.php
 %%DRUPAL_BASE%%/modules/help/help.css
 %%DRUPAL_BASE%%/modules/help/help.info
 %%DRUPAL_BASE%%/modules/help/help.module
@@ -1072,144 +1071,5 @@
 %%DRUPAL_BASE%%/web.config
 %%DRUPAL_BASE%%/xmlrpc.php
 @unexec rm -f %%DRUPAL_BASE%%/files/.htaccess 2> /dev/null || true
-@dirrm %%DRUPAL_BASE%%/themes/stark
-@dirrm %%DRUPAL_BASE%%/themes/seven/images
-@dirrm %%DRUPAL_BASE%%/themes/seven
-@dirrm %%DRUPAL_BASE%%/themes/garland/images
-@dirrm %%DRUPAL_BASE%%/themes/garland/color
-@dirrm %%DRUPAL_BASE%%/themes/garland
-@dirrm %%DRUPAL_BASE%%/themes/engines/phptemplate
-@dirrm %%DRUPAL_BASE%%/themes/engines
-@dirrm %%DRUPAL_BASE%%/themes/bartik/templates
-@dirrm %%DRUPAL_BASE%%/themes/bartik/images
-@dirrm %%DRUPAL_BASE%%/themes/bartik/css
-@dirrm %%DRUPAL_BASE%%/themes/bartik/color
-@dirrm %%DRUPAL_BASE%%/themes/bartik
-@dirrm %%DRUPAL_BASE%%/themes
-@dirrmtry %%DRUPAL_BASE%%/sites/default/files
-@dirrmtry %%DRUPAL_BASE%%/sites/default
-@dirrmtry %%DRUPAL_BASE%%/sites/all/themes
-@dirrmtry %%DRUPAL_BASE%%/sites/all/modules
-@dirrmtry %%DRUPAL_BASE%%/sites/all/libraries
-@dirrmtry %%DRUPAL_BASE%%/sites/all
-@dirrmtry %%DRUPAL_BASE%%/sites
-@dirrm %%DRUPAL_BASE%%/scripts
-@dirrm %%DRUPAL_BASE%%/profiles/testing/modules/drupal_system_listing_incompatible_test
-@dirrm %%DRUPAL_BASE%%/profiles/testing/modules/drupal_system_listing_compatible_test
-@dirrm %%DRUPAL_BASE%%/profiles/testing/modules
-@dirrm %%DRUPAL_BASE%%/profiles/testing
-@dirrm %%DRUPAL_BASE%%/profiles/standard/translations
-@dirrm %%DRUPAL_BASE%%/profiles/standard
-@dirrm %%DRUPAL_BASE%%/profiles/minimal/translations
-@dirrm %%DRUPAL_BASE%%/profiles/minimal
-@dirrm %%DRUPAL_BASE%%/profiles
-@dirrm %%DRUPAL_BASE%%/modules/user/tests
-@dirrm %%DRUPAL_BASE%%/modules/user
-@dirrm %%DRUPAL_BASE%%/modules/update/tests/themes/update_test_subtheme
-@dirrm %%DRUPAL_BASE%%/modules/update/tests/themes/update_test_basetheme
-@dirrm %%DRUPAL_BASE%%/modules/update/tests/themes
-@dirrm %%DRUPAL_BASE%%/modules/update/tests
-@dirrm %%DRUPAL_BASE%%/modules/update
-@dirrm %%DRUPAL_BASE%%/modules/trigger/tests
-@dirrm %%DRUPAL_BASE%%/modules/trigger
-@dirrm %%DRUPAL_BASE%%/modules/translation/tests
-@dirrm %%DRUPAL_BASE%%/modules/translation
-@dirrm %%DRUPAL_BASE%%/modules/tracker
-@dirrm %%DRUPAL_BASE%%/modules/toolbar
-@dirrm %%DRUPAL_BASE%%/modules/taxonomy
-@dirrm %%DRUPAL_BASE%%/modules/system/tests
-@dirrm %%DRUPAL_BASE%%/modules/system
-@dirrm %%DRUPAL_BASE%%/modules/syslog
-@dirrm %%DRUPAL_BASE%%/modules/statistics
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/upgrade
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/themes/test_theme
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/themes/test_subtheme
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/themes/test_basetheme
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/themes
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/psr_0_test/lib/Drupal/psr_0_test/Tests/Nested
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/psr_0_test/lib/Drupal/psr_0_test/Tests
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/psr_0_test/lib/Drupal/psr_0_test
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/psr_0_test/lib/Drupal
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/psr_0_test/lib
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/psr_0_test
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/drupal_system_listing_incompatible_test
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests/drupal_system_listing_compatible_test
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/tests
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/lib/Drupal/simpletest/Tests
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/lib/Drupal/simpletest
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/lib/Drupal
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/lib
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/files/css_test_files/css_subfolder
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/files/css_test_files
-@dirrm %%DRUPAL_BASE%%/modules/simpletest/files
-@dirrm %%DRUPAL_BASE%%/modules/simpletest
-@dirrm %%DRUPAL_BASE%%/modules/shortcut
-@dirrm %%DRUPAL_BASE%%/modules/search/tests
-@dirrm %%DRUPAL_BASE%%/modules/search
-@dirrm %%DRUPAL_BASE%%/modules/rdf/tests
-@dirrm %%DRUPAL_BASE%%/modules/rdf
-@dirrm %%DRUPAL_BASE%%/modules/profile
-@dirrm %%DRUPAL_BASE%%/modules/poll
-@dirrm %%DRUPAL_BASE%%/modules/php
-@dirrm %%DRUPAL_BASE%%/modules/path
-@dirrm %%DRUPAL_BASE%%/modules/overlay/images
-@dirrm %%DRUPAL_BASE%%/modules/overlay
-@dirrm %%DRUPAL_BASE%%/modules/openid/tests
-@dirrm %%DRUPAL_BASE%%/modules/openid
-@dirrm %%DRUPAL_BASE%%/modules/node/tests
-@dirrm %%DRUPAL_BASE%%/modules/node
-@dirrm %%DRUPAL_BASE%%/modules/menu
-@dirrm %%DRUPAL_BASE%%/modules/locale/tests/translations
-@dirrm %%DRUPAL_BASE%%/modules/locale/tests
-@dirrm %%DRUPAL_BASE%%/modules/locale
-@dirrm %%DRUPAL_BASE%%/modules/image/tests
-@dirrm %%DRUPAL_BASE%%/modules/image
-@dirrm %%DRUPAL_BASE%%/modules/help
-@dirrm %%DRUPAL_BASE%%/modules/forum
-@dirrm %%DRUPAL_BASE%%/modules/filter/tests
-@dirrm %%DRUPAL_BASE%%/modules/filter
-@dirrm %%DRUPAL_BASE%%/modules/file/tests
-@dirrm %%DRUPAL_BASE%%/modules/file/icons
-@dirrm %%DRUPAL_BASE%%/modules/file
-@dirrm %%DRUPAL_BASE%%/modules/field_ui
-@dirrm %%DRUPAL_BASE%%/modules/field/theme
-@dirrm %%DRUPAL_BASE%%/modules/field/tests
-@dirrm %%DRUPAL_BASE%%/modules/field/modules/text
-@dirrm %%DRUPAL_BASE%%/modules/field/modules/options
-@dirrm %%DRUPAL_BASE%%/modules/field/modules/number
-@dirrm %%DRUPAL_BASE%%/modules/field/modules/list/tests
-@dirrm %%DRUPAL_BASE%%/modules/field/modules/list
-@dirrm %%DRUPAL_BASE%%/modules/field/modules/field_sql_storage
-@dirrm %%DRUPAL_BASE%%/modules/field/modules
-@dirrm %%DRUPAL_BASE%%/modules/field
-@dirrm %%DRUPAL_BASE%%/modules/dblog
-@dirrm %%DRUPAL_BASE%%/modules/dashboard
-@dirrm %%DRUPAL_BASE%%/modules/contextual/images
-@dirrm %%DRUPAL_BASE%%/modules/contextual
-@dirrm %%DRUPAL_BASE%%/modules/contact
-@dirrm %%DRUPAL_BASE%%/modules/comment
-@dirrm %%DRUPAL_BASE%%/modules/color/images
-@dirrm %%DRUPAL_BASE%%/modules/color
-@dirrm %%DRUPAL_BASE%%/modules/book
-@dirrm %%DRUPAL_BASE%%/modules/blog
-@dirrm %%DRUPAL_BASE%%/modules/block/tests/themes/block_test_theme
-@dirrm %%DRUPAL_BASE%%/modules/block/tests/themes
-@dirrm %%DRUPAL_BASE%%/modules/block/tests
-@dirrm %%DRUPAL_BASE%%/modules/block
-@dirrm %%DRUPAL_BASE%%/modules/aggregator/tests
-@dirrm %%DRUPAL_BASE%%/modules/aggregator
-@dirrmtry %%DRUPAL_BASE%%/modules
-@dirrm %%DRUPAL_BASE%%/misc/ui/images
-@dirrm %%DRUPAL_BASE%%/misc/ui
-@dirrm %%DRUPAL_BASE%%/misc/farbtastic
-@dirrm %%DRUPAL_BASE%%/misc
-@dirrm %%DRUPAL_BASE%%/includes/filetransfer
-@dirrm %%DRUPAL_BASE%%/includes/database/sqlite
-@dirrm %%DRUPAL_BASE%%/includes/database/pgsql
-@dirrm %%DRUPAL_BASE%%/includes/database/mysql
-@dirrm %%DRUPAL_BASE%%/includes/database
-@dirrm %%DRUPAL_BASE%%/includes
-@dirrmtry %%DRUPAL_BASE%%/
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @owner root
 @group wheel