Update xlog to 0.9.1:

Fixed a crash when clicking on the frequency button with hamlib enabled
Fixed calculation of bearing and range between locations west of Greewich
Wildcards are now accepted for list of logs

6 files changed, 30 insertions, 68 deletions

diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index b66ef060912..611964f12d3 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2004/01/24 13:40:44 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/18 06:04:44 wulf Exp $
 #
 
-DISTNAME=	xlog-0.8
-PKGREVISION=	1
+DISTNAME=	xlog-0.9.1
 CATEGORIES=	ham
-MASTER_SITES=	http://people.debian.org/~pa3aba/download/
+MASTER_SITES=	http://www.qsl.net/pg4i/download/
 
 MAINTAINER=	wulf@NetBSD.org
-HOMEPAGE=	http://people.debian.org/~pa3aba/xlog.html
+HOMEPAGE=	http://http://www.qsl.net/pg4i/linux/xlog.html
 COMMENT=	Amateur Radio logging program
 
 USE_BUILDLINK2=	yes
@@ -17,5 +16,5 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-hamlib
 
 .include "../../ham/hamlib/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/xlog/PLIST b/ham/xlog/PLIST
index 0a188983659..04c87d10f11 100644
--- a/ham/xlog/PLIST
+++ b/ham/xlog/PLIST
@@ -1,16 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/03 00:45:22 wulf Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/18 06:04:44 wulf Exp $
 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
@@ -22,7 +20,7 @@ share/xlog/pixmaps/s6.xpm
 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/cty.dat
@@ -31,15 +29,15 @@ 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/TODO
-share/xlog/AUTHORS
 share/xlog/THANKS
+share/xlog/TODO
+share/xlog/qsllabels.glabels
 man/man1/xlog.1
 @dirrm share/xlog/dxcc
 @dirrm share/xlog/pixmaps
 @dirrm share/xlog/remote
-@dirrm share/xlog/themes
 @dirrm share/xlog
diff --git a/ham/xlog/distinfo b/ham/xlog/distinfo
index 8c022ed094a..2f563deab82 100644
--- a/ham/xlog/distinfo
+++ b/ham/xlog/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/07/03 00:45:21 wulf Exp $
+$NetBSD: distinfo,v 1.2 2004/02/18 06:04:44 wulf Exp $
 
-SHA1 (xlog-0.8.tar.gz) = 1ed13b0b0b91a760c1c29b568abc0ea39c46fbf1
-Size (xlog-0.8.tar.gz) = 370516 bytes
-SHA1 (patch-aa) = 291f57d385352bc208ab80a062d69f3e52479878
-SHA1 (patch-ab) = 9f7c4858fd471c6aa89bd28a8124f1a8aae3f700
-SHA1 (patch-ac) = 0e046aebc30bc0f16a42d19001ed1beb9faa2017
+SHA1 (xlog-0.9.1.tar.gz) = 30d9bb55dbd4661a3c174c150e6b82de123dd9d9
+Size (xlog-0.9.1.tar.gz) = 430371 bytes
+SHA1 (patch-ab) = 214fd2e598bd347db546250c91bfdb1c05562585
+SHA1 (patch-ad) = 2464ba878bf4090c4de3c542e8c29d2dd946f914
diff --git a/ham/xlog/patches/patch-aa b/ham/xlog/patches/patch-aa
deleted file mode 100644
index a94c36aa282..00000000000
--- a/ham/xlog/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/03 00:45:22 wulf Exp $
-
---- src/callbacks_qsoframe.c.orig	2003-07-03 05:39:02.000000000 +0930
-+++ src/callbacks_qsoframe.c	2003-07-03 05:39:48.000000000 +0930
-@@ -308,7 +308,7 @@
- 	    g_string_sprintf (digits, "%Ld", state.rigfrequency);
- 	  else
- 	    g_string_sprintf (digits, "%Ld",
--			      (long long) rintl (state.rigfrequency /
-+			      (long long) rint (state.rigfrequency /
- 						 pow (10,
- 						      preferences.round)));
- 	  g_string_insert_c (digits, (digits->len) - 6 + preferences.round,
diff --git a/ham/xlog/patches/patch-ab b/ham/xlog/patches/patch-ab
index 323aff4f9f1..bc834d5a223 100644
--- a/ham/xlog/patches/patch-ab
+++ b/ham/xlog/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/07/03 00:45:23 wulf Exp $
+$NetBSD: patch-ab,v 1.2 2004/02/18 06:04:44 wulf Exp $
 
---- src/hamlib-utils.c.orig	2003-07-03 05:39:11.000000000 +0930
-+++ src/hamlib-utils.c	2003-07-03 05:39:23.000000000 +0930
-@@ -221,7 +221,7 @@
- 		g_string_sprintf (digits, "%Ld", freq);
- 	      else
- 		g_string_sprintf (digits, "%Ld",
--				  (long long) rintl (freq /
-+				  (long long) rint (freq /
- 						     pow (10,
- 							  preferences.
- 							  round)));
+--- src/hamlib-utils.c.orig	2004-02-01 16:21:58.000000000 +1030
++++ src/hamlib-utils.c	2004-02-01 16:22:07.000000000 +1030
+@@ -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/ham/xlog/patches/patch-ac b/ham/xlog/patches/patch-ac
deleted file mode 100644
index 3c817274de0..00000000000
--- a/ham/xlog/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/07/03 00:45:23 wulf Exp $
-
---- Makefile.in.orig	2003-01-18 22:52:42.000000000 +1030
-+++ Makefile.in	2003-07-03 06:45:48.000000000 +0930
-@@ -577,11 +577,11 @@
- 		$(INSTALL_DATA) xlog.1 $(DESTDIR)$(mandir)/man1; \
- 	fi
- 
--	install -m 0644 FAQ $(DESTDIR)$(pkgdatadir)
--	install -m 0644 README $(DESTDIR)$(pkgdatadir)
--	install -m 0644 TODO $(DESTDIR)$(pkgdatadir)
--	install -m 0644 AUTHORS $(DESTDIR)$(pkgdatadir)
--	install -m 0644 THANKS $(DESTDIR)$(pkgdatadir)
-+	${INSTALL_DATA} FAQ $(DESTDIR)$(pkgdatadir)
-+	${INSTALL_DATA} README $(DESTDIR)$(pkgdatadir)
-+	${INSTALL_DATA} TODO $(DESTDIR)$(pkgdatadir)
-+	${INSTALL_DATA} AUTHORS $(DESTDIR)$(pkgdatadir)
-+	${INSTALL_DATA} THANKS $(DESTDIR)$(pkgdatadir)
- 
- dist-hook:
- 	if test -d pixmaps; then \