[Lunar-commits] <moonbase> evolution: fix build

[Zachary McGrew]

commit c3e7fd59cc568ebb3f22b7478668346dbeb11322
Author: Zachary McGrew <zmcgrew at lunar-linux.org>
Date:   Fri Apr 23 17:57:59 2010 -0700

    evolution: fix build
---
 gnome2/desktop/evolution/BUILD   |   19 ++++++-------------
 gnome2/desktop/evolution/DEPENDS |    1 +
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/gnome2/desktop/evolution/BUILD b/gnome2/desktop/evolution/BUILD
index de9adc0..e79179c 100644
--- a/gnome2/desktop/evolution/BUILD
+++ b/gnome2/desktop/evolution/BUILD
@@ -1,19 +1,12 @@
 (
 
-  OPTS+=" --without-weather --disable-nm"  &&
+  #PST import support is disabled until I can find the correct library
+  OPTS+=" --without-weather --disable-nm --disable-pst-import"  &&
 
-  ./configure  --prefix=${GNOME210_PREFIX:-/usr}                \
-               --sysconfdir=/etc                                \
-               --localstatedir=/var                             \
-               --mandir=${GNOME210_PREFIX:-/usr}/share/man      \
-               --infodir=${GNOME210_PREFIX:-/usr}/share/info    \
-               --enable-nntp=yes                                \
-               $OPTS                                            &&
+  default_build
 
-  default_make                                                  &&
-
-  if ! grep -q '/usr/lib/bonobo/servers' /etc/bonobo-activation/bonobo-activation-config.xml ; then
-    sedit "s:<searchpath>:<searchpath>\n\t<item>/usr/lib/bonobo/servers</item>:" /etc/bonobo-activation/bonobo-activation-config.xml
-  fi
+#  if ! grep -q '/usr/lib/bonobo/servers' /etc/bonobo-activation/bonobo-activation-config.xml ; then
+#    sedit "s:<searchpath>:<searchpath>\n\t<item>/usr/lib/bonobo/servers</item>:" /etc/bonobo-activation/bonobo-activation-config.xml
+#  fi
 
 ) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/evolution/DEPENDS b/gnome2/desktop/evolution/DEPENDS
index 1e38aa6..b171b3b 100644
--- a/gnome2/desktop/evolution/DEPENDS
+++ b/gnome2/desktop/evolution/DEPENDS
@@ -3,6 +3,7 @@ depends  evolution-data-server
 depends  hicolor-icon-theme
 depends  scrollkeeper
 depends  gnome-doc-utils
+depends  libcanberra
 
 optional_depends  gnupg        ""  ""  \
                                "for encrypted mail support"