- Update to 6.x-2.0

Approved by:	maintainer implicit

6 files changed, 15 insertions, 24 deletions

diff --git a/www/drupal6-seo_checklist/Makefile b/www/drupal6-seo_checklist/Makefile
index 5da5632adac2..b081d12ff527 100644
--- a/www/drupal6-seo_checklist/Makefile
+++ b/www/drupal6-seo_checklist/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	seo_checklist
-DISTVERSION=	6.x-1.0-beta3
+DISTVERSION=	6.x-2.0
 CATEGORIES=	www
 
 MAINTAINER=	nick@foobar.org
 COMMENT=	Drupal module to provide checklist of actions for SEO
 
 DRUPAL6_MODULE=	yes
-MODULE_FILES=	SEOChecklist.info SEOChecklist.install SEOChecklist.module
-
+MODULE_FILES=	seochecklist.info seochecklist.install seochecklist.module
 DOC_FILES=	LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
diff --git a/www/drupal6-seo_checklist/distinfo b/www/drupal6-seo_checklist/distinfo
index 9c515c2441d5..828574ac2055 100644
--- a/www/drupal6-seo_checklist/distinfo
+++ b/www/drupal6-seo_checklist/distinfo
@@ -1,3 +1,3 @@
-MD5 (drupal/seo_checklist-6.x-1.0-beta3.tar.gz) = 37b2500d7990e15c613403a4a04dfbe5
-SHA256 (drupal/seo_checklist-6.x-1.0-beta3.tar.gz) = b1e57874c199a4ed9b886daa75ec7a1737fefd177abb4c22569ca6fd2a92094a
-SIZE (drupal/seo_checklist-6.x-1.0-beta3.tar.gz) = 12975
+MD5 (drupal/seo_checklist-6.x-2.0.tar.gz) = bcdc6552409a26705c2fb16547ac4ecf
+SHA256 (drupal/seo_checklist-6.x-2.0.tar.gz) = f757a6d935cda3ce6f4360ecf17b7ea3ab9c9fc67ba06cc42f9dc07be18a3a55
+SIZE (drupal/seo_checklist-6.x-2.0.tar.gz) = 11954
diff --git a/www/drupal6-wysiwyg/Makefile b/www/drupal6-wysiwyg/Makefile
index eb8805b88fed..dcea00afe576 100644
--- a/www/drupal6-wysiwyg/Makefile
+++ b/www/drupal6-wysiwyg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wysiwyg
-DISTVERSION=	6.x-2.0-alpha1
+DISTVERSION=	6.x-2.0
 CATEGORIES=	www
 
 MAINTAINER=	nick@foobar.org
@@ -20,7 +20,7 @@ RUN_DEPENDS+=	${LOCALBASE}/${TINYMCEDIR}:${PORTSDIR}/www/tinymce3
 PLIST_FILES+=	${DRUPAL_MODDIR}/tinymce
 
 DRUPAL6_MODULE=	yes
-MODULE_FILES=	editors/css/markitup-1.css \
+MODULE_FILES=	editors/css/openwysiwyg.css \
 		editors/css/tinymce-2.css \
 		editors/css/tinymce-3.css \
 		editors/js/fckeditor-2.6.js \
@@ -54,10 +54,6 @@ MODULE_FILES=	editors/css/markitup-1.css \
 		plugins/break/images/spacer.gif \
 		plugins/break/break.css \
 		plugins/break/break.js \
-		plugins/break/langs/ca.js \
-		plugins/break/langs/de.js \
-		plugins/break/langs/en.js \
-		plugins/break/langs/es.js \
 		plugins/break.inc \
 		translations/wysiwyg.pot \
 		translations/da.po \
diff --git a/www/drupal6-wysiwyg/distinfo b/www/drupal6-wysiwyg/distinfo
index 8c11a6e57b00..4671a1f72780 100644
--- a/www/drupal6-wysiwyg/distinfo
+++ b/www/drupal6-wysiwyg/distinfo
@@ -1,3 +1,3 @@
-MD5 (drupal/wysiwyg-6.x-2.0-alpha1.tar.gz) = a745141da5436606e8bdf848cfd6da20
-SHA256 (drupal/wysiwyg-6.x-2.0-alpha1.tar.gz) = b0c093d53ffb50ff2e441b31dc88e72dc76e4f4dbe4691bb7defbad7febbb578
-SIZE (drupal/wysiwyg-6.x-2.0-alpha1.tar.gz) = 80232
+MD5 (drupal/wysiwyg-6.x-2.0.tar.gz) = 0dcc5b435b6698e61a336d32f280ed95
+SHA256 (drupal/wysiwyg-6.x-2.0.tar.gz) = 712dc4d744539b46df00372ce405cb177db580d368ad05230f4658a612457232
+SIZE (drupal/wysiwyg-6.x-2.0.tar.gz) = 89627
diff --git a/www/drupal7-wysiwyg/Makefile b/www/drupal7-wysiwyg/Makefile
index eb8805b88fed..dcea00afe576 100644
--- a/www/drupal7-wysiwyg/Makefile
+++ b/www/drupal7-wysiwyg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wysiwyg
-DISTVERSION=	6.x-2.0-alpha1
+DISTVERSION=	6.x-2.0
 CATEGORIES=	www
 
 MAINTAINER=	nick@foobar.org
@@ -20,7 +20,7 @@ RUN_DEPENDS+=	${LOCALBASE}/${TINYMCEDIR}:${PORTSDIR}/www/tinymce3
 PLIST_FILES+=	${DRUPAL_MODDIR}/tinymce
 
 DRUPAL6_MODULE=	yes
-MODULE_FILES=	editors/css/markitup-1.css \
+MODULE_FILES=	editors/css/openwysiwyg.css \
 		editors/css/tinymce-2.css \
 		editors/css/tinymce-3.css \
 		editors/js/fckeditor-2.6.js \
@@ -54,10 +54,6 @@ MODULE_FILES=	editors/css/markitup-1.css \
 		plugins/break/images/spacer.gif \
 		plugins/break/break.css \
 		plugins/break/break.js \
-		plugins/break/langs/ca.js \
-		plugins/break/langs/de.js \
-		plugins/break/langs/en.js \
-		plugins/break/langs/es.js \
 		plugins/break.inc \
 		translations/wysiwyg.pot \
 		translations/da.po \
diff --git a/www/drupal7-wysiwyg/distinfo b/www/drupal7-wysiwyg/distinfo
index 8c11a6e57b00..4671a1f72780 100644
--- a/www/drupal7-wysiwyg/distinfo
+++ b/www/drupal7-wysiwyg/distinfo
@@ -1,3 +1,3 @@
-MD5 (drupal/wysiwyg-6.x-2.0-alpha1.tar.gz) = a745141da5436606e8bdf848cfd6da20
-SHA256 (drupal/wysiwyg-6.x-2.0-alpha1.tar.gz) = b0c093d53ffb50ff2e441b31dc88e72dc76e4f4dbe4691bb7defbad7febbb578
-SIZE (drupal/wysiwyg-6.x-2.0-alpha1.tar.gz) = 80232
+MD5 (drupal/wysiwyg-6.x-2.0.tar.gz) = 0dcc5b435b6698e61a336d32f280ed95
+SHA256 (drupal/wysiwyg-6.x-2.0.tar.gz) = 712dc4d744539b46df00372ce405cb177db580d368ad05230f4658a612457232
+SIZE (drupal/wysiwyg-6.x-2.0.tar.gz) = 89627