From owner-svn-ports-head@freebsd.org Sun Feb 25 03:23:23 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B800F389AC; Sun, 25 Feb 2018 03:23:23 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B517E8636F; Sun, 25 Feb 2018 03:23:22 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AFFCF2F010; Sun, 25 Feb 2018 03:23:22 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1P3NMZW097260; Sun, 25 Feb 2018 03:23:22 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1P3NMwt097255; Sun, 25 Feb 2018 03:23:22 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201802250323.w1P3NMwt097255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 25 Feb 2018 03:23:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462893 - in head/sysutils/synergy: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/sysutils/synergy: . files X-SVN-Commit-Revision: 462893 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Feb 2018 03:23:23 -0000 Author: yuri Date: Sun Feb 25 03:23:21 2018 New Revision: 462893 URL: https://svnweb.freebsd.org/changeset/ports/462893 Log: sysutils/synergy: Update to 2.0.0 Changelog (incomplete): https://github.com/symless/synergy-core/blob/master/ChangeLog Additional port changes: * Changed to DISTVERSION * USES=cmake:outsource * Added SYNERGY_REVISION cmake variable with fake 7-digit hash that it now expects * Updated PLIST_FILES * Updated do-install * Split out do-install-EXAMPLES-on * Removed post-extract with gtest extraction (not needed) * Updated WWW * Updated patches, deleted unnecessary ones. Approved by: tcberner (mentor, implicit) Added: head/sysutils/synergy/files/patch-CMakeLists.txt (contents, props changed) Deleted: head/sysutils/synergy/files/patch-src_CMakeLists.txt head/sysutils/synergy/files/patch-src_lib_common_common.h head/sysutils/synergy/files/patch-src_test_CMakeLists.txt Modified: head/sysutils/synergy/Makefile head/sysutils/synergy/distinfo head/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt head/sysutils/synergy/pkg-descr Modified: head/sysutils/synergy/Makefile ============================================================================== --- head/sysutils/synergy/Makefile Sun Feb 25 03:10:33 2018 (r462892) +++ head/sysutils/synergy/Makefile Sun Feb 25 03:23:21 2018 (r462893) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= synergy -PORTVERSION= 1.8.8 DISTVERSIONPREFIX= v +DISTVERSION= 2.0.0 DISTVERSIONSUFFIX= -stable CATEGORIES= sysutils @@ -14,37 +14,37 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcurl.so:ftp/curl -USES= cmake cpe ssl +USES= cmake:outsource cpe ssl CPE_VENDOR= synergy-foss -USE_XORG= ice xtst x11 sm xext xinerama xrandr xi USE_GITHUB= yes GH_ACCOUNT= symless GH_PROJECT= synergy-core +USE_XORG= ice xtst x11 sm xext xinerama xrandr xi +CMAKE_ARGS= -DSYNERGY_REVISION:STRING=${PORTVERSION:S/.//g}00000 # it expects a 7-digit hash + CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE=yes -PLIST_FILES= bin/synergyc bin/synergyd bin/synergys \ +PLIST_FILES= bin/synergyc bin/synergys bin/synergy-core \ man/man1/synergyc.1.gz man/man1/synergys.1.gz PORTEXAMPLES= synergy.conf.example synergy.conf.example-basic \ synergy.conf.example-advanced OPTIONS_DEFINE= EXAMPLES -post-extract: - @${MKDIR} ${WRKSRC}/ext/gtest-1.6.0 - @${TAR} xf ${WRKSRC}/ext/gtest-1.6.0.zip -C ${WRKSRC}/ext/gtest-1.6.0 - do-install: -.for f in synergyc synergyd synergys - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin +.for f in synergyc synergys synergy-core + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin .endfor - ${INSTALL_MAN} ${WRKSRC}/doc/synergyc.man \ - ${STAGEDIR}${MANPREFIX}/man/man1/synergyc.1 - ${INSTALL_MAN} ${WRKSRC}/doc/synergys.man \ - ${STAGEDIR}${MANPREFIX}/man/man1/synergys.1 - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +.for f in synergyc synergys + ${INSTALL_MAN} ${WRKSRC}/doc/${f}.man \ + ${STAGEDIR}${MANPREFIX}/man/man1/${f}.1 +.endfor + +do-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ${PORTEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor Modified: head/sysutils/synergy/distinfo ============================================================================== --- head/sysutils/synergy/distinfo Sun Feb 25 03:10:33 2018 (r462892) +++ head/sysutils/synergy/distinfo Sun Feb 25 03:23:21 2018 (r462893) @@ -1,3 +1,3 @@ -TIMESTAMP = 1511905795 -SHA256 (symless-synergy-core-v1.8.8-stable_GH0.tar.gz) = 9ee45aabf9f77925bfab6248e713ae5d9e6bfe6bc246e4a0a6304dc6a30f5f14 -SIZE (symless-synergy-core-v1.8.8-stable_GH0.tar.gz) = 13498827 +TIMESTAMP = 1519524199 +SHA256 (symless-synergy-core-v2.0.0-stable_GH0.tar.gz) = d4afbbde2c819da44588afbf66ebb3376494d627f6bc4efaf0144b3fb3a41905 +SIZE (symless-synergy-core-v2.0.0-stable_GH0.tar.gz) = 5892923 Added: head/sysutils/synergy/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/synergy/files/patch-CMakeLists.txt Sun Feb 25 03:23:21 2018 (r462893) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2018-02-25 02:25:11 UTC ++++ CMakeLists.txt +@@ -299,7 +299,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Da + ${OPENSSL_ROOT}/lib/libssl.a + ${OPENSSL_ROOT}/lib/libcrypto.a + ) +-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") ++elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD") + set (OPENSSL_LIBS ssl crypto) + else() + message (FATAL_ERROR "Couldn't find OpenSSL") Modified: head/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt ============================================================================== --- head/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt Sun Feb 25 03:10:33 2018 (r462892) +++ head/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt Sun Feb 25 03:23:21 2018 (r462893) @@ -1,9 +1,9 @@ ---- src/lib/arch/CMakeLists.txt.orig 2015-08-03 10:52:29.431081000 +0800 -+++ src/lib/arch/CMakeLists.txt 2015-08-03 10:52:45.330309000 +0800 -@@ -50,5 +50,5 @@ +--- src/lib/arch/CMakeLists.txt.orig 2018-02-25 02:17:23 UTC ++++ src/lib/arch/CMakeLists.txt +@@ -40,5 +40,5 @@ endif() add_library(arch STATIC ${sources}) if (UNIX) -- target_link_libraries(arch dl ${libs}) -+ target_link_libraries(arch ${libs}) +- target_link_libraries(arch dl ${libs}) ++ target_link_libraries(arch ${CMAKE_DL_LIBS} ${libs}) endif() Modified: head/sysutils/synergy/pkg-descr ============================================================================== --- head/sysutils/synergy/pkg-descr Sun Feb 25 03:10:33 2018 (r462892) +++ head/sysutils/synergy/pkg-descr Sun Feb 25 03:23:21 2018 (r462893) @@ -4,4 +4,4 @@ own display, without special hardware. It's intended with multiple computers on their desk since each system uses its own display. -WWW: http://synergy-foss.org/ +WWW: https://symless.com/synergy