aboutsummaryrefslogtreecommitdiffstats
path: root/mail/evolution
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2002-05-12 12:20:04 +0800
committermarcus <marcus@FreeBSD.org>2002-05-12 12:20:04 +0800
commit53405bb4c470a5fb4990bd78796b61ce132df364 (patch)
tree041110c2534e45ad348e2d8bbd98cc24e8560057 /mail/evolution
parentd16c0bbaedd363891aeb28064c9452bb457189ab (diff)
downloadfreebsd-ports-gnome-53405bb4c470a5fb4990bd78796b61ce132df364.tar.gz
freebsd-ports-gnome-53405bb4c470a5fb4990bd78796b61ce132df364.tar.zst
freebsd-ports-gnome-53405bb4c470a5fb4990bd78796b61ce132df364.zip
Update to 1.0.5.
I'll keep the distfile in my people site until the FTP site is updated or Ximian posts the official source tarball to the GNOME master site mirrors.
Diffstat (limited to 'mail/evolution')
-rw-r--r--mail/evolution/Makefile7
-rw-r--r--mail/evolution/distinfo2
-rw-r--r--mail/evolution/files/patch-aa60
-rw-r--r--mail/evolution/files/patch-importers::Makefile.in69
-rw-r--r--mail/evolution/files/patch-libical_configure10
-rw-r--r--mail/evolution/files/patch-po::Makefile.in.in39
-rw-r--r--mail/evolution/files/patch-shell::Makefile.in17
-rw-r--r--mail/evolution/pkg-plist2
8 files changed, 112 insertions, 94 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index e9a417cc7c25..d725506526a8 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,16 +6,15 @@
#
PORTNAME= evolution
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.0.5
CATEGORIES= mail gnome
-MASTER_SITES= http://people.FreeBSD.org/~sobomax/ \
+MASTER_SITES= http://people.FreeBSD.org/~marcus/ \
${MASTER_SITE_GNOME} \
http://people.FreeBSD.org/~sobomax/:local
# ${MASTER_SITE_LOCAL:S,$,:local,}
MASTER_SITE_SUBDIR= stable/sources/evolution \
sobomax/:local
-DISTFILES= ${PORTNAME}-homebrew-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
db-3.1.17${EXTRACT_SUFX}:local
DIST_SUBDIR= gnome
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 16ec27c6e9dd..8776a4c7cd27 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/evolution-homebrew-1.0.4.tar.bz2) = d5e5245a10893eaa74bed0a3370dd5a1
+MD5 (gnome/evolution-1.0.5.tar.bz2) = 754184f266b483ee2257c9db4d8be943
MD5 (gnome/db-3.1.17.tar.bz2) = b237f4e38a650d096389ff54d564928d
MD5 (gnome/evolution-1.0.2-reply-to.diff.gz) = d7d7dd874562da73979ce13a57093760
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 9154b2e0abf1..71df5eceaf86 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,14 +1,52 @@
-
-$FreeBSD$
-
---- configure.orig Tue May 7 13:42:10 2002
-+++ configure Tue May 7 13:45:24 2002
-@@ -9225,7 +9225,7 @@
- CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"
+--- 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
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -9290,7 +9291,7 @@
--for ac_header in db.h db3/db.h
-+for ac_header in db3/db.h
+ CPPFLAGS_save="$CPPFLAGS"
+ CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"
+-for ac_hdr in db.h db3/db.h
++for ac_hdr in db3/db.h
do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -9364,7 +9365,7 @@
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+- { echo "configure: error: Found db.h is not version $evolution_db_version" 1>&2; exit 1; }
++# { echo "configure: error: Found db.h is not version $evolution_db_version" 1>&2; exit 1; }
+ 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 @@
+ *) # Relative path.
+ ac_sub_cache_file="$ac_dots$cache_file" ;;
+ esac
+- case "$ac_given_INSTALL" in
+- [/$]*) INSTALL="$ac_given_INSTALL" ;;
+- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+- esac
++# case "$ac_given_INSTALL" in
++# [/$]*) INSTALL="$ac_given_INSTALL" ;;
++# *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++# esac
+
+ echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+ # The eval makes quoting arguments work.
diff --git a/mail/evolution/files/patch-importers::Makefile.in b/mail/evolution/files/patch-importers::Makefile.in
index 99c93d046135..031b5e6ecc10 100644
--- a/mail/evolution/files/patch-importers::Makefile.in
+++ b/mail/evolution/files/patch-importers::Makefile.in
@@ -1,41 +1,38 @@
$FreeBSD$
---- importers/Makefile.in.orig Tue May 7 13:51:10 2002
-+++ importers/Makefile.in Tue May 7 13:52:43 2002
-@@ -308,7 +308,7 @@
- evolution_elm_importer_DEPENDENCIES = \
- $(top_builddir)/shell/importer/libevolution-importer.la \
- $(top_builddir)/e-util/libeutil.la
--evolution_elm_importer_LDFLAGS =
-+evolution_elm_importer_LDFLAGS = -module -avoid-version
- am_evolution_gnomecard_importer_OBJECTS = \
- evolution-gnomecard-importer.$(OBJEXT)
- evolution_gnomecard_importer_OBJECTS = \
-@@ -321,7 +321,7 @@
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/e-util/ename/libename.la \
- $(top_builddir)/libversit/libversit.la
--evolution_gnomecard_importer_LDFLAGS =
-+evolution_gnomecard_importer_LDFLAGS = -module -avoid-version
- am_evolution_netscape_importer_OBJECTS = Mail-common.$(OBJEXT) \
- Mail-skels.$(OBJEXT) Mail-stubs.$(OBJEXT) \
- netscape-importer.$(OBJEXT)
-@@ -330,7 +330,7 @@
- evolution_netscape_importer_DEPENDENCIES = \
- $(top_builddir)/shell/importer/libevolution-importer.la \
- $(top_builddir)/e-util/libeutil.la
--evolution_netscape_importer_LDFLAGS =
+--- 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 = \
+ $(top_builddir)/shell/importer/libevolution-importer.la \
+ $(top_builddir)/e-util/libeutil.la
+-evolution_netscape_importer_LDFLAGS =
+evolution_netscape_importer_LDFLAGS = -module -avoid-version
- am_evolution_pine_importer_OBJECTS = pine-importer.$(OBJEXT)
- evolution_pine_importer_OBJECTS = $(am_evolution_pine_importer_OBJECTS)
- evolution_pine_importer_DEPENDENCIES = \
-@@ -341,7 +341,7 @@
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/e-util/ename/libename.la \
- $(top_builddir)/libversit/libversit.la
--evolution_pine_importer_LDFLAGS =
+ evolution_elm_importer_OBJECTS = elm-importer.$(OBJEXT)
+ evolution_elm_importer_DEPENDENCIES = \
+ $(top_builddir)/shell/importer/libevolution-importer.la \
+ $(top_builddir)/e-util/libeutil.la
+-evolution_elm_importer_LDFLAGS =
++evolution_elm_importer_LDFLAGS = -module -avoid-version
+ 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 \
+ $(top_builddir)/e-util/ename/libename.la \
+ $(top_builddir)/libversit/libversit.la
+-evolution_pine_importer_LDFLAGS =
+evolution_pine_importer_LDFLAGS = -module -avoid-version
-
- DEFS = @DEFS@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ evolution_gnomecard_importer_OBJECTS = \
+ evolution-gnomecard-importer.$(OBJEXT)
+ evolution_gnomecard_importer_DEPENDENCIES = \
+@@ -324,7 +324,7 @@
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/e-util/ename/libename.la \
+ $(top_builddir)/libversit/libversit.la
+-evolution_gnomecard_importer_LDFLAGS =
++evolution_gnomecard_importer_LDFLAGS = -module -avoid-version
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/mail/evolution/files/patch-libical_configure b/mail/evolution/files/patch-libical_configure
new file mode 100644
index 000000000000..0adebf78b6ab
--- /dev/null
+++ b/mail/evolution/files/patch-libical_configure
@@ -0,0 +1,10 @@
+--- 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-po::Makefile.in.in b/mail/evolution/files/patch-po::Makefile.in.in
index 5c7b20e8312b..85c5f9db34b6 100644
--- a/mail/evolution/files/patch-po::Makefile.in.in
+++ b/mail/evolution/files/patch-po::Makefile.in.in
@@ -1,41 +1,14 @@
$FreeBSD$
---- po/Makefile.in.in.orig Tue May 7 20:42:39 2002
-+++ po/Makefile.in.in Wed May 8 09:10:45 2002
-@@ -16,6 +16,8 @@
-
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
-+DOMAIN = evolution
- VPATH = @srcdir@
-
- prefix = @prefix@
-@@ -33,7 +35,7 @@
- MSGFMT = @MSGFMT@
- XGETTEXT = @XGETTEXT@
- MSGMERGE = msgmerge
--MSGMERGE_UPDATE = @MSGMERGE@ --update
-+MSGMERGE_UPDATE = $(MSGMERGE) --update
- MSGINIT = msginit
- MSGCONV = msgconv
- MSGFILTER = msgfilter
-@@ -129,7 +131,7 @@
+--- po/Makefile.in.in.orig Thu Feb 7 14:34:39 2002
++++ po/Makefile.in.in Thu Feb 7 14:36:07 2002
+@@ -106,7 +106,7 @@
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
-- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-+ lang=`echo $$cat | sed -e 's/\.mo$$//'`; \
+- lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++ lang=`echo $$cat | sed 's/\.mo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
- if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
-@@ -181,7 +183,7 @@
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
-- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-+ lang=`echo $$cat | sed -e 's/\.mo$$//'`; \
- dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
- for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ if test -r $$cat; then \
diff --git a/mail/evolution/files/patch-shell::Makefile.in b/mail/evolution/files/patch-shell::Makefile.in
index 5360c1864c4c..9fc5e6555160 100644
--- a/mail/evolution/files/patch-shell::Makefile.in
+++ b/mail/evolution/files/patch-shell::Makefile.in
@@ -1,15 +1,14 @@
$FreeBSD$
---- shell/Makefile.in.orig Tue May 7 14:02:49 2002
-+++ shell/Makefile.in Tue May 7 14:04:06 2002
-@@ -197,8 +197,7 @@
+--- 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 @@
SUBDIRS = glade importer
--INCLUDES = -O \
-- -I$(top_srcdir)/widgets \
-+INCLUDES = -I$(top_srcdir)/widgets \
- -I$(top_srcdir)/widgets/misc \
- -I$(top_srcdir)/libical/src/libical \
- -I$(top_srcdir) \
+-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\"
+
+
+ # CORBA stuff
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index f495681054ea..ce66eb7f4628 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -323,6 +323,7 @@ share/gnome/help/evolution/C/configure.html
share/gnome/help/evolution/C/contact-automation-basic.html
share/gnome/help/evolution/C/contact-search.html
share/gnome/help/evolution/C/customizing-summary.html
+share/gnome/help/evolution/C/docbook.css
share/gnome/help/evolution/C/encryption.html
share/gnome/help/evolution/C/figures/calendar.png
share/gnome/help/evolution/C/figures/config-cal.png
@@ -434,6 +435,7 @@ share/gnome/help/evolution/no/config.html
share/gnome/help/evolution/no/contact-automation-basic.html
share/gnome/help/evolution/no/contact-search.html
share/gnome/help/evolution/no/customizing-summary.html
+share/gnome/help/evolution/no/docbook.css
share/gnome/help/evolution/no/encryption.html
share/gnome/help/evolution/no/figures/calendar.png
share/gnome/help/evolution/no/figures/config-cal.png