diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-05-08 15:19:31 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-05-08 15:19:31 +0000 |
commit | ebb3027ee5030336e512f969edca4bdb5c9c5f8f (patch) | |
tree | fa5d91de3ee0659375e4a63aaa5db0d35fbfbc4d /mail/evolution | |
parent | Update to 0.94.12 (diff) |
Update to 1.0.4. Use home-rolled distfile (using sources checked out from
their cvs repo passed through automake/autoconf with EVOLUTION_1_0_4 tag),
because ximian doesn't hurry up to release an official source tarball.
Notes
Notes:
svn path=/head/; revision=58707
Diffstat (limited to 'mail/evolution')
-rw-r--r-- | mail/evolution/Makefile | 11 | ||||
-rw-r--r-- | mail/evolution/distinfo | 2 | ||||
-rw-r--r-- | mail/evolution/files/patch-aa | 49 | ||||
-rw-r--r-- | mail/evolution/files/patch-camel_camel-mime-message.c | 13 | ||||
-rw-r--r-- | mail/evolution/files/patch-importers::Makefile.in | 69 | ||||
-rw-r--r-- | mail/evolution/files/patch-ltmain.sh | 45 | ||||
-rw-r--r-- | mail/evolution/files/patch-po::Makefile.in.in | 39 | ||||
-rw-r--r-- | mail/evolution/files/patch-shell::Makefile.in | 17 | ||||
-rw-r--r-- | mail/evolution/pkg-plist | 31 |
9 files changed, 93 insertions, 183 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 491ad0facd5b..0080e3137e60 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -6,15 +6,15 @@ # PORTNAME= evolution -PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTVERSION= 1.0.4 CATEGORIES= mail gnome -MASTER_SITES= ${MASTER_SITE_GNOME} \ +MASTER_SITES= http://people.FreeBSD.org/~sobomax/ \ + ${MASTER_SITE_GNOME} \ http://people.FreeBSD.org/~sobomax/:local # ${MASTER_SITE_LOCAL:S,$,:local,} MASTER_SITE_SUBDIR= stable/sources/evolution \ sobomax/:local -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ +DISTFILES= ${PORTNAME}-homebrew-${PORTVERSION}${EXTRACT_SUFX} \ db-3.1.17${EXTRACT_SUFX}:local DIST_SUBDIR= gnome @@ -41,7 +41,8 @@ USE_BISON= yes USE_X_PREFIX= yes USE_GNOME= yes USE_OPENSSL= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +LIBTOOLFILES= configure libical/configure CONFIGURE_ARGS= --with-db3-libs=${DB3_WRKSRC} \ --with-db3-includes=${DB3_WRKSRC} \ --with-html-dir=${PREFIX}/share/gnome/html \ diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index 5930bc610dd3..16ec27c6e9dd 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome/evolution-1.0.3.tar.bz2) = ea834053264d8a399d4cc26148219378 +MD5 (gnome/evolution-homebrew-1.0.4.tar.bz2) = d5e5245a10893eaa74bed0a3370dd5a1 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 bdde2090fd13..9154b2e0abf1 100644 --- a/mail/evolution/files/patch-aa +++ b/mail/evolution/files/patch-aa @@ -1,47 +1,14 @@ $FreeBSD$ ---- configure.orig Sun Jan 13 19:02:14 2002 -+++ configure Sun Jan 13 19:02:40 2002 -@@ -9292,7 +9292,7 @@ - - CPPFLAGS_save="$CPPFLAGS" +--- 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" --for ac_hdr in db.h db3/db.h -+for ac_hdr in db3/db.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -9366,7 +9366,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* - -@@ -9477,7 +9477,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" -@@ -12707,10 +12707,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. +-for ac_header in db.h db3/db.h ++for ac_header 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 diff --git a/mail/evolution/files/patch-camel_camel-mime-message.c b/mail/evolution/files/patch-camel_camel-mime-message.c deleted file mode 100644 index df92a52a222b..000000000000 --- a/mail/evolution/files/patch-camel_camel-mime-message.c +++ /dev/null @@ -1,13 +0,0 @@ ---- camel/camel-mime-message.c.orig Mon Dec 10 14:54:11 2001 -+++ camel/camel-mime-message.c Fri Apr 26 17:19:59 2002 -@@ -209,8 +209,10 @@ - tz = -local->tm_gmtoff; - #endif - offset = -(((tz/60/60) * 100) + (tz/60 % 60)); -+#if defined(HAVE_TIMEZONE) - if (local->tm_isdst>0) - offset += 100; -+#endif - } - message->date = date; - message->date_offset = offset; diff --git a/mail/evolution/files/patch-importers::Makefile.in b/mail/evolution/files/patch-importers::Makefile.in index 031b5e6ecc10..99c93d046135 100644 --- a/mail/evolution/files/patch-importers::Makefile.in +++ b/mail/evolution/files/patch-importers::Makefile.in @@ -1,38 +1,41 @@ $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 = \ - $(top_builddir)/shell/importer/libevolution-importer.la \ - $(top_builddir)/e-util/libeutil.la --evolution_netscape_importer_LDFLAGS = -+evolution_netscape_importer_LDFLAGS = -module -avoid-version - 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 = +--- 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 - 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 - 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 = + 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 - 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) + 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 = ++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_pine_importer_LDFLAGS = -module -avoid-version + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) diff --git a/mail/evolution/files/patch-ltmain.sh b/mail/evolution/files/patch-ltmain.sh deleted file mode 100644 index 91713d2306f8..000000000000 --- a/mail/evolution/files/patch-ltmain.sh +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Wed Jan 23 11:38:40 2002 -+++ ltmain.sh Sun Feb 3 01:44:17 2002 -@@ -1037,8 +1037,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 - ;; - -@@ -2412,6 +2420,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4179,10 +4190,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-po::Makefile.in.in b/mail/evolution/files/patch-po::Makefile.in.in index 85c5f9db34b6..5c7b20e8312b 100644 --- a/mail/evolution/files/patch-po::Makefile.in.in +++ b/mail/evolution/files/patch-po::Makefile.in.in @@ -1,14 +1,41 @@ $FreeBSD$ ---- 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 @@ +--- 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 @@ @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ -- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ -+ lang=`echo $$cat | sed 's/\.mo$$//'`; \ +- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed -e 's/\.mo$$//'`; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ $(mkinstalldirs) $(DESTDIR)$$dir; \ - if test -r $$cat; then \ + 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 \ diff --git a/mail/evolution/files/patch-shell::Makefile.in b/mail/evolution/files/patch-shell::Makefile.in index 9fc5e6555160..5360c1864c4c 100644 --- a/mail/evolution/files/patch-shell::Makefile.in +++ b/mail/evolution/files/patch-shell::Makefile.in @@ -1,14 +1,15 @@ $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 Tue May 7 14:02:49 2002 ++++ shell/Makefile.in Tue May 7 14:04:06 2002 +@@ -197,8 +197,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\" - - - # CORBA stuff +-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) \ diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist index 5d4a6b793c5e..f495681054ea 100644 --- a/mail/evolution/pkg-plist +++ b/mail/evolution/pkg-plist @@ -323,7 +323,6 @@ 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 @@ -435,7 +434,6 @@ 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 @@ -526,35 +524,6 @@ share/gnome/help/evolution/no/usage-print.html share/gnome/help/evolution/no/usage-summary.html share/gnome/help/evolution/no/usage-sync.html share/gnome/help/evolution/no/usage.html -share/gnome/html/evolution-devel-guide/alarm-trigger-generation-code.html -share/gnome/html/evolution-devel-guide/calclient.html -share/gnome/html/evolution-devel-guide/calcomponent.html -share/gnome/html/evolution-devel-guide/calendar-alarm-generation.html -share/gnome/html/evolution-devel-guide/calendar-architecture.html -share/gnome/html/evolution-devel-guide/calendar-public-reference.html -share/gnome/html/evolution-devel-guide/evolution-api-reference.html -share/gnome/html/evolution-devel-guide/evolution-cal-util-cal-recur.html -share/gnome/html/evolution-devel-guide/evolution-cal-util-cal-util.html -share/gnome/html/evolution-devel-guide/evolution-cal-util-timeutil.html -share/gnome/html/evolution-devel-guide/evolution-calendar.html -share/gnome/html/evolution-devel-guide/fdl-section1.html -share/gnome/html/evolution-devel-guide/fdl-section10.html -share/gnome/html/evolution-devel-guide/fdl-section2.html -share/gnome/html/evolution-devel-guide/fdl-section3.html -share/gnome/html/evolution-devel-guide/fdl-section4.html -share/gnome/html/evolution-devel-guide/fdl-section5.html -share/gnome/html/evolution-devel-guide/fdl-section6.html -share/gnome/html/evolution-devel-guide/fdl-section7.html -share/gnome/html/evolution-devel-guide/fdl-section8.html -share/gnome/html/evolution-devel-guide/fdl-section9.html -share/gnome/html/evolution-devel-guide/fdl-using.html -share/gnome/html/evolution-devel-guide/fdl.html -share/gnome/html/evolution-devel-guide/generating-trigger-instances.html -share/gnome/html/evolution-devel-guide/index.html -share/gnome/html/evolution-devel-guide/introduction.html -share/gnome/html/evolution-devel-guide/x102.html -share/gnome/html/evolution-devel-guide/x125.html -share/gnome/html/evolution-devel-guide/x134.html share/gnome/idl/Composer.idl share/gnome/idl/Evolution-Activity.idl share/gnome/idl/Evolution-Composer.idl |