Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/net/synergy/Makefile	2019/08/22 12:23:41	1.56
+++ pkgsrc/net/synergy/Makefile	2024/05/16 06:15:24	1.85
@@ -1,12 +1,19 @@
-# $NetBSD: Makefile,v 1.56 2019/08/22 12:23:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.85 2024/05/16 06:15:24 wiz Exp $
 
-DISTNAME=		synergy-core-1.10.2
+DISTNAME=		synergy-core-1.14.6.19
 PKGNAME=		${DISTNAME:S/-core//}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net x11
 MASTER_SITES=		${MASTER_SITE_GITHUB:=symless/}
 GITHUB_PROJECT=		synergy-core
-GITHUB_TAG=		v${PKGVERSION_NOREV}-stable
+GITHUB_TAG=		${PKGVERSION_NOREV}-stable
+DISTFILES=		${DEFAULT_DISTFILES}		\
+			  googletest-1.10.0.tar.gz	\
+			  pugixml-1.12.1.tar.gz
+SITES.googletest-1.10.0.tar.gz=	\
+	-${MASTER_SITE_GITHUB:=google/}googletest/archive/release-1.10.0.tar.gz
+SITES.pugixml-1.12.1.tar.gz=	\
+	-${MASTER_SITE_GITHUB:=zeux/}pugixml/archive/v1.12.1.tar.gz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://synergy-project.org/
@@ -14,20 +21,12 @@ COMMENT=		Let a user share a mouse and k
 LICENSE=		gnu-gpl-v2
 
 USE_LANGUAGES=		c c++11
-# Main configuration is CMake, but subdirectories are GNU configure.
-# We need to set GNU_CONFIGURE=yes for config.{guess,sub} overrides to kick in.
-# We override the do-configure target to prevent pkgsrc from running both
-# configuration mechanisms.
 USE_CMAKE=		yes
-GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
 CMAKE_ARGS+=		-DSYNERGY_BUILD_LEGACY_GUI=OFF
+CMAKE_ARGS+=		-DSYNERGY_BUILD_LEGACY_INSTALLER=OFF
 
-CONFIG_SUB_OVERRIDE+=	ext/gmock/build-aux/config.sub
-CONFIG_SUB_OVERRIDE+=	ext/gtest/build-aux/config.sub
-CONFIG_GUESS_OVERRIDE+=	ext/gmock/build-aux/config.guess
-CONFIG_GUESS_OVERRIDE+=	ext/gtest/build-aux/config.guess
-
-CONFIGURE_ENV+=		GIT_COMMIT=1b4c0761
+CONFIGURE_ENV+=		GIT_COMMIT=218fa800
 
 EXAMPLES=	MacReadme.txt org.synergy-foss.org.synergyc.plist \
 		org.synergy-foss.org.synergys.plist synergy.conf.example \
@@ -38,12 +37,15 @@ SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
 SUBST_FILES.fix-paths=		src/lib/arch/unix/ArchFileUnix.cpp
 SUBST_FILES.fix-paths+=		src/lib/arch/unix/ArchDaemonUnix.h
+SUBST_FILES.fix-paths+=		src/lib/synergy/unix/AppUtilUnix.cpp
 SUBST_SED.fix-paths=		-e 's,"/etc,"${PKG_SYSCONFDIR},g'
+SUBST_SED.fix-paths+=		-e 's,"/usr/share/X11,"${X11BASE}/share/X11,g'
 
-BUILDLINK_TRANSFORM+=		rm:-march=native
-
-.PHONY: do-configure
-do-configure: do-configure-cmake
+post-extract:
+	${RM} -rf ${WRKSRC}/ext/googletest
+	${LN} -s ${WRKDIR}/googletest-* ${WRKSRC}/ext/googletest
+	${RM} -rf ${WRKSRC}/ext/pugixml
+	${LN} -s ${WRKDIR}/pugixml-* ${WRKSRC}/ext/pugixml
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/${PKGBASE}
 
@@ -80,11 +82,16 @@ BUILDLINK_TRANSFORM+=	rm:-ldl
 
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
+.include "../../net/mDNSResponder/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .if !exists(/System/Library/Frameworks/Carbon.framework)
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"