comms/xdx: Update 2.4 -> 2.91

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 <bsd.port.mk>
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 <errno.h>
+ #include <fcntl.h>
+ #include <netdb.h>
+-#include <resolv.h>
++//#include <resolv.h>
+ #include <signal.h>
+ #include <stdlib.h>
+ #include <string.h>
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~