sysutils/synergy: Correct version confusion: current version is 1.x.x, not 2.x.x

Therefore sysutils/synergy-1 is removed, and sysutils/synergy PORTEPOCH is bumped because the prevuous commit went backwards 2.x.x -> 1.x.x

Reference: https://github.com/symless/synergy-core/issues/6850#issuecomment-732045154

Reported by:	Aleksander Matveev <timon@timon.net.nz>

7 files changed, 2 insertions, 82 deletions

diff --git a/MOVED b/MOVED
index b801d82db34f..b42a925d926c 100644
--- a/MOVED
+++ b/MOVED
@@ -16192,3 +16192,4 @@ www/rubygem-gitlab-puma_worker_killer|www/rubygem-puma_worker_killer|2021-03-03|
 www/rubygem-gitlab-puma|www/rubygem-puma|2021-03-03|Obsolete, use www/rubygem-puma instead
 korean/man-doc||2021-03-03|Has expired: Poor quality, severely outdated and undermaintained
 devel/relx||2021-03-03|Has expired: Script removed upstream, library included in devel/rebar3
+sysutils/synergy-1|sysutils/synergy|2021-03-03|Current version is 1.x.x, 2.x.x was tagged by the upstream by mistake
diff --git a/sysutils/Makefile b/sysutils/Makefile
index c363026a7aaf..09f52eb82c2a 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1293,7 +1293,6 @@
     SUBDIR += symlinks
     SUBDIR += symon
     SUBDIR += synergy
-    SUBDIR += synergy-1
     SUBDIR += sysctlbyname-improved-kmod
     SUBDIR += sysctlinfo-kmod
     SUBDIR += sysgather
diff --git a/sysutils/synergy-1/Makefile b/sysutils/synergy-1/Makefile
deleted file mode 100644
index cff510f397a8..000000000000
--- a/sysutils/synergy-1/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	synergy-1
-DISTVERSIONPREFIX=	v
-DISTVERSION=	1.13.0
-DISTVERSIONSUFFIX=	-stable
-CATEGORIES=	sysutils
-
-MAINTAINER=	yuri@FreeBSD.org
-COMMENT=	Mouse and keyboard sharing utility
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-LIB_DEPENDS=	libcurl.so:ftp/curl
-
-USES=		cmake compiler:c++14-lang cpe ssl xorg
-CPE_VENDOR=	synergy-foss
-USE_GITHUB=	yes
-GH_ACCOUNT=	symless
-GH_PROJECT=	synergy-core
-USE_XORG=	ice xtst x11 sm xext xinerama xrandr xi
-
-GH_TUPLE=	google:googletest:18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6:google_googletest/ext/googletest # should not be needed: https://github.com/symless/synergy-core/issues/6787
-
-CONFLICTS=	synergy
-
-CMAKE_OFF=	BUILD_TESTS SYNERGY_BUILD_LEGACY_INSTALLER SYNERGY_BUILD_LEGACY_GUI
-CMAKE_ARGS=	-DSYNERGY_REVISION:STRING=${DISTVERSION:S/.//g}0000 # it expects a 7-digit hash
-
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
-
-MAKE_JOBS_UNSAFE=yes
-
-PORTEXAMPLES=	synergy.conf.example synergy.conf.example-basic \
-		synergy.conf.example-advanced
-
-OPTIONS_DEFINE=	EXAMPLES
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|return "/etc"|return "${PREFIX}/etc"|' \
-		${WRKSRC}/src/lib/arch/unix/ArchFileUnix.cpp
-	@${REINPLACE_CMD} -e 's|/etc/synergy.conf|${PREFIX}/etc/synergy.conf|' \
-		${WRKSRC}/doc/synergys.man
-
-do-install:
-.for f in synergyc synergyd synergys
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin
-.endfor
-.for f in synergyc synergys
-	${INSTALL_MAN} ${WRKSRC}/doc/${f}.man \
-		${STAGEDIR}${MANPREFIX}/man/man1/${f}.1
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/doc/synergy.conf.example-basic ${STAGEDIR}${PREFIX}/etc/synergy.conf.sample # server config
-
-do-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for f in ${PORTEXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${EXAMPLESDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/sysutils/synergy-1/distinfo b/sysutils/synergy-1/distinfo
deleted file mode 100644
index 3008d42bc21c..000000000000
--- a/sysutils/synergy-1/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1609652251
-SHA256 (symless-synergy-core-v1.13.0-stable_GH0.tar.gz) = a57989dd2d3ae30657f2b95cba3cae112c189f9bbbc3d1b25b3874859afeb94d
-SIZE (symless-synergy-core-v1.13.0-stable_GH0.tar.gz) = 8657662
-SHA256 (google-googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6_GH0.tar.gz) = d518c1c146c5a87cdedbee8535a396f95d91e8b39baa539fd4c50bd62148d199
-SIZE (google-googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6_GH0.tar.gz) = 876756
diff --git a/sysutils/synergy-1/pkg-descr b/sysutils/synergy-1/pkg-descr
deleted file mode 100644
index f6276742ebd9..000000000000
--- a/sysutils/synergy-1/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Synergy lets you easily share a single mouse and keyboard between
-multiple computers with different operating systems, each with its
-own display, without special hardware.  It's intended for users
-with multiple computers on their desk since each system uses its
-own display.
-
-WWW: https://symless.com/synergy
diff --git a/sysutils/synergy-1/pkg-plist b/sysutils/synergy-1/pkg-plist
deleted file mode 100644
index ba87c4d4eafd..000000000000
--- a/sysutils/synergy-1/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/synergyc
-bin/synergys
-bin/synergyd
-man/man1/synergyc.1.gz
-man/man1/synergys.1.gz
-@sample etc/synergy.conf.sample
diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index 7dd722900219..a7897ffd4aad 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	synergy
 DISTVERSION=	1.13.1.41
 DISTVERSIONSUFFIX=	-stable
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org