diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile index eddfceb35af..b0731b00cd4 100644 --- a/comms/xdx/Makefile +++ b/comms/xdx/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2008/06/01 17:17:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2008/10/29 11:28:36 landry Exp $ COMMENT= X DX cluster watcher -VERSION= 2.2 +VERSION= 2.4 DISTNAME= xdx-${VERSION} -PKGNAME= ${DISTNAME}p2 CATEGORIES= comms hamradio HOMEPAGE= http://www.qsl.net/pg4i/linux/xdx.html diff --git a/comms/xdx/distinfo b/comms/xdx/distinfo index 1771d565023..c22c7b932e3 100644 --- a/comms/xdx/distinfo +++ b/comms/xdx/distinfo @@ -1,5 +1,5 @@ -MD5 (xdx-2.2.tar.gz) = cIX8SerN8S9+uq0IosN4kg== -RMD160 (xdx-2.2.tar.gz) = XSI2C7EKun4vrcjUheIsId6+nV4= -SHA1 (xdx-2.2.tar.gz) = EBtxC4Rt6NWGVey6z3ZvwJ8kPfA= -SHA256 (xdx-2.2.tar.gz) = MSw/ppIhEk4EtuR7gbUVoXBuvtVOX/GB2lfvKq3nWDQ= -SIZE (xdx-2.2.tar.gz) = 253015 +MD5 (xdx-2.4.tar.gz) = mDTpdZ99agt7L+IAAgVR1w== +RMD160 (xdx-2.4.tar.gz) = 4D8iD6WdYRe0NFYdReScbFFv6ic= +SHA1 (xdx-2.4.tar.gz) = 4eO+MAuzrErM069UFeDRLCEakfI= +SHA256 (xdx-2.4.tar.gz) = /v4/s05WYT+bE4iCvIImEGmVyAHYc6HF9uWVv8noH6k= +SIZE (xdx-2.4.tar.gz) = 282279 diff --git a/comms/xdx/patches/patch-src_gui_c b/comms/xdx/patches/patch-src_gui_c deleted file mode 100644 index 9eed70a7f5c..00000000000 --- a/comms/xdx/patches/patch-src_gui_c +++ /dev/null @@ -1,65 +0,0 @@ -$OpenBSD: patch-src_gui_c,v 1.1 2007/10/24 22:42:26 jasper Exp $ ---- src/gui.c.orig Tue Oct 16 12:50:12 2007 -+++ src/gui.c Tue Oct 16 12:52:58 2007 -@@ -172,7 +172,7 @@ create_mainwindow (void) - servertype *cluster; - PangoFontDescription *font_description; - gint pango_size; -- GtkTooltips *tooltips; -+ GtkTooltip *tooltip; - GtkAccelGroup *key_toggle, *grab_focus; - gchar *str; - -@@ -378,34 +378,34 @@ create_mainwindow (void) - gtk_paned_add1 (GTK_PANED (vpaned), clistscrolledwindow); - gtk_paned_add2 (GTK_PANED (vpaned), chathbox); - gtk_box_pack_start (GTK_BOX (mainvbox), vpaned, TRUE, TRUE, 0); -- tooltips = gtk_tooltips_new (); -+ tooltip = gtk_tooltips_new (); - -- gtk_tooltips_set_tip(tooltips, highentry1, _("Enter a word to highlight"), NULL); -- gtk_tooltips_set_tip(tooltips, highentry2, _("Enter a word to highlight"), NULL); -- gtk_tooltips_set_tip(tooltips, highentry3, _("Enter a word to highlight"), NULL); -- gtk_tooltips_set_tip(tooltips, highentry4, _("Enter a word to highlight"), NULL); -- gtk_tooltips_set_tip(tooltips, highentry5, _("Enter a word to highlight"), NULL); -- gtk_tooltips_set_tip(tooltips, highentry6, _("Enter a word to highlight"), NULL); -- gtk_tooltips_set_tip(tooltips, highentry7, _("Enter a word to highlight"), NULL); -- gtk_tooltips_set_tip(tooltips, highentry8, _("Enter a word to highlight"), NULL); -+ gtk_tooltips_set_tip(tooltip, highentry1, _("Enter a word to highlight"), NULL); -+ gtk_tooltips_set_tip(tooltip, highentry2, _("Enter a word to highlight"), NULL); -+ gtk_tooltips_set_tip(tooltip, highentry3, _("Enter a word to highlight"), NULL); -+ gtk_tooltips_set_tip(tooltip, highentry4, _("Enter a word to highlight"), NULL); -+ gtk_tooltips_set_tip(tooltip, highentry5, _("Enter a word to highlight"), NULL); -+ gtk_tooltips_set_tip(tooltip, highentry6, _("Enter a word to highlight"), NULL); -+ gtk_tooltips_set_tip(tooltip, highentry7, _("Enter a word to highlight"), NULL); -+ gtk_tooltips_set_tip(tooltip, highentry8, _("Enter a word to highlight"), NULL); - str = g_strdup_printf (_("Include prompt [Ctrl+%d]"), 1); -- gtk_tooltips_set_tip(tooltips, highcheck1, str, NULL); -+ gtk_tooltips_set_tip(tooltip, highcheck1, str, NULL); - str = g_strdup_printf (_("Include prompt [Ctrl+%d]"), 2); -- gtk_tooltips_set_tip(tooltips, highcheck2, str, NULL); -+ gtk_tooltips_set_tip(tooltip, highcheck2, str, NULL); - str = g_strdup_printf (_("Include prompt [Ctrl+%d]"), 3); -- gtk_tooltips_set_tip(tooltips, highcheck3, str, NULL); -+ gtk_tooltips_set_tip(tooltip, highcheck3, str, NULL); - str = g_strdup_printf (_("Include prompt [Ctrl+%d]"), 4); -- gtk_tooltips_set_tip(tooltips, highcheck4, str, NULL); -+ gtk_tooltips_set_tip(tooltip, highcheck4, str, NULL); - str = g_strdup_printf (_("Include prompt [Ctrl+%d]"), 5); -- gtk_tooltips_set_tip(tooltips, highcheck5, str, NULL); -+ gtk_tooltips_set_tip(tooltip, highcheck5, str, NULL); - str = g_strdup_printf (_("Include prompt [Ctrl+%d]"), 6); -- gtk_tooltips_set_tip(tooltips, highcheck6, str, NULL); -+ gtk_tooltips_set_tip(tooltip, highcheck6, str, NULL); - str = g_strdup_printf (_("Include prompt [Ctrl+%d]"), 7); -- gtk_tooltips_set_tip(tooltips, highcheck7, str, NULL); -+ gtk_tooltips_set_tip(tooltip, highcheck7, str, NULL); - str = g_strdup_printf (_("Include prompt [Ctrl+%d]"), 8); -- gtk_tooltips_set_tip(tooltips, highcheck8, str, NULL); -+ gtk_tooltips_set_tip(tooltip, highcheck8, str, NULL); - str = g_strdup_printf (_("Enable/disable sound [Ctrl+%d]"), 0); -- gtk_tooltips_set_tip(tooltips, soundcheck, str, NULL); -+ gtk_tooltips_set_tip(tooltip, soundcheck, str, NULL); - - mainentry = gtk_text_view_new (); - gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW(mainentry), GTK_WRAP_WORD); diff --git a/comms/xdx/patches/patch-src_gui_manualdialog_c b/comms/xdx/patches/patch-src_gui_manualdialog_c new file mode 100644 index 00000000000..121fb9721c2 --- /dev/null +++ b/comms/xdx/patches/patch-src_gui_manualdialog_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_gui_manualdialog_c,v 1.1 2008/10/29 11:28:36 landry Exp $ +--- src/gui_manualdialog.c.orig Tue Oct 28 16:26:09 2008 ++++ src/gui_manualdialog.c Tue Oct 28 16:27:12 2008 +@@ -59,7 +59,7 @@ void on_manual_activate (GtkMenuItem * menuitem, gpoin + helpfile = g_strdup_printf ("%s%s%s", PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S, _("MANUAL")); + + g_signal_connect(G_OBJECT(manualdialog), "response", +- GTK_SIGNAL_FUNC(gtk_widget_destroy), NULL); ++ G_CALLBACK(gtk_widget_destroy), NULL); + + + in = fopen (helpfile, "r"); diff --git a/comms/xdx/patches/patch-src_gui_settingsdialog_c b/comms/xdx/patches/patch-src_gui_settingsdialog_c deleted file mode 100644 index 5acb3798666..00000000000 --- a/comms/xdx/patches/patch-src_gui_settingsdialog_c +++ /dev/null @@ -1,50 +0,0 @@ -$OpenBSD: patch-src_gui_settingsdialog_c,v 1.1 2007/10/24 22:42:26 jasper Exp $ ---- src/gui_settingsdialog.c.orig Tue Oct 16 12:50:55 2007 -+++ src/gui_settingsdialog.c Tue Oct 16 12:52:10 2007 -@@ -202,7 +202,7 @@ void on_settings_activate (GtkMenuItem * menuitem, gpo - gint response, pango_size; - gboolean state; - gchar *str; -- GtkTooltips *tooltips; -+ GtkTooltip *tooltip; - GtkTextBuffer *buffer; - GtkTextTagTable *table; - GdkColor color; -@@ -269,10 +269,10 @@ void on_settings_activate (GtkMenuItem * menuitem, gpo - pcommandsentry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (pcommandshbox), pcommandsentry, TRUE, TRUE, 5); - gtk_entry_set_max_length (GTK_ENTRY (pcommandsentry), 80); -- tooltips = gtk_tooltips_new (); -- gtk_tooltips_set_tip (tooltips, pcommandsentry, -+ tooltip = gtk_tooltips_new (); -+ gtk_tooltips_set_tip (tooltip, pcommandsentry, - _("Comma separated list of commands to send at login"), NULL); -- gtk_tooltips_set_tip (tooltips, pcallsignentry, -+ gtk_tooltips_set_tip (tooltip, pcallsignentry, - _("Callsign to be used for login"), NULL); - - ploginframelabel = gtk_label_new (_("Login")); -@@ -317,7 +317,7 @@ void on_settings_activate (GtkMenuItem * menuitem, gpo - gtk_entry_set_max_length (GTK_ENTRY (prigentry), 80); - phamliblabel = gtk_label_new (_("Hamlib")); - gtk_frame_set_label_widget (GTK_FRAME (phamlibframe), phamliblabel); -- gtk_tooltips_set_tip (tooltips, prigentry, _( -+ gtk_tooltips_set_tip (tooltip, prigentry, _( - "When double clicking on a dx-spot this will set the frequency of your " - "rig using rigctl (%d = the frequency retrieved from the DX spot)" - ), NULL); -@@ -366,11 +366,11 @@ void on_settings_activate (GtkMenuItem * menuitem, gpo - gtk_entry_set_max_length (GTK_ENTRY (pprogmailentry), 80); - pproglabel = gtk_label_new (_("Programs")); - gtk_frame_set_label_widget (GTK_FRAME (pprogframe), pproglabel); -- gtk_tooltips_set_tip (tooltips, pprogbrowserentry, -+ gtk_tooltips_set_tip (tooltip, pprogbrowserentry, - _("Web browser to start after clicking on a url (%s = url)"), NULL); -- gtk_tooltips_set_tip (tooltips, pprogmailentry, -+ gtk_tooltips_set_tip (tooltip, pprogmailentry, - _("Mail program to start after clicking on a mail url (%s = mail url)"), NULL); -- gtk_tooltips_set_tip (tooltips, pprogsoundentry, -+ gtk_tooltips_set_tip (tooltip, pprogsoundentry, - _("Program used to play sound (%s = sound file)"), NULL); - - if (g_ascii_strcasecmp (preferences.browserapp, "?")) diff --git a/comms/xdx/pkg/PLIST b/comms/xdx/pkg/PLIST index 783ccaefb8c..3691c7425e8 100644 --- a/comms/xdx/pkg/PLIST +++ b/comms/xdx/pkg/PLIST @@ -1,18 +1,19 @@ -@comment $OpenBSD: PLIST,v 1.3 2007/12/15 19:12:06 ajacoutot Exp $ -bin/xdx +@comment $OpenBSD: PLIST,v 1.4 2008/10/29 11:28:36 landry Exp $ +@bin bin/xdx @man man/man1/xdx.1 -share/applications/ share/applications/Xdx.desktop share/locale/es/LC_MESSAGES/xdx.mo share/locale/fr/LC_MESSAGES/xdx.mo share/locale/nl/LC_MESSAGES/xdx.mo share/locale/pl/LC_MESSAGES/xdx.mo +share/locale/pt/LC_MESSAGES/xdx.mo share/xdx/ share/xdx/MANUAL share/xdx/MANUAL.es share/xdx/MANUAL.fr share/xdx/MANUAL.nl share/xdx/MANUAL.pl +share/xdx/cty.dat share/xdx/pixmaps/ share/xdx/pixmaps/bigsmile.png share/xdx/pixmaps/cry.png