misc/libreoffice4: patch to avoid pulling in java sdk

[Matthias Ferdinand <mf+ml.pkgsrc-users%netzwerkagentursaarland.de@localhost>]

Hello,

the options.mk in misc/libreoffice4 does the following java-related
includes:

    .include "../../mk/java-env.mk"
    .include "../../mk/java-vm.mk"

The latter sets up a dependency on a java sdk, even if "-java" is set as
a build option for libreoffice4.

Fix (patch attached): move include of ../../mk/java-vm.mk a few lines
below into the section depending of "java" being set as a build option.


Regards
Matthias   

Index: misc/libreoffice4/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/misc/libreoffice4/options.mk,v
retrieving revision 1.9
diff -u -p -r1.9 options.mk
--- misc/libreoffice4/options.mk	3 Mar 2015 21:39:13 -0000	1.9
+++ misc/libreoffice4/options.mk	16 Mar 2015 17:48:32 -0000
@@ -10,11 +10,11 @@ PKG_SUGGESTED_OPTIONS=	java
 
 .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-vm.mk"
 USE_JAVA=		yes
 USE_JAVA2=		yes
 BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant