svn commit: r405770 - in head: Mk/Uses www/drupal6-advanced_help www/drupal6-cck www/drupal6-chaos www/drupal6-ckeditor www/drupal6-content_access www/drupal6-geshifilter www/drupal6-google_analyti...
John Marino
marino at FreeBSD.org
Mon Jan 11 08:51:53 UTC 2016
Author: marino
Date: Mon Jan 11 08:51:49 2016
New Revision: 405770
URL: https://svnweb.freebsd.org/changeset/ports/405770
Log:
Remove OPTIONS_DEFINE out of Mk/Uses/drupal.mk (affects many drupal ports)
The USES= fragments are not supposed to modify OPTIONS_* because they are
loaded after bsd.options.mk.
In the particular case of drupal, this resulted in SELECTED_OPTIONS and
DESELECTED_OPTIONS being incorrect. A second problem was that the "="
was used for assignment rather than "?=", meaning that any port with
USES=drupal got their options overwritten at some point (this included
the main www/drupal6 and www/drupal7 ports).
This commit adds OPTIONS_DEFINE=DOCS to almost every port that had set
USES=drupal to correct the mistake of setting options in Mk/Uses.
PR: 206060
Modified:
head/Mk/Uses/drupal.mk
head/www/drupal6-advanced_help/Makefile
head/www/drupal6-cck/Makefile
head/www/drupal6-chaos/Makefile
head/www/drupal6-ckeditor/Makefile
head/www/drupal6-content_access/Makefile
head/www/drupal6-geshifilter/Makefile
head/www/drupal6-google_analytics/Makefile
head/www/drupal6-image/Makefile
head/www/drupal6-imce/Makefile
head/www/drupal6-menu_block/Makefile
head/www/drupal6-mimedetect/Makefile
head/www/drupal6-nice_menus/Makefile
head/www/drupal6-nodewords/Makefile
head/www/drupal6-page_title/Makefile
head/www/drupal6-panels/Makefile
head/www/drupal6-path_redirect/Makefile
head/www/drupal6-pathauto/Makefile
head/www/drupal6-print/Makefile
head/www/drupal6-seo_checklist/Makefile
head/www/drupal6-services/Makefile
head/www/drupal6-tagadelic/Makefile
head/www/drupal6-token/Makefile
head/www/drupal6-views/Makefile
head/www/drupal6-webform/Makefile
head/www/drupal6-wysiwyg/Makefile
head/www/drupal6-zeropoint/Makefile
head/www/drupal7-wysiwyg/Makefile
Modified: head/Mk/Uses/drupal.mk
==============================================================================
--- head/Mk/Uses/drupal.mk Mon Jan 11 07:48:53 2016 (r405769)
+++ head/Mk/Uses/drupal.mk Mon Jan 11 08:51:49 2016 (r405770)
@@ -47,9 +47,6 @@ DOCSDIR?= ${DRUPAL_DOCSDIR}
.if ${_DRUPAL_COMP}
_USES_POST+= drupal
PKGNAMEPREFIX= drupal${_DRUPAL_VERSION}-
-.if defined(DOC_FILES)
-OPTIONS_DEFINE= DOCS
-.endif
# drupal contributions must be licensed under the GPLv2 or GPLv3. This is
# documented at: http://drupal.org/licensing/faq/
Modified: head/www/drupal6-advanced_help/Makefile
==============================================================================
--- head/www/drupal6-advanced_help/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-advanced_help/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -43,5 +43,6 @@ MODULE_FILES= help/advanced_help.help.in
translations/advanced_help.pot \
translations/fr.po
DOC_FILES= LICENSE.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-cck/Makefile
==============================================================================
--- head/www/drupal6-cck/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-cck/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -242,5 +242,6 @@ MODULE_FILES= help/add-existing-field.ht
translations/vi.po
DOC_FILES= CHANGELOG.txt DEVELOPER.txt README.txt UPGRADE.txt \
LICENSE.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-chaos/Makefile
==============================================================================
--- head/www/drupal6-chaos/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-chaos/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -366,5 +366,6 @@ DOC_DIRS= ctools_plugin_example
DOC_FILES= ctools_plugin_example/README.txt LICENSE.txt \
CHANGELOG.txt API.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-ckeditor/Makefile
==============================================================================
--- head/www/drupal6-ckeditor/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-ckeditor/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -313,6 +313,8 @@ DOC_FILES= ckeditor/LICENSE.html ckedito
TROUBLESHOOTING.txt README.txt \
LICENSE.txt CHANGELOG.txt
+OPTIONS_DEFINE= DOCS
+
post-extract:
@cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/ckeditor_3.3.tar.gz
Modified: head/www/drupal6-content_access/Makefile
==============================================================================
--- head/www/drupal6-content_access/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-content_access/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -27,5 +27,6 @@ MODULE_FILES= tests/content_access.test
translations/sv.po
DOC_FILES= README.txt UPGRADE.txt LICENSE.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-geshifilter/Makefile
==============================================================================
--- head/www/drupal6-geshifilter/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-geshifilter/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -29,6 +29,7 @@ MODULE_FILES= geshi-extra/drupal5.php ge
DOC_DIRS= geshi-extra
DOC_FILES= LICENSE.txt README.txt geshi-extra/README
+OPTIONS_DEFINE= DOCS
post-patch:
@${REINPLACE_CMD} -e's|%%LOCALBASE%%|${LOCALBASE}|g' \
Modified: head/www/drupal6-google_analytics/Makefile
==============================================================================
--- head/www/drupal6-google_analytics/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-google_analytics/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -14,5 +14,6 @@ MODULE_FILES= googleanalytics.admin.inc
googleanalytics.info googleanalytics.js googleanalytics.test
DOC_FILES= LICENSE.txt README.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-image/Makefile
==============================================================================
--- head/www/drupal6-image/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-image/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -146,5 +146,6 @@ MODULE_FILES= contrib/image_attach/tests
views/image_plugin_argument_validate_image_size.inc
DOC_FILES= LICENSE.txt CHANGELOG.txt INSTALL.txt README.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-imce/Makefile
==============================================================================
--- head/www/drupal6-imce/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-imce/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -52,5 +52,6 @@ MODULE_FILES= translations/uk.po \
css/collapsed.png
DOC_FILES= README.txt LICENSE.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-menu_block/Makefile
==============================================================================
--- head/www/drupal6-menu_block/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-menu_block/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -19,5 +19,6 @@ MODULE_FILES= menu-block-wrapper.tpl.php
plugins/content_types/menu_tree/menu_tree.inc
MODULE_DIRS= plugins/content_types/menu_tree plugins/content_types plugins
DOC_FILES= CHANGELOG.txt README.txt LICENSE.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-mimedetect/Makefile
==============================================================================
--- head/www/drupal6-mimedetect/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-mimedetect/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -17,6 +17,7 @@ USES= drupal:6,module
MODULE_FILES= magic magic.mgc magic.mime \
mimedetect.info mimedetect.install mimedetect.module
DOC_FILES= LICENSE.txt README.txt
+OPTIONS_DEFINE= DOCS
NO_ARCH= yes
.include <bsd.port.mk>
Modified: head/www/drupal6-nice_menus/Makefile
==============================================================================
--- head/www/drupal6-nice_menus/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-nice_menus/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -19,5 +19,6 @@ MODULE_FILES= arrow-right.png nice_menus
superfish/js/jquery.hoverIntent.minified.js \
superfish/js/superfish.js
DOC_FILES= CHANGELOG.txt README.txt UPGRADE.txt LICENSE.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-nodewords/Makefile
==============================================================================
--- head/www/drupal6-nodewords/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-nodewords/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -24,5 +24,6 @@ MODULE_FILES= includes/forum.inc include
nodewords_og/nodewords_og.install \
nodewords_og/nodewords_og.module
DOC_FILES= README.txt CHANGELOG.txt API.txt LICENSE.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-page_title/Makefile
==============================================================================
--- head/www/drupal6-page_title/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-page_title/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -23,5 +23,6 @@ MODULE_FILES= page_title-admin-settings-
MODULE_DIRS= modules views/plugins/ views tests
DOC_FILES= CHANGELOG.txt README.txt LICENSE.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-panels/Makefile
==============================================================================
--- head/www/drupal6-panels/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-panels/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -188,5 +188,6 @@ MODULE_FILES= translations/panels.pot \
DOC_FILES= README.txt LICENSE.txt \
KNOWN_ISSUES.txt INSTALL.txt \
D6UPDATE.txt CHANGELOG.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-path_redirect/Makefile
==============================================================================
--- head/www/drupal6-path_redirect/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-path_redirect/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -20,5 +20,6 @@ MODULE_FILES= generate/path_redirect_gen
MODULE_DIRS= generate
DOC_FILES= LICENSE.txt README.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-pathauto/Makefile
==============================================================================
--- head/www/drupal6-pathauto/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-pathauto/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -15,5 +15,6 @@ MODULE_FILES= pathauto.admin.inc pathaut
pathauto.test pathauto.api.php pathauto.info pathauto.js \
pathauto.pathauto.inc pathauto.tokens.inc
DOC_FILES= INSTALL.txt API.txt README.txt LICENSE.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-print/Makefile
==============================================================================
--- head/www/drupal6-print/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-print/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -30,5 +30,6 @@ MODULE_FILES= icons/mail_icon.gif icons/
translations/tr.po translations/uk.po
DOC_FILES= CHANGELOG.txt CREDITS.txt INSTALL.txt \
LICENSE.txt MAINTAINERS.txt README.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-seo_checklist/Makefile
==============================================================================
--- head/www/drupal6-seo_checklist/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-seo_checklist/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -11,5 +11,6 @@ COMMENT= Drupal module to provide checkl
USES= drupal:6,module
MODULE_FILES= seochecklist.info seochecklist.install seochecklist.module
DOC_FILES= LICENSE.txt README.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-services/Makefile
==============================================================================
--- head/www/drupal6-services/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-services/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -59,5 +59,6 @@ MODULE_FILES= auth/services_keyauth/serv
services.resource-translation.inc services_admin_browse.inc
DOC_FILES= LICENSE.txt README.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-tagadelic/Makefile
==============================================================================
--- head/www/drupal6-tagadelic/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-tagadelic/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -21,5 +21,6 @@ MODULE_FILES= tagadelic.css tagadelic.in
translations/nl.po translations/pl.po \
translations/ru.po translations/tagadelic.pot
DOC_FILES= LICENSE.txt README.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-token/Makefile
==============================================================================
--- head/www/drupal6-token/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-token/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -21,5 +21,6 @@ MODULE_FILES= translations/token.pot tra
MODULE_DIRS= translations
DOC_FILES= API.txt LICENSE.txt README.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-views/Makefile
==============================================================================
--- head/www/drupal6-views/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-views/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -395,6 +395,7 @@ MODULE_FILES= css/views-admin.css \
DOC_FILES= LICENSE.txt README.txt CHANGELOG.txt \
documentation-standards.txt
+OPTIONS_DEFINE= DOCS
## Maintenance targets for creating lists of directories and files.
module-dirs: patch
Modified: head/www/drupal6-webform/Makefile
==============================================================================
--- head/www/drupal6-webform/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-webform/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -74,5 +74,6 @@ MODULE_DIRS= components \
views
DOC_FILES= CHANGELOG.txt LICENSE.txt README.txt THEMING.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal6-wysiwyg/Makefile
==============================================================================
--- head/www/drupal6-wysiwyg/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-wysiwyg/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -65,6 +65,7 @@ MODULE_DIRS= editors/css editors/js edit
plugins/break/langs plugins/break plugins translations
DOC_FILES= CHANGELOG.txt README.txt LICENSE.txt
+OPTIONS_DEFINE= DOCS
post-install:
${LN} -s ${PREFIX}/${TINYMCEDIR} ${STAGEDIR}${PREFIX}/${DRUPAL_MODDIR}
Modified: head/www/drupal6-zeropoint/Makefile
==============================================================================
--- head/www/drupal6-zeropoint/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal6-zeropoint/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -140,5 +140,6 @@ MODULE_FILES= _custom/custom-style.css _
search-theme-form.tpl.php template.php theme-settings.php \
views-view.tpl.php zeropoint.info
DOC_FILES= CHANGELOG.txt LICENSE.txt README.txt
+OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>
Modified: head/www/drupal7-wysiwyg/Makefile
==============================================================================
--- head/www/drupal7-wysiwyg/Makefile Mon Jan 11 07:48:53 2016 (r405769)
+++ head/www/drupal7-wysiwyg/Makefile Mon Jan 11 08:51:49 2016 (r405770)
@@ -12,7 +12,7 @@ COMMENT= Allows implementation of WYSIWY
USES= drupal:7,module
-OPTIONS_DEFINE= TINYMCE3 CKEDITOR YUI
+OPTIONS_DEFINE= TINYMCE3 CKEDITOR YUI DOCS
TINYMCE3_DESC= Install TinyMCE3 Editor
CKEDITOR_DESC= Install CKEditor
More information about the svn-ports-head
mailing list