CVS: crater/mail/evolution BUILD, 1.2, 1.3 DEPENDS, 1.5, 1.6 DETAILS, 1.4, 1.5 PRE_BUILD, 1.1, 1.2

[Nick Hudson]

Update of /var/cvs/lunar/crater/mail/evolution
In directory dbguin.lunar-linux.org:/tmp/cvs-serv9732/evolution

Modified Files:
	BUILD DEPENDS DETAILS PRE_BUILD 
Log Message:

No more need for the db3 compile and link to during the evo compile.  Now evolution-data-server takes care of all that.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/mail/evolution/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	8 Dec 2003 22:19:23 -0000	1.2
+++ BUILD	9 Dec 2003 05:26:13 -0000	1.3
@@ -1,20 +1,12 @@
 (
 
-  mkdir  evolution-db3                                           &&
-  ( 
-    cd  db-$DBVERSION/build_unix                                 &&
-    ../dist/configure  --prefix=$SOURCE_DIRECTORY/evolution-db3  \
-                       --disable-dynamic                         &&
-    make                                                         &&
-    make  install
-  )                                                              &&
-
   if [ -z "$DISPLAY" ] ; then
-    OPTS="$OPTS --disable-gtk-doc"
     message "To get evolution devlopment documentation you must build with"
     message "an active X windows connection. i.e. $DISPLAY is set."
   fi								 &&
 
+  intltoolize --copy --force --automake                          &&
+
   ./configure  --prefix=/usr                                     \
                --sysconfdir=/etc                                 \
                --localstatedir=/var                              \
@@ -22,6 +14,8 @@
                --mandir=/usr/share/man		                 \
      	       --infodir=/usr/share/info	                 \
                --enable-ipv6                                     \
+               --enable-nntp=yes                                 \
+               --enable-imapp=yes                                \
                --enable-gtk-doc                                  \
                $OPTS                                             &&
   default_make                                                   &&

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/crater/mail/evolution/DEPENDS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DEPENDS	9 Dec 2003 04:54:33 -0000	1.5
+++ DEPENDS	9 Dec 2003 05:26:13 -0000	1.6
@@ -22,7 +22,10 @@
 optional_depends  "mozilla"                                           \
                   "--with-nspr-includes=/usr/include/mozilla/nspr     \
                    --with-nspr-libs=/usr/lib/mozilla                  \
+                   --enable-nss=yes                                   \
                    --with-nss-includes=/usr/include/mozilla           \
                    --with-nss-libs=/usr/lib/mozilla"                  \
                   ""                                                  \
                   "for mozilla support"                               &&
+
+optional_depends  "openldap" "--with-openldap=yes" "" "for OpenLDAP support" 

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/mail/evolution/DETAILS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DETAILS	8 Dec 2003 22:19:23 -0000	1.4
+++ DETAILS	9 Dec 2003 05:26:13 -0000	1.5
@@ -1,13 +1,9 @@
           MODULE=evolution
          VERSION=1.5
-       DBVERSION=3.1.17
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=db-$DBVERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/$MODULE/$VERSION/$SOURCE
       SOURCE_VFY=md5:cc820ffb5c9e91ad79d94e700262c418
-  SOURCE2_URL[0]=http://www.sleepycat.com/update/snapshot/$SOURCE2
-     SOURCE2_VFY=md5:5baeb94fb934d0bf783ea42117c400be
         WEB_SITE=http://www.ximian.com/products/ximian_evolution
          ENTERED=20011109
          UPDATED=20031208

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/mail/evolution/PRE_BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PRE_BUILD	29 Sep 2002 20:19:31 -0000	1.1
+++ PRE_BUILD	9 Dec 2003 05:26:13 -0000	1.2
@@ -1,3 +1 @@
-default_pre_build      &&
-cd  $SOURCE_DIRECTORY  &&
-unpack  $SOURCE2
+default_pre_build