pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

misc/libreoffice4: patch to avoid pulling in java sdk


the in misc/libreoffice4 does the following java-related

    .include "../../mk/"
    .include "../../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/ a few lines
below into the section depending of "java" being set as a build option.

Index: misc/libreoffice4/
RCS file: /cvsroot/pkgsrc/misc/libreoffice4/,v
retrieving revision 1.9
diff -u -p -r1.9
--- misc/libreoffice4/	3 Mar 2015 21:39:13 -0000	1.9
+++ misc/libreoffice4/	16 Mar 2015 17:48:32 -0000
@@ -10,11 +10,11 @@ PKG_SUGGESTED_OPTIONS=	java
 .include "../../mk/"
 .include "../../mk/"
-.include "../../mk/"
 PLIST_VARS+=	java kde4 gtk3
 .if !empty(PKG_OPTIONS:Mjava)
+.include "../../mk/"
 USE_JAVA=		yes
 USE_JAVA2=		yes
 BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant

Home | Main Index | Thread Index | Old Index