git: f1c06929a717 - main - sysutils/synergy: Add LEGACY option; Add test target; Install syntool.

Yuri Victorovich yuri at FreeBSD.org
Tue May 25 17:26:28 UTC 2021


The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f1c06929a717f9145b22ca947597466a60ed8b78

commit f1c06929a717f9145b22ca947597466a60ed8b78
Author:     Yuri Victorovich <yuri at FreeBSD.org>
AuthorDate: 2021-05-25 17:10:18 +0000
Commit:     Yuri Victorovich <yuri at FreeBSD.org>
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 at 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 <bsd.port.mk>
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


More information about the dev-commits-ports-all mailing list