Update to 1.2.0.

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

4 files changed, 51 insertions, 40 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index bcaea09da..3743edfd4 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.1.90
+PORTVERSION=	1.2.0
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://people.FreeBSD.org/~sobomax/:local
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1 \
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2 \
 			sobomax/:local
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		db-3.1.17${EXTRACT_SUFX}:local
diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo
index 4c2ff725a..eae12ea00 100644
--- a/mail/evolution-devel/distinfo
+++ b/mail/evolution-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome/evolution-1.1.90.tar.bz2) = 9a5c5ffc1d2bc23c9753b5c44d5038be
+MD5 (gnome/evolution-1.2.0.tar.bz2) = 949c31941e869606ab808ce42f3a8e98
 MD5 (gnome/db-3.1.17.tar.bz2) = b237f4e38a650d096389ff54d564928d
diff --git a/mail/evolution-devel/files/patch-Makefile.in b/mail/evolution-devel/files/patch-Makefile.in
new file mode 100644
index 000000000..c6cd1867e
--- /dev/null
+++ b/mail/evolution-devel/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Mon Nov 11 17:44:58 2002
++++ Makefile.in	Mon Nov 11 17:45:22 2002
+@@ -223,7 +223,7 @@
+ changelogs =  	ChangeLog
+ 
+ 
+-confexecdir = $(libdir)
++confexecdir = $(prefix)/etc
+ confexec_DATA =  	camelConf.sh				evolution_shellConf.sh			evolution_addressbookConf.sh		evolution_calendarConf.sh
+ 
+ 
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
index d41893bb4..2390096be 100644
--- a/mail/evolution-devel/pkg-plist
+++ b/mail/evolution-devel/pkg-plist
@@ -21,6 +21,10 @@ bin/killev
 bin/load-gnomecard-addressbook
 bin/load-pine-addressbook
 bin/wombat
+etc/camelConf.sh
+etc/evolution_addressbookConf.sh
+etc/evolution_calendarConf.sh
+etc/evolution_shellConf.sh
 include/camel/broken-date-parser.h
 include/camel/camel-address.h
 include/camel/camel-arg.h
@@ -267,40 +271,36 @@ include/evolution/widgets/e-search-bar.h
 include/evolution/widgets/e-title-bar.h
 include/evolution/widgets/e-url-entry.h
 include/evolution/wombat/wombat-client.h
-lib/camelConf.sh
-lib/evolution/1.1/camel-providers/libcamelimap.so
-lib/evolution/1.1/camel-providers/libcamelimap.urls
-lib/evolution/1.1/camel-providers/libcamellocal.so
-lib/evolution/1.1/camel-providers/libcamellocal.urls
-lib/evolution/1.1/camel-providers/libcamelpop3.so
-lib/evolution/1.1/camel-providers/libcamelpop3.urls
-lib/evolution/1.1/camel-providers/libcamelsendmail.so
-lib/evolution/1.1/camel-providers/libcamelsendmail.urls
-lib/evolution/1.1/camel-providers/libcamelsmtp.so
-lib/evolution/1.1/camel-providers/libcamelsmtp.urls
-lib/evolution/1.1/evolution-mail-importers/libmbox.so
-lib/evolution/1.1/evolution-mail-importers/liboutlook.so
-lib/evolution/1.1/libcal-util-static.a
-lib/evolution/1.1/libebook-static.a
-lib/evolution/1.1/libebook.a
-lib/evolution/1.1/libebook.so
-lib/evolution/1.1/libebook.so.0
-lib/evolution/1.1/libeconduit.a
-lib/evolution/1.1/libeconduit.so
-lib/evolution/1.1/libeconduit.so.0
-lib/evolution/1.1/libedb3util.a
-lib/evolution/1.1/libedb3util.so
-lib/evolution/1.1/libedb3util.so.0
-lib/evolution/1.1/libemiscwidgets.a
-lib/evolution/1.1/libeutil.a
-lib/evolution/1.1/libeutil.so
-lib/evolution/1.1/libeutil.so.0
-lib/evolution/1.1/libpas.a
-lib/evolution/1.1/libpcs.a
-lib/evolution/1.1/libversit.a
-lib/evolution_addressbookConf.sh
-lib/evolution_calendarConf.sh
-lib/evolution_shellConf.sh
+lib/evolution/1.2/camel-providers/libcamelimap.so
+lib/evolution/1.2/camel-providers/libcamelimap.urls
+lib/evolution/1.2/camel-providers/libcamellocal.so
+lib/evolution/1.2/camel-providers/libcamellocal.urls
+lib/evolution/1.2/camel-providers/libcamelpop3.so
+lib/evolution/1.2/camel-providers/libcamelpop3.urls
+lib/evolution/1.2/camel-providers/libcamelsendmail.so
+lib/evolution/1.2/camel-providers/libcamelsendmail.urls
+lib/evolution/1.2/camel-providers/libcamelsmtp.so
+lib/evolution/1.2/camel-providers/libcamelsmtp.urls
+lib/evolution/1.2/evolution-mail-importers/libmbox.so
+lib/evolution/1.2/evolution-mail-importers/liboutlook.so
+lib/evolution/1.2/libcal-util-static.a
+lib/evolution/1.2/libebook-static.a
+lib/evolution/1.2/libebook.a
+lib/evolution/1.2/libebook.so
+lib/evolution/1.2/libebook.so.0
+lib/evolution/1.2/libeconduit.a
+lib/evolution/1.2/libeconduit.so
+lib/evolution/1.2/libeconduit.so.0
+lib/evolution/1.2/libedb3util.a
+lib/evolution/1.2/libedb3util.so
+lib/evolution/1.2/libedb3util.so.0
+lib/evolution/1.2/libemiscwidgets.a
+lib/evolution/1.2/libeutil.a
+lib/evolution/1.2/libeutil.so
+lib/evolution/1.2/libeutil.so.0
+lib/evolution/1.2/libpas.a
+lib/evolution/1.2/libpcs.a
+lib/evolution/1.2/libversit.a
 %%PILOT:%%lib/gnome-pilot/conduits/libeaddress_conduit.so
 %%PILOT:%%lib/gnome-pilot/conduits/libecalendar_conduit.so
 %%PILOT:%%lib/gnome-pilot/conduits/libetodo_conduit.so
@@ -1417,9 +1417,9 @@ share/locale/zh_CN/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/evolution
 @dirrm share/doc/evolution-cal-util
 @dirrm share/doc/evolution-cal-client
-@dirrm lib/evolution/1.1/evolution-mail-importers
-@dirrm lib/evolution/1.1/camel-providers
-@dirrm lib/evolution/1.1
+@dirrm lib/evolution/1.2/evolution-mail-importers
+@dirrm lib/evolution/1.2/camel-providers
+@dirrm lib/evolution/1.2
 @dirrm lib/evolution
 @dirrm include/evolution/wombat
 @dirrm include/evolution/widgets