Tue Dec 23 18:52:54 2014 UTC ()
Fix build with clang.


(joerg)
diff -r1.62 -r1.63 pkgsrc/ham/xlog/Makefile
diff -r1.15 -r1.16 pkgsrc/ham/xlog/distinfo
diff -r0 -r1.1 pkgsrc/ham/xlog/patches/patch-src_logfile_adif2.c
cvs diff -r1.62 -r1.63 pkgsrc/ham/xlog/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/xlog/Makefile 2014/12/15 08:36:40 1.62
+++ pkgsrc/ham/xlog/Makefile 2014/12/23 18:52:54 1.63
@@ -1,27 +1,34 @@ @@ -1,27 +1,34 @@
1# $NetBSD: Makefile,v 1.62 2014/12/15 08:36:40 mef Exp $ 1# $NetBSD: Makefile,v 1.63 2014/12/23 18:52:54 joerg Exp $
2# 2#
3 3
4DISTNAME= xlog-2.0.12 4DISTNAME= xlog-2.0.12
5CATEGORIES= ham 5CATEGORIES= ham
6MASTER_SITES= http://download.savannah.gnu.org/releases/xlog/ 6MASTER_SITES= http://download.savannah.gnu.org/releases/xlog/
7LICENSE= gnu-gpl-v3 7LICENSE= gnu-gpl-v3
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.nongnu.org/xlog/ 10HOMEPAGE= http://www.nongnu.org/xlog/
11COMMENT= Amateur Radio logging program 11COMMENT= Amateur Radio logging program
12 12
13DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 13DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_PKGLOCALEDIR=yes 16USE_PKGLOCALEDIR=yes
17USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
18 18
19CONFIGURE_ARGS+= --enable-hamlib 19CONFIGURE_ARGS+= --enable-hamlib
20 20
 21.include "../../mk/compiler.mk"
 22.if !empty(PKGSRC_COMPILER:Mclang)
 23BUILDLINK_TRANSFORM+= rm:-Wno-unused-but-set-variable
 24_WRAP_EXTRA_ARGS.CC+= -Wno-error=parentheses-equality -Wno-error=tautological-compare
 25CWRAPPERS_APPEND.cc+= -Wno-error=parentheses-equality -Wno-error=tautological-compare
 26.endif
 27
21.include "../../databases/shared-mime-info/buildlink3.mk" 28.include "../../databases/shared-mime-info/buildlink3.mk"
22.include "../../ham/hamlib/buildlink3.mk" 29.include "../../ham/hamlib/buildlink3.mk"
23.include "../../x11/gtk2/buildlink3.mk" 30.include "../../x11/gtk2/buildlink3.mk"
24.include "../../print/libgnomeprint/buildlink3.mk" 31.include "../../print/libgnomeprint/buildlink3.mk"
25.include "../../sysutils/desktop-file-utils/buildlink3.mk" 32.include "../../sysutils/desktop-file-utils/buildlink3.mk"
26.include "../../sysutils/desktop-file-utils/desktopdb.mk" 33.include "../../sysutils/desktop-file-utils/desktopdb.mk"
27.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/ham/xlog/distinfo (expand / switch to unified diff)

--- pkgsrc/ham/xlog/distinfo 2014/12/15 08:36:40 1.15
+++ pkgsrc/ham/xlog/distinfo 2014/12/23 18:52:54 1.16
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.15 2014/12/15 08:36:40 mef Exp $ 1$NetBSD: distinfo,v 1.16 2014/12/23 18:52:54 joerg Exp $
2 2
3SHA1 (xlog-2.0.12.tar.gz) = d63c200f388720e4cb594be6d8d2925b0df0511a 3SHA1 (xlog-2.0.12.tar.gz) = d63c200f388720e4cb594be6d8d2925b0df0511a
4RMD160 (xlog-2.0.12.tar.gz) = b597452ae9468517da2c263c3f4dfcdf1702aecd 4RMD160 (xlog-2.0.12.tar.gz) = b597452ae9468517da2c263c3f4dfcdf1702aecd
5Size (xlog-2.0.12.tar.gz) = 11396005 bytes 5Size (xlog-2.0.12.tar.gz) = 11396005 bytes
6SHA1 (patch-src_callbacks_mainwindow_qsoframe_c) = 354d979f0f591039df0377e640bdc76b6d4831a4 6SHA1 (patch-src_callbacks_mainwindow_qsoframe_c) = 354d979f0f591039df0377e640bdc76b6d4831a4
7SHA1 (patch-src_dxcc_c) = 2fea7448ecd452064ff86ab228ec7490a0c187f3 7SHA1 (patch-src_dxcc_c) = 2fea7448ecd452064ff86ab228ec7490a0c187f3
 8SHA1 (patch-src_logfile_adif2.c) = 19c52c20d2bb0c86fc489691a8bd996c14f6e03f
8SHA1 (patch-src_logfile_edittest_c) = 803cec0af65e359eecfea6fc9e079899999a7529 9SHA1 (patch-src_logfile_edittest_c) = 803cec0af65e359eecfea6fc9e079899999a7529
9SHA1 (patch-src_logfile_logfile_c) = 92ccae2d101297365ef1cd69464edd182b142338 10SHA1 (patch-src_logfile_logfile_c) = 92ccae2d101297365ef1cd69464edd182b142338
10SHA1 (patch-src_strptime_c) = 5471f5acc7adc16ca08d479473b424c6798bf30c 11SHA1 (patch-src_strptime_c) = 5471f5acc7adc16ca08d479473b424c6798bf30c
File Added: pkgsrc/ham/xlog/patches/Attic/patch-src_logfile_adif2.c
$NetBSD: patch-src_logfile_adif2.c,v 1.1 2014/12/23 18:52:54 joerg Exp $

--- src/logfile/adif2.c.orig	2014-12-23 17:34:08.000000000 +0000
+++ src/logfile/adif2.c
@@ -56,8 +56,6 @@ extern preferencestype preferences;
  */
 static const gint adif_fields[] = { DATE, GMT, CALL, BAND, MODE, RST, MYRST,
 	QSLOUT, QSLIN, REMARKS, POWER, GMTEND, NAME, QTH, LOCATOR, U1, U2 };
-static const gint adif_widths[] = { 15, 8, 15, 15, 8, 8, 8, 8, 8, 80, 8, 8, 8,
-	8, 6, 8, 8 };
 static const gint adif_field_nr = 17;
 
 static LOGDB *adif_handle;