aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2009-04-23 15:55:31 +0800
committermaho <maho@FreeBSD.org>2009-04-23 15:55:31 +0800
commit1dd283c083c86f059a971a7f38f4c2d04af3415c (patch)
tree85a1c21819396960335fe19c1516ec0ad7d923c2
parentdd3c2ef4b03d7c56b46d4ef030b3ac32c80335a4 (diff)
downloadfreebsd-ports-gnome-1dd283c083c86f059a971a7f38f4c2d04af3415c.tar.gz
freebsd-ports-gnome-1dd283c083c86f059a971a7f38f4c2d04af3415c.tar.zst
freebsd-ports-gnome-1dd283c083c86f059a971a7f38f4c2d04af3415c.zip
Allow compilation without gnome.
Submitted by: Stefan Thurner <thurners@nicsys.de>
-rw-r--r--editors/openoffice-3-devel/files/Makefile.knobs10
-rw-r--r--editors/openoffice.org-3-RC/files/Makefile.knobs10
-rw-r--r--editors/openoffice.org-3-devel/files/Makefile.knobs10
3 files changed, 15 insertions, 15 deletions
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index e601e4651f61..849e2e5c6e01 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -26,10 +26,10 @@ CONFIGURE_ARGS+= --disable-mozilla
CONFIGURE_ARGS+= --enable-build-mozilla
.endif
-.if defined(WITHOUT_GNOMEVFS)
-CONFIGURE_ARGS+= --disable-gnome-vfs
+.if defined(WITHOUT_GNOME)
+CONFIGURE_ARGS+= --disable-gconf --disable-gnome-vfs
.else
-USE_GNOME+= gnomevfs2
+USE_GNOME+= gconf2 gnomevfs2
.endif
.if defined(WITH_EVOLUTION2)
@@ -72,10 +72,10 @@ pre-fetch:
@${ECHO} "You can compile OOo without Mozilla connectivity with"
@${ECHO} "make -DWITHOUT_MOZILLA"
.endif
-.if !defined(WITHOUT_GNOMEVFS)
+.if !defined(WITHOUT_GNOME)
@${ECHO}
@${ECHO} "You can compile OOo without gnome VFS support with"
- @${ECHO} "make -DWITHOUT_GNOMEVFS"
+ @${ECHO} "make -DWITHOUT_GNOME"
.endif
.if !defined(WITH_SYSTEM_ICU)
@${ECHO}
diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs
index c1a56b9ed2a3..e1053db6682d 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-RC/files/Makefile.knobs
@@ -23,10 +23,10 @@ CONFIGURE_ARGS+= --disable-mozilla
CONFIGURE_ARGS+= --enable-build-mozilla
.endif
-.if defined(WITHOUT_GNOMEVFS)
-CONFIGURE_ARGS+= --disable-gnome-vfs
+.if defined(WITHOUT_GNOME)
+CONFIGURE_ARGS+= --disable-gconf --disable-gnome-vfs
.else
-USE_GNOME+= gnomevfs2
+USE_GNOME+= gconf2 gnomevfs2
.endif
.if defined(WITH_EVOLUTION2)
@@ -69,10 +69,10 @@ pre-fetch:
@${ECHO} "You can compile OOo without Mozilla connectivity with"
@${ECHO} "make -DWITHOUT_MOZILLA"
.endif
-.if !defined(WITHOUT_GNOMEVFS)
+.if !defined(WITHOUT_GNOME)
@${ECHO}
@${ECHO} "You can compile OOo without gnome VFS support with"
- @${ECHO} "make -DWITHOUT_GNOMEVFS"
+ @${ECHO} "make -DWITHOUT_GNOME"
.endif
.if !defined(WITH_SYSTEM_ICU)
@${ECHO}
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index e601e4651f61..849e2e5c6e01 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/files/Makefile.knobs
@@ -26,10 +26,10 @@ CONFIGURE_ARGS+= --disable-mozilla
CONFIGURE_ARGS+= --enable-build-mozilla
.endif
-.if defined(WITHOUT_GNOMEVFS)
-CONFIGURE_ARGS+= --disable-gnome-vfs
+.if defined(WITHOUT_GNOME)
+CONFIGURE_ARGS+= --disable-gconf --disable-gnome-vfs
.else
-USE_GNOME+= gnomevfs2
+USE_GNOME+= gconf2 gnomevfs2
.endif
.if defined(WITH_EVOLUTION2)
@@ -72,10 +72,10 @@ pre-fetch:
@${ECHO} "You can compile OOo without Mozilla connectivity with"
@${ECHO} "make -DWITHOUT_MOZILLA"
.endif
-.if !defined(WITHOUT_GNOMEVFS)
+.if !defined(WITHOUT_GNOME)
@${ECHO}
@${ECHO} "You can compile OOo without gnome VFS support with"
- @${ECHO} "make -DWITHOUT_GNOMEVFS"
+ @${ECHO} "make -DWITHOUT_GNOME"
.endif
.if !defined(WITH_SYSTEM_ICU)
@${ECHO}