diff options
| author | marino <marino@FreeBSD.org> | 2016-01-11 16:51:49 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2016-01-11 16:51:49 +0800 |
| commit | 32326eeb97c388ee2f819059415ad53def617982 (patch) | |
| tree | 44f088a6d8476984d4a65e17221e8edfd8adc13f /Mk/Uses/drupal.mk | |
| parent | fb3f8a89f0af435634c295319f08982160397171 (diff) | |
| download | freebsd-ports-gnome-32326eeb97c388ee2f819059415ad53def617982.tar.gz freebsd-ports-gnome-32326eeb97c388ee2f819059415ad53def617982.tar.zst freebsd-ports-gnome-32326eeb97c388ee2f819059415ad53def617982.zip | |
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
Diffstat (limited to 'Mk/Uses/drupal.mk')
| -rw-r--r-- | Mk/Uses/drupal.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Mk/Uses/drupal.mk b/Mk/Uses/drupal.mk index 246fff224834..6fd915041722 100644 --- a/Mk/Uses/drupal.mk +++ b/Mk/Uses/drupal.mk @@ -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/ |