Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --- pkgsrc/net/synergy/Makefile 2018/08/16 18:55:08 1.49 +++ pkgsrc/net/synergy/Makefile 2022/03/14 11:40:08 1.73 @@ -1,12 +1,18 @@ -# $NetBSD: Makefile,v 1.49 2018/08/16 18:55:08 adam Exp $ +# $NetBSD: Makefile,v 1.73 2022/03/14 11:40:08 tnn Exp $ -DISTNAME= synergy-core-2.0.0 +DISTNAME= synergy-core-1.14.3.5 PKGNAME= ${DISTNAME:S/-core//} -PKGREVISION= 2 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,19 +20,11 @@ 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 +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=0bd448d5 +CONFIGURE_ENV+= GIT_COMMIT=218fa800 EXAMPLES= MacReadme.txt org.synergy-foss.org.synergyc.plist \ org.synergy-foss.org.synergys.plist synergy.conf.example \ @@ -39,10 +37,11 @@ SUBST_FILES.fix-paths= src/lib/arch/uni SUBST_FILES.fix-paths+= src/lib/arch/unix/ArchDaemonUnix.h SUBST_SED.fix-paths= -e 's,"/etc,"${PKG_SYSCONFDIR},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} @@ -51,7 +50,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${p} ${DESTDIR}${PREFIX}/bin/${p} ${INSTALL_MAN} ${WRKSRC}/doc/${p}.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${p}.1 .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/bin/synergy-core ${DESTDIR}${PREFIX}/bin/synergy-core .for f in ${EXAMPLES} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE} .endfor @@ -78,11 +76,18 @@ CFLAGS+= -DUSYNERGY_LITTLE_ENDIAN BUILDLINK_TRANSFORM+= rm:-ldl .endif +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"