3 files changed, 71 insertions, 23 deletions

diff --git a/palm/synce-librra/Makefile b/palm/synce-librra/Makefile
index 472af7a49afc..e80078e7983c 100644
--- a/palm/synce-librra/Makefile
+++ b/palm/synce-librra/Makefile
@@ -4,30 +4,62 @@
 #
 # $FreeBSD$
 
-PORTNAME=	synce-rra
-PORTVERSION=	0.9.1
+PORTNAME=	librra
+PORTVERSION=	0.12
 CATEGORIES=	palm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	synce
+MASTER_SITES=	SF/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+=	${LOCALBASE}/lib/libmimedir.a:${PORTSDIR}/devel/libmimedir
 
-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_LDCONFIG=	yes
+USE_ICONV=	yes
+USE_GNOME=	gnomehack gnometarget
+CONFIGURE_ARGS+=	--with-libsynce="${LOCALBASE}" \
+			--with-libmimedir="${LOCALBASE}"
+
+.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-minor-tools
+.if !defined(WITHOUT_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 --git a/palm/synce-librra/distinfo b/palm/synce-librra/distinfo
index 707ebf0caf0b..02e8d11254dc 100644
--- a/palm/synce-librra/distinfo
+++ b/palm/synce-librra/distinfo
@@ -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.12.tar.gz) = 867b29f88df6a7706c2a4b2bda658c9e
+SHA256 (librra-0.12.tar.gz) = 6845bb2a0a47aacad981a825fbe6a937355498653b0d90ab2dd7d01e2d223fa1
+SIZE (librra-0.12.tar.gz) = 434059
diff --git a/palm/synce-librra/pkg-plist b/palm/synce-librra/pkg-plist
index 0279c4f8ca1b..712f5f937cbe 100644
--- a/palm/synce-librra/pkg-plist
+++ b/palm/synce-librra/pkg-plist
@@ -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