[pkgsrc/trunk]: pkgsrc/misc/libreoffice4 Fix -java case.

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ad07cae212e6
branches:  trunk
changeset: 648684:ad07cae212e6
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon Mar 16 18:16:26 2015 +0000

description:
Fix -java case.

Matthias Ferdinand reported that this package includes java mk files
even in PKG_OPTIONS.libreoffice4=-java case.

diffstat:

 misc/libreoffice4/options.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r b08d0e186a2a -r ad07cae212e6 misc/libreoffice4/options.mk
--- a/misc/libreoffice4/options.mk      Mon Mar 16 15:22:47 2015 +0000
+++ b/misc/libreoffice4/options.mk      Mon Mar 16 18:16:26 2015 +0000
@@ -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 @@
 .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