Update to 3.6.4.

Point to the new location of evolution 3.x.


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

3 files changed, 56 insertions, 34 deletions

diff --git a/mail/evolution-kolab/Makefile b/mail/evolution-kolab/Makefile
index a1abea1b3..6b7c4cb75 100644
--- a/mail/evolution-kolab/Makefile
+++ b/mail/evolution-kolab/Makefile
@@ -3,32 +3,31 @@
 #   $MCom: ports/trunk/mail/evolution-kolab/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	evolution-kolab
-PORTVERSION=	3.4.4
+PORTVERSION=	3.6.4
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Kolab groupware connector for evolution 3
+COMMENT=	Kolab groupware connector for evolution
 
-BUILD_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3 \
+BUILD_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution \
 		gperf>=3.0.3:${PORTSDIR}/devel/gperf
 LIB_DEPENDS=	libgmime-2.4.so:${PORTSDIR}/mail/gmime24
-RUN_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3
+RUN_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution
 
-NO_STAGE=	yes
-EVO_VER=	3.4.1
+EVO_VER=	3.6.0
 USE_XZ=		yes
 USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
-USE_SQLITE=	yes
+USE_SQLITE=	3
 MAKE_JOBS_UNSAFE=yes
 USE_GNOME=	gnomeprefix intlhack ltasneededhack libxml2 gconf2 
 CONFIGURE_ENV=	ac_cv_path_GPERF=${LOCALBASE}/bin/gperf
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-VERSION=	3.4
+VERSION=	3.6
 PLIST_SUB=	VERSION=${VERSION}
 
 .include <bsd.port.pre.mk>
@@ -41,4 +40,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,prefix}/doc/evolution_kolab,prefix}/share/doc/evolution_kolab,g' \
 		${WRKSRC}/Makefile.in
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libekolabconv.so.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/evolution-data-server/*/*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/evolution/${VERSION}/*/*.so
+
 .include <bsd.port.post.mk>
diff --git a/mail/evolution-kolab/distinfo b/mail/evolution-kolab/distinfo
index 42abc0617..f126a19d9 100644
--- a/mail/evolution-kolab/distinfo
+++ b/mail/evolution-kolab/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/evolution-kolab-3.4.4.tar.xz) = 96ee29d99725dc03e0766ac5cfee6466f9067ca5d6ebb5284ce5c5eeca594c9a
-SIZE (gnome3/evolution-kolab-3.4.4.tar.xz) = 716436
+SHA256 (gnome3/evolution-kolab-3.6.4.tar.xz) = 4f471cf04756b026fe4449f88c790310b548972ad1b36ba99bdb127d87a63a2c
+SIZE (gnome3/evolution-kolab-3.6.4.tar.xz) = 669844
diff --git a/mail/evolution-kolab/pkg-plist b/mail/evolution-kolab/pkg-plist
index bf187be1a..457d5833b 100644
--- a/mail/evolution-kolab/pkg-plist
+++ b/mail/evolution-kolab/pkg-plist
@@ -1,4 +1,3 @@
-bin/camel-kolab-imapx-provider
 bin/evolution_kolab
 bin/tdriver
 bin/test-kolab-mail-access
@@ -6,10 +5,6 @@ bin/test-kolab-util-cal-freebusy
 bin/test-kolab-util-http
 bin/test-kolab-util-ldap
 bin/unittest-libekolabconv
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-kolab.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-kolab.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-kolab.so
-lib/evolution/%%VERSION%%/plugins/org-gnome-kolab.eplug
 lib/evolution-data-server/addressbook-backends/libebookbackendkolab.a
 lib/evolution-data-server/addressbook-backends/libebookbackendkolab.la
 lib/evolution-data-server/addressbook-backends/libebookbackendkolab.so
@@ -20,19 +15,20 @@ lib/evolution-data-server/camel-providers/libcamelkolab.a
 lib/evolution-data-server/camel-providers/libcamelkolab.la
 lib/evolution-data-server/camel-providers/libcamelkolab.so
 lib/evolution-data-server/camel-providers/libcamelkolab.urls
-lib/libekolab.a
-lib/libekolab.la
-lib/libekolab.so
-lib/libekolabbackend.a
-lib/libekolabbackend.la
-lib/libekolabbackend.so
+lib/evolution-data-server/registry-modules/module-kolab-backend.a
+lib/evolution-data-server/registry-modules/module-kolab-backend.la
+lib/evolution-data-server/registry-modules/module-kolab-backend.so
+lib/evolution/%%VERSION%%/modules/module-kolab-configuration.a
+lib/evolution/%%VERSION%%/modules/module-kolab-configuration.la
+lib/evolution/%%VERSION%%/modules/module-kolab-configuration.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-kolab.a
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-kolab.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-kolab.so
+lib/evolution/%%VERSION%%/plugins/org-gnome-kolab.eplug
 lib/libekolabconv.a
 lib/libekolabconv.la
 lib/libekolabconv.so
 lib/libekolabconv.so.0
-lib/libekolabutil.a
-lib/libekolabutil.la
-lib/libekolabutil.so
 share/doc/evolution-kolab_addressbook/EBookBackendKolab.html
 share/doc/evolution-kolab_addressbook/api-index-full.html
 share/doc/evolution-kolab_addressbook/ch01.html
@@ -61,15 +57,9 @@ share/doc/evolution-kolab_calendar/object-tree.html
 share/doc/evolution-kolab_calendar/right.png
 share/doc/evolution-kolab_calendar/style.css
 share/doc/evolution-kolab_calendar/up.png
-share/doc/evolution-kolab_camel/CamelKolabIMAPXFolder.html
-share/doc/evolution-kolab_camel/CamelKolabIMAPXStore.html
-share/doc/evolution-kolab_camel/CamelKolabSession.html
 share/doc/evolution-kolab_camel/api-index-full.html
 share/doc/evolution-kolab_camel/ch01.html
-share/doc/evolution-kolab_camel/evolution-kolab-camel-camel-kolab-imapx-metadata-db.html
-share/doc/evolution-kolab_camel/evolution-kolab-camel-camel-kolab-imapx-metadata.html
 share/doc/evolution-kolab_camel/evolution-kolab-camel-camel-kolab-imapx-provider.html
-share/doc/evolution-kolab_camel/evolution-kolab-camel-camel-kolab-stream.html
 share/doc/evolution-kolab_camel/evolution-kolab_camel.devhelp2
 share/doc/evolution-kolab_camel/home.png
 share/doc/evolution-kolab_camel/index.html
@@ -132,14 +122,11 @@ share/doc/evolution_kolab/ChangeLog
 share/doc/evolution_kolab/INSTALL
 share/doc/evolution_kolab/NEWS
 share/doc/evolution_kolab/README
-share/evolution-kolab/README
-share/evolution-kolab/VERSIONS
 share/locale/am/LC_MESSAGES/evolution_kolab.mo
 share/locale/ar/LC_MESSAGES/evolution_kolab.mo
 share/locale/as/LC_MESSAGES/evolution_kolab.mo
 share/locale/ast/LC_MESSAGES/evolution_kolab.mo
 share/locale/az/LC_MESSAGES/evolution_kolab.mo
-share/locale/be/LC_MESSAGES/evolution_kolab.mo
 share/locale/bg/LC_MESSAGES/evolution_kolab.mo
 share/locale/bn/LC_MESSAGES/evolution_kolab.mo
 share/locale/bn_IN/LC_MESSAGES/evolution_kolab.mo
@@ -216,6 +203,38 @@ share/locale/xh/LC_MESSAGES/evolution_kolab.mo
 share/locale/zh_CN/LC_MESSAGES/evolution_kolab.mo
 share/locale/zh_HK/LC_MESSAGES/evolution_kolab.mo
 share/locale/zh_TW/LC_MESSAGES/evolution_kolab.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
 @dirrm share/doc/evolution-kolab_libekolabconv
 @dirrm share/doc/evolution-kolab_libekolab
 @dirrm share/doc/evolution-kolab_eplugin
@@ -223,4 +242,3 @@ share/locale/zh_TW/LC_MESSAGES/evolution_kolab.mo
 @dirrm share/doc/evolution-kolab_calendar
 @dirrm share/doc/evolution-kolab_addressbook
 @dirrm share/doc/evolution_kolab
-@dirrm share/evolution-kolab