From 0bdeb82558543108f71727bb2d92d98e01a64bd2 Mon Sep 17 00:00:00 2001 From: "Patrick S. Gardella" Date: Wed, 4 Feb 2004 16:15:04 +0000 Subject: Update to 0.9.1 --- comms/xlog/Makefile | 17 ++++++++++++----- comms/xlog/distinfo | 2 +- comms/xlog/files/patch-aa | 32 +++++++++++--------------------- comms/xlog/pkg-plist | 26 +++++++++++++------------- 4 files changed, 37 insertions(+), 40 deletions(-) diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile index eed253b1177b..6d34f266408c 100644 --- a/comms/xlog/Makefile +++ b/comms/xlog/Makefile @@ -5,18 +5,25 @@ # $FreeBSD$ PORTNAME= xlog -PORTVERSION= 0.7 -PORTREVISION= 1 +PORTVERSION= 0.9.1 +PORTREVISION= 0 CATEGORIES= comms -MASTER_SITES= http://people.debian.org/~pa3aba/download/ +MASTER_SITES= http://www.qsl.net/pg4i/download/ MAINTAINER= patrick@FreeBSD.org COMMENT= An Amateur Radio station logging application -USE_GTK= yes +USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_ARGS= GTKCONFIG=${GTK_CONFIG} MAN1= xlog.1 .include + +.if defined(WITH_HAMLIB) +LIB_DEPENDS= hamlib-1.1.4.1:${PORTSDIR}/comms/hamlib +CONFIGURE_ARGS+= --enable-hamlib +PLIST_SUB+= HAMLIB="" +CONFIGURE_ENV= PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig +MAKE_ENV= PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig +.endif diff --git a/comms/xlog/distinfo b/comms/xlog/distinfo index a38e578da068..b4c0e1416275 100644 --- a/comms/xlog/distinfo +++ b/comms/xlog/distinfo @@ -1 +1 @@ -MD5 (xlog-0.7.tar.gz) = a86a32473bf24750dc98f68f730d8408 +MD5 (xlog-0.9.1.tar.gz) = 432d6dea2cea14d46c323c46419603a0 diff --git a/comms/xlog/files/patch-aa b/comms/xlog/files/patch-aa index a9de5e4821bd..c97f459d2dad 100644 --- a/comms/xlog/files/patch-aa +++ b/comms/xlog/files/patch-aa @@ -1,21 +1,11 @@ ---- 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 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-plist b/comms/xlog/pkg-plist index 1faa3629a200..b39372de0f19 100644 --- a/comms/xlog/pkg-plist +++ b/comms/xlog/pkg-plist @@ -1,15 +1,10 @@ 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 +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 +16,23 @@ 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/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/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/themes @dirrm share/xlog -- cgit v1.2.3