Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --- pkgsrc/net/synergy/Makefile 2014/12/01 12:39:17 1.21 +++ pkgsrc/net/synergy/Makefile 2022/03/14 11:40:08 1.73 @@ -1,20 +1,30 @@ -# $NetBSD: Makefile,v 1.21 2014/12/01 12:39:17 joerg Exp $ -# +# $NetBSD: Makefile,v 1.73 2022/03/14 11:40:08 tnn Exp $ -DISTNAME= synergy-1.4.12-Source -PKGNAME= ${DISTNAME:S/-Source//} +DISTNAME= synergy-core-1.14.3.5 +PKGNAME= ${DISTNAME:S/-core//} CATEGORIES= net x11 -MASTER_SITES= http://synergy.googlecode.com/files/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=symless/} +GITHUB_PROJECT= synergy-core +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/ COMMENT= Let a user share a mouse and keyboard among computers LICENSE= gnu-gpl-v2 -EXTRACT_USING= bsdtar -USE_LANGUAGES= c c++ -USE_TOOLS+= unzip +USE_LANGUAGES= c c++11 USE_CMAKE= yes +CMAKE_ARGS+= -DSYNERGY_BUILD_LEGACY_GUI=OFF +CMAKE_ARGS+= -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF + +CONFIGURE_ENV+= GIT_COMMIT=218fa800 EXAMPLES= MacReadme.txt org.synergy-foss.org.synergyc.plist \ org.synergy-foss.org.synergys.plist synergy.conf.example \ @@ -23,21 +33,18 @@ EXAMPLES= MacReadme.txt org.synergy-foss SUBST_CLASSES+= fix-paths SUBST_STAGE.fix-paths= pre-configure SUBST_MESSAGE.fix-paths= Fixing absolute paths. -SUBST_FILES.fix-paths= src/lib/arch/CArchFileUnix.cpp -SUBST_SED.fix-paths= -e 's,"/etc","${PKG_SYSCONFDIR}",g' - -BUILDLINK_TRANSFORM+= rm:-march=native +SUBST_FILES.fix-paths= src/lib/arch/unix/ArchFileUnix.cpp +SUBST_FILES.fix-paths+= src/lib/arch/unix/ArchDaemonUnix.h +SUBST_SED.fix-paths= -e 's,"/etc,"${PKG_SYSCONFDIR},g' post-extract: - ${MKDIR} ${WRKSRC}/tools/cryptopp562 - cd ${WRKSRC}/tools/cryptopp562 && unzip -aqo ../cryptopp562.zip + ${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} -post-build: - ${CP} ${WRKSRC}/doc/synergyc.man ${WRKSRC}/doc/synergyc.1 - ${CP} ${WRKSRC}/doc/synergys.man ${WRKSRC}/doc/synergys.1 - do-install: .for p in synergyc synergys ${INSTALL_PROGRAM} ${WRKSRC}/bin/${p} ${DESTDIR}${PREFIX}/bin/${p} @@ -49,22 +56,42 @@ do-install: .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) -_WRAP_EXTRA_ARGS.CXX+= -std=c++11 -CWRAPPERS_APPEND.cxx+= -std=c++11 +_WRAP_EXTRA_ARGS.CXX+= -Wno-switch -Wno-unused \ + -Wno-deprecated-register -Wno-tautological-compare \ + -Wno-logical-op-parentheses -Wno-null-dereference +CWRAPPERS_APPEND.cxx+= -Wno-switch -Wno-unused \ + -Wno-deprecated-register -Wno-tautological-compare \ + -Wno-logical-op-parentheses -Wno-null-dereference .endif -# tools/cryptopp562/GNUmakefile -.include "../../mk/bsd.prefs.mk" -.if !empty(MACHINE_PLATFORM:MNetBSD-[0-6].*-i386) -CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM +.include "../../mk/endian.mk" +.if ${MACHINE_ENDIAN} == "big" +CFLAGS+= -DUSYNERGY_BIG_ENDIAN +.else +CFLAGS+= -DUSYNERGY_LITTLE_ENDIAN .endif +# XXX surely there exists a better way to do this +.if ${OPSYS} != "Linux" +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" .endif +.include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk"