5 files changed, 33 insertions, 53 deletions

diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index e24ee052abc2..0f2283894b8c 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -5,37 +5,28 @@
 # $FreeBSD$
 
 PORTNAME=	xlog
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.6
 CATEGORIES=	comms
 MASTER_SITES=	http://www.qsl.net/pg4i/download/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An Amateur Radio station logging application
+COMMENT=	Amateur Radio logging application
 
-BROKEN=		"Does not compile"
-
-USE_GNOME=	gtk20
+USE_X_PREFIX=	yes
+USE_GNOME=	pkgconfig libgnomeprint
 GNU_CONFIGURE=	yes
-
-MAN1=		xlog.1
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "alpha" && ${OSVERSION} < 500000
-BROKEN=		"Does not compile on alpha 4.x"
-.endif
+USE_GMAKE=	yes
 
 .if defined(WITH_HAMLIB)
-LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib
+LIB_DEPENDS+=	hamlib:${PORTSDIR}/comms/hamlib
 CONFIGURE_ARGS+=	--enable-hamlib
-PLIST_SUB+=	HAMLIB=""
-USE_GNOME=	pkgconfig
 .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.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/xlog/distinfo b/comms/xlog/distinfo
index 67a32399f9c1..14a448cc2152 100644
--- a/comms/xlog/distinfo
+++ b/comms/xlog/distinfo
@@ -1,2 +1,2 @@
-MD5 (xlog-0.9.1.tar.gz) = 432d6dea2cea14d46c323c46419603a0
-SIZE (xlog-0.9.1.tar.gz) = 430371
+MD5 (xlog-0.9.6.tar.gz) = 2546a1e073fe34db3486f69ed31ea9f1
+SIZE (xlog-0.9.6.tar.gz) = 3177340
diff --git a/comms/xlog/files/patch-aa b/comms/xlog/files/patch-aa
deleted file mode 100644
index c97f459d2dad..000000000000
--- a/comms/xlog/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hamlib-utils.c.orig	Fri Jan 30 13:54:44 2004
-+++ src/hamlib-utils.c	Fri Jan 30 13:55:08 2004
-@@ -604,7 +604,7 @@
-   if (preferences.round == 0)
-     g_string_printf (digits, "%Ld", state.rigfrequency);
- 	else
--	  g_string_printf (digits, "%Ld", (long long) rintl (state.rigfrequency /
-+	  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 --git a/comms/xlog/pkg-descr b/comms/xlog/pkg-descr
index 07e5b5165838..3d4f55c84ad1 100644
--- a/comms/xlog/pkg-descr
+++ b/comms/xlog/pkg-descr
@@ -1,14 +1,20 @@
-Xlog is a basic Amateur Radio station log.  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 
+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.
+Major bugfixes and features of this release include improved printing
+using libgnomeprint and map files for future releases. See the INSTALL
+file in the work directory for more information
 
 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 (deskutils/glabels) using the template
+called qsllabels.glabels in the xlog /usr/local/share/xlog directory.
 
 WWW: http://www.qsl.net/pg4i/linux/xlog.html
diff --git a/comms/xlog/pkg-plist b/comms/xlog/pkg-plist
index b39372de0f19..41b680cdc0c3 100644
--- a/comms/xlog/pkg-plist
+++ b/comms/xlog/pkg-plist
@@ -1,5 +1,12 @@
 bin/xlog
-share/xlog
+share/xlog/AUTHORS
+share/xlog/FAQ
+share/xlog/MANUAL
+share/xlog/README
+share/xlog/THANKS
+share/xlog/TODO
+share/xlog/dxcc/cty.dat
+share/xlog/dxcc/xlog.dat
 share/xlog/pixmaps/book.xpm
 share/xlog/pixmaps/mini-clock.xpm
 share/xlog/pixmaps/mini-trx.xpm
@@ -19,20 +26,7 @@ share/xlog/pixmaps/s9.xpm
 share/xlog/pixmaps/xlog-logo.png
 share/xlog/pixmaps/xlog.png
 share/xlog/pixmaps/xlog.xpm
-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/FAQ
-share/xlog/README
-share/xlog/TODO
-share/xlog/AUTHORS
-share/xlog/THANKS
-share/xlog/MANUAL
 share/xlog/qsllabels.glabels
 @dirrm share/xlog/pixmaps
 @dirrm share/xlog/dxcc
-@dirrm share/xlog/remote
 @dirrm share/xlog