summaryrefslogtreecommitdiff
path: root/mail/evolution/files
diff options
context:
space:
mode:
Diffstat (limited to 'mail/evolution/files')
-rw-r--r--mail/evolution/files/patch-Makefile.in11
-rw-r--r--mail/evolution/files/patch-aa34
-rw-r--r--mail/evolution/files/patch-ac14
-rw-r--r--mail/evolution/files/patch-camel::providers::local::Makefile.in14
-rw-r--r--mail/evolution/files/patch-camel::providers::nntp::Makefile.in14
-rw-r--r--mail/evolution/files/patch-camel::providers::pop3::Makefile.in14
-rw-r--r--mail/evolution/files/patch-camel::providers::sendmail::Makefile.in14
-rw-r--r--mail/evolution/files/patch-camel::providers::smtp::Makefile.in14
-rw-r--r--mail/evolution/files/patch-camel_Makefile.in11
-rw-r--r--mail/evolution/files/patch-importers::Makefile.in25
-rw-r--r--mail/evolution/files/patch-libical::src::libical::icallangbind.c15
-rw-r--r--mail/evolution/files/patch-libical_configure10
-rw-r--r--mail/evolution/files/patch-libversit::vcc.y14
-rw-r--r--mail/evolution/files/patch-libversit::vobject.c14
-rw-r--r--mail/evolution/files/patch-ltmain.sh42
-rw-r--r--mail/evolution/files/patch-mail::importers::Makefile.in18
-rw-r--r--mail/evolution/files/patch-my-evolution::Locations35
-rw-r--r--mail/evolution/files/patch-my-evolution::e-summary-preferences.c26
-rw-r--r--mail/evolution/files/patch-shell::Makefile.in15
19 files changed, 105 insertions, 249 deletions
diff --git a/mail/evolution/files/patch-Makefile.in b/mail/evolution/files/patch-Makefile.in
new file mode 100644
index 000000000000..c6cd1867e395
--- /dev/null
+++ b/mail/evolution/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Mon Nov 11 17:44:58 2002
++++ Makefile.in Mon Nov 11 17:45:22 2002
+@@ -223,7 +223,7 @@
+ changelogs = ChangeLog
+
+
+-confexecdir = $(libdir)
++confexecdir = $(prefix)/etc
+ confexec_DATA = camelConf.sh evolution_shellConf.sh evolution_addressbookConf.sh evolution_calendarConf.sh
+
+
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 71df5eceaf86..a5f86eb6aee9 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,14 +1,15 @@
---- configure.orig Sat May 11 22:55:23 2002
-+++ configure Sat May 11 22:56:01 2002
-@@ -6036,6 +6036,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+--- configure.orig Fri Sep 13 15:38:11 2002
++++ configure Fri Oct 11 00:11:31 2002
+@@ -7258,7 +7258,7 @@
+ fi
+ rm -f conftest*
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9290,7 +9291,7 @@
+-ALL_LINGUAS="az bg ca cs da de el en_AU en_GB es et eu fi fr ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sv tr uk vi zh_CN zh_TW"
++ALL_LINGUAS="az bg ca cs da de el en_AU en_GB es et eu fi fr ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sv tr uk vi zh_CN"
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+@@ -9634,7 +9634,7 @@
CPPFLAGS_save="$CPPFLAGS"
CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"
@@ -17,7 +18,7 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -9364,7 +9365,7 @@
+@@ -9708,7 +9708,7 @@
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
@@ -26,16 +27,7 @@
fi
rm -f conftest*
-@@ -9475,7 +9476,7 @@
-
- echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6
- if test "$ac_cv_db3_lib_version_match" = no; then
-- { echo "configure: error: db3 headers and library do not match... multiple copies installed?" 1>&2; exit 1; }
-+# { echo "configure: error: db3 headers and library do not match... multiple copies installed?" 1>&2; exit 1; }
- fi
-
- CPPFLAGS="$CPPFLAGS_save"
-@@ -12799,10 +12800,10 @@
+@@ -13706,10 +13708,10 @@
*) # Relative path.
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
diff --git a/mail/evolution/files/patch-ac b/mail/evolution/files/patch-ac
deleted file mode 100644
index 69c82fa12d2a..000000000000
--- a/mail/evolution/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- camel/providers/imap/Makefile.in.orig Tue Jan 22 09:37:18 2002
-+++ camel/providers/imap/Makefile.in Tue Jan 22 21:07:36 2002
-@@ -227,7 +227,7 @@
- camel-imap-wrapper.h
-
-
--libcamelimap_la_LDFLAGS = -version-info 0:0:0
-+libcamelimap_la_LDFLAGS = -avoid-version -module
-
- noinst_HEADERS = \
- camel-imap-private.h
diff --git a/mail/evolution/files/patch-camel::providers::local::Makefile.in b/mail/evolution/files/patch-camel::providers::local::Makefile.in
deleted file mode 100644
index b235df8d1530..000000000000
--- a/mail/evolution/files/patch-camel::providers::local::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- camel/providers/local/Makefile.in 2002/01/22 19:07:18 1.1
-+++ camel/providers/local/Makefile.in 2002/01/22 19:07:55
-@@ -244,7 +244,7 @@
- camel-local-private.h
-
-
--libcamellocal_la_LDFLAGS = -version-info 0:0:0
-+libcamellocal_la_LDFLAGS = -avoid-version -module
-
- libcamellocal_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/libibex/libibex.la
-
diff --git a/mail/evolution/files/patch-camel::providers::nntp::Makefile.in b/mail/evolution/files/patch-camel::providers::nntp::Makefile.in
deleted file mode 100644
index 593f524d6aaf..000000000000
--- a/mail/evolution/files/patch-camel::providers::nntp::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- camel/providers/nntp/Makefile.in 2002/01/22 19:07:18 1.1
-+++ camel/providers/nntp/Makefile.in 2002/01/22 19:07:59
-@@ -221,7 +221,7 @@
- camel-nntp-utils.h
-
-
--libcamelnntp_la_LDFLAGS = -version-info 0:0:0
-+libcamelnntp_la_LDFLAGS = -avoid-version -module
-
- EXTRA_DIST = libcamelnntp.urls
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/mail/evolution/files/patch-camel::providers::pop3::Makefile.in b/mail/evolution/files/patch-camel::providers::pop3::Makefile.in
deleted file mode 100644
index 6a490196c41e..000000000000
--- a/mail/evolution/files/patch-camel::providers::pop3::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- camel/providers/pop3/Makefile.in 2002/01/22 19:07:18 1.1
-+++ camel/providers/pop3/Makefile.in 2002/01/22 19:08:04
-@@ -215,7 +215,7 @@
- camel-pop3-store.h
-
-
--libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0
-+libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -avoid-version -module
-
- libcamelpop3_la_LIBADD = $(top_builddir)/e-util/libeutil.la
-
diff --git a/mail/evolution/files/patch-camel::providers::sendmail::Makefile.in b/mail/evolution/files/patch-camel::providers::sendmail::Makefile.in
deleted file mode 100644
index 237577f34b86..000000000000
--- a/mail/evolution/files/patch-camel::providers::sendmail::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- camel/providers/sendmail/Makefile.in 2002/01/22 19:07:18 1.1
-+++ camel/providers/sendmail/Makefile.in 2002/01/22 19:08:14
-@@ -211,7 +211,7 @@
- camel-sendmail-transport.h
-
-
--libcamelsendmail_la_LDFLAGS = -version-info 0:0:0
-+libcamelsendmail_la_LDFLAGS = -avoid-version -module
-
- EXTRA_DIST = libcamelsendmail.urls
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/mail/evolution/files/patch-camel::providers::smtp::Makefile.in b/mail/evolution/files/patch-camel::providers::smtp::Makefile.in
deleted file mode 100644
index 2074e0c398ea..000000000000
--- a/mail/evolution/files/patch-camel::providers::smtp::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- camel/providers/smtp/Makefile.in 2002/01/22 19:07:18 1.1
-+++ camel/providers/smtp/Makefile.in 2002/01/22 19:08:18
-@@ -215,7 +215,7 @@
- camel-smtp-transport.h
-
-
--libcamelsmtp_la_LDFLAGS = -version-info 0:0:0
-+libcamelsmtp_la_LDFLAGS = -avoid-version -module
-
- libcamelsmtp_la_LIBADD = $(top_builddir)/e-util/libeutil.la
-
diff --git a/mail/evolution/files/patch-camel_Makefile.in b/mail/evolution/files/patch-camel_Makefile.in
new file mode 100644
index 000000000000..8cc05b89d6cb
--- /dev/null
+++ b/mail/evolution/files/patch-camel_Makefile.in
@@ -0,0 +1,11 @@
+--- camel/Makefile.in.orig Thu Sep 19 15:23:54 2002
++++ camel/Makefile.in Thu Sep 19 15:24:30 2002
+@@ -265,7 +265,7 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lintl
+ libcamel_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la
+ libcamel_la_OBJECTS = broken-date-parser.lo camel-address.lo \
+ camel-arg.lo camel-block-file.lo camel-certdb.lo camel-charset-map.lo \
diff --git a/mail/evolution/files/patch-importers::Makefile.in b/mail/evolution/files/patch-importers::Makefile.in
index 031b5e6ecc10..d562548238d1 100644
--- a/mail/evolution/files/patch-importers::Makefile.in
+++ b/mail/evolution/files/patch-importers::Makefile.in
@@ -1,12 +1,9 @@
-
-$FreeBSD$
-
---- importers/Makefile.in 2002/01/22 13:48:11 1.1
-+++ importers/Makefile.in 2002/01/22 13:49:10
-@@ -300,12 +300,12 @@
- evolution_netscape_importer_DEPENDENCIES = \
+--- importers/Makefile.in.orig Thu Sep 19 00:27:31 2002
++++ importers/Makefile.in Thu Sep 19 00:30:02 2002
+@@ -277,12 +277,12 @@
$(top_builddir)/shell/importer/libevolution-importer.la \
- $(top_builddir)/e-util/libeutil.la
+ $(top_builddir)/camel/libcamel.la $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/filter/libfilter.la $(top_builddir)/shell/libeshell.la
-evolution_netscape_importer_LDFLAGS =
+evolution_netscape_importer_LDFLAGS = -module -avoid-version
evolution_elm_importer_OBJECTS = elm-importer.$(OBJEXT)
@@ -18,19 +15,19 @@ $FreeBSD$
evolution_pine_importer_OBJECTS = pine-importer.$(OBJEXT)
evolution_pine_importer_DEPENDENCIES = \
$(top_builddir)/shell/importer/libevolution-importer.la \
-@@ -314,7 +314,7 @@
- $(top_builddir)/e-util/libeutil.la \
+@@ -290,7 +290,7 @@
+ $(top_builddir)/camel/libcamel.la $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/e-util/ename/libename.la \
- $(top_builddir)/libversit/libversit.la
+ $(top_builddir)/libversit/libversit.a
-evolution_pine_importer_LDFLAGS =
+evolution_pine_importer_LDFLAGS = -module -avoid-version
evolution_gnomecard_importer_OBJECTS = \
evolution-gnomecard-importer.$(OBJEXT)
evolution_gnomecard_importer_DEPENDENCIES = \
-@@ -324,7 +324,7 @@
- $(top_builddir)/e-util/libeutil.la \
+@@ -299,7 +299,7 @@
+ $(top_builddir)/camel/libcamel.la $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/e-util/ename/libename.la \
- $(top_builddir)/libversit/libversit.la
+ $(top_builddir)/libversit/libversit.a
-evolution_gnomecard_importer_LDFLAGS =
+evolution_gnomecard_importer_LDFLAGS = -module -avoid-version
CFLAGS = @CFLAGS@
diff --git a/mail/evolution/files/patch-libical::src::libical::icallangbind.c b/mail/evolution/files/patch-libical::src::libical::icallangbind.c
deleted file mode 100644
index 4d3402387be1..000000000000
--- a/mail/evolution/files/patch-libical::src::libical::icallangbind.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- libical/src/libical/icallangbind.c 2001/11/20 12:10:52 1.1
-+++ libical/src/libical/icallangbind.c 2001/11/20 12:11:22
-@@ -22,7 +22,9 @@
- #include "icalproperty.h"
- #include "icalerror.h"
- #include "icalmemory.h"
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <string.h>
-
- int* icallangbind_new_array(int size){
diff --git a/mail/evolution/files/patch-libical_configure b/mail/evolution/files/patch-libical_configure
deleted file mode 100644
index 0adebf78b6ab..000000000000
--- a/mail/evolution/files/patch-libical_configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- libical/configure.orig Sat May 11 23:20:35 2002
-+++ libical/configure Sat May 11 23:20:57 2002
-@@ -5553,6 +5553,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/mail/evolution/files/patch-libversit::vcc.y b/mail/evolution/files/patch-libversit::vcc.y
deleted file mode 100644
index 0514266ef18d..000000000000
--- a/mail/evolution/files/patch-libversit::vcc.y
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- libversit/vcc.y 2001/11/20 12:31:59 1.1
-+++ libversit/vcc.y 2001/11/20 12:32:39
-@@ -107,7 +107,7 @@
- #endif
-
- #include <string.h>
--#ifndef __MWERKS__
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
- #endif
- #include <stdio.h>
diff --git a/mail/evolution/files/patch-libversit::vobject.c b/mail/evolution/files/patch-libversit::vobject.c
deleted file mode 100644
index fe28ce1ca511..000000000000
--- a/mail/evolution/files/patch-libversit::vobject.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- libversit/vobject.c 2001/11/20 12:33:21 1.1
-+++ libversit/vobject.c 2001/11/20 12:33:50
-@@ -42,7 +42,7 @@
- * vobject, and convert a vobject into its textual representation.
- */
-
--#ifndef MWERKS
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
- #endif
-
diff --git a/mail/evolution/files/patch-ltmain.sh b/mail/evolution/files/patch-ltmain.sh
new file mode 100644
index 000000000000..1c2fba5d533f
--- /dev/null
+++ b/mail/evolution/files/patch-ltmain.sh
@@ -0,0 +1,42 @@
+--- ltmain.sh.orig Fri Sep 13 15:38:11 2002
++++ ltmain.sh Fri Oct 11 01:44:24 2002
+@@ -1073,8 +1073,16 @@
+ continue
+ ;;
+
++ -pthread)
++ compile_command="$compile_command -pthread"
++ finalize_command="$finalize_command -pthread"
++ compiler_flags="$compiler_flags -pthread"
++ continue
++ ;;
++
+ -module)
+ module=yes
++ build_old_libs=no
+ continue
+ ;;
+
+@@ -2502,6 +2510,9 @@
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+ if test $build_libtool_need_lc = "yes"; then
+@@ -4286,10 +4297,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/mail/evolution/files/patch-mail::importers::Makefile.in b/mail/evolution/files/patch-mail::importers::Makefile.in
deleted file mode 100644
index 70474e04e422..000000000000
--- a/mail/evolution/files/patch-mail::importers::Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- mail/importers/Makefile.in 2002/01/22 19:54:48 1.1
-+++ mail/importers/Makefile.in 2002/01/22 19:55:23
-@@ -202,10 +202,10 @@
- liboutlook_la_SOURCES = \
- evolution-outlook-importer.c
-
--liboutlook_la_LDFLAGS = -version-info 0:0:0
-+liboutlook_la_LDFLAGS = -avoid-version -module
-
- libmbox_la_SOURCES = evolution-mbox-importer.c
--libmbox_la_LDFLAGS = -version-info 0:0:0
-+libmbox_la_LDFLAGS = -avoid-version -module
-
- oafdir = $(datadir)/oaf
- oaf_in_files = GNOME_Evolution_Mail_Mbox_Importer.oaf.in \
diff --git a/mail/evolution/files/patch-my-evolution::Locations b/mail/evolution/files/patch-my-evolution::Locations
deleted file mode 100644
index 598af141e233..000000000000
--- a/mail/evolution/files/patch-my-evolution::Locations
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- my-evolution/Locations 2001/12/15 08:57:59 1.1
-+++ my-evolution/Locations 2001/12/15 11:43:14
-@@ -1583,7 +1583,7 @@
-
- [EU]
- name=Europe
--states=AB OS BE BA BG CZ HR CY DK EE FI FR MK DE GI GR HU IE IS IT LV LT LU MT MD NL NO PL PT RO RU SK SI SP SE CH TR UK YU
-+states=AB OS BE BA BG CZ HR CY DK EE FI FR MK DE GI GR HU IE IS IT LV LT LU MT MD NL NO PL PT RO RU SK SI SP SE CH TR UA UK YU
-
- [EU_AB]
- name=Albania
-@@ -1849,6 +1849,20 @@
- loc50=Yakutsk UEEE ------ ---
- loc51=Yekaterinburg USSS ------ ---
- loc52=Yuzhno-Sakhalinsk UHSS ------ ---
-+
-+[EU_UA]
-+name=Ukraine
-+loc0=Kiev UKBB ------ ---
-+loc1=Donetsk UKCC ------ ---
-+loc2=Dnepropetrovsk UKDD ------ ---
-+loc3=Krivoy\\ Rog UKDR ------ ---
-+loc4=Simferopol UKFF ------ ---
-+loc5=Kharkov UKHH ------ ---
-+loc6=Ivano-frankovsk UKLI ------ ---
-+loc7=Lvov UKLL ------ ---
-+loc8=Rovno UKLR ------ ---
-+loc9=Uzhgorod UKLU ------ ---
-+loc10=Odessa UKOO ------ ---
-
- [EU_SK]
- name=Slovakia
diff --git a/mail/evolution/files/patch-my-evolution::e-summary-preferences.c b/mail/evolution/files/patch-my-evolution::e-summary-preferences.c
index f1fdd28c7535..aa7befa54962 100644
--- a/mail/evolution/files/patch-my-evolution::e-summary-preferences.c
+++ b/mail/evolution/files/patch-my-evolution::e-summary-preferences.c
@@ -1,17 +1,13 @@
-
-$FreeBSD$
-
---- my-evolution/e-summary-preferences.c 2001/12/15 11:37:58 1.1
-+++ my-evolution/e-summary-preferences.c 2001/12/15 11:41:56
-@@ -440,9 +440,11 @@
- {"http://www.bsdtoday.com/backend/bt.rdf", "BSD Today"},
- {"http://beyond2000.com/b2k.rdf", "Beyond 2000"},
- {"http://www.cnn.com/cnn.rss", "CNN"},
+--- my-evolution/e-summary-preferences.c.orig Thu Sep 26 15:23:36 2002
++++ my-evolution/e-summary-preferences.c Tue Oct 15 17:22:04 2002
+@@ -581,8 +581,10 @@
+ {"http://barrapunto.com/gnome.rdf", "Barrapunto GNOME", FALSE,},
+ {"http://www.bsdtoday.com/backend/bt.rdf", "BSD Today", FALSE},
+ {"http://beyond2000.com/b2k.rdf", "Beyond 2000", FALSE},
+ {"http://daily.daemonnews.org/ddn.rdf.php3", "Daily Daemon News"},
- {"http://www.debianplanet.org/debianplanet/backend.php", "Debian Planet"},
- {"http://www.dictionary.com/wordoftheday/wotd.rss", N_("Dictionary.com Word of the Day")},
- {"http://www.dvdreview.com/rss/newschannel.rss", "DVD Review"},
+ {"http://www.dictionary.com/wordoftheday/wotd.rss", N_("Dictionary.com Word of the Day"), FALSE},
+ {"http://www.dvdreview.com/rss/newschannel.rss", "DVD Review", FALSE},
+ {"http://www.freebsd.org/news/news.rdf", "FreeBSD Newsflash"},
- {"http://freshmeat.net/backend/fm.rdf", "Freshmeat"},
- {"http://news.gnome.org/gnome-news/rdf", "GNotices"},
- {"http://headlines.internet.com/internetnews/prod-news/news.rss", "Internet.com"},
+ {"http://freshmeat.net/backend/fm.rdf", "Freshmeat", FALSE},
+ {"http://news.gnome.org/gnome-news/rdf", "GNotices", FALSE},
+ {"http://headlines.internet.com/internetnews/prod-news/news.rss", "Internet.com", FALSE},
diff --git a/mail/evolution/files/patch-shell::Makefile.in b/mail/evolution/files/patch-shell::Makefile.in
index 9fc5e6555160..aa610af86769 100644
--- a/mail/evolution/files/patch-shell::Makefile.in
+++ b/mail/evolution/files/patch-shell::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- shell/Makefile.in.orig Thu Feb 7 14:38:27 2002
-+++ shell/Makefile.in Thu Feb 7 14:39:37 2002
-@@ -195,7 +195,7 @@
+--- shell/Makefile.in.orig Thu Sep 19 13:31:46 2002
++++ shell/Makefile.in Thu Sep 19 13:38:39 2002
+@@ -217,7 +217,7 @@
SUBDIRS = glade importer
--INCLUDES = -O -I$(top_srcdir)/widgets -I$(top_srcdir)/widgets/misc -I$(top_srcdir)/libical/src/libical -I$(top_srcdir) $(BONOBO_GNOME_CFLAGS) $(BONOBO_CONF_CFLAGS) $(EXTRA_GNOME_CFLAGS) $(GTKHTML_CFLAGS) -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" -DEVOLUTION_DATADIR=\""$(datadir)"\" -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" -DG_LOG_DOMAIN=\"evolution-shell\"
-+INCLUDES = -I$(top_srcdir)/widgets -I$(top_srcdir)/widgets/misc -I$(top_srcdir)/libical/src/libical -I$(top_srcdir) $(BONOBO_GNOME_CFLAGS) $(BONOBO_CONF_CFLAGS) $(EXTRA_GNOME_CFLAGS) $(GTKHTML_CFLAGS) -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" -DEVOLUTION_DATADIR=\""$(datadir)"\" -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" -DG_LOG_DOMAIN=\"evolution-shell\"
+-INCLUDES = -O -I$(top_srcdir)/widgets -I$(top_srcdir)/widgets/misc -I$(top_srcdir)/libical/src/libical -I$(top_builddir)/libical/src/libical -I$(top_srcdir) -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" -DEVOLUTION_DATADIR=\""$(datadir)"\" -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" -DPREFIX=\"$(prefix)\" -DG_LOG_DOMAIN=\"evolution-shell\" $(SHELL_CFLAGS)
++INCLUDES = -I$(top_srcdir)/widgets -I$(top_srcdir)/widgets/misc -I$(top_srcdir)/libical/src/libical -I$(top_builddir)/libical/src/libical -I$(top_srcdir) -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" -DEVOLUTION_DATADIR=\""$(datadir)"\" -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" -DPREFIX=\"$(prefix)\" -DG_LOG_DOMAIN=\"evolution-shell\" $(SHELL_CFLAGS)
- # CORBA stuff
+ # Shell CORBA stuff