svn commit: r420292 - head/www/drupal7-wysiwyg
Pawel Pekala
pawel at FreeBSD.org
Tue Aug 16 17:14:13 UTC 2016
Author: pawel
Date: Tue Aug 16 17:14:12 2016
New Revision: 420292
URL: https://svnweb.freebsd.org/changeset/ports/420292
Log:
- Update to version 7.x-2.2 [1]
- Convert to options helpers
- While installing editor be sure to create DRUPAL_MODLIB which
is not in STAGEDIR avoiding install failure
PR: 211806 [1]
Submitted by: Jochen Neumeister [1]
Modified:
head/www/drupal7-wysiwyg/Makefile
head/www/drupal7-wysiwyg/distinfo
Modified: head/www/drupal7-wysiwyg/Makefile
==============================================================================
--- head/www/drupal7-wysiwyg/Makefile Tue Aug 16 17:13:29 2016 (r420291)
+++ head/www/drupal7-wysiwyg/Makefile Tue Aug 16 17:14:12 2016 (r420292)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= wysiwyg
-DISTVERSION= 7.x-2.0
-PORTREVISION= 1
+DISTVERSION= 7.x-2.2
CATEGORIES= www
MAINTAINER= ports at FreeBSD.org
@@ -13,23 +12,6 @@ COMMENT= Allows implementation of WYSIWY
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 \
@@ -77,28 +59,29 @@ MODULE_FILES= editors/css/openwysiwyg.cs
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>
Modified: head/www/drupal7-wysiwyg/distinfo
==============================================================================
--- head/www/drupal7-wysiwyg/distinfo Tue Aug 16 17:13:29 2016 (r420291)
+++ head/www/drupal7-wysiwyg/distinfo Tue Aug 16 17:14:12 2016 (r420292)
@@ -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
More information about the svn-ports-all
mailing list