aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/synergy-plus/Makefile3
-rw-r--r--sysutils/synergy/Makefile4
2 files changed, 6 insertions, 1 deletions
diff --git a/sysutils/synergy-plus/Makefile b/sysutils/synergy-plus/Makefile
index 53c30dc0ec11..9f2cfe4fd7b0 100644
--- a/sysutils/synergy-plus/Makefile
+++ b/sysutils/synergy-plus/Makefile
@@ -7,6 +7,7 @@
PORTNAME= synergy-plus
PORTVERSION= 1.3.4
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= GOOGLE_CODE
@@ -20,6 +21,8 @@ USE_XORG= ice xtst x11 sm
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFLICTS= synergy-[0-9]*
+
post-patch:
@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/configure
diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index ce557ef01ce2..ed78b138a703 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -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 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README
+CONFLICTS= synergy-plus-[0-9]*
+
post-patch:
@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/configure