Index: ports/sysutils/synergy/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/synergy/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ports/sysutils/synergy/Makefile	22 Aug 2009 00:35:28 -0000	1.21
+++ ports/sysutils/synergy/Makefile	23 Oct 2009 12:52:04 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	synergy
 PORTVERSION= 	1.3.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}2/Sources/${PORTVERSION}
 
@@ -21,6 +21,8 @@
 
 DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README
 
+CONFLICTS=	synergy-plus-[0-9]*
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/configure
 
Index: ports/sysutils/synergy-plus/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/synergy-plus/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- ports/sysutils/synergy-plus/Makefile	12 Oct 2009 19:33:13 -0000	1.1
+++ ports/sysutils/synergy-plus/Makefile	23 Oct 2009 12:52:04 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	synergy-plus
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	GOOGLE_CODE
 
@@ -20,6 +21,8 @@
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
+CONFLICTS=	synergy-[0-9]*
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/configure