2 files changed, 166 insertions, 137 deletions

diff --git a/www/drupal6-panels/Makefile b/www/drupal6-panels/Makefile
index 01fcf373fb53..4a1ed4e1b45c 100644
--- a/www/drupal6-panels/Makefile
+++ b/www/drupal6-panels/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	panels
-DISTVERSION=	6.x-3.3
+DISTVERSION=	6.x-3.5
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.drupal.org/files/projects/
 
@@ -24,144 +24,173 @@ MODULE_DIRS=	translations templates plugins/task_handlers \
 		plugins/layouts/threecol_33_34_33 \
 		plugins/layouts/threecol_25_50_25_stacked \
 		plugins/layouts/threecol_25_50_25 \
-		plugins/layouts/onecol \
-		plugins/layouts/flexible \
-		plugins/layouts plugins/cache \
-		plugins panels_node \
-		panels_mini/plugins/content_types \
-		panels_mini/plugins panels_mini \
-		panels_export js includes \
-		images help docs css
+		plugins/layouts/onecol plugins/layouts/flexible \
+		plugins/layouts plugins/cache plugins \
+		panels_stylizer/plugins/styles \
+		panels_stylizer/plugins/style_bases/region/region_rounded_shadow \
+		panels_stylizer/plugins/style_bases/region/region_plain_box \
+		panels_stylizer/plugins/style_bases/region \
+		panels_stylizer/plugins/style_bases/pane/pane_rounded_shadow \
+		panels_stylizer/plugins/style_bases/pane/pane_plain_box \
+		panels_stylizer/plugins/style_bases/pane \
+		panels_stylizer/plugins/style_bases panels_stylizer/plugins \
+		panels_stylizer panels_node panels_mini/plugins/content_types \
+		panels_mini/plugins panels_mini panels_export \
+		js includes images help css
 
-MODULE_FILES=	css/panels-dashboard.css \
-		css/panels.css \
-		css/panels_admin.css \
-		css/panels_dnd.css \
-		css/panels_page.css \
-		docs/docs.inc \
-		docs/doxygen.css \
-		docs/sample_plugin_ct.inc \
-		panels.info \
-		panels.install \
+MODULE_FILES=	translations/panels.pot \
+		translations/panels.ja.po \
+		translations/panels.fr.po \
+		translations/panels.de.po \
+		templates/panels-pane.tpl.php \
+		templates/panels-dashboard.tpl.php \
+		plugins/task_handlers/panel_context.inc \
+		plugins/styles/naked.inc \
+		plugins/styles/list.inc \
+		plugins/styles/default.inc \
+		plugins/styles/corners/shadow-t.png \
+		plugins/styles/corners/shadow-r.png \
+		plugins/styles/corners/shadow-l.png \
+		plugins/styles/corners/shadow-b.png \
+		plugins/styles/corners/rounded_corners.inc \
+		plugins/styles/corners/panels-rounded-corners-box.tpl.php \
+		plugins/styles/corners/corner-bits.png \
+		plugins/styles/block.inc \
+		plugins/layouts/twocol_stacked/twocol_stacked.png \
+		plugins/layouts/twocol_stacked/twocol_stacked.inc \
+		plugins/layouts/twocol_stacked/twocol_stacked.css \
+		plugins/layouts/twocol_stacked/panels-twocol-stacked.tpl.php \
+		plugins/layouts/twocol_bricks/twocol_bricks.png \
+		plugins/layouts/twocol_bricks/twocol_bricks.inc \
+		plugins/layouts/twocol_bricks/twocol_bricks.css \
+		plugins/layouts/twocol_bricks/panels-twocol-bricks.tpl.php \
+		plugins/layouts/twocol/twocol.png \
+		plugins/layouts/twocol/twocol.inc \
+		plugins/layouts/twocol/twocol.css \
+		plugins/layouts/twocol/panels-twocol.tpl.php \
+		plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.png \
+		plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.inc \
+		plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.css \
+		plugins/layouts/threecol_33_34_33_stacked/panels-threecol-33-34-33-stacked.tpl.php \
+		plugins/layouts/threecol_33_34_33/threecol_33_34_33.png \
+		plugins/layouts/threecol_33_34_33/threecol_33_34_33.inc \
+		plugins/layouts/threecol_33_34_33/threecol_33_34_33.css \
+		plugins/layouts/threecol_33_34_33/panels-threecol-33-34-33.tpl.php \
+		plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.png \
+		plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.inc \
+		plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.css \
+		plugins/layouts/threecol_25_50_25_stacked/panels-threecol-25-50-25-stacked.tpl.php \
+		plugins/layouts/threecol_25_50_25/threecol_25_50_25.png \
+		plugins/layouts/threecol_25_50_25/threecol_25_50_25.inc \
+		plugins/layouts/threecol_25_50_25/threecol_25_50_25.css \
+		plugins/layouts/threecol_25_50_25/panels-threecol-25-50-25.tpl.php \
+		plugins/layouts/onecol/panels-onecol.tpl.php \
+		plugins/layouts/onecol/onecol.png \
+		plugins/layouts/onecol/onecol.inc \
+		plugins/layouts/onecol/onecol.css \
+		plugins/layouts/flexible/grippie-vertical.png \
+		plugins/layouts/flexible/flexible.png \
+		plugins/layouts/flexible/flexible.inc \
+		plugins/layouts/flexible/flexible.css \
+		plugins/layouts/flexible/flexible-admin.js \
+		plugins/layouts/flexible/flexible-admin.css \
+		plugins/cache/simple.inc \
+		panels_stylizer/plugins/styles/stylizer.inc \
+		panels_stylizer/plugins/style_bases/region/region_rounded_shadow/region_rounded_shadow.inc \
+		panels_stylizer/plugins/style_bases/region/region_rounded_shadow/region-rounded-shadow.tpl.php \
+		panels_stylizer/plugins/style_bases/region/region_rounded_shadow/region-rounded-shadow.css \
+		panels_stylizer/plugins/style_bases/region/region_rounded_shadow/icon.png \
+		panels_stylizer/plugins/style_bases/region/region_rounded_shadow/box-shadow.png \
+		panels_stylizer/plugins/style_bases/region/region_rounded_shadow/box-color.png \
+		panels_stylizer/plugins/style_bases/region/region_plain_box/region_plain_box.inc \
+		panels_stylizer/plugins/style_bases/region/region_plain_box/region-plain-box.tpl.php \
+		panels_stylizer/plugins/style_bases/region/region_plain_box/region-plain-box.css \
+		panels_stylizer/plugins/style_bases/region/region_plain_box/icon.png \
+		panels_stylizer/plugins/style_bases/pane/pane_rounded_shadow/pane_rounded_shadow.inc \
+		panels_stylizer/plugins/style_bases/pane/pane_rounded_shadow/pane-rounded-shadow.tpl.php \
+		panels_stylizer/plugins/style_bases/pane/pane_rounded_shadow/pane-rounded-shadow.css \
+		panels_stylizer/plugins/style_bases/pane/pane_rounded_shadow/icon.png \
+		panels_stylizer/plugins/style_bases/pane/pane_rounded_shadow/box-shadow.png \
+		panels_stylizer/plugins/style_bases/pane/pane_rounded_shadow/box-color.png \
+		panels_stylizer/plugins/style_bases/pane/pane_plain_box/pane_plain_box.inc \
+		panels_stylizer/plugins/style_bases/pane/pane_plain_box/pane-plain-box.tpl.php \
+		panels_stylizer/plugins/style_bases/pane/pane_plain_box/pane-plain-box.css \
+		panels_stylizer/plugins/style_bases/pane/pane_plain_box/icon.png \
+		panels_stylizer/panels_stylizer.module \
+		panels_stylizer/panels_stylizer.install \
+		panels_stylizer/panels_stylizer.info \
+		panels_stylizer/panels_stylizer.admin.inc \
+		panels_stylizer/panels-style.js \
+		panels_stylizer/panels-style.css \
+		panels_node/panels_node.module \
+		panels_node/panels_node.install \
+		panels_node/panels_node.info \
+		panels_mini/plugins/content_types/panels_mini.inc \
+		panels_mini/plugins/content_types/icon_panels_mini.png \
+		panels_mini/panels_mini.module \
+		panels_mini/panels_mini.install \
+		panels_mini/panels_mini.info \
+		panels_mini/panels_mini.admin.inc \
+		panels_export/panels_export.module \
 		panels.module \
-		panels2.doxy \
-		help/api.html \
-		help/display.html \
-		help/pane.html \
-		help/panels.help.ini \
-		help/plugin-layout.html \
-		help/plugin-style.html \
-		images/arrow-active.png \
-		images/arrow-down-light.png \
-		images/bg-content-modal.png \
-		images/bg-shade-dark.png \
-		images/bg-shade-light.png \
-		images/bg-shade-medium.png \
-		images/bg-shade-white-lrg.png \
-		images/blank.gif \
-		images/close.gif \
-		images/delete.png \
-		images/go-down.png \
-		images/go-right.png \
-		images/go-up.png \
-		images/icon-addcontent.png \
-		images/icon-cache.png \
-		images/icon-configure.png \
-		images/icon-delete.png \
-		images/icon-draggable.png \
+		panels.install \
+		panels.info \
+		js/panels.js \
+		js/panels-base.js \
+		js/layout.js \
+		js/display_editor.js \
+		includes/plugins.inc \
+		includes/display-render.inc \
+		includes/display-layout.inc \
+		includes/display-edit.inc \
+		includes/common.inc \
+		includes/callbacks.inc \
+		images/user-trash.png \
+		images/throbber.gif \
+		images/sprite.png \
+		images/sky.png \
+		images/screenshot-4.jpg \
+		images/screenshot-3.jpg \
+		images/screenshot-2.jpg \
+		images/screenshot-1.jpg \
+		images/portlet-expanded.png \
+		images/portlet-collapsed.png \
 		images/no-icon.png \
-		images/icon-hidepane.png \
 		images/icon-showpane.png \
-		images/portlet-collapsed.png \
-		images/portlet-expanded.png \
-		images/screenshot-1.jpg \
-		images/screenshot-2.jpg \
-		images/screenshot-3.jpg \
-		images/screenshot-4.jpg \
-		images/sky.png \
-		images/sprite.png \
-		images/throbber.gif \
-		images/user-trash.png \
-		includes/callbacks.inc \
-		includes/common.inc \
-		includes/display-edit.inc \
-		includes/display-layout.inc \
-		includes/display-render.inc \
-		includes/plugins.inc \
-		js/display_editor.js \
-		js/layout.js \
-		js/panels-base.js \
-		js/panels.js \
-		panels_export/panels_export.module \
-		panels_mini/plugins/content_types/icon_panels_mini.png \
-		panels_mini/plugins/content_types/panels_mini.inc \
-		panels_mini/panels_mini.admin.inc \
-		panels_mini/panels_mini.info \
-		panels_mini/panels_mini.install \
-		panels_mini/panels_mini.module \
-		panels_node/panels_node.info \
-		panels_node/panels_node.install \
-		panels_node/panels_node.module \
-		plugins/cache/simple.inc \
-		plugins/layouts/flexible/flexible-admin.css \
-		plugins/layouts/flexible/flexible-admin.js \
-		plugins/layouts/flexible/flexible.css \
-		plugins/layouts/flexible/flexible.inc \
-		plugins/layouts/flexible/flexible.png \
-		plugins/layouts/flexible/grippie-vertical.png \
-		plugins/layouts/onecol/onecol.css \
-		plugins/layouts/onecol/onecol.inc \
-		plugins/layouts/onecol/onecol.png \
-		plugins/layouts/onecol/panels-onecol.tpl.php \
-		plugins/layouts/threecol_25_50_25/panels-threecol-25-50-25.tpl.php \
-		plugins/layouts/threecol_25_50_25/threecol_25_50_25.css \
-		plugins/layouts/threecol_25_50_25/threecol_25_50_25.inc \
-		plugins/layouts/threecol_25_50_25/threecol_25_50_25.png \
-		plugins/layouts/threecol_25_50_25_stacked/panels-threecol-25-50-25-stacked.tpl.php \
-		plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.css \
-		plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.inc \
-		plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.png \
-		plugins/layouts/threecol_33_34_33/panels-threecol-33-34-33.tpl.php \
-		plugins/layouts/threecol_33_34_33/threecol_33_34_33.css \
-		plugins/layouts/threecol_33_34_33/threecol_33_34_33.inc \
-		plugins/layouts/threecol_33_34_33/threecol_33_34_33.png \
-		plugins/layouts/threecol_33_34_33_stacked/panels-threecol-33-34-33-stacked.tpl.php \
-		plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.css \
-		plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.inc \
-		plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.png \
-		plugins/layouts/twocol/panels-twocol.tpl.php \
-		plugins/layouts/twocol/twocol.css \
-		plugins/layouts/twocol/twocol.inc \
-		plugins/layouts/twocol/twocol.png \
-		plugins/layouts/twocol_bricks/panels-twocol-bricks.tpl.php \
-		plugins/layouts/twocol_bricks/twocol_bricks.css \
-		plugins/layouts/twocol_bricks/twocol_bricks.inc \
-		plugins/layouts/twocol_bricks/twocol_bricks.png \
-		plugins/layouts/twocol_stacked/panels-twocol-stacked.tpl.php \
-		plugins/layouts/twocol_stacked/twocol_stacked.css \
-		plugins/layouts/twocol_stacked/twocol_stacked.inc \
-		plugins/layouts/twocol_stacked/twocol_stacked.png \
-		plugins/styles/corners/corner-bits.png \
-		plugins/styles/corners/panels-rounded-corners-box.tpl.php \
-		plugins/styles/corners/rounded_corners.inc \
-		plugins/styles/corners/shadow-b.png \
-		plugins/styles/corners/shadow-l.png \
-		plugins/styles/corners/shadow-r.png \
-		plugins/styles/corners/shadow-t.png \
-		plugins/styles/block.inc \
-		plugins/styles/default.inc \
-		plugins/styles/list.inc \
-		plugins/styles/naked.inc \
-		plugins/task_handlers/panel_context.inc \
-		templates/panels-dashboard.tpl.php \
-		templates/panels-pane.tpl.php \
-		translations/panels.de.po \
-		translations/panels.fr.po \
-		translations/panels.ja.po \
-		translations/panels.pot \
+		images/icon-hidepane.png \
+		images/icon-draggable.png \
+		images/icon-delete.png \
+		images/icon-configure.png \
+		images/icon-cache.png \
+		images/icon-addcontent.png \
+		images/go-up.png \
+		images/go-right.png \
+		images/go-down.png \
+		images/delete.png \
+		images/close.gif \
+		images/blank.gif \
+		images/bg-shade-white-lrg.png \
+		images/bg-shade-medium.png \
+		images/bg-shade-light.png \
+		images/bg-shade-dark.png \
+		images/bg-content-modal.png \
+		images/arrow-down-light.png \
+		images/arrow-active.png \
+		help/plugin-style.html \
+		help/plugin-layout.html \
+		help/panels.help.ini \
+		help/pane.html \
+		help/display.html \
+		help/api.html \
+		css/panels_page.css \
+		css/panels_dnd.css \
+		css/panels_admin.css \
+		css/panels.css \
+		css/panels-dashboard.css
 
-DOC_FILES=	D6UPDATE.txt API.txt CHANGELOG.txt INSTALL.txt \
-		KNOWN_ISSUES.txt README.txt TODO.txt LICENSE.txt
+DOC_FILES=	README.txt LICENSE.txt \
+		KNOWN_ISSUES.txt INSTALL.txt \
+		D6UPDATE.txt CHANGELOG.txt
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
diff --git a/www/drupal6-panels/distinfo b/www/drupal6-panels/distinfo
index c882e01137fd..7a8ba10c4903 100644
--- a/www/drupal6-panels/distinfo
+++ b/www/drupal6-panels/distinfo
@@ -1,3 +1,3 @@
-MD5 (drupal/panels-6.x-3.3.tar.gz) = 46285850574246604750def846433e05
-SHA256 (drupal/panels-6.x-3.3.tar.gz) = d0fc16e70c84fd608b29ce4ee724cbcb76342cbc64e0378b3f8bba09d5859027
-SIZE (drupal/panels-6.x-3.3.tar.gz) = 348175
+MD5 (drupal/panels-6.x-3.5.tar.gz) = f713545b0a818271a43ffc10c9e192bd
+SHA256 (drupal/panels-6.x-3.5.tar.gz) = b5d857890bb16f7ffc9c7013e96cadca73dbaf907d22735417c6a5f862178401
+SIZE (drupal/panels-6.x-3.5.tar.gz) = 348703