Index: head/www/drupal7-wysiwyg/Makefile
===================================================================
--- head/www/drupal7-wysiwyg/Makefile	(revision 420291)
+++ head/www/drupal7-wysiwyg/Makefile	(revision 420292)
@@ -1,104 +1,87 @@
 # Created by: Nick Hilliard <nick@foobar.org>
 # $FreeBSD$
 
 PORTNAME=	wysiwyg
-DISTVERSION=	7.x-2.0
-PORTREVISION=	1
+DISTVERSION=	7.x-2.2
 CATEGORIES=	www
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows implementation of WYSIWYG editors for editing Drupal content
 
 #LICENSE from bsd.drupal.mk
 
 USES=		drupal:7,module
 
-OPTIONS_DEFINE=	TINYMCE3 CKEDITOR DOCS
-
-TINYMCE3_DESC=	Install TinyMCE3 Editor
-CKEDITOR_DESC=	Install CKEditor
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTINYMCE3}
-RUN_DEPENDS+=	${LOCALBASE}/www/tinymce:www/tinymce3
-PLIST_FILES+=	${DRUPAL_MODLIB}/tinymce
-.endif
-
-.if ${PORT_OPTIONS:MCKEDITOR}
-RUN_DEPENDS+=	${LOCALBASE}/www/ckeditor:www/ckeditor
-PLIST_FILES+=	${DRUPAL_MODLIB}/ckeditor
-.endif
-
 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 \
 		wysiwyg.init.js \
 		wysiwyg.install \
 		wysiwyg.js \
 		wysiwyg.module \
 		plugins/break/images/break.gif \
 		plugins/break/images/breaktext.gif \
 		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/tr.po \
-		translations/uk.po
+		plugins/break.inc
 
 MODULE_DIRS=	editors/css editors/js editors plugins/break/images \
-		plugins/break/langs plugins/break plugins translations
+		plugins/break/langs plugins/break plugins
 
 DOC_FILES=	CHANGELOG.txt README.txt LICENSE.txt
 
-post-install:
-.if ${PORT_OPTIONS:MTINYMCE3}
+OPTIONS_DEFINE=	TINYMCE3 CKEDITOR DOCS
+
+CKEDITOR_DESC=	Install CKEditor
+CKEDITOR_RUN_DEPENDS=	CKEditor>0:www/ckeditor
+CKEDITOR_PLIST_FILES=	${DRUPAL_MODLIB}/ckeditor
+
+TINYMCE3_DESC=	Install TinyMCE3 Editor
+TINYMCE3_RUN_DEPENDS=	tinymce3>0:www/tinymce3
+TINYMCE3_PLIST_FILES=	${DRUPAL_MODLIB}/tinymce
+
+post-install-TINYMCE3-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${DRUPAL_MODLIB}
 	${LN} -fs ${PREFIX}/www/tinymce ${STAGEDIR}${PREFIX}/${DRUPAL_MODLIB}
-.endif
-.if ${PORT_OPTIONS:MCKEDITOR}
+
+post-install-CKEDITOR-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${DRUPAL_MODLIB}
 	${LN} -fs ${PREFIX}/www/CKEditor ${STAGEDIR}${PREFIX}/${DRUPAL_MODLIB}/ckeditor
-.endif
 
 .include <bsd.port.mk>
Index: head/www/drupal7-wysiwyg/distinfo
===================================================================
--- head/www/drupal7-wysiwyg/distinfo	(revision 420291)
+++ head/www/drupal7-wysiwyg/distinfo	(revision 420292)
@@ -1,2 +1,3 @@
-SHA256 (drupal/wysiwyg-7.x-2.0.tar.gz) = afb47bba4eb96bb06b437b3a4f11223dc25100bbddfa5b01cade348635f2f143
-SIZE (drupal/wysiwyg-7.x-2.0.tar.gz) = 108538
+TIMESTAMP = 1471063944
+SHA256 (drupal/wysiwyg-7.x-2.2.tar.gz) = 6ebbdf4bbf299b10a177f5000013c3016ff0203a747a9298755790e733860c12
+SIZE (drupal/wysiwyg-7.x-2.2.tar.gz) = 78233