mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
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
This commit is contained in:
parent
50ce3a08a4
commit
c7aba825f0
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=405770
@ -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/
|
||||
|
@ -43,5 +43,6 @@ MODULE_FILES= help/advanced_help.help.ini help/ini-file.html \
|
||||
translations/advanced_help.pot \
|
||||
translations/fr.po
|
||||
DOC_FILES= LICENSE.txt
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -242,5 +242,6 @@ MODULE_FILES= help/add-existing-field.html \
|
||||
translations/vi.po
|
||||
DOC_FILES= CHANGELOG.txt DEVELOPER.txt README.txt UPGRADE.txt \
|
||||
LICENSE.txt
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -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>
|
||||
|
@ -313,6 +313,8 @@ DOC_FILES= ckeditor/LICENSE.html ckeditor/INSTALL.html \
|
||||
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
|
||||
|
||||
|
@ -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>
|
||||
|
@ -29,6 +29,7 @@ MODULE_FILES= geshi-extra/drupal5.php geshi-extra/drupal6.php \
|
||||
|
||||
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' \
|
||||
|
@ -14,5 +14,6 @@ MODULE_FILES= googleanalytics.admin.inc googleanalytics.install googleanalytics.
|
||||
googleanalytics.info googleanalytics.js googleanalytics.test
|
||||
|
||||
DOC_FILES= LICENSE.txt README.txt
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -146,5 +146,6 @@ MODULE_FILES= contrib/image_attach/tests/image_attach.test \
|
||||
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>
|
||||
|
@ -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>
|
||||
|
@ -19,5 +19,6 @@ MODULE_FILES= menu-block-wrapper.tpl.php menu_block.admin.inc menu_block.book.in
|
||||
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>
|
||||
|
@ -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>
|
||||
|
@ -19,5 +19,6 @@ MODULE_FILES= arrow-right.png nice_menus.install nice_menus_default-rtl.css \
|
||||
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>
|
||||
|
@ -24,5 +24,6 @@ MODULE_FILES= includes/forum.inc includes/image.inc includes/node.inc \
|
||||
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>
|
||||
|
@ -23,5 +23,6 @@ MODULE_FILES= page_title-admin-settings-form.tpl.php page_title.install page_tit
|
||||
MODULE_DIRS= modules views/plugins/ views tests
|
||||
|
||||
DOC_FILES= CHANGELOG.txt README.txt LICENSE.txt
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -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>
|
||||
|
@ -20,5 +20,6 @@ MODULE_FILES= generate/path_redirect_generate.drush.inc \
|
||||
MODULE_DIRS= generate
|
||||
|
||||
DOC_FILES= LICENSE.txt README.txt
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -15,5 +15,6 @@ MODULE_FILES= pathauto.admin.inc pathauto.inc pathauto.install pathauto.module \
|
||||
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>
|
||||
|
@ -30,5 +30,6 @@ MODULE_FILES= icons/mail_icon.gif icons/pdf_icon.gif icons/print_icon.gif \
|
||||
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>
|
||||
|
@ -11,5 +11,6 @@ COMMENT= Drupal module to provide checklist of actions for SEO
|
||||
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>
|
||||
|
@ -59,5 +59,6 @@ MODULE_FILES= auth/services_keyauth/services_keyauth.admin.inc \
|
||||
services.resource-translation.inc services_admin_browse.inc
|
||||
|
||||
DOC_FILES= LICENSE.txt README.txt
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -21,5 +21,6 @@ MODULE_FILES= tagadelic.css tagadelic.info tagadelic.install \
|
||||
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>
|
||||
|
@ -21,5 +21,6 @@ MODULE_FILES= translations/token.pot translations/da.po translations/de.po \
|
||||
MODULE_DIRS= translations
|
||||
|
||||
DOC_FILES= API.txt LICENSE.txt README.txt
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
@ -65,6 +65,7 @@ MODULE_DIRS= editors/css editors/js editors plugins/break/images \
|
||||
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}
|
||||
|
@ -140,5 +140,6 @@ MODULE_FILES= _custom/custom-style.css _custom/headerimg/credits.txt \
|
||||
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>
|
||||
|
@ -12,7 +12,7 @@ COMMENT= Allows implementation of WYSIWYG editors for editing Drupal content
|
||||
|
||||
USES= drupal:7,module
|
||||
|
||||
OPTIONS_DEFINE= TINYMCE3 CKEDITOR YUI
|
||||
OPTIONS_DEFINE= TINYMCE3 CKEDITOR YUI DOCS
|
||||
|
||||
TINYMCE3_DESC= Install TinyMCE3 Editor
|
||||
CKEDITOR_DESC= Install CKEditor
|
||||
|
Loading…
Reference in New Issue
Block a user