diff options
| author | ryoon <ryoon@pkgsrc.org> | 2015-03-16 18:16:26 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2015-03-16 18:16:26 +0000 |
| commit | 3390a796175631efc7810660295be616d29f9ccd (patch) | |
| tree | b660946690ea6bcf60dc6958b11db5d39c58199a /misc | |
| parent | 943401aaef7af146a12d29437f03960de7d14ab6 (diff) | |
| download | pkgsrc-3390a796175631efc7810660295be616d29f9ccd.tar.gz | |
Fix -java case.
Matthias Ferdinand reported that this package includes java mk files
even in PKG_OPTIONS.libreoffice4=-java case.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/libreoffice4/options.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/misc/libreoffice4/options.mk b/misc/libreoffice4/options.mk index d89d7ab4c53..2aa46444dd6 100644 --- a/misc/libreoffice4/options.mk +++ b/misc/libreoffice4/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2015/03/03 21:39:13 ryoon Exp $ +# $NetBSD: options.mk,v 1.10 2015/03/16 18:16:26 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice4 PKG_SUPPORTED_OPTIONS= java debug kde4 gtk3 @@ -9,12 +9,12 @@ PKG_SUGGESTED_OPTIONS= java .endif .include "../../mk/bsd.options.mk" -.include "../../mk/java-env.mk" -.include "../../mk/java-vm.mk" PLIST_VARS+= java kde4 gtk3 .if !empty(PKG_OPTIONS:Mjava) +.include "../../mk/java-env.mk" +.include "../../mk/java-vm.mk" USE_JAVA= yes USE_JAVA2= yes BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant |