Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/deskutils/libopensync-plugin-evolution2/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	19 Jul 2008 14:00:25 -0000	1.1
+++ Makefile	19 Jul 2008 23:47:18 -0000
@@ -6,19 +6,27 @@
 #
 
 PORTNAME=	libopensync-plugin-evolution2
-PORTVERSION=	0.22
+PORTVERSION=	0.36
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	ports@logvinov.com
 COMMENT=	Evolution 2 plugin for the OpenSync framework
 
-LIB_DEPENDS=	opensync.0:${PORTSDIR}/devel/libopensync022
+LIB_DEPENDS=	opensync.1:${PORTSDIR}/devel/libopensync
+RUN_DEPENDS=	vconvert:${PORTSDIR}/deskutils/libopensync-plugin-vformat-devel
 
-CONFLICTS=	libopensync-plugin-evolution2-devel-[0-9]*
+CONFLICTS=	libopensync-plugin-evolution2-0.2*
 
 USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-Wno-dev
 USE_GNOME=	evolutiondataserver gconf2
 
+pre-patch:
+	@${REINPLACE_CMD} -e "/FIND_PACKAGE( Check )/d" ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e "s|MESSAGE|# MESSAGE|" \
+		${WRKSRC}/cmake/modules/MacroEnsureOutOfSourceBuild.cmake
+
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/deskutils/libopensync-plugin-evolution2/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	19 Jul 2008 14:00:25 -0000	1.1
+++ distinfo	19 Jul 2008 23:44:58 -0000
@@ -1,3 +1,3 @@
-MD5 (libopensync-plugin-evolution2-0.22.tar.bz2) = c4419dd2451bd1595fe42fcf96a9ba45
-SHA256 (libopensync-plugin-evolution2-0.22.tar.bz2) = 2a309178a1aafaa147b792502a241e0036889e2f4153065a10313e7db3c26e65
-SIZE (libopensync-plugin-evolution2-0.22.tar.bz2) = 219916
+MD5 (libopensync-plugin-evolution2-0.36.tar.bz2) = ed3aca114a81ad8cc543b3dd68af657a
+SHA256 (libopensync-plugin-evolution2-0.36.tar.bz2) = 19f1a24d54daec7b6e1321548799e500893b8aebe6dda995dc8eb162f77932c2
+SIZE (libopensync-plugin-evolution2-0.36.tar.bz2) = 35361
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/deskutils/libopensync-plugin-evolution2/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	19 Jul 2008 14:00:25 -0000	1.1
+++ pkg-plist	19 Jul 2008 23:44:58 -0000
@@ -1,8 +1,6 @@
-include/opensync-1.0/opensync/evo2_sync.h
-lib/opensync/plugins/evo2_sync.so
-lib/opensync/plugins/evo2_sync.la
-share/opensync/defaults/evo2-sync
-@dirrmtry lib/opensync/plugins
-@dirrmtry lib/opensync
-@dirrmtry share/opensync/defaults
-@dirrmtry share/opensync
+lib/opensync-1.0/plugins/evo2-sync.so
+share/opensync-1.0/defaults/evo2-sync
+@dirrmtry lib/opensync-1.0/plugins
+@dirrmtry lib/opensync-1.0
+@dirrmtry share/opensync-1.0/defaults
+@dirrmtry share/opensync-1.0
Index: files/patch-src_Makefile.in
===================================================================
RCS file: files/patch-src_Makefile.in
diff -N files/patch-src_Makefile.in
--- files/patch-src_Makefile.in	19 Jul 2008 14:00:25 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	2008-07-11 14:03:05.000000000 +1000
-+++ src/Makefile.in	2008-07-11 14:03:10.000000000 +1000
-@@ -198,7 +198,7 @@
- INCLUDES = @PACKAGE_CFLAGS@ @EPACKAGE_CFLAGS@
- 
- # Please remove '-Wno-return-type' when Evo fixes the warning in their headers.
--AM_CFLAGS = -Wall -Werror -Wno-return-type
-+AM_CFLAGS = -Wall -Wno-return-type
- config_DATA = evo2-sync
- opensyncheader_HEADERS = evo2_sync.h
- plugin_LTLIBRARIES = evo2_sync.la