Thu May 29 23:03:55 2014 UTC ()
Fix path to gtk3.


(wiz)
diff -r1.4 -r1.5 pkgsrc/misc/libreoffice4/options.mk
cvs diff -r1.4 -r1.5 pkgsrc/misc/libreoffice4/Attic/options.mk (switch to unified diff)

--- pkgsrc/misc/libreoffice4/Attic/options.mk 2014/05/16 11:53:08 1.4
+++ pkgsrc/misc/libreoffice4/Attic/options.mk 2014/05/29 23:03:55 1.5
@@ -1,61 +1,61 @@ @@ -1,61 +1,61 @@
1# $NetBSD: options.mk,v 1.4 2014/05/16 11:53:08 ryoon Exp $ 1# $NetBSD: options.mk,v 1.5 2014/05/29 23:03:55 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice4 3PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice4
4PKG_SUPPORTED_OPTIONS= java debug kde4 gtk3 4PKG_SUPPORTED_OPTIONS= java debug kde4 gtk3
5 5
6.include "../../mk/bsd.prefs.mk" 6.include "../../mk/bsd.prefs.mk"
7.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" 7.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
8PKG_SUGGESTED_OPTIONS= java 8PKG_SUGGESTED_OPTIONS= java
9.endif 9.endif
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13PLIST_VARS+= java kde4 gtk3 13PLIST_VARS+= java kde4 gtk3
14 14
15.if !empty(PKG_OPTIONS:Mjava) 15.if !empty(PKG_OPTIONS:Mjava)
16USE_JAVA= yes 16USE_JAVA= yes
17USE_JAVA2= yes 17USE_JAVA2= yes
18BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant 18BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
19FIND_PREFIX:= ANTDIR=apache-ant 19FIND_PREFIX:= ANTDIR=apache-ant
20DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18 20DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18
21FIND_PREFIX:= HSQLDB_SYSDIR=hsqldb18 21FIND_PREFIX:= HSQLDB_SYSDIR=hsqldb18
22.include "../../mk/find-prefix.mk" 22.include "../../mk/find-prefix.mk"
23CONFIGURE_ARGS+= --enable-ext-wiki-publisher \ 23CONFIGURE_ARGS+= --enable-ext-wiki-publisher \
24 --with-java \ 24 --with-java \
25 --with-jdk-home=${PKG_JAVA_HOME} \ 25 --with-jdk-home=${PKG_JAVA_HOME} \
26 --with-ant-home=${ANTDIR} \ 26 --with-ant-home=${ANTDIR} \
27 --enable-scripting-beanshell \ 27 --enable-scripting-beanshell \
28 --enable-scripting-javascript \ 28 --enable-scripting-javascript \
29 --with-system-hsqldb \ 29 --with-system-hsqldb \
30 --with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar 30 --with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar
31.include "../../mk/java-env.mk" 31.include "../../mk/java-env.mk"
32.include "../../mk/java-vm.mk" 32.include "../../mk/java-vm.mk"
33PLIST_SRC+= ${PLIST_SRC_DFLT:Q} PLIST.java 33PLIST_SRC+= ${PLIST_SRC_DFLT:Q} PLIST.java
34PLIST.java= yes 34PLIST.java= yes
35.else 35.else
36CONFIGURE_ARGS+= --without-java 36CONFIGURE_ARGS+= --without-java
37.endif 37.endif
38 38
39.if !empty(PKG_OPTIONS:Mdebug) 39.if !empty(PKG_OPTIONS:Mdebug)
40CONFIGURE_ARGS+= --enable-debug 40CONFIGURE_ARGS+= --enable-debug
41CONFIGURE_ARGS+= --enable-selective-debuginfo="all" 41CONFIGURE_ARGS+= --enable-selective-debuginfo="all"
42.else 42.else
43CONFIGURE_ARGS+= --enable-release-build 43CONFIGURE_ARGS+= --enable-release-build
44.endif 44.endif
45 45
46.if !empty(PKG_OPTIONS:Mgtk3) 46.if !empty(PKG_OPTIONS:Mgtk3)
47CONFIGURE_ARGS+= --enable-gtk3 47CONFIGURE_ARGS+= --enable-gtk3
48PLIST.gtk3= yes 48PLIST.gtk3= yes
49.include "../../x11/gtk3+/buildlink3.mk" 49.include "../../x11/gtk3/buildlink3.mk"
50.else 50.else
51CONFIGURE_ARGS+= --disable-gtk3 51CONFIGURE_ARGS+= --disable-gtk3
52.endif 52.endif
53 53
54.if !empty(PKG_OPTIONS:Mkde4) 54.if !empty(PKG_OPTIONS:Mkde4)
55CONFIGURE_ARGS+= --enable-kde4 55CONFIGURE_ARGS+= --enable-kde4
56CONFIGURE_ENV+= KDE4DIR="${LOCALBASE}" 56CONFIGURE_ENV+= KDE4DIR="${LOCALBASE}"
57PLIST.kde4= yes 57PLIST.kde4= yes
58.include "../../x11/kdelibs4/buildlink3.mk" 58.include "../../x11/kdelibs4/buildlink3.mk"
59.else 59.else
60CONFIGURE_ARGS+= --disable-kde4 60CONFIGURE_ARGS+= --disable-kde4
61.endif 61.endif