On Sun Mar 17, 2024 at 03:32:15PM +0100, Landry Breuil wrote:
> Hi,
>
> previous release was a bit dated so update to latest, changelog at
> https://www.mail-archive.com/x2go-announcements@lists.x2go.org/msg00218.html
>
> seems to work fine in basic testing
Missing RUN_DEPENDS+=misc/shared-mime-info otherwise OK rsadowski
>
> Landry
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/x2goclient/Makefile,v
> retrieving revision 1.18
> diff -u -r1.18 Makefile
> --- Makefile 27 Sep 2023 20:37:29 -0000 1.18
> +++ Makefile 17 Mar 2024 14:30:20 -0000
> @@ -1,7 +1,6 @@
> COMMENT = Qt client for the X2Go system
>
> -DISTNAME = x2goclient-4.1.2.2
> -REVISION = 1
> +DISTNAME = x2goclient-4.1.2.3
>
> CATEGORIES = x11
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/x2goclient/distinfo,v
> retrieving revision 1.6
> diff -u -r1.6 distinfo
> --- distinfo 19 Mar 2020 19:51:09 -0000 1.6
> +++ distinfo 17 Mar 2024 14:30:20 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (x2goclient-4.1.2.2.tar.gz) =
> yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So=
> -SIZE (x2goclient-4.1.2.2.tar.gz) = 2576404
> +SHA256 (x2goclient-4.1.2.3.tar.gz) =
> q4uzx40xYlx0nkLxX4EP49JCknoVKYMIwT3qO5Fayjw=
> +SIZE (x2goclient-4.1.2.3.tar.gz) = 2582072
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/x2goclient/patches/patch-Makefile,v
> retrieving revision 1.2
> diff -u -r1.2 patch-Makefile
> --- patches/patch-Makefile 11 Mar 2022 20:17:40 -0000 1.2
> +++ patches/patch-Makefile 17 Mar 2024 14:30:20 -0000
> @@ -1,20 +1,42 @@
> Index: Makefile
> --- Makefile.orig
> +++ Makefile
> -@@ -19,9 +19,9 @@ PREFIX=/usr/local
> - ETCDIR=/etc/x2go
> - BINDIR=$(PREFIX)/bin
> - SHAREDIR=$(PREFIX)/share
> --MANDIR=$(SHAREDIR)/man
> --QMAKE_BINARY=qmake-qt4
> --LRELEASE_BINARY=lrelease-qt4
> -+MANDIR=$(PREFIX)/man
> -+QMAKE_BINARY=qmake-qt5
> -+LRELEASE_BINARY=lrelease-qt5
> - QMAKE_OPTS=
> +@@ -21,20 +21,11 @@ RM_DIR ?= rmdir -p --ignore-fail-on-non-empty
> + DESTDIR ?=
> + PREFIX ?= /usr/local
> + ETCDIR ?= /etc/x2go
> +-BINDIR ?= $(PREFIX)/bin
> +-SHAREDIR ?= $(PREFIX)/share
> +-MANDIR ?= $(SHAREDIR)/man
> +-ifeq ($(QT_VERSION),4)
> +- QMAKE_BINARY ?= qmake-qt4
> +- LRELEASE_BINARY ?= lrelease-qt4
> +-else
> +- ifeq ($(QT_VERSION),5)
> +- QMAKE_BINARY ?= qmake
> +- LRELEASE_BINARY ?= lrelease
> +- else
> +- $(error Unsupported Qt version "$(QT_VERSION)" passed.)
> +- endif
> +-endif
> ++BINDIR ?= /usr/local/bin
> ++SHAREDIR ?= /usr/local/share
> ++MANDIR ?= /usr/local/man
> ++QMAKE_BINARY ?= qmake-qt5
> ++LRELEASE_BINARY ?= lrelease-qt5
> + QMAKE_OPTS ?=
>
> - LDFLAGS=
> -@@ -115,7 +115,6 @@ install_man:
> + LDFLAGS ?=
> +@@ -71,7 +62,7 @@ MAKEOVERRIDES = SHELL QT_VERSION INSTALL_DIR INSTALL_F
> + .MAKEOVERRIDES = SHELL QT_VERSION INSTALL_DIR INSTALL_FILE INSTALL_SYMLINK
> INSTALL_PROGRAM RM_FILE RM_DIR DESTDIR PREFIX ETCDIR BINDIR SHAREDIR MANDIR
> QMAKE_BINARY LRELEASE_BINARY QMAKE_OPTS LDFLAGS LIBS
> +
> + # OpenBSD way.
> +-.MAKEFLAGS = SHELL QT_VERSION INSTALL_DIR INSTALL_FILE INSTALL_SYMLINK
> INSTALL_PROGRAM RM_FILE RM_DIR DESTDIR PREFIX ETCDIR BINDIR SHAREDIR MANDIR
> QMAKE_BINARY LRELEASE_BINARY QMAKE_OPTS LDFLAGS LIBS
> ++#.MAKEFLAGS = SHELL QT_VERSION INSTALL_DIR INSTALL_FILE INSTALL_SYMLINK
> INSTALL_PROGRAM RM_FILE RM_DIR DESTDIR PREFIX ETCDIR BINDIR SHAREDIR MANDIR
> QMAKE_BINARY LRELEASE_BINARY QMAKE_OPTS LDFLAGS LIBS
> +
> +
> + all: build
> +@@ -130,7 +121,6 @@ install_man:
> $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/
> $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
> $(INSTALL_FILE) man/man1/x2goclient.1
> $(DESTDIR)$(MANDIR)/man1/x2goclient.1
> Index: patches/patch-x2goclient_pro
> ===================================================================
> RCS file: /cvs/ports/x11/x2goclient/patches/patch-x2goclient_pro,v
> retrieving revision 1.7
> diff -u -r1.7 patch-x2goclient_pro
> --- patches/patch-x2goclient_pro 11 Mar 2022 20:17:40 -0000 1.7
> +++ patches/patch-x2goclient_pro 17 Mar 2024 14:30:20 -0000
> @@ -3,7 +3,7 @@
> Index: x2goclient.pro
> --- x2goclient.pro.orig
> +++ x2goclient.pro
> -@@ -165,7 +165,7 @@ else:win32 {
> +@@ -171,7 +171,7 @@ else:win32 {
> }
> else {
> # For backwards-compatibility.
> @@ -11,8 +11,8 @@
> + LIBS += -lssh
> }
>
> - win32:LIBS += -lAdvAPI32 -lshell32 -lUser32
> -@@ -203,7 +203,7 @@ else:message("No translation files in project")
> + win32:!mxe {
> +@@ -211,7 +211,7 @@ else:message("No translation files in project")
>
> TEMPLATE = app
> DEPENDPATH += .
> @@ -21,14 +21,23 @@
> RESOURCES += res/resources.qrc
>
> exists(res/txt/git-info) {
> -@@ -220,6 +220,10 @@ linux|linux-* {
> - message("building $$TARGET via $$QMAKESPEC with ldap and cups")
> +@@ -229,6 +229,10 @@ linux|linux-* {
> LIBS += -lldap -lcups -lX11 -lXpm
> DEFINES += __linux__
> -+}
> + }
> +openbsd-* {
> + message("building $$TARGET with ldap and cups")
> + LIBS += -lldap -lcups -lX11 -lXpm
> - }
> ++}
> x2go_linux_static {
> message("linking all libs statically")
> + DEFINES += __linux__
> +@@ -278,7 +282,7 @@ win32|win32-* {
> + CONFIG += static release
> + }
> + QT += svg network
> +-linux|linux-* {
> ++openbsd-*|linux|linux-* {
> + greaterThan(QT_MAJOR_VERSION, 4): QT += x11extras
> + }
> + win32|win32-* {
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/x2goclient/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -r1.4 PLIST
> --- pkg/PLIST 11 Mar 2022 20:17:40 -0000 1.4
> +++ pkg/PLIST 17 Mar 2024 14:30:20 -0000
> @@ -8,6 +8,7 @@
> share/icons/hicolor/16x16/apps/x2goclient.png
> share/icons/hicolor/32x32/apps/x2goclient.png
> share/icons/hicolor/64x64/apps/x2goclient.png
> +share/mime/packages/x-x2go.xml
> share/x2goclient/
> share/x2goclient/icons/
> share/x2goclient/icons/x2goclient.png
> @@ -15,3 +16,4 @@
> share/x2goclient/icons/x2gosession.png
> @tag update-desktop-database
> @tag gtk-update-icon-cache %D/share/icons/hicolor
> +@tag update-mime-database
