diff options
-rw-r--r-- | mail/evolution-devel/Makefile | 9 | ||||
-rw-r--r-- | mail/evolution-devel/distinfo | 2 | ||||
-rw-r--r-- | mail/evolution-devel/files/patch-aa | 9 | ||||
-rw-r--r-- | mail/evolution-devel/files/patch-ab | 94 | ||||
-rw-r--r-- | mail/evolution-devel/pkg-plist | 10 | ||||
-rw-r--r-- | mail/evolution/Makefile | 9 | ||||
-rw-r--r-- | mail/evolution/distinfo | 2 | ||||
-rw-r--r-- | mail/evolution/files/patch-aa | 9 | ||||
-rw-r--r-- | mail/evolution/files/patch-ab | 94 | ||||
-rw-r--r-- | mail/evolution/pkg-plist | 10 |
10 files changed, 38 insertions, 210 deletions
diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile index f2749823c1db..40ac821d867c 100644 --- a/mail/evolution-devel/Makefile +++ b/mail/evolution-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= evolution -PORTVERSION= 0.2 +PORTVERSION= 0.3.1 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/evolution @@ -44,6 +44,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PLIST_SUB= VERSION=${PORTVERSION} +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + post-install: @${CAT} ${PKGMESSAGE} diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo index 712134bc17b8..4876d7f25e9a 100644 --- a/mail/evolution-devel/distinfo +++ b/mail/evolution-devel/distinfo @@ -1 +1 @@ -MD5 (evolution-0.2.tar.gz) = 65b5eaa61dd2afc920210c0c45acd253 +MD5 (evolution-0.3.1.tar.gz) = 20ba7a8d88ec8f0e27048a6c8877a2f9 diff --git a/mail/evolution-devel/files/patch-aa b/mail/evolution-devel/files/patch-aa index 0b720b181274..c77b683a198e 100644 --- a/mail/evolution-devel/files/patch-aa +++ b/mail/evolution-devel/files/patch-aa @@ -1,14 +1,5 @@ --- configure.orig Mon Jul 10 20:48:19 2000 +++ configure Tue Jul 11 19:15:28 2000 -@@ -4116,7 +4116,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo @@ -5795,8 +5795,8 @@ { echo "configure: error: Did not find gdkpixbuf installed" 1>&2; exit 1; } fi diff --git a/mail/evolution-devel/files/patch-ab b/mail/evolution-devel/files/patch-ab index 33e776273e14..4a534e9b2df4 100644 --- a/mail/evolution-devel/files/patch-ab +++ b/mail/evolution-devel/files/patch-ab @@ -1,101 +1,7 @@ ---- addressbook/ename/Makefile.in.orig Fri Jun 2 15:48:59 2000 -+++ addressbook/ename/Makefile.in Wed Jun 28 18:13:26 2000 -@@ -149,3 +149,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"EName\" -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir) -I. -I.. -I$(top_builddir) -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"EName\" -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir) -I. -I.. -I$(top_builddir) -I$(includedir) $(GNOME_INCLUDEDIR) - ---- addressbook/backend/ebook/Makefile.in.orig Fri Jun 2 15:49:01 2000 -+++ addressbook/backend/ebook/Makefile.in Wed Jun 28 18:18:09 2000 -@@ -159,3 +159,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"EBook\" -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_srcdir)/addressbook/ename -I$(top_builddir)/addressbook/backend -I$(top_builddir)/addressbook/ename $(BONOBO_GNOME_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"EBook\" -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_srcdir)/addressbook/ename -I$(top_builddir)/addressbook/backend -I$(top_builddir)/addressbook/ename $(BONOBO_GNOME_CFLAGS) - ---- addressbook/backend/pas/Makefile.in.orig Fri Jun 2 15:49:02 2000 -+++ addressbook/backend/pas/Makefile.in Wed Jun 28 18:20:11 2000 -@@ -157,3 +157,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"wombat-pas\" -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(BONOBO_GNOME_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"wombat-pas\" -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(BONOBO_GNOME_CFLAGS) - ---- addressbook/gui/component/Makefile.in.orig Mon Jul 10 21:34:24 2000 -+++ addressbook/gui/component/Makefile.in Tue Jul 11 19:32:26 2000 -@@ -168,3 +168,3 @@ - --INCLUDES = -DG_LOG_DOMAIN=\"evolution-addressbook\" $(EXTRA_GNOME_CFLAGS) $(GNOME_INCLUDEDIR) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/shell -I$(top_builddir)/shell -I$(top_srcdir)/widgets/e-text -I$(top_srcdir)/widgets/e-table -I$(top_srcdir)/widgets/misc -I$(top_srcdir)/addressbook/gui/minicard -I$(top_srcdir)/addressbook/contact-editor -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(BONOBO_HTML_GNOME_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" -+INCLUDES = -DG_LOG_DOMAIN=\"evolution-addressbook\" $(EXTRA_GNOME_CFLAGS) $(GNOME_INCLUDEDIR) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/shell -I$(top_builddir)/shell -I$(top_srcdir)/widgets/e-text -I$(top_srcdir)/widgets/e-table -I$(top_srcdir)/widgets/misc -I$(top_srcdir)/addressbook/gui/minicard -I$(top_srcdir)/addressbook/contact-editor -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(BONOBO_HTML_GNOME_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" -DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\" -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" - ---- addressbook/gui/component/select-names/Makefile.in.orig Mon Jul 10 21:34:25 2000 -+++ addressbook/gui/component/select-names/Makefile.in Tue Jul 11 22:42:25 2000 -@@ -179,3 +179,3 @@ - --INCLUDES = -DG_LOG_DOMAIN=\"evolution-addressbook\" $(EXTRA_GNOME_CFLAGS) $(GNOME_INCLUDEDIR) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/shell -I$(top_builddir)/shell -I$(top_srcdir)/widgets/e-text -I$(top_srcdir)/widgets/e-table -I$(top_srcdir)/addressbook/gui/minicard -I$(top_srcdir)/addressbook/contact-editor -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(BONOBO_HTML_GNOME_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" -+INCLUDES = -DG_LOG_DOMAIN=\"evolution-addressbook\" $(EXTRA_GNOME_CFLAGS) $(GNOME_INCLUDEDIR) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/shell -I$(top_builddir)/shell -I$(top_srcdir)/widgets/e-text -I$(top_srcdir)/widgets/e-table -I$(top_srcdir)/addressbook/gui/minicard -I$(top_srcdir)/addressbook/contact-editor -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(BONOBO_HTML_GNOME_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" -DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\" -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" - ---- calendar/cal-client/Makefile.in.orig Mon Jul 10 21:34:30 2000 -+++ calendar/cal-client/Makefile.in Tue Jul 11 19:33:16 2000 -@@ -175,3 +175,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"cal-client\" -I$(top_srcdir)/calendar -I$(srcdir) -I$(top_srcdir) -I. -I.. -I$(top_builddir) -I$(top_builddir)/libical/src/libical -I$(top_srcdir)/libical/src/libical $(BONOBO_GNOME_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"cal-client\" -I$(top_srcdir)/calendar -I$(srcdir) -I$(top_srcdir) -I. -I.. -I$(top_builddir) -I$(top_builddir)/libical/src/libical -I$(top_srcdir)/libical/src/libical $(BONOBO_GNOME_CFLAGS) - ---- calendar/cal-util/Makefile.in.orig Mon Jul 10 21:34:29 2000 -+++ calendar/cal-util/Makefile.in Tue Jul 11 19:34:04 2000 -@@ -165,3 +165,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"cal-util\" -I$(top_srcdir) -I$(top_srcdir)/calendar -I. -I.. -I$(top_builddir) -I$(top_srcdir)/libical/src/libical -I$(top_builddir)/libical/src/libical $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"cal-util\" -I$(top_srcdir) -I$(top_srcdir)/calendar -I. -I.. -I$(top_builddir) -I$(top_srcdir)/libical/src/libical -I$(top_builddir)/libical/src/libical $(GNOME_INCLUDEDIR) - --- calendar/gui/Makefile.in.orig Mon Jul 10 21:34:31 2000 +++ calendar/gui/Makefile.in Tue Jul 11 22:41:10 2000 -@@ -165,3 +165,3 @@ - --help_base = $(datadir)/gnome/help/cal -+help_base = $(datadir)/help/cal - -@@ -172,3 +172,3 @@ - --INCLUDES = -DG_LOG_DOMAIN=\"calendar-gui\" -I$(top_builddir)/shell -I$(top_srcdir)/shell -I$(top_srcdir) -I$(top_srcdir)/calendar -I$(top_srcdir)/libical/src/libical -I$(top_srcdir)/widgets -I$(includedir) $(BONOBO_VFS_GNOME_CFLAGS) -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -DG_LOG_DOMAIN=\"calendar-gui\" -I$(top_builddir)/shell -I$(top_srcdir)/shell -I$(top_srcdir) -I$(top_srcdir)/calendar -I$(top_srcdir)/libical/src/libical -I$(top_srcdir)/widgets -I$(includedir) $(BONOBO_VFS_GNOME_CFLAGS) -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - @@ -593,3 +593,3 @@ install-data-local: - $(mkinstalldirs) $(DESTDIR)$(help_base)/C +# $(mkinstalldirs) $(DESTDIR)$(help_base)/C $(mkinstalldirs) $(Conduitsdir) ---- calendar/gui/dialogs/Makefile.in.orig Fri Jun 2 15:49:12 2000 -+++ calendar/gui/dialogs/Makefile.in Wed Jun 28 18:24:00 2000 -@@ -151,3 +151,3 @@ - --INCLUDES = -DG_LOG_DOMAIN=\"calendar-gui\" -I$(top_srcdir) -I$(top_srcdir)/calendar -I$(top_srcdir)/libical/src/libical -I$(includedir) -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" $(BONOBO_VFS_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -DG_LOG_DOMAIN=\"calendar-gui\" -I$(top_srcdir) -I$(top_srcdir)/calendar -I$(top_srcdir)/libical/src/libical -I$(includedir) -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" $(BONOBO_VFS_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - ---- calendar/pcs/Makefile.in.orig Mon Jul 10 21:34:30 2000 -+++ calendar/pcs/Makefile.in Tue Jul 11 19:35:14 2000 -@@ -163,3 +163,3 @@ - --INCLUDES = -DG_LOG_DOMAIN=\"wombat-pcs\" -I$(top_srcdir) -I$(top_srcdir)/calendar -I$(top_srcdir)/libical/src/libical -I$(top_builddir)/libical/src/libical $(BONOBO_VFS_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -DG_LOG_DOMAIN=\"wombat-pcs\" -I$(top_srcdir) -I$(top_srcdir)/calendar -I$(top_srcdir)/libical/src/libical -I$(top_builddir)/libical/src/libical $(BONOBO_VFS_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - ---- mail/Makefile.in.orig Mon Jul 10 21:34:09 2000 -+++ mail/Makefile.in Tue Jul 11 19:36:13 2000 -@@ -169,3 +169,3 @@ - --INCLUDES = -I$(top_srcdir)/widgets -I$(top_srcdir)/widgets/e-text -I$(top_srcdir) -I$(top_srcdir)/camel -I$(top_builddir)/shell -I$(top_srcdir)/shell $(BONOBO_HTML_GNOME_CFLAGS) $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" -DEVOLUTION_DATADIR=\""$(datadir)"\" -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" -DG_LOG_DOMAIN=\"evolution-mail\" $(THREADS_CFLAGS) -+INCLUDES = -I$(top_srcdir)/widgets -I$(top_srcdir)/widgets/e-text -I$(top_srcdir) -I$(top_srcdir)/camel -I$(top_builddir)/shell -I$(top_srcdir)/shell $(BONOBO_HTML_GNOME_CFLAGS) $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" -DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\" -DEVOLUTION_DATADIR=\""$(datadir)"\" -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" -DG_LOG_DOMAIN=\"evolution-mail\" $(THREADS_CFLAGS) - ---- shell/Makefile.in.orig Mon Jul 10 21:33:55 2000 -+++ shell/Makefile.in Tue Jul 11 19:36:47 2000 -@@ -165,3 +165,3 @@ - --INCLUDES = -I$(top_srcdir)/widgets -I$(top_srcdir)/widgets/misc -I$(top_srcdir) $(BONOBO_GNOME_CFLAGS) $(GCONF_CFLAGS) -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" -DEVOLUTION_DATADIR=\""$(datadir)"\" -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" -DG_LOG_DOMAIN=\"evolution-shell\" -+INCLUDES = -I$(top_srcdir)/widgets -I$(top_srcdir)/widgets/misc -I$(top_srcdir) $(BONOBO_GNOME_CFLAGS) $(GCONF_CFLAGS) -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\" -DEVOLUTION_DATADIR=\""$(datadir)"\" -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" -DG_LOG_DOMAIN=\"evolution-shell\" - ---- wombat/Makefile.in.orig Mon Jul 10 21:34:33 2000 -+++ wombat/Makefile.in Tue Jul 11 19:37:30 2000 -@@ -163,3 +163,3 @@ - --INCLUDES = -DG_LOG_DOMAIN=\"wombat\" -I$(top_srcdir)/e-util -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend -I$(top_srcdir)/calendar -I$(top_srcdir)/calendar/pcs $(GNOME_INCLUDEDIR) $(BONOBO_VFS_GNOME_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -DG_LOG_DOMAIN=\"wombat\" -I$(top_srcdir)/e-util -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend -I$(top_srcdir)/calendar -I$(top_srcdir)/calendar/pcs $(GNOME_INCLUDEDIR) $(BONOBO_VFS_GNOME_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\" - diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist index e892124a8a1d..d9d231370c7d 100644 --- a/mail/evolution-devel/pkg-plist +++ b/mail/evolution-devel/pkg-plist @@ -133,6 +133,7 @@ share/evolution/default_user/shortcuts.xml share/evolution/filtertypes.xml share/evolution/vfoldertypes.xml share/gnome/apps/Applications/evolution.desktop +share/gnome/evolution/arrow.png share/gnome/evolution/default_user/local/Calendar/folder-metadata.xml share/gnome/evolution/default_user/local/Contacts/folder-metadata.xml share/gnome/evolution/default_user/local/Drafts/folder-metadata.xml @@ -147,6 +148,7 @@ share/gnome/evolution/glade/alarm-notify.glade share/gnome/evolution/glade/alphabet.glade share/gnome/evolution/glade/categories.glade share/gnome/evolution/glade/contact-editor.glade +share/gnome/evolution/glade/e-contact-editor-confirm-delete.glade share/gnome/evolution/glade/e-contact-print.glade share/gnome/evolution/glade/e-contact-print.glade.h share/gnome/evolution/glade/e-msg-composer-address-dialog.glade @@ -163,6 +165,8 @@ share/gnome/evolution/glade/ldap-server-dialog.glade share/gnome/evolution/glade/ldap-server-dialog.glade.h share/gnome/evolution/glade/mail-config.glade share/gnome/evolution/glade/select-names.glade +share/gnome/evolution/glade/task-editor-dialog.glade +share/gnome/help/evolution/C/docbook.css share/gnome/help/evolution/C/fig/calendar.png share/gnome/help/evolution/C/fig/config-cal.png share/gnome/help/evolution/C/fig/config-mail.png @@ -171,6 +175,10 @@ share/gnome/help/evolution/C/fig/filter-new-fig.png share/gnome/help/evolution/C/fig/mail-druid-pic.png share/gnome/help/evolution/C/fig/mainwindow-pic.png share/gnome/help/evolution/C/fig/vfolder-createrule-fig.png +share/gnome/html/evolution-cal-client-decl.txt +share/gnome/html/evolution-cal-client-sections.txt +share/gnome/html/evolution-cal-client.hierarchy +share/gnome/html/evolution-cal-client.types share/gnome/idl/addressbook.idl share/gnome/idl/evolution-calendar.idl share/gnome/images/evolution/briefcase.png @@ -217,6 +225,7 @@ share/locale/tr/LC_MESSAGES/evolution.mo share/locale/uk/LC_MESSAGES/evolution.mo @dirrm share/gnome/images/evolution @dirrm share/gnome/images +@dirrm share/gnome/html/evolution-devel-guide @dirrm share/gnome/help/evolution/C/fig @dirrm share/gnome/help/evolution/C @dirrm share/gnome/help/evolution @@ -231,6 +240,7 @@ share/locale/uk/LC_MESSAGES/evolution.mo @dirrm share/gnome/evolution/default_user/local @dirrm share/gnome/evolution/default_user @dirrm share/gnome/evolution +@dirrm share/evolution/default_user/news @dirrm share/evolution/default_user @dirrm share/evolution @dirrm lib/evolution/camel-providers/%%VERSION%% diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index f2749823c1db..40ac821d867c 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -6,7 +6,7 @@ # PORTNAME= evolution -PORTVERSION= 0.2 +PORTVERSION= 0.3.1 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/evolution @@ -44,6 +44,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PLIST_SUB= VERSION=${PORTVERSION} +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + post-install: @${CAT} ${PKGMESSAGE} diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index 712134bc17b8..4876d7f25e9a 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1 +1 @@ -MD5 (evolution-0.2.tar.gz) = 65b5eaa61dd2afc920210c0c45acd253 +MD5 (evolution-0.3.1.tar.gz) = 20ba7a8d88ec8f0e27048a6c8877a2f9 diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa index 0b720b181274..c77b683a198e 100644 --- a/mail/evolution/files/patch-aa +++ b/mail/evolution/files/patch-aa @@ -1,14 +1,5 @@ --- configure.orig Mon Jul 10 20:48:19 2000 +++ configure Tue Jul 11 19:15:28 2000 -@@ -4116,7 +4116,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo @@ -5795,8 +5795,8 @@ { echo "configure: error: Did not find gdkpixbuf installed" 1>&2; exit 1; } fi diff --git a/mail/evolution/files/patch-ab b/mail/evolution/files/patch-ab index 33e776273e14..4a534e9b2df4 100644 --- a/mail/evolution/files/patch-ab +++ b/mail/evolution/files/patch-ab @@ -1,101 +1,7 @@ ---- addressbook/ename/Makefile.in.orig Fri Jun 2 15:48:59 2000 -+++ addressbook/ename/Makefile.in Wed Jun 28 18:13:26 2000 -@@ -149,3 +149,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"EName\" -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir) -I. -I.. -I$(top_builddir) -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"EName\" -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir) -I. -I.. -I$(top_builddir) -I$(includedir) $(GNOME_INCLUDEDIR) - ---- addressbook/backend/ebook/Makefile.in.orig Fri Jun 2 15:49:01 2000 -+++ addressbook/backend/ebook/Makefile.in Wed Jun 28 18:18:09 2000 -@@ -159,3 +159,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"EBook\" -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_srcdir)/addressbook/ename -I$(top_builddir)/addressbook/backend -I$(top_builddir)/addressbook/ename $(BONOBO_GNOME_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"EBook\" -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_srcdir)/addressbook/ename -I$(top_builddir)/addressbook/backend -I$(top_builddir)/addressbook/ename $(BONOBO_GNOME_CFLAGS) - ---- addressbook/backend/pas/Makefile.in.orig Fri Jun 2 15:49:02 2000 -+++ addressbook/backend/pas/Makefile.in Wed Jun 28 18:20:11 2000 -@@ -157,3 +157,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"wombat-pas\" -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(BONOBO_GNOME_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"wombat-pas\" -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(BONOBO_GNOME_CFLAGS) - ---- addressbook/gui/component/Makefile.in.orig Mon Jul 10 21:34:24 2000 -+++ addressbook/gui/component/Makefile.in Tue Jul 11 19:32:26 2000 -@@ -168,3 +168,3 @@ - --INCLUDES = -DG_LOG_DOMAIN=\"evolution-addressbook\" $(EXTRA_GNOME_CFLAGS) $(GNOME_INCLUDEDIR) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/shell -I$(top_builddir)/shell -I$(top_srcdir)/widgets/e-text -I$(top_srcdir)/widgets/e-table -I$(top_srcdir)/widgets/misc -I$(top_srcdir)/addressbook/gui/minicard -I$(top_srcdir)/addressbook/contact-editor -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(BONOBO_HTML_GNOME_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" -+INCLUDES = -DG_LOG_DOMAIN=\"evolution-addressbook\" $(EXTRA_GNOME_CFLAGS) $(GNOME_INCLUDEDIR) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/shell -I$(top_builddir)/shell -I$(top_srcdir)/widgets/e-text -I$(top_srcdir)/widgets/e-table -I$(top_srcdir)/widgets/misc -I$(top_srcdir)/addressbook/gui/minicard -I$(top_srcdir)/addressbook/contact-editor -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(BONOBO_HTML_GNOME_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" -DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\" -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" - ---- addressbook/gui/component/select-names/Makefile.in.orig Mon Jul 10 21:34:25 2000 -+++ addressbook/gui/component/select-names/Makefile.in Tue Jul 11 22:42:25 2000 -@@ -179,3 +179,3 @@ - --INCLUDES = -DG_LOG_DOMAIN=\"evolution-addressbook\" $(EXTRA_GNOME_CFLAGS) $(GNOME_INCLUDEDIR) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/shell -I$(top_builddir)/shell -I$(top_srcdir)/widgets/e-text -I$(top_srcdir)/widgets/e-table -I$(top_srcdir)/addressbook/gui/minicard -I$(top_srcdir)/addressbook/contact-editor -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(BONOBO_HTML_GNOME_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" -+INCLUDES = -DG_LOG_DOMAIN=\"evolution-addressbook\" $(EXTRA_GNOME_CFLAGS) $(GNOME_INCLUDEDIR) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/shell -I$(top_builddir)/shell -I$(top_srcdir)/widgets/e-text -I$(top_srcdir)/widgets/e-table -I$(top_srcdir)/addressbook/gui/minicard -I$(top_srcdir)/addressbook/contact-editor -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend $(BONOBO_HTML_GNOME_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" -DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\" -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" - ---- calendar/cal-client/Makefile.in.orig Mon Jul 10 21:34:30 2000 -+++ calendar/cal-client/Makefile.in Tue Jul 11 19:33:16 2000 -@@ -175,3 +175,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"cal-client\" -I$(top_srcdir)/calendar -I$(srcdir) -I$(top_srcdir) -I. -I.. -I$(top_builddir) -I$(top_builddir)/libical/src/libical -I$(top_srcdir)/libical/src/libical $(BONOBO_GNOME_CFLAGS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"cal-client\" -I$(top_srcdir)/calendar -I$(srcdir) -I$(top_srcdir) -I. -I.. -I$(top_builddir) -I$(top_builddir)/libical/src/libical -I$(top_srcdir)/libical/src/libical $(BONOBO_GNOME_CFLAGS) - ---- calendar/cal-util/Makefile.in.orig Mon Jul 10 21:34:29 2000 -+++ calendar/cal-util/Makefile.in Tue Jul 11 19:34:04 2000 -@@ -165,3 +165,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"cal-util\" -I$(top_srcdir) -I$(top_srcdir)/calendar -I. -I.. -I$(top_builddir) -I$(top_srcdir)/libical/src/libical -I$(top_builddir)/libical/src/libical $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DG_LOG_DOMAIN=\"cal-util\" -I$(top_srcdir) -I$(top_srcdir)/calendar -I. -I.. -I$(top_builddir) -I$(top_srcdir)/libical/src/libical -I$(top_builddir)/libical/src/libical $(GNOME_INCLUDEDIR) - --- calendar/gui/Makefile.in.orig Mon Jul 10 21:34:31 2000 +++ calendar/gui/Makefile.in Tue Jul 11 22:41:10 2000 -@@ -165,3 +165,3 @@ - --help_base = $(datadir)/gnome/help/cal -+help_base = $(datadir)/help/cal - -@@ -172,3 +172,3 @@ - --INCLUDES = -DG_LOG_DOMAIN=\"calendar-gui\" -I$(top_builddir)/shell -I$(top_srcdir)/shell -I$(top_srcdir) -I$(top_srcdir)/calendar -I$(top_srcdir)/libical/src/libical -I$(top_srcdir)/widgets -I$(includedir) $(BONOBO_VFS_GNOME_CFLAGS) -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -DG_LOG_DOMAIN=\"calendar-gui\" -I$(top_builddir)/shell -I$(top_srcdir)/shell -I$(top_srcdir) -I$(top_srcdir)/calendar -I$(top_srcdir)/libical/src/libical -I$(top_srcdir)/widgets -I$(includedir) $(BONOBO_VFS_GNOME_CFLAGS) -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - @@ -593,3 +593,3 @@ install-data-local: - $(mkinstalldirs) $(DESTDIR)$(help_base)/C +# $(mkinstalldirs) $(DESTDIR)$(help_base)/C $(mkinstalldirs) $(Conduitsdir) ---- calendar/gui/dialogs/Makefile.in.orig Fri Jun 2 15:49:12 2000 -+++ calendar/gui/dialogs/Makefile.in Wed Jun 28 18:24:00 2000 -@@ -151,3 +151,3 @@ - --INCLUDES = -DG_LOG_DOMAIN=\"calendar-gui\" -I$(top_srcdir) -I$(top_srcdir)/calendar -I$(top_srcdir)/libical/src/libical -I$(includedir) -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" $(BONOBO_VFS_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -DG_LOG_DOMAIN=\"calendar-gui\" -I$(top_srcdir) -I$(top_srcdir)/calendar -I$(top_srcdir)/libical/src/libical -I$(includedir) -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" $(BONOBO_VFS_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - ---- calendar/pcs/Makefile.in.orig Mon Jul 10 21:34:30 2000 -+++ calendar/pcs/Makefile.in Tue Jul 11 19:35:14 2000 -@@ -163,3 +163,3 @@ - --INCLUDES = -DG_LOG_DOMAIN=\"wombat-pcs\" -I$(top_srcdir) -I$(top_srcdir)/calendar -I$(top_srcdir)/libical/src/libical -I$(top_builddir)/libical/src/libical $(BONOBO_VFS_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -DG_LOG_DOMAIN=\"wombat-pcs\" -I$(top_srcdir) -I$(top_srcdir)/calendar -I$(top_srcdir)/libical/src/libical -I$(top_builddir)/libical/src/libical $(BONOBO_VFS_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - ---- mail/Makefile.in.orig Mon Jul 10 21:34:09 2000 -+++ mail/Makefile.in Tue Jul 11 19:36:13 2000 -@@ -169,3 +169,3 @@ - --INCLUDES = -I$(top_srcdir)/widgets -I$(top_srcdir)/widgets/e-text -I$(top_srcdir) -I$(top_srcdir)/camel -I$(top_builddir)/shell -I$(top_srcdir)/shell $(BONOBO_HTML_GNOME_CFLAGS) $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" -DEVOLUTION_DATADIR=\""$(datadir)"\" -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" -DG_LOG_DOMAIN=\"evolution-mail\" $(THREADS_CFLAGS) -+INCLUDES = -I$(top_srcdir)/widgets -I$(top_srcdir)/widgets/e-text -I$(top_srcdir) -I$(top_srcdir)/camel -I$(top_builddir)/shell -I$(top_srcdir)/shell $(BONOBO_HTML_GNOME_CFLAGS) $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" -DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\" -DEVOLUTION_DATADIR=\""$(datadir)"\" -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" -DG_LOG_DOMAIN=\"evolution-mail\" $(THREADS_CFLAGS) - ---- shell/Makefile.in.orig Mon Jul 10 21:33:55 2000 -+++ shell/Makefile.in Tue Jul 11 19:36:47 2000 -@@ -165,3 +165,3 @@ - --INCLUDES = -I$(top_srcdir)/widgets -I$(top_srcdir)/widgets/misc -I$(top_srcdir) $(BONOBO_GNOME_CFLAGS) $(GCONF_CFLAGS) -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" -DEVOLUTION_DATADIR=\""$(datadir)"\" -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" -DG_LOG_DOMAIN=\"evolution-shell\" -+INCLUDES = -I$(top_srcdir)/widgets -I$(top_srcdir)/widgets/misc -I$(top_srcdir) $(BONOBO_GNOME_CFLAGS) $(GCONF_CFLAGS) -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\" -DEVOLUTION_DATADIR=\""$(datadir)"\" -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" -DG_LOG_DOMAIN=\"evolution-shell\" - ---- wombat/Makefile.in.orig Mon Jul 10 21:34:33 2000 -+++ wombat/Makefile.in Tue Jul 11 19:37:30 2000 -@@ -163,3 +163,3 @@ - --INCLUDES = -DG_LOG_DOMAIN=\"wombat\" -I$(top_srcdir)/e-util -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend -I$(top_srcdir)/calendar -I$(top_srcdir)/calendar/pcs $(GNOME_INCLUDEDIR) $(BONOBO_VFS_GNOME_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -DG_LOG_DOMAIN=\"wombat\" -I$(top_srcdir)/e-util -I$(top_srcdir) -I$(top_srcdir)/addressbook/backend -I$(top_builddir)/addressbook/backend -I$(top_srcdir)/calendar -I$(top_srcdir)/calendar/pcs $(GNOME_INCLUDEDIR) $(BONOBO_VFS_GNOME_CFLAGS) -DEVOLUTION_VERSION=\""$(VERSION)"\" -DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\" - diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist index e892124a8a1d..d9d231370c7d 100644 --- a/mail/evolution/pkg-plist +++ b/mail/evolution/pkg-plist @@ -133,6 +133,7 @@ share/evolution/default_user/shortcuts.xml share/evolution/filtertypes.xml share/evolution/vfoldertypes.xml share/gnome/apps/Applications/evolution.desktop +share/gnome/evolution/arrow.png share/gnome/evolution/default_user/local/Calendar/folder-metadata.xml share/gnome/evolution/default_user/local/Contacts/folder-metadata.xml share/gnome/evolution/default_user/local/Drafts/folder-metadata.xml @@ -147,6 +148,7 @@ share/gnome/evolution/glade/alarm-notify.glade share/gnome/evolution/glade/alphabet.glade share/gnome/evolution/glade/categories.glade share/gnome/evolution/glade/contact-editor.glade +share/gnome/evolution/glade/e-contact-editor-confirm-delete.glade share/gnome/evolution/glade/e-contact-print.glade share/gnome/evolution/glade/e-contact-print.glade.h share/gnome/evolution/glade/e-msg-composer-address-dialog.glade @@ -163,6 +165,8 @@ share/gnome/evolution/glade/ldap-server-dialog.glade share/gnome/evolution/glade/ldap-server-dialog.glade.h share/gnome/evolution/glade/mail-config.glade share/gnome/evolution/glade/select-names.glade +share/gnome/evolution/glade/task-editor-dialog.glade +share/gnome/help/evolution/C/docbook.css share/gnome/help/evolution/C/fig/calendar.png share/gnome/help/evolution/C/fig/config-cal.png share/gnome/help/evolution/C/fig/config-mail.png @@ -171,6 +175,10 @@ share/gnome/help/evolution/C/fig/filter-new-fig.png share/gnome/help/evolution/C/fig/mail-druid-pic.png share/gnome/help/evolution/C/fig/mainwindow-pic.png share/gnome/help/evolution/C/fig/vfolder-createrule-fig.png +share/gnome/html/evolution-cal-client-decl.txt +share/gnome/html/evolution-cal-client-sections.txt +share/gnome/html/evolution-cal-client.hierarchy +share/gnome/html/evolution-cal-client.types share/gnome/idl/addressbook.idl share/gnome/idl/evolution-calendar.idl share/gnome/images/evolution/briefcase.png @@ -217,6 +225,7 @@ share/locale/tr/LC_MESSAGES/evolution.mo share/locale/uk/LC_MESSAGES/evolution.mo @dirrm share/gnome/images/evolution @dirrm share/gnome/images +@dirrm share/gnome/html/evolution-devel-guide @dirrm share/gnome/help/evolution/C/fig @dirrm share/gnome/help/evolution/C @dirrm share/gnome/help/evolution @@ -231,6 +240,7 @@ share/locale/uk/LC_MESSAGES/evolution.mo @dirrm share/gnome/evolution/default_user/local @dirrm share/gnome/evolution/default_user @dirrm share/gnome/evolution +@dirrm share/evolution/default_user/news @dirrm share/evolution/default_user @dirrm share/evolution @dirrm lib/evolution/camel-providers/%%VERSION%% |