diff -ur /home/kibab/ports/synce-rra/Makefile /home/kibab/ports-dev/synce-librra/Makefile
--- /home/kibab/ports/synce-rra/Makefile	2007-03-24 01:02:30.000000000 +0300
+++ /home/kibab/ports-dev/synce-librra/Makefile	2008-07-08 22:44:59.000000000 +0400
@@ -1,33 +1,67 @@
-# New ports collection makefile for:   synce-rra
-# Date created:                March 2004
-# Whom:                        Sam Lawrance <boris@brooknet.com.au>
+# New ports collection makefile for:   synce-librra
+# Date created:                Jul 2008
+# Whom:                        Ilya Bakulin <webmaster@kibab.com>
 #
-# $FreeBSD: ports/palm/synce-rra/Makefile,v 1.16 2007/03/23 22:02:30 pav Exp $
+# $FreeBSD$
 
-PORTNAME=	synce-rra
-PORTVERSION=	0.9.1
+PORTNAME=	librra
+PORTVERSION=	0.11.1
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
+PKGNAMEPREFIX?=	synce-
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Remote Replication Agent Connection protocol library
+MAINTAINER=	webmaster@kibab.com
+COMMENT?=	Remote Replication Agent Connection protocol library
 
-LIB_DEPENDS=	synce.0:${PORTSDIR}/palm/synce-libsynce \
+LIB_DEPENDS+=	synce.0:${PORTSDIR}/palm/synce-libsynce \
 		rapi.2:${PORTSDIR}/palm/synce-librapi2
-BUILD_DEPENDS=	${LOCALBASE}/lib/libmimedir.a:${PORTSDIR}/devel/libmimedir
-RUN_DEPENDS=	${LOCALBASE}/lib/libmimedir.a:${PORTSDIR}/devel/libmimedir
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libmimedir.a:${PORTSDIR}/devel/libmimedir
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-MAN1=		synce-matchmaker.1
+OPTIONS?=	TOOLS	"Build with minor rra command line tools"	on \
+		RECURR	"Enable experimential recurrence support"	off
 
-USE_ICONV=	yes
+GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--with-libsynce=${LOCALBASE}
+USE_ICONV=	yes
+USE_GNOME=	gnomehack gnometarget
+CONFIGURE_ARGS+=	--with-libsynce="${LOCALBASE}" \
+			--with-libmimedir="${LOCALBASE}"
+
 USE_LDCONFIG=	yes
 
+.include <bsd.port.pre.mk>
+
+.if defined(RRA_SLAVE) && ${RRA_SLAVE} == "pythonb"
+# If we're building python bindings, omit building tools
+CONFIGURE_ARGS+=	--enable-python-bindings --disable-minor-tools
+.else
+# Not building bindings
+MAN1=		synce-matchmaker.1
+CONFIGURE_ARGS+=	--disable-python-bindings
+.if !defined(WITH_TOOLS)
+CONFIGURE_ARGS+=	--disable-minor-tools
+PLIST_SUB+=	TOOLS="@comment "
+.else
+MAN1+=		rra-appointment-from-vevent.1 \
+		rra-appointment-to-vevent.1 rra-contact-from-vcard.1 \
+		rra-contact-to-vcard.1 rra-decode.1 \
+		rra-delete.1 rra-get-data.1 \
+		rra-get-ids.1 rra-get-types.1 \
+		rra-get-recurring-appointments.1 rra-put-data.1 \
+		rra-subscribe.1 rra-task-from-vtodo.1 \
+		rra-task-to-vtodo.1 rra-timezone.1
+PLIST_SUB+=	TOOLS=""
+.endif
+
+.if defined(WITH_RECURR)
+CONFIGURE_ARGS+=	--enable-recurrence
+.endif
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror||g' \
 		${WRKSRC}/lib/Makefile.in
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ur /home/kibab/ports/synce-rra/distinfo /home/kibab/ports-dev/synce-librra/distinfo
--- /home/kibab/ports/synce-rra/distinfo	2005-11-25 20:09:21.000000000 +0300
+++ /home/kibab/ports-dev/synce-librra/distinfo	2008-05-18 22:01:50.000000000 +0400
@@ -1,3 +1,3 @@
-MD5 (synce-rra-0.9.1.tar.gz) = 72742f93f19d5727159989ec80a725f0
-SHA256 (synce-rra-0.9.1.tar.gz) = 9564e1e6bfff0ce40f7c7ac01dae65f194d83323584aa5492b749ccd96f395b3
-SIZE (synce-rra-0.9.1.tar.gz) = 379075
+MD5 (librra-0.11.1.tar.gz) = 1dff577a2b1ac85a69768de555d05ee7
+SHA256 (librra-0.11.1.tar.gz) = 6a0991c7af8472a882beb8738f2e8d9b8ccc9e2bea7709a5ad8137850541164e
+SIZE (librra-0.11.1.tar.gz) = 433941
Only in /home/kibab/ports-dev/synce-librra/files: patch-python-pyrra.pyx
Only in /home/kibab/ports/synce-rra/files: patch-src-rra-decode.c
Only in /home/kibab/ports/synce-rra/files: patch-src-rra-timezone.c
diff -ur /home/kibab/ports/synce-rra/pkg-plist /home/kibab/ports-dev/synce-librra/pkg-plist
--- /home/kibab/ports/synce-rra/pkg-plist	2004-03-14 00:44:14.000000000 +0300
+++ /home/kibab/ports-dev/synce-librra/pkg-plist	2008-06-19 14:29:21.000000000 +0400
@@ -1,14 +1,30 @@
 bin/synce-matchmaker
+%%TOOLS%%bin/rra-get-types
+%%TOOLS%%bin/rra-get-ids
+%%TOOLS%%bin/rra-get-data
+%%TOOLS%%bin/rra-put-data
+%%TOOLS%%bin/rra-delete
+%%TOOLS%%bin/rra-decode
+%%TOOLS%%bin/rra-subscribe
+%%TOOLS%%bin/rra-get-recurring-appointments
+%%TOOLS%%bin/rra-contact-to-vcard
+%%TOOLS%%bin/rra-contact-from-vcard
+%%TOOLS%%bin/rra-appointment-from-vevent
+%%TOOLS%%bin/rra-appointment-to-vevent
+%%TOOLS%%bin/rra-task-from-vtodo
+%%TOOLS%%bin/rra-task-to-vtodo
+%%TOOLS%%bin/rra-timezone
 include/rra/appointment.h
 include/rra/contact.h
 include/rra/matchmaker.h
 include/rra/syncmgr.h
-include/rra/task.h
 include/rra/timezone.h
+include/rra/frontend.h
+include/rra/task.h
 include/rra/uint32vector.h
-lib/librra.a
-lib/librra.la
-lib/librra.so
-lib/librra.so.0
-share/aclocal/rra.m4
 @dirrm include/rra
+lib/librra.so.0
+lib/librra.so
+lib/librra.la
+lib/librra.a
+libdata/pkgconfig/librra.pc