ports/66778: UPDATE /comms/xlog to 0.9.6 to replace broken port

Mon May 17 22:30:20 UTC 2004

>Number:         66778
>Category:       ports
>Synopsis:       UPDATE /comms/xlog to 0.9.6 to replace broken port
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 17 15:30:16 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Matt Dawson
>Release:        FreeBSD 5.2.1-RELEASE-p6 i386
>Organization:
n/a
>Environment:
System: FreeBSD workstation1.local.mattsnetwork.co.uk 5.2.1-RELEASE-p6 FreeBSD 5.2.1-RELEASE-p6 #0: Mon May 17 22:32:05 BST 2004 root at workstation1.local.mattsnetwork.co.uk:/usr/obj/usr/src/sys/WORKSTATION1 i386


>Description:

Update of /comms/xlog to latest 0.9.6 version which will replace broken
0.9.2 version currently in ports. Supercedes PR-66460 which I submitted

>How-To-Repeat:

Try compiling the current port

>Fix:

Diff attached

--- xlog-0.9.6.diff begins here ---
diff -ruN /usr/ports/comms/xlog/Makefile /usr/local/build/usr/ports/comms/xlog/Makefile
--- /usr/ports/comms/xlog/Makefile	Tue Apr 20 04:32:22 2004
+++ /usr/local/build/usr/ports/comms/xlog/Makefile	Mon May 17 23:11:48 2004
@@ -1,41 +1,34 @@
 # New ports collection makefile for:	xlog
-# Date created:		2002-11-05
-# Whom:			Patrick Gardella <patrick at FreeBSD.org>
+# Date created:		2004-05-17
+# Whom:			Matt Dawson <matt at mattsnetwork.co.uk>
 #
-# $FreeBSD: ports/comms/xlog/Makefile,v 1.9 2004/04/19 04:47:10 kris Exp $
+# $FreeBSD: ports/comms/xlog/Makefile,v 1.10 2004/05/17 22:48:55 mattd Exp $
 
 PORTNAME=	xlog
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.6
 CATEGORIES=	comms
-MASTER_SITES=	http://www.qsl.net/pg4i/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
 
-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
-CONFIGURE_ARGS+=	--enable-hamlib
-PLIST_SUB+=	HAMLIB=""
-USE_GNOME=	pkgconfig
+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.post.mk>
+.include <bsd.port.mk>
diff -ruN /usr/ports/comms/xlog/README.html /usr/local/build/usr/ports/comms/xlog/README.html
--- /usr/ports/comms/xlog/README.html	Mon Feb 23 18:44:59 2004
+++ /usr/local/build/usr/ports/comms/xlog/README.html	Thu Jan  1 01:00:00 1970
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
-
-<html>
-  <head>
-    <title>The FreeBSD Ports Collection (comms/xlog)</title>
-  </head>
-
-  <body>
-    <h1>The FreeBSD Ports Collection (comms/xlog)</h1>
-    <hr>
-
-    <p>You are now in the directory for the port "comms/xlog".</p>
-
-    <p>The package name of this port is "xlog-0.7".</p>
-
-    <p>This is the one-line description for this port:</p>
-    <hr>
-
-    <p>
-An Amateur Radio station logging application
-    </p>
-    <hr>
-
-    <p>Please read the "<a href="pkg-descr">description file</a>" for a
-    longer description and/or visit the <a href="http://people.debian.org/~pa3aba/xlog.html">web site</a> for futher informations.</p>
-
-    <p>If needed, you may contact the <a href=
-    "mailto:patrick at FreeBSD.org">maintainer</a> of this port or the port <a href=
-    "mailto:ports at FreeBSD.org">mailing-list</a>.</p>
-
-    <p>This port requires package(s) "XFree86-libraries-4.3.0_6 expat-1.95.6_1 fontconfig-2.2.90_3 freetype2-2.1.5_1 gettext-0.12.1 glib-1.2.10_10 gtk-1.2.10_10 imake-4.3.0_1 libiconv-1.9.1_3 perl-5.6.1_15 pkgconfig-0.15.0" to build.</p>
-
-    <p>This port requires package(s) "XFree86-libraries-4.3.0_6 expat-1.95.6_1 fontconfig-2.2.90_3 freetype2-2.1.5_1 gettext-0.12.1 glib-1.2.10_10 gtk-1.2.10_10 imake-4.3.0_1 libiconv-1.9.1_3 perl-5.6.1_15 pkgconfig-0.15.0" to run.</p>
-
-    <p>Go to the <a href="../../README.html">top of the ports tree</a> for
-    a summary on how to use the ports collection.</p>
-    <hr>
-
-    <p><a href="../README.html">Go up one level</a> | <a href=
-    "../../README.html">Go to top of ports tree</a></p>
-  </body>
-</html>
-
diff -ruN /usr/ports/comms/xlog/distinfo /usr/local/build/usr/ports/comms/xlog/distinfo
--- /usr/ports/comms/xlog/distinfo	Mon Apr 12 15:26:07 2004
+++ /usr/local/build/usr/ports/comms/xlog/distinfo	Mon May 17 23:03:00 2004
@@ -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 -ruN /usr/ports/comms/xlog/files/patch-aa /usr/local/build/usr/ports/comms/xlog/files/patch-aa
--- /usr/ports/comms/xlog/files/patch-aa	Mon Apr 12 15:26:07 2004
+++ /usr/local/build/usr/ports/comms/xlog/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -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 -ruN /usr/ports/comms/xlog/pkg-descr /usr/local/build/usr/ports/comms/xlog/pkg-descr
--- /usr/ports/comms/xlog/pkg-descr	Mon Apr 12 15:26:07 2004
+++ /usr/local/build/usr/ports/comms/xlog/pkg-descr	Mon May 10 13:54:57 2004
@@ -1,14 +1,22 @@
-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.
+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 (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
+matt at mattsnetwork.co.uk
diff -ruN /usr/ports/comms/xlog/pkg-plist /usr/local/build/usr/ports/comms/xlog/pkg-plist
--- /usr/ports/comms/xlog/pkg-plist	Mon Apr 12 15:26:07 2004
+++ /usr/local/build/usr/ports/comms/xlog/pkg-plist	Mon May 10 14:09:17 2004
@@ -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,8 @@
 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
- at dirrm share/xlog/remote
 @dirrm share/xlog
+
--- xlog-0.9.6.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

