From nobody Fri Dec 08 10:25:39 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SmnN34Gzqz53lLg; Fri, 8 Dec 2023 10:25:39 +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 4SmnN33kflz3fRs; Fri, 8 Dec 2023 10:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702031139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b5vZ8h73Toq19AHhnYGhXtZZfoxj4GsdPNE8lXmCMXI=; b=AG61yeRTsF65NG/vNZvvRAPd4OB6x4C3RRSA73EQieGsWBQHlccW3P83DH5jwa4nW+RP91 fOVD+E9VD1WZf+rpOrzfiuWrBsM8DgAP+plw99uR1+v2BmyezTURyWjQ+RqlnR7Qwt1GjV Whe38JY/5VSCXI+z3XeCTI55uM0Z6Dwc3rzpF1GF4aPVViAI91AHGOWefgNanjDufdLPCA vo8kDk01mkmDOcfbW9Hcuxs4UZH0VyTMQGDXCz+fyAJ/eKUp1kIosH5h7ultSqfE1ZgPoq bKOCGi1YxyQFgSYvqeFqzCawWb5yEsgI2SmpYt9BKsJKBAKD8oTsVPSY0Grabg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702031139; a=rsa-sha256; cv=none; b=QEBTn0QRFQFI9u6FD5Wh8Ix9A8y93mgrMhD/s41eIfvNBT+imv/O9UWbYJyVMbYdTD4g/c Z67wC+Jzo3UylWs26XO/SguTFCOW4mr03NLA16vH8brcf2KDfzZ3z5qAAHNVe1RXLFXZTO uJbtOnTGy4HMB7Ae0RFbGK/QGvWwTs2ef97V+z07P027NMHxO9Xp0P7kwOiEajAtSWh0mn wqHu0uWvK+U+9t0SW7BHjyjIDu1jZjFSf2EQYmlrk8aqcT07WUwelT8hsxSzH33Tw7xMxO 6/PLLnpVA2ID9vUb/z0xBHj1Z58mKaDcK7VYiTlaYftfX6jipsOV1Cof7Qjr8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702031139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b5vZ8h73Toq19AHhnYGhXtZZfoxj4GsdPNE8lXmCMXI=; b=iQQvH0iPs1bbXvjv7BluAodvxgNSFeDl9rlUiZrYxth/kCrD8+0oRNN9UTG/KCbrvqHbSJ XQqel8BoAYnJTwZsMmtm+7mU7pMBtJ6FHbea3grHgHD/W27pFYoWm/AMPBZLc9XmkbnZcU rhIIg1U3VXWi31630alQVLIRPsne52MnBBo6Ti5x+DAAresX1WEW4Qy8twnPT/mooCeNWj vemOCq2VFyluuIDTXynPci7tSVIfhteuECPrc9amLl/767xKupAGqu33pEHasD7o1PDRzw 8guAF6Cg9I2GFd2ryLuo0GaOdTDuCyyGxT8zlczz4UOqT1vQCmy/Hbm0laOkUw== 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 4SmnN32nFPz2GS; Fri, 8 Dec 2023 10:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8APdP6047985; Fri, 8 Dec 2023 10:25:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8APdZb047982; Fri, 8 Dec 2023 10:25:39 GMT (envelope-from git) Date: Fri, 8 Dec 2023 10:25:39 GMT Message-Id: <202312081025.3B8APdZb047982@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 406c1bd11b50 - main - net/spiritvnc: the port had been updated to version 0.5.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 406c1bd11b50161ab3ed5ab46a79529fc6e89bfb Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=406c1bd11b50161ab3ed5ab46a79529fc6e89bfb commit 406c1bd11b50161ab3ed5ab46a79529fc6e89bfb Author: Alexey Dokuchaev AuthorDate: 2023-12-08 10:24:32 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-12-08 10:24:32 +0000 net/spiritvnc: the port had been updated to version 0.5.4 This brings new features, bug fixes, and tons of improvements; one big change is a switch from using libssh2 to the system's built-in ssh(1) program. Reported by: Will Brokenbourgh (upstream developer) --- net/spiritvnc/Makefile | 9 ++++----- net/spiritvnc/distinfo | 6 +++--- net/spiritvnc/files/patch-Makefile | 28 +++++++++++++++++----------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/net/spiritvnc/Makefile b/net/spiritvnc/Makefile index de536c81cc31..679484e999ef 100644 --- a/net/spiritvnc/Makefile +++ b/net/spiritvnc/Makefile @@ -1,6 +1,6 @@ PORTNAME= spiritvnc -PORTVERSION= 0.4.6 -PORTREVISION= 1 +PORTVERSION= 0.5.4 +DISTVERSIONPREFIX= v CATEGORIES= net MAINTAINER= danfe@FreeBSD.org @@ -13,15 +13,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ libfontconfig.so:x11-fonts/fontconfig \ libpng.so:graphics/png \ - libssh2.so:security/libssh2 \ libvncclient.so:net/libvncserver -USES= jpeg pkgconfig xorg +USES= gmake jpeg pkgconfig xorg USE_GITHUB= yes USE_XORG= x11 xcursor xext xfixes xft xinerama xpm xrender GH_ACCOUNT= willbprog127 -GH_PROJECT= ${PORTNAME}-fltk +GH_PROJECT= ${PORTNAME}-fltk-no-libssh2 PLIST_FILES= bin/${PORTNAME} diff --git a/net/spiritvnc/distinfo b/net/spiritvnc/distinfo index 4167665cf90c..6b25e2d64423 100644 --- a/net/spiritvnc/distinfo +++ b/net/spiritvnc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621292146 -SHA256 (willbprog127-spiritvnc-fltk-0.4.6_GH0.tar.gz) = 539c03a9f2c516efba6d6d338eacc43e827c3775778cb0e1fa2e5a9a8a11cca9 -SIZE (willbprog127-spiritvnc-fltk-0.4.6_GH0.tar.gz) = 52118 +TIMESTAMP = 1698944824 +SHA256 (willbprog127-spiritvnc-fltk-no-libssh2-v0.5.4_GH0.tar.gz) = 78a8b43fe2338ac3e3a4fe32e45526c7ac0e8190951230ac8cd6b4cc5f680819 +SIZE (willbprog127-spiritvnc-fltk-no-libssh2-v0.5.4_GH0.tar.gz) = 56197 diff --git a/net/spiritvnc/files/patch-Makefile b/net/spiritvnc/files/patch-Makefile index 577e48df3ca3..bdad63d5a40d 100644 --- a/net/spiritvnc/files/patch-Makefile +++ b/net/spiritvnc/files/patch-Makefile @@ -1,22 +1,28 @@ ---- Makefile.orig 2021-02-15 06:05:31 UTC +--- Makefile.orig 2023-11-02 17:07:04 UTC +++ Makefile -@@ -1,5 +1,5 @@ +@@ -1,10 +1,10 @@ CC = c++ --CFLAGS = -O2 -Wall -lpthread `fltk-config --use-images --cxxflags --ldflags` \ -+CFLAGS += -Wall -lpthread -lXpm `fltk-config --use-images --cxxflags --ldflags` \ - `pkg-config --cflags --libs libvncclient libvncserver libssh2` +-CFLAGS = -O2 -Wall -Wunused -lpthread `fltk-config --use-images --cxxflags --ldflags` \ ++CFLAGS += -Wall -Wunused -lpthread `fltk-config --use-images --cxxflags --ldflags` \ + --std=c++11 -finline-functions DEBUGFLGS= -g -O0 BINDIR = /usr/local/bin -@@ -7,6 +7,8 @@ TARGET = spiritvnc-fltk - SRC = `ls src/*.cxx` + TARGET = spiritvnc-fltk +-SRC = `ls src/*.cxx` ++SRC = $(wildcard src/*.cxx) PKGCONF = `which pkg-config` + LIBVNC = + OSNAME = $(shell uname -s) +@@ -17,6 +17,8 @@ else + LIBVNC = `pkg-config --cflags --libs libvncclient libvncserver` + endif +all: spiritvnc-fltk + spiritvnc-fltk: - @if [ -z ${PKGCONF} ]; then \ - echo " " ; \ -@@ -30,7 +32,7 @@ clean:: + @echo "Building on '$(OSNAME)'" + @echo "" +@@ -47,7 +49,7 @@ clean:: rm -f $(TARGET) install: @@ -24,4 +30,4 @@ + $(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BINDIR)/spiritvnc uninstall: - @if [ -f ${BINDIR}"/"${TARGET} ] ; then \ + @if [ -f $(BINDIR)"/"$(TARGET) ] ; then \