Update to 2.11.1.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8815 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 19 insertions, 123 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9f20c4b30..99bb96891 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.134 2007/03/13 05:41:38 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.136 2007/04/28 07:42:59 marcus Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.10.1
-PORTREVISION=	1
+PORTVERSION=	2.11.1.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -44,9 +43,9 @@ GCONF_SCHEMAS=	apps_evolution_addressbook-${EVO_VERSION}.schemas \
 		apps_evolution_shell-${EVO_VERSION}.schemas \
 		evolution-mail-${EVO_VERSION}.schemas
 
-EVO_VERSION=	2.10
+EVO_VERSION=	2.12
 PLIST_SUB=	VERSION=${EVO_VERSION} \
-		PORTVERSION=2.10
+		PORTVERSION=2.12
 
 OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 		LDAP "Enable LDAP support" on \
@@ -107,6 +106,8 @@ CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 post-patch:
 	@${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \
 	    	${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|stdlib.n|stdlib.h|' \
+	    	${WRKSRC}/iconv-detect.c
 
 post-install: install-ldconfig-file
 	${MKDIR} ${PREFIX}/include/evolution-${EVO_VERSION}/composer
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index afa9d9d78..bc1553d39 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.10.1.tar.bz2) = 16051c6cbb617cb04665e402566e0976
-SHA256 (gnome2/evolution-2.10.1.tar.bz2) = d396190136e6322c2ae820993467bf41a8e188f9597ccf00e3411560280b5cda
-SIZE (gnome2/evolution-2.10.1.tar.bz2) = 15689020
+MD5 (gnome2/evolution-2.11.1.1.tar.bz2) = 57d18a92c1c14d10f090a7cfbcfb98db
+SHA256 (gnome2/evolution-2.11.1.1.tar.bz2) = 3dcf44db57d6b0491488a54484e109858a1231bd5b9dbccdc2d7d2f837885c8a
+SIZE (gnome2/evolution-2.11.1.1.tar.bz2) = 15547510
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index dddc3d635..93eb4ed5b 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Wed Apr 11 20:01:06 2007
-+++ configure	Thu Apr 12 01:10:01 2007
-@@ -24916,6 +24916,15 @@ case "$host" in
+--- configure.orig	Fri May  4 23:52:09 2007
++++ configure	Fri May  4 23:53:24 2007
+@@ -23418,6 +23418,15 @@ case "$host" in
      SOFTOKN3_LIB=''
      HAL_REQUIREMENT=''
      ;;
@@ -16,15 +16,7 @@
  *)  os_win32=no
      NO_UNDEFINED=''
      SOEXT='.so'
-@@ -24979,6 +24988,7 @@ int main (int argc, char **argv)
- {
-         iconv_t cd;
-         cd = iconv_open ("UTF-8", "ISO-8859-1");
-+        return (0);
- }
- 
- _ACEOF
-@@ -26594,6 +26604,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -24916,6 +24925,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -32,16 +24,16 @@
  
  		#define BUFSIZE (sizeof(struct hostent)+10)
  
-@@ -30819,7 +30830,7 @@ if test "x${with_krb5}" != "xno"; then
+@@ -28749,7 +28759,7 @@ if test "x${with_krb5}" != "xno"; then
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
 -	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
 +	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
- 	{ echo "$as_me:$LINENO: checking for Kerberos 5" >&5
- echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; }
+ 	echo "$as_me:$LINENO: checking for Kerberos 5" >&5
+ echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
  if test "${ac_cv_lib_kerberos5+set}" = set; then
-@@ -37148,7 +37159,7 @@ componentdir="$privlibdir/components"
+@@ -34737,7 +34747,7 @@ componentdir="$privlibdir/components"
  idldir='${datadir}'/idl/evolution-$BASE_VERSION
  
  
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 7285b7b27..dbaa33ba8 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -23,7 +23,6 @@ include/evolution-%%VERSION%%/e-util/e-error.h
 include/evolution-%%VERSION%%/e-util/e-event.h
 include/evolution-%%VERSION%%/e-util/e-folder-map.h
 include/evolution-%%VERSION%%/e-util/e-fsutils.h
-include/evolution-%%VERSION%%/e-util/e-gtk-utils.h
 include/evolution-%%VERSION%%/e-util/e-gui-utils.h
 include/evolution-%%VERSION%%/e-util/e-html-utils.h
 include/evolution-%%VERSION%%/e-util/e-icon-factory.h
@@ -129,6 +128,8 @@ include/evolution-%%VERSION%%/misc/e-selection-model-array.h
 include/evolution-%%VERSION%%/misc/e-selection-model-simple.h
 include/evolution-%%VERSION%%/misc/e-selection-model.h
 include/evolution-%%VERSION%%/misc/e-send-options.h
+include/evolution-%%VERSION%%/misc/e-spinner.c
+include/evolution-%%VERSION%%/misc/e-spinner.h
 include/evolution-%%VERSION%%/misc/e-task-bar.h
 include/evolution-%%VERSION%%/misc/e-task-widget.h
 include/evolution-%%VERSION%%/misc/e-unicode.h
@@ -855,101 +856,6 @@ share/gnome/help/evolution/es/figures/sub-others-folder.png
 share/gnome/help/evolution/es/figures/sub-pub-fold.png
 share/gnome/help/evolution/es/figures/ver_view_a.png
 share/gnome/help/evolution/es/figures/vfolder-createrule-fig.png
-share/gnome/help/evolution/fr/evolution.xml
-share/gnome/help/evolution/fr/figures/Screenshot-Free-Busy.png
-share/gnome/help/evolution/fr/figures/account_editor_a.png
-share/gnome/help/evolution/fr/figures/calendar.png
-share/gnome/help/evolution/fr/figures/categories_a.png
-share/gnome/help/evolution/fr/figures/collap_head_a.png
-share/gnome/help/evolution/fr/figures/config-cal.png
-share/gnome/help/evolution/fr/figures/config-mail.png
-share/gnome/help/evolution/fr/figures/contact-editor.png
-share/gnome/help/evolution/fr/figures/contact.png
-share/gnome/help/evolution/fr/figures/contacts_mainwindow_a.png
-share/gnome/help/evolution/fr/figures/delgt-add.png
-share/gnome/help/evolution/fr/figures/evo_account_editor_a.png
-share/gnome/help/evolution/fr/figures/evo_account_info_a.png
-share/gnome/help/evolution/fr/figures/evo_add_rule_a.png
-share/gnome/help/evolution/fr/figures/evo_adv_search_a.png
-share/gnome/help/evolution/fr/figures/evo_allday_a.png
-share/gnome/help/evolution/fr/figures/evo_cal_a.png
-share/gnome/help/evolution/fr/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/fr/figures/evo_calender_appointmnt.png
-share/gnome/help/evolution/fr/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/fr/figures/evo_edit_rule_a.png
-share/gnome/help/evolution/fr/figures/evo_edit_search.png
-share/gnome/help/evolution/fr/figures/evo_email_a.png
-share/gnome/help/evolution/fr/figures/evo_flag_follow_up_a.png
-share/gnome/help/evolution/fr/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/fr/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/fr/figures/evo_gwreceiveoptedit_a.png
-share/gnome/help/evolution/fr/figures/evo_identity_a.png
-share/gnome/help/evolution/fr/figures/evo_identityedit_a.png
-share/gnome/help/evolution/fr/figures/evo_imapheader_a.png
-share/gnome/help/evolution/fr/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/fr/figures/evo_import_asst_a.png
-share/gnome/help/evolution/fr/figures/evo_mail_a.png
-share/gnome/help/evolution/fr/figures/evo_mail_callout_a.png
-share/gnome/help/evolution/fr/figures/evo_maildirreceive_a.png
-share/gnome/help/evolution/fr/figures/evo_mboxreceive_a.png
-share/gnome/help/evolution/fr/figures/evo_memo_a.png
-share/gnome/help/evolution/fr/figures/evo_mereceive_a.png
-share/gnome/help/evolution/fr/figures/evo_message_filters_a.png
-share/gnome/help/evolution/fr/figures/evo_mhreceive_a.png
-share/gnome/help/evolution/fr/figures/evo_newmess_a.png
-share/gnome/help/evolution/fr/figures/evo_popreceive_a.png
-share/gnome/help/evolution/fr/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/fr/figures/evo_receive_setup2_a.png
-share/gnome/help/evolution/fr/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/fr/figures/evo_rmdrnotes_a.png
-share/gnome/help/evolution/fr/figures/evo_rule_a.png
-share/gnome/help/evolution/fr/figures/evo_select_add_folder.png
-share/gnome/help/evolution/fr/figures/evo_select_folder.png
-share/gnome/help/evolution/fr/figures/evo_send_option_a.png
-share/gnome/help/evolution/fr/figures/evo_send_setup_a.png
-share/gnome/help/evolution/fr/figures/evo_sendstatus_a.png
-share/gnome/help/evolution/fr/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/fr/figures/evo_timezone_a.png
-share/gnome/help/evolution/fr/figures/evo_usereceive_a.png
-share/gnome/help/evolution/fr/figures/exchange-delegation.png
-share/gnome/help/evolution/fr/figures/exchange-identity.png
-share/gnome/help/evolution/fr/figures/exchange-receive-options.png
-share/gnome/help/evolution/fr/figures/exchange-receive.png
-share/gnome/help/evolution/fr/figures/exchg-identity.png
-share/gnome/help/evolution/fr/figures/exchng-identity.png
-share/gnome/help/evolution/fr/figures/exchng-rec-mail.png
-share/gnome/help/evolution/fr/figures/exchng-rec-mails.png
-share/gnome/help/evolution/fr/figures/exchng-rec-option.png
-share/gnome/help/evolution/fr/figures/exchng-rec-options.png
-share/gnome/help/evolution/fr/figures/exchng-settings.png
-share/gnome/help/evolution/fr/figures/filter-new-fig.png
-share/gnome/help/evolution/fr/figures/free_busy.png
-share/gnome/help/evolution/fr/figures/full-1.png
-share/gnome/help/evolution/fr/figures/full-2.png
-share/gnome/help/evolution/fr/figures/full-3.png
-share/gnome/help/evolution/fr/figures/full-4.png
-share/gnome/help/evolution/fr/figures/full-5.png
-share/gnome/help/evolution/fr/figures/full-6.png
-share/gnome/help/evolution/fr/figures/full-7.png
-share/gnome/help/evolution/fr/figures/mail-druid-pic.png
-share/gnome/help/evolution/fr/figures/mail-inbox.png
-share/gnome/help/evolution/fr/figures/mail-threaded.png
-share/gnome/help/evolution/fr/figures/mail_mainwindow_a.png
-share/gnome/help/evolution/fr/figures/mailer_preferences.png
-share/gnome/help/evolution/fr/figures/mainwindow-pic.png
-share/gnome/help/evolution/fr/figures/minus.png
-share/gnome/help/evolution/fr/figures/newmsg.png
-share/gnome/help/evolution/fr/figures/plus.png
-share/gnome/help/evolution/fr/figures/proxy-cal.png
-share/gnome/help/evolution/fr/figures/proxy-login.png
-share/gnome/help/evolution/fr/figures/quick_add_a.png
-share/gnome/help/evolution/fr/figures/replymsg.png
-share/gnome/help/evolution/fr/figures/schedule.png
-share/gnome/help/evolution/fr/figures/stock_search.png
-share/gnome/help/evolution/fr/figures/sub-others-folder.png
-share/gnome/help/evolution/fr/figures/sub-pub-fold.png
-share/gnome/help/evolution/fr/figures/ver_view_a.png
-share/gnome/help/evolution/fr/figures/vfolder-createrule-fig.png
 share/gnome/help/evolution/sv/evolution.xml
 share/gnome/help/evolution/sv/figures/Screenshot-Free-Busy.png
 share/gnome/help/evolution/sv/figures/account_editor_a.png
@@ -1057,7 +963,6 @@ share/mime-info/evolution.keys
 share/mime-info/evolution.mime
 share/omf/evolution/evolution-C.omf
 share/omf/evolution/evolution-en_GB.omf
-share/omf/evolution/evolution-fr.omf
 share/omf/evolution/evolution-es.omf
 share/omf/evolution/evolution-sv.omf
 share/icons/hicolor/16x16/apps/evolution.png
@@ -1143,8 +1048,6 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/idl/evolution-%%VERSION%%
 @dirrm share/gnome/help/evolution/sv/figures
 @dirrm share/gnome/help/evolution/sv
-@dirrm share/gnome/help/evolution/fr/figures
-@dirrm share/gnome/help/evolution/fr
 @dirrm share/gnome/help/evolution/es/figures
 @dirrm share/gnome/help/evolution/es
 @dirrm share/gnome/help/evolution/en_GB/figures