- Update drupal7-wysiwyg to 7.x.2.0

- Attach to build

PR:		ports/155350
Submitted by:	Nick Hilliard <nick@foobar.org> (maintainer)

3 files changed, 52 insertions, 13 deletions

diff --git a/www/Makefile b/www/Makefile
index 8b74b45f9267..9256e482dd0b 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -195,6 +195,7 @@
     SUBDIR += drupal6-wysiwyg
     SUBDIR += drupal6-zeropoint
     SUBDIR += drupal7
+    SUBDIR += drupal7-wysiwyg
     SUBDIR += drush
     SUBDIR += dtse
     SUBDIR += dummyflash
diff --git a/www/drupal7-wysiwyg/Makefile b/www/drupal7-wysiwyg/Makefile
index 3eb89238d5e8..63a0fa912851 100644
--- a/www/drupal7-wysiwyg/Makefile
+++ b/www/drupal7-wysiwyg/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	drupal6-wysiwyg
+# Ports collection makefile for:	drupal7-wysiwyg
 # Date created:				2 June 2009
 # Whom:					Nick Hilliard <nick@foobar.org>
 #
@@ -6,43 +6,68 @@
 #
 
 PORTNAME=	wysiwyg
-DISTVERSION=	6.x-2.0
-PORTREVISION=	1
+DISTVERSION=	7.x-2.0
 CATEGORIES=	www
 
 MAINTAINER=	nick@foobar.org
 COMMENT=	Allows implementation of WYSIWYG editors for editing Drupal content
 
-TINYMCEDIR=	www/tinymce
+#LICENSE from bsd.drupal.mk
 
-# we support either tinymce2 or tinymce3
-RUN_DEPENDS+=	${LOCALBASE}/${TINYMCEDIR}:${PORTSDIR}/www/tinymce3
+OPTIONS=	TINYMCE3	"Install TinyMCE3 Editor" off \
+		CKEDITOR	"Install CKEditor" off \
+		YUI		"Install Yahoo UI Editor" off
 
-PLIST_FILES+=	${DRUPAL_MODDIR}/tinymce
+.include <bsd.port.options.mk>
 
-DRUPAL6_MODULE=	yes
+.if defined(WITH_TINYMCE3)
+RUN_DEPENDS+=	${LOCALBASE}/www/tinymce:${PORTSDIR}/www/tinymce3
+PLIST_FILES+=	${DRUPAL_MODLIB}/tinymce
+.endif
+
+.if defined(WITH_CKEDITOR)
+RUN_DEPENDS+=	${LOCALBASE}/www/ckeditor:${PORTSDIR}/www/ckeditor
+PLIST_FILES+=	${DRUPAL_MODLIB}/ckeditor
+.endif
+
+.if defined(WITH_YUI)
+RUN_DEPENDS+=	${LOCALBASE}/www/yui:${PORTSDIR}/www/yahoo-ui
+PLIST_FILES+=	${DRUPAL_MODLIB}/yui
+.endif
+
+DRUPAL_MODULE=	yes
+DRUPAL_VERSION=	7
 MODULE_FILES=	editors/css/openwysiwyg.css \
 		editors/css/tinymce-2.css \
 		editors/css/tinymce-3.css \
+		editors/js/ckeditor-3.0.js \
 		editors/js/fckeditor-2.6.js \
 		editors/js/fckeditor.config.js \
 		editors/js/jwysiwyg.js \
 		editors/js/markitup.js \
 		editors/js/nicedit.js \
 		editors/js/none.js \
+		editors/js/openwysiwyg.js \
 		editors/js/tinymce-2.js \
 		editors/js/tinymce-3.js \
+		editors/js/whizzywig-56.js \
+		editors/js/whizzywig-60.js \
 		editors/js/whizzywig.js \
+		editors/js/wymeditor.js \
 		editors/js/yui.js \
+		editors/ckeditor.inc \
 		editors/fckeditor.inc \
 		editors/jwysiwyg.inc \
 		editors/markitup.inc \
 		editors/nicedit.inc \
+		editors/openwysiwyg.inc \
 		editors/tinymce.inc \
 		editors/whizzywig.inc \
+		editors/wymeditor.inc \
 		editors/yui.inc \
 		wysiwyg-dialog-page.tpl.php \
 		wysiwyg.admin.inc \
+		wysiwyg.api.js \
 		wysiwyg.api.php \
 		wysiwyg.dialog.inc \
 		wysiwyg.info \
@@ -55,15 +80,20 @@ MODULE_FILES=	editors/css/openwysiwyg.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 \
 		translations/de.po \
 		translations/el.po \
+		translations/fi.po \
 		translations/fr.po \
 		translations/hu.po \
-		translations/sv.po \
-		translations/tr.po
+		translations/tr.po \
+		translations/uk.po
 
 MODULE_DIRS=	editors/css editors/js editors plugins/break/images \
 		plugins/break/langs plugins/break plugins translations
@@ -71,7 +101,15 @@ MODULE_DIRS=	editors/css editors/js editors plugins/break/images \
 DOC_FILES=	CHANGELOG.txt README.txt LICENSE.txt
 
 post-install:
-	${LN} -s ${PREFIX}/${TINYMCEDIR} ${PREFIX}/${DRUPAL_MODDIR}
+.if defined(WITH_TINYMCE3)
+	${LN} -fs ${PREFIX}/www/tinymce ${PREFIX}/${DRUPAL_MODLIB}
+.endif
+.if defined(WITH_CKEDITOR)
+	${LN} -fs ${PREFIX}/www/CKEditor ${PREFIX}/${DRUPAL_MODLIB}/ckeditor
+.endif
+.if defined(WITH_YUI)
+	${LN} -fs ${PREFIX}/www/yahoo ${PREFIX}/${DRUPAL_MODLIB}/yui
+.endif
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/Mk/bsd.drupal.mk"
diff --git a/www/drupal7-wysiwyg/distinfo b/www/drupal7-wysiwyg/distinfo
index b6b130594908..df6578c53401 100644
--- a/www/drupal7-wysiwyg/distinfo
+++ b/www/drupal7-wysiwyg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (drupal/wysiwyg-6.x-2.0.tar.gz) = 712dc4d744539b46df00372ce405cb177db580d368ad05230f4658a612457232
-SIZE (drupal/wysiwyg-6.x-2.0.tar.gz) = 89627
+SHA256 (drupal/wysiwyg-7.x-2.0.tar.gz) = afb47bba4eb96bb06b437b3a4f11223dc25100bbddfa5b01cade348635f2f143
+SIZE (drupal/wysiwyg-7.x-2.0.tar.gz) = 108538