ports/61770: Port update: comms/xlog
Matt Dawson
matt at mattsnetwork.co.uk
Fri Jan 23 09:50:18 UTC 2004
>Number: 61770
>Category: ports
>Synopsis: Port update: comms/xlog
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 23 01:50:10 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Matt Dawson
>Release: FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD central.local.mattsnetwork.co.uk 4.9-RELEASE-p1 FreeBSD 4.9-RELEASE-p1 #0: Thu Dec 4 17:23:42 GMT 2003 root at central.local.mattsnetwork.co.uk:/usr/obj/usr/src/sys/CENTRAL i386
>Description:
Port update: comms/xlog To include changes to the build
to enable hamlib supprt and updates to the program
itself. If Patrick no longer wishes to maintain this
port, I am willing to take on that role.
>How-To-Repeat:
>Fix:
--- xlog.diff begins here ---
diff -ruN /usr/ports/comms/xlog/Makefile ./xlog/Makefile
--- /usr/ports/comms/xlog/Makefile Fri Mar 7 05:57:38 2003
+++ ./xlog/Makefile Fri Jan 23 08:34:42 2004
@@ -1,21 +1,34 @@
# New ports collection makefile for: xlog
-# Date created: 2002-11-05
-# Whom: Patrick Gardella <patrick at FreeBSD.org>
+# Date created: 2004-01-22
+# Whom: Matt Dawson <matt at mattsnetwork.co.uk>
#
-# $FreeBSD: ports/comms/xlog/Makefile,v 1.2 2003/03/07 05:57:38 ade Exp $
+# $FreeBSD: ports/comms/xlog/Makefile,v 1.3 2004/01/22 00:17:38 mattd Exp $
PORTNAME= xlog
-PORTVERSION= 0.7
+PORTVERSION= 0.9.1
CATEGORIES= comms
-MASTER_SITES= http://people.debian.org/~pa3aba/download/
+MASTER_SITES= http://www.qsl.net/pg4i/download/
-MAINTAINER= patrick at FreeBSD.org
-COMMENT= An Amateur Radio station logging application
+MAINTAINER= patrick at freebsd.org
+COMMENT= Amateur Radio logging application
-USE_GTK= yes
+USE_X_PREFIX= yes
+USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= GTKCONFIG=${GTK_CONFIG}
+USE_GMAKE= yes
+
+.if defined(WITH_HAMLIB)
+LIB_DEPENDS+= hamlib:${PORTSDIR}/comms/hamlib
+USE_PKGCONFIG= yes
+CONFIGURE_ENV= PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig
+CONFIGURE_ARGS+= --enable-hamlib
+.endif
MAN1= xlog.1
+
+pre-extract:
+.if !defined(WITH_HAMLIB)
+ @${ECHO_MSG} "You can enable hamlib support for Xlog by defining WITH_HAMLIB"
+.endif
.include <bsd.port.mk>
diff -ruN /usr/ports/comms/xlog/distinfo ./xlog/distinfo
--- /usr/ports/comms/xlog/distinfo Tue Nov 5 19:14:30 2002
+++ ./xlog/distinfo Wed Jan 21 21:25:14 2004
@@ -1 +1 @@
-MD5 (xlog-0.7.tar.gz) = a86a32473bf24750dc98f68f730d8408
+MD5 (xlog-0.9.1.tar.gz) = 432d6dea2cea14d46c323c46419603a0
diff -ruN /usr/ports/comms/xlog/files/patch-aa ./xlog/files/patch-aa
--- /usr/ports/comms/xlog/files/patch-aa Tue Nov 5 19:14:30 2002
+++ ./xlog/files/patch-aa Wed Jan 21 21:50:10 2004
@@ -1,21 +1,19 @@
---- src/callbacks.c.orig Tue Nov 5 08:44:15 2002
-+++ src/callbacks.c Tue Nov 5 11:00:58 2002
-@@ -74,6 +74,9 @@
- extern RIG *myrig;
- #endif
-
-+/* qsort/bsearch callback functions */
-+typedef int (*compar_callback_fn) (const void *, const void *);
-+
- /* ABOUT DIALOG */
- void on_aboutbutton_clicked (GtkButton *button, gpointer user_data)
- {
-@@ -1627,7 +1630,7 @@
- if (fields[i] != logw->logfields[i]) break;
-
- /* copy and re-order the array */
-- qsort(fields, QSO_FIELDS, sizeof(gint), (__compar_fn_t)compare_fields);
-+ qsort(fields, QSO_FIELDS, sizeof(gint), (compar_callback_fn)compare_fields);
- if (i < QSO_FIELDS)
- {
- for (i = 0; i < QSO_FIELDS; i++)
+*** src/hamlib-utils.c.orig Wed Jan 21 21:28:03 2004
+--- src/hamlib-utils.c Wed Jan 21 21:28:26 2004
+***************
+*** 604,610 ****
+ if (preferences.round == 0)
+ g_string_printf (digits, "%Ld", state.rigfrequency);
+ else
+! g_string_printf (digits, "%Ld", (long long) rintl (state.rigfrequency /
+ pow (10, preferences.round)));
+ g_string_insert_c (digits, (digits->len) - 6 + preferences.round, '.');
+ g_strstrip (digits->str);
+--- 604,610 ----
+ if (preferences.round == 0)
+ g_string_printf (digits, "%Ld", state.rigfrequency);
+ else
+! g_string_printf (digits, "%Ld", (long long) rint (state.rigfrequency /
+ pow (10, preferences.round)));
+ g_string_insert_c (digits, (digits->len) - 6 + preferences.round, '.');
+ g_strstrip (digits->str);
diff -ruN /usr/ports/comms/xlog/files/patch-ab ./xlog/files/patch-ab
--- /usr/ports/comms/xlog/files/patch-ab Tue Nov 5 19:14:30 2002
+++ ./xlog/files/patch-ab Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
---- src/callbacks_qsoframe.c.orig Tue Nov 5 11:02:05 2002
-+++ src/callbacks_qsoframe.c Tue Nov 5 11:16:32 2002
-@@ -25,6 +25,10 @@
- #include <time.h>
- #include <math.h>
- #include <ctype.h>
-+#ifdef __FreeBSD__
-+#include <machine/param.h>
-+#include <sys/types.h>
-+#endif
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <errno.h>
diff -ruN /usr/ports/comms/xlog/files/patch-ac ./xlog/files/patch-ac
--- /usr/ports/comms/xlog/files/patch-ac Tue Nov 5 19:14:30 2002
+++ ./xlog/files/patch-ac Thu Jan 1 01:00:00 1970
@@ -1,20 +0,0 @@
---- src/utils.c.orig Tue Nov 5 11:22:20 2002
-+++ src/utils.c Tue Nov 5 11:23:06 2002
-@@ -284,7 +284,7 @@
-
- str = g_new0(gchar, 100);
-
-- fr = atoll(arg);
-+ fr = strtoll(arg, (char **)NULL, 10);
-
- if (fr > 1325) /* no dot */
- {
-@@ -295,7 +295,7 @@
- str[strlen(str) - 6] = '\0';
- else if (strlen(str) > 3)
- str[strlen(str) - 3] = '\0';
-- fr = atoll(str);
-+ fr = strtoll(str, (char **)NULL, 10);
- }
-
- switch (fr)
diff -ruN /usr/ports/comms/xlog/files/patch-ad ./xlog/files/patch-ad
--- /usr/ports/comms/xlog/files/patch-ad Tue Nov 5 19:14:30 2002
+++ ./xlog/files/patch-ad Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- intl/dcigettext.c.orig Tue Nov 5 11:32:40 2002
-+++ intl/dcigettext.c Tue Nov 5 11:33:55 2002
-@@ -58,7 +58,7 @@
- #include <stdlib.h>
-
- #include <string.h>
--#if !HAVE_STRCHR && !defined _LIBC
-+#if !HAVE_STRCHR && !defined _LIBC && !defined __FreeBSD__
- # ifndef strchr
- # define strchr index
- # endif
diff -ruN /usr/ports/comms/xlog/patch ./xlog/patch
--- /usr/ports/comms/xlog/patch Thu Jan 1 01:00:00 1970
+++ ./xlog/patch Thu Jan 22 00:07:07 2004
@@ -0,0 +1,51 @@
+*** Makefile.orig Wed Jan 21 21:02:44 2004
+--- Makefile Wed Jan 21 23:57:29 2004
+***************
+*** 5,21 ****
+ # $FreeBSD: ports/comms/xlog/Makefile,v 1.2 2003/03/07 05:57:38 ade Exp $
+
+ PORTNAME= xlog
+! PORTVERSION= 0.7
+ CATEGORIES= comms
+! MASTER_SITES= http://people.debian.org/~pa3aba/download/
+
+! MAINTAINER= patrick at FreeBSD.org
+! COMMENT= An Amateur Radio station logging application
+
+ USE_GTK= yes
+ GNU_CONFIGURE= yes
+ CONFIGURE_ARGS= GTKCONFIG=${GTK_CONFIG}
+
+ MAN1= xlog.1
+
+ .include <bsd.port.mk>
+--- 5,33 ----
+ # $FreeBSD: ports/comms/xlog/Makefile,v 1.2 2003/03/07 05:57:38 ade Exp $
+
+ PORTNAME= xlog
+! PORTVERSION= 0.9.1
+ CATEGORIES= comms
+! MASTER_SITES= http://www.qsl.net/pg4i/download/
+
+! MAINTAINER= patrick at freebsd.org
+! COMMENT= Amateur Radio station logging application
+
+ USE_GTK= yes
+ GNU_CONFIGURE= yes
++ USE_GMAKE= yes
+ CONFIGURE_ARGS= GTKCONFIG=${GTK_CONFIG}
+
++ .if defined(WITH_HAMLIB)
++ USE_PKGCONFIG= yes
++ CONFIGURE_ENV= PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig
++ CONFIGURE_ARGS+= --enable-hamlib
++ .endif
++
+ MAN1= xlog.1
++
++ pre-extract:
++ .if !defined(WITH_HAMLIB)
++ @${ECHO_MSG} "You can enable hamlib support for radio control by defining WITH_HAMLIB"
++ .endif
+
+ .include <bsd.port.mk>
diff -ruN /usr/ports/comms/xlog/pkg-descr ./xlog/pkg-descr
--- /usr/ports/comms/xlog/pkg-descr Tue Nov 5 19:14:30 2002
+++ ./xlog/pkg-descr Fri Jan 23 09:03:39 2004
@@ -1,14 +1,29 @@
-Xlog is a basic Amateur Radio station log. Xlog is able to do
+Xlog is an Amateur Radio station logger. Xlog is able to do
DXCC lookups and will display country information, CQ and ITU zone,
location in latitude and longitude and distance and heading in
kilometers or miles, both for short and long path. Locator distance
and heading calculation for VHF logging is also supported.
-If your rig supports data retrieval over the serial line, you
-should have a look at the Hamradio Control Libraries (hamlib)
-port, which will allow for automatic retrieval of information
-from your radio.
+Xlog has, from version 0.9, been rewritten using Gtk2+. The application
+now appears much cleaner and the hamlib support is far better. Other
+improvements include the ability to load log sets using wildcards, for
+example * will load all .xlog files in your .xlog directory on startup.
+
+The Ham Radio Control libraries are located in comms/hamlib and if your
+radio supports control over the serial port and you have the requisite
+serial interface, you should check them out.
Xlog supports cabrillo and ADIF and can import twlog and editest files.
+It also has the ability to customise log fields which makes it ideal for
+use in those countries that have odd logging rules such as the U.K.
+
+There is a new format for exporting the log called 'labels'. This will
+save some fields of the log in a TAB separated file. This file can be
+imported into glabels (PORTSDIR/deskutils/glabels) using the template
+called qsllabels.glabels in the xlog LOCALBASE/share/xlog directory.
+
+
+WWW: http://www.qsl.net/pg4i/linux/xlog.html
-WWW: http://people.debian.org/~pa3aba/xlog.html
+- MattD..
+matt at mattsnetwork.co.uk
diff -ruN /usr/ports/comms/xlog/pkg-plist ./xlog/pkg-plist
--- /usr/ports/comms/xlog/pkg-plist Tue Nov 5 19:14:30 2002
+++ ./xlog/pkg-plist Fri Jan 23 08:49:58 2004
@@ -1,15 +1,9 @@
bin/xlog
-share/locale/da/LC_MESSAGES/xlog.mo
-share/locale/nl/LC_MESSAGES/xlog.mo
-share/locale/fr/LC_MESSAGES/xlog.mo
-share/locale/es/LC_MESSAGES/xlog.mo
-share/xlog/pixmaps/add.xpm
-share/xlog/pixmaps/cancel.xpm
-share/xlog/pixmaps/del.xpm
+share/xlog/pixmaps/book.xpm
share/xlog/pixmaps/mini-clock.xpm
share/xlog/pixmaps/mini-trx.xpm
share/xlog/pixmaps/mini-xlog.xpm
-share/xlog/pixmaps/ok.xpm
+share/xlog/pixmaps/s-meter.xpm
share/xlog/pixmaps/s.xpm
share/xlog/pixmaps/s0.xpm
share/xlog/pixmaps/s1.xpm
@@ -21,18 +15,23 @@
share/xlog/pixmaps/s7.xpm
share/xlog/pixmaps/s8.xpm
share/xlog/pixmaps/s9.xpm
-share/xlog/pixmaps/update.xpm
+share/xlog/pixmaps/xlog-logo.png
share/xlog/pixmaps/xlog.png
share/xlog/pixmaps/xlog.xpm
-share/xlog/dxcc/dxcck2di.changes
-share/xlog/dxcc/dxcck2di.txt
+share/xlog/dxcc/cty.dat
+share/xlog/dxcc/xlog.dat
share/xlog/remote/Makefile
share/xlog/remote/README
share/xlog/remote/fromxlog.c
share/xlog/remote/sendtoxlog.c
-share/xlog/themes/xlogrc
+share/xlog/AUTHORS
+share/xlog/FAQ
+share/xlog/MANUAL
+share/xlog/README
+share/xlog/THANKS
+share/xlog/TODO
+share/xlog/qsllabels.glabels
@dirrm share/xlog/pixmaps
@dirrm share/xlog/dxcc
@dirrm share/xlog/remote
- at dirrm share/xlog/themes
@dirrm share/xlog
--- xlog.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list