From owner-dev-commits-ports-main@freebsd.org Tue May 25 17:26:28 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 89381651100; Tue, 25 May 2021 17:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FqLbS1x7dz3qwp; Tue, 25 May 2021 17:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 294BF219DD; Tue, 25 May 2021 17:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14PHQSqg076201; Tue, 25 May 2021 17:26:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14PHQSBs076200; Tue, 25 May 2021 17:26:28 GMT (envelope-from git) Date: Tue, 25 May 2021 17:26:28 GMT Message-Id: <202105251726.14PHQSBs076200@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: f1c06929a717 - main - sysutils/synergy: Add LEGACY option; Add test target; Install syntool. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1c06929a717f9145b22ca947597466a60ed8b78 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 May 2021 17:26:28 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=f1c06929a717f9145b22ca947597466a60ed8b78 commit f1c06929a717f9145b22ca947597466a60ed8b78 Author: Yuri Victorovich AuthorDate: 2021-05-25 17:10:18 +0000 Commit: Yuri Victorovich CommitDate: 2021-05-25 17:26:22 +0000 sysutils/synergy: Add LEGACY option; Add test target; Install syntool. LEGACY option enables GUI, synergyd, installer that the project can build optionally. --- sysutils/synergy/Makefile | 23 +++++++++++++++++++++-- sysutils/synergy/pkg-plist | 3 +++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile index 6b7d0605475f..ad36b3c3024a 100644 --- a/sysutils/synergy/Makefile +++ b/sysutils/synergy/Makefile @@ -1,7 +1,7 @@ PORTNAME= synergy DISTVERSION= 1.13.1.41 DISTVERSIONSUFFIX= -stable -PORTEPOCH= 2 +PORTEPOCH= 3 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org @@ -23,12 +23,14 @@ GH_PROJECT= synergy-core GH_TUPLE= google:googletest:18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6:google_googletest/ext/googletest CMAKE_ARGS= -DSYNERGY_REVISION:STRING=${PORTVERSION:S/.//g}00 # it expects a 8-digit hash +CMAKE_OFF= BUILD_TESTS PORTEXAMPLES= synergy.conf.example synergy.conf.example-basic \ synergy.conf.example-advanced -OPTIONS_DEFINE= AVAHI_LIBDNS EXAMPLES +OPTIONS_DEFINE= AVAHI_LIBDNS EXAMPLES LEGACY OPTIONS_DEFAULT= AVAHI_LIBDNS +OPTIONS_SUB= yes AVAHI_LIBDNS_DESC= Use libdns from avahi to avoid conflicts with KDE/Gnome AVAHI_LIBDNS_USES= pkgconfig @@ -38,6 +40,10 @@ AVAHI_LIBDNS_LIB_DEPENDS= libdns_sd.so:net/avahi-libdns AVAHI_LIBDNS_LDFLAGS_OFF= -ldns_sd AVAHI_LIBDNS_LIB_DEPENDS_OFF= libdns_sd.so:net/mDNSResponder +LEGACY_DESC= Build the legacy GUI, synergyd, installer +LEGACY_CONFIGURE_ENV_OFF= SYNERGY_NO_LEGACY=true +LEGACY_USE= QT=gui + post-patch: @${REINPLACE_CMD} -e 's|return "/etc"|return "${PREFIX}/etc"|' \ ${WRKSRC}/src/lib/arch/unix/ArchFileUnix.cpp @@ -50,12 +56,25 @@ do-install: # https://github.com/symless/synergy-core/issues/6895 ${INSTALL_MAN} ${WRKSRC}/doc/${f}.man \ ${STAGEDIR}${MANPREFIX}/man/man1/${f}.1 .endfor + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/syntool ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/doc/synergy.conf.example-basic ${STAGEDIR}${PREFIX}/etc/synergy.conf.sample # server config +do-install-LEGACY-on: +.for f in synergy synergyd + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin +.endfor + do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ${PORTEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor +do-test: + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${BUILD_WRKSRC}/bin/unittests \ + ${BUILD_WRKSRC}/bin/integtests + .include diff --git a/sysutils/synergy/pkg-plist b/sysutils/synergy/pkg-plist index e8d3b4e1d42d..2f412d35c8b8 100644 --- a/sysutils/synergy/pkg-plist +++ b/sysutils/synergy/pkg-plist @@ -1,5 +1,8 @@ +%%LEGACY%%bin/synergy bin/synergyc +%%LEGACY%%bin/synergyd bin/synergys +bin/syntool man/man1/synergyc.1.gz man/man1/synergys.1.gz @sample etc/synergy.conf.sample