From 5b2d359f07db7cc9c05bda74f076cceee7aecdea Mon Sep 17 00:00:00 2001
From: Jeremy Messenger <mezz@FreeBSD.org>
Date: Tue, 30 Jan 2007 05:07:09 +0000
Subject: Update to 2.8.3.

---
 mail/evolution/files/patch-data_Makefile.in | 28 +++++++++++++++-------------
 mail/evolution/files/patch-mail_em-utils.h  | 10 ----------
 2 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 mail/evolution/files/patch-mail_em-utils.h

(limited to 'mail/evolution/files')

diff --git a/mail/evolution/files/patch-data_Makefile.in b/mail/evolution/files/patch-data_Makefile.in
index 06105b89c2d5..b6b89ee4bb78 100644
--- a/mail/evolution/files/patch-data_Makefile.in
+++ b/mail/evolution/files/patch-data_Makefile.in
@@ -1,23 +1,25 @@
---- data/Makefile.in.orig	Mon Nov 20 14:17:52 2006
-+++ data/Makefile.in	Mon Nov 20 14:26:10 2006
-@@ -753,15 +753,15 @@ uninstall-info: uninstall-info-recursive
+--- data/Makefile.in.orig	Mon Jan 29 21:52:23 2007
++++ data/Makefile.in	Mon Jan 29 21:59:20 2007
+@@ -753,16 +753,16 @@
  install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
  	$(mkinstalldirs) $(DESTDIR)$(desktopdir);							\
  	$(INSTALL_DATA) $(desktop_file)									\
--			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop ;	\
-+			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ;     \
+-			$(DESTDIR)$(desktopdir)/$(desktop_file) ;	\
++			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ;	\
  	$(mkinstalldirs) $(DESTDIR)$(keysdir);								\
--	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys ;	\
-+	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;    \
+-	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file) ;	\
++	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
  	$(mkinstalldirs) $(DESTDIR)$(mimedir);								\
--	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime ;
+-	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file) ;
 +	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
  
  uninstall-local: uninstall-kde-applnk
--	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; 	\
--	rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
-+	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ;      \
-+	rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;  \
- 	rm -rf $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
+-	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file) ; 	\
+-	rm -rf $(DESTDIR)$(keysdir)/$(keys_file) ;	\
+-	rm -rf $(DESTDIR)$(mimedir)/$(mime_file) ;
++	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; 	\
++	rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
++	rm -rf $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
  
  # CDE Stuff
+ 
diff --git a/mail/evolution/files/patch-mail_em-utils.h b/mail/evolution/files/patch-mail_em-utils.h
deleted file mode 100644
index b3e7b9ffbe25..000000000000
--- a/mail/evolution/files/patch-mail_em-utils.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- mail/em-utils.h.orig	Tue Aug  3 16:59:46 2004
-+++ mail/em-utils.h	Tue Aug  3 17:00:04 2004
-@@ -23,6 +23,7 @@
- #ifndef __EM_UTILS_H__
- #define __EM_UTILS_H__
- 
-+#include <sys/types.h>
- #include <glib.h>
- 
- #ifdef __cplusplus
-- 
cgit v1.2.3