From nobody Sun Sep 11 16:18:33 2022 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 4MQZfK29MYz4c8yR; Sun, 11 Sep 2022 16:18:33 +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 4MQZfK1kvxz45Q8; Sun, 11 Sep 2022 16:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662913113; 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=r6kXTsjsyiCfcvWj7x8/DOdGLfXcr4Sx0asfwJvD7W8=; b=iNDhQlAxjBSiGklej4E48tuKRnG9qDRkFacledMZEmrePxAfhREvOelInQUFfNA1wx4Fg/ 4eY10GGEe1hsK6M5z8g0rtsUI4GKoUANSMuJeBsjahUkJ75Q2TEXEpMOVM9R5G5lo1+uJd TGEvFzFaG//oN5L7jJMF8dTT/TLYT2l8GkjzGymXDogpLPGpGi5l3eUxMpdoqSJaRjbESW jzkE0wa3sys523GrYabGavWWmgURiJeyi4EGziFaBMbKQcGyooro2CH9BSndG8MZVnJbit N/ftmjZE8mxFNU8v3hUnLuiXaxkkk3xstdAtskGfSktljk7J49AG9vnc/HF41w== 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 4MQZfK0qRjzhhy; Sun, 11 Sep 2022 16:18:33 +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 28BGIXjj065273; Sun, 11 Sep 2022 16:18:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28BGIXHO065272; Sun, 11 Sep 2022 16:18:33 GMT (envelope-from git) Date: Sun, 11 Sep 2022 16:18:33 GMT Message-Id: <202209111618.28BGIXHO065272@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: 9fb6444a20b6 - main - comms/xdx: Update 2.4 -> 2.91 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fb6444a20b626ccfd2735e59f75d53ff868ccfb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662913113; 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=r6kXTsjsyiCfcvWj7x8/DOdGLfXcr4Sx0asfwJvD7W8=; b=wFHvY/nVgY7AKS9PhlSwHlHpchkzyr1y3WntMPfbuf2sOTQPPmdjw5+cIA8EFqb1hLrH5y aYWrkWDL8fhctK8tTRa+tKSG03WzO7s8pQtOXNdxqTxCvyZq04OHhgHJmcXigtO8GYo4n5 vUrYYZ5YjED3UO5FBo4qisvs7/FHoW78dBXC11jK0w2QON9BECVMZGDnmxlh5z8J9jSQMb mEmo0AIZV3OZBYUyO4LUePi1ewPITI2vPtJJCUfgkbDHmpN92MXQt6p9EhtvPG0NkFb3Uv ed6KwWrM1QMusL4NJl+iJu7KtqeaTvr2aWq49qwaGK44b6lCoGGUy0/qejuHWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662913113; a=rsa-sha256; cv=none; b=TusykSUFDkGrgkHjDF1+NWOR7HKtElaOV6gKlGBHHG7Jv59p1v3nRDe9GdChxcKGGVvPE/ aLfgQS1rbz07DfbobQHDjyQ8vBMjeC7HEO/F3YtkG/f4kXy7PlABjkyG5RvBwaY1sbkvZW S7C7yDlShs5THUTnmzUbHDCu+XaKMQCcEd31HvRI8GbGcXlWH/oJmluGa4ETtbk/0VqtDV 3FMZPhf0DsGCrjT+Wd/8BoO8/KPU43G/FP+LNEgOSkziUo/FfjJ/RMmLwzPUb9XiESy9+i f4mr7yyMJmRf3wiOmeEIt7/4ojcogKESa+6uyNfPttsJIcuYMgENZ5TSbEN9qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9fb6444a20b626ccfd2735e59f75d53ff868ccfb commit 9fb6444a20b626ccfd2735e59f75d53ff868ccfb Author: Yuri Victorovich AuthorDate: 2022-09-11 16:17:28 +0000 Commit: Yuri Victorovich CommitDate: 2022-09-11 16:17:28 +0000 comms/xdx: Update 2.4 -> 2.91 --- comms/xdx/Makefile | 14 ++++---------- comms/xdx/distinfo | 5 +++-- comms/xdx/files/patch-src_Makefile.in | 15 --------------- comms/xdx/files/patch-src_gui.c | 10 ---------- comms/xdx/files/patch-src_gui.h | 11 ----------- comms/xdx/files/patch-src_net.c | 13 +++++++++++++ comms/xdx/pkg-plist | 8 ++++---- 7 files changed, 24 insertions(+), 52 deletions(-) diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile index ed6e88fd6535..0ebe6e2e3771 100644 --- a/comms/xdx/Makefile +++ b/comms/xdx/Makefile @@ -1,13 +1,11 @@ PORTNAME= xdx -PORTVERSION= 2.4 -PORTREVISION= 7 +DISTVERSION= 2.91 CATEGORIES= comms hamradio -MASTER_SITES= http://www.chronos.org.uk/download/ \ - LOCAL/db +MASTER_SITES= SF/xdxclusterclient/${PORTVERSION}/ MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio DX cluster monitor -WWW= http://pg4i.chronos.org.uk/linux/xdx.html +WWW= https://sourceforge.net/projects/xdxclusterclient/ LICENSE= GPLv2 @@ -15,12 +13,8 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 USES= gettext gmake gnome pkgconfig -USE_GNOME= cairo gtk20 gdkpixbuf2 +USE_GNOME= cairo gdkpixbuf2 gtk30 GNU_CONFIGURE= yes -#post-patch: -# @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ -# 's|-D.*_DISABLE_DEPRECATED||g' - .include diff --git a/comms/xdx/distinfo b/comms/xdx/distinfo index ab0acf9da791..71e05f1bd3b6 100644 --- a/comms/xdx/distinfo +++ b/comms/xdx/distinfo @@ -1,2 +1,3 @@ -SHA256 (xdx-2.4.tar.gz) = fefe3fb34e56613f9b138882bc8226106995c801d873a1c5f6e595bfc9e81fa9 -SIZE (xdx-2.4.tar.gz) = 282279 +TIMESTAMP = 1662911183 +SHA256 (xdx-2.91.tar.gz) = 4dcba623ba062cb028e67d40a85b9f8eea23259af34ff4752ccc60ca9a2dce7e +SIZE (xdx-2.91.tar.gz) = 346342 diff --git a/comms/xdx/files/patch-src_Makefile.in b/comms/xdx/files/patch-src_Makefile.in deleted file mode 100644 index ef7ac29b1b65..000000000000 --- a/comms/xdx/files/patch-src_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- src/Makefile.in.orig 2007-11-21 17:46:24 UTC -+++ src/Makefile.in -@@ -181,11 +181,7 @@ INCLUDES = \ - @GTK_CFLAGS@ -I.. \ - -DPACKAGE_DATA_DIR=\"$(datadir)/xdx\" \ - -DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \ -- -DPACKAGE_SOURCE_DIR=\"$(srcdir)\" \ -- -DG_DISABLE_DEPRECATED \ -- -DGDK_DISABLE_DEPRECATED \ -- -DGDK_PIXBUF_DISABLE_DEPRECATED \ -- -DGTK_DISABLE_DEPRECATED -+ -DPACKAGE_SOURCE_DIR=\"$(srcdir)\" - - xdx_SOURCES = \ - gui.h \ diff --git a/comms/xdx/files/patch-src_gui.c b/comms/xdx/files/patch-src_gui.c deleted file mode 100644 index f375a028556d..000000000000 --- a/comms/xdx/files/patch-src_gui.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/gui.c.orig 2020-08-23 16:44:09 UTC -+++ src/gui.c -@@ -41,6 +41,7 @@ - #include "text.h" - - extern preferencestype preferences; -+guitype *gui; - - static void on_highcheck_toggled (GtkToggleButton *togglebutton, gpointer user_data); - static void on_soundcheck_toggled (GtkToggleButton *togglebutton, gpointer user_data); diff --git a/comms/xdx/files/patch-src_gui.h b/comms/xdx/files/patch-src_gui.h deleted file mode 100644 index b54446c08f7a..000000000000 --- a/comms/xdx/files/patch-src_gui.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gui.h.orig 2006-02-26 19:41:12 UTC -+++ src/gui.h -@@ -49,7 +49,7 @@ typedef struct guitype { - gchar *high8tagname; - } guitype; - --guitype *gui; -+extern guitype *gui; - - guitype *new_gui(void); - void create_mainwindow (void); diff --git a/comms/xdx/files/patch-src_net.c b/comms/xdx/files/patch-src_net.c new file mode 100644 index 000000000000..fa1c588da326 --- /dev/null +++ b/comms/xdx/files/patch-src_net.c @@ -0,0 +1,13 @@ +- workaround for https://github.com/N0NB/xdx/issues/12 + +--- src/net.c.orig 2022-09-11 15:53:06 UTC ++++ src/net.c +@@ -62,7 +62,7 @@ + #include + #include + #include +-#include ++//#include + #include + #include + #include diff --git a/comms/xdx/pkg-plist b/comms/xdx/pkg-plist index ee3d28b65945..92467124b473 100644 --- a/comms/xdx/pkg-plist +++ b/comms/xdx/pkg-plist @@ -1,6 +1,9 @@ bin/xdx man/man1/xdx.1.gz share/applications/Xdx.desktop +share/locale/de/LC_MESSAGES/xdx.mo +share/locale/en@boldquot/LC_MESSAGES/xdx.mo +share/locale/en@quot/LC_MESSAGES/xdx.mo share/locale/es/LC_MESSAGES/xdx.mo share/locale/fr/LC_MESSAGES/xdx.mo share/locale/nl/LC_MESSAGES/xdx.mo @@ -12,16 +15,13 @@ share/locale/pt/LC_MESSAGES/xdx.mo %%DATADIR%%/MANUAL.nl %%DATADIR%%/MANUAL.pl %%DATADIR%%/cty.dat +%%DATADIR%%/gnuplot/wwv.gnuplot %%DATADIR%%/pixmaps/bigsmile.png %%DATADIR%%/pixmaps/cry.png %%DATADIR%%/pixmaps/sad.png %%DATADIR%%/pixmaps/smile.png %%DATADIR%%/pixmaps/wink.png %%DATADIR%%/pixmaps/xdx-logo.png -%%DATADIR%%/pixmaps/xdx-logo.xcf %%DATADIR%%/pixmaps/xdx.png -%%DATADIR%%/pixmaps/xdx.xcf %%DATADIR%%/pixmaps/xdx.xpm %%DATADIR%%/sounds/attention.wav -%%DATADIR%%/wwv.gnuplot -%%DATADIR%%/wwv.gnuplot~