Received: by mail.netbsd.org (Postfix, from userid 605) id A2D3384DBE; Tue, 7 Jan 2020 13:03:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2D32A84D47 for ; Tue, 7 Jan 2020 13:03:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Nes5xcuPN3kw for ; Tue, 7 Jan 2020 13:03:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 76B3684D20 for ; Tue, 7 Jan 2020 13:03:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 70A2FFBF4; Tue, 7 Jan 2020 13:03:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1578402230360" MIME-Version: 1.0 Date: Tue, 7 Jan 2020 13:03:50 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/math/xylib To: pkgsrc-changes@NetBSD.org Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20200107130350.70A2FFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1578402230360 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Tue Jan 7 13:03:50 UTC 2020 Modified Files: pkgsrc/math/xylib: Makefile PLIST buildlink3.mk distinfo Added Files: pkgsrc/math/xylib: Makefile.common pkgsrc/math/xylib/patches: patch-xylib_util.cpp Removed Files: pkgsrc/math/xylib/patches: patch-xylib_cache.h Log Message: Update xylib to version 1.5 Update xylib to version 1.5. change from release notes: improved CNF reading changes to reading SpecsLab2 xy support text files with lines terminated by CR only more robust reading of CSV files fixes for big-endian platforms included xyConvert (GUI converter) support filenames with non-ascii characters added SpecsLab2 xy format To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/xylib/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/math/xylib/Makefile.common cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/xylib/PLIST cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/xylib/buildlink3.mk cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/xylib/distinfo cvs rdiff -u -r1.2 -r0 pkgsrc/math/xylib/patches/patch-xylib_cache.h cvs rdiff -u -r0 -r1.1 pkgsrc/math/xylib/patches/patch-xylib_util.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1578402230360 Content-Disposition: inline Content-Length: 4890 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/xylib/Makefile diff -u pkgsrc/math/xylib/Makefile:1.6 pkgsrc/math/xylib/Makefile:1.7 --- pkgsrc/math/xylib/Makefile:1.6 Fri Sep 14 00:22:11 2012 +++ pkgsrc/math/xylib/Makefile Tue Jan 7 13:03:50 2020 @@ -1,19 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2012/09/14 00:22:11 asau Exp $ +# $NetBSD: Makefile,v 1.7 2020/01/07 13:03:50 nros Exp $ -DISTNAME= xylib-1.0 -CATEGORIES= math -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xylib/} -EXTRACT_SUFX= .tar.bz2 +.include "Makefile.common" +COMMENT= Library for reading powder diffraction data -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://xylib.sourceforge.net/ -COMMENT= Library for reading powder diffraction data - -LICENSE= gnu-lgpl-v2 - -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes -GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --without-gui .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/boost-headers/buildlink3.mk" Index: pkgsrc/math/xylib/PLIST diff -u pkgsrc/math/xylib/PLIST:1.4 pkgsrc/math/xylib/PLIST:1.5 --- pkgsrc/math/xylib/PLIST:1.4 Fri Sep 14 00:22:11 2012 +++ pkgsrc/math/xylib/PLIST Tue Jan 7 13:03:50 2020 @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.4 2012/09/14 00:22:11 asau Exp $ +@comment $NetBSD: PLIST,v 1.5 2020/01/07 13:03:50 nros Exp $ bin/xyconv -include/xylib/brucker_raw.h +include/xylib/bruker_raw.h include/xylib/cache.h include/xylib/canberra_cnf.h include/xylib/canberra_mca.h @@ -14,6 +14,8 @@ include/xylib/philips_raw.h include/xylib/philips_udf.h include/xylib/riet7.h include/xylib/rigaku_dat.h +include/xylib/specsxy.h +include/xylib/spectra.h include/xylib/text.h include/xylib/uxd.h include/xylib/vamas.h Index: pkgsrc/math/xylib/buildlink3.mk diff -u pkgsrc/math/xylib/buildlink3.mk:1.3 pkgsrc/math/xylib/buildlink3.mk:1.4 --- pkgsrc/math/xylib/buildlink3.mk:1.3 Mon May 7 01:53:47 2012 +++ pkgsrc/math/xylib/buildlink3.mk Tue Jan 7 13:03:50 2020 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2012/05/07 01:53:47 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2020/01/07 13:03:50 nros Exp $ BUILDLINK_TREE+= xylib @@ -6,7 +6,7 @@ BUILDLINK_TREE+= xylib XYLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xylib+= xylib>=0.4 -BUILDLINK_ABI_DEPENDS.xylib+= xylib>=0.8nb1 +BUILDLINK_ABI_DEPENDS.xylib+= xylib>=1.5 BUILDLINK_PKGSRCDIR.xylib?= ../../math/xylib .include "../../archivers/bzip2/buildlink3.mk" Index: pkgsrc/math/xylib/distinfo diff -u pkgsrc/math/xylib/distinfo:1.7 pkgsrc/math/xylib/distinfo:1.8 --- pkgsrc/math/xylib/distinfo:1.7 Mon Dec 23 19:54:51 2019 +++ pkgsrc/math/xylib/distinfo Tue Jan 7 13:03:50 2020 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2019/12/23 19:54:51 nros Exp $ +$NetBSD: distinfo,v 1.8 2020/01/07 13:03:50 nros Exp $ -SHA1 (xylib-1.0.tar.bz2) = 3664b6753e11673e637ced473ce00d24ff0ce338 -RMD160 (xylib-1.0.tar.bz2) = 3a125a7d08a60fa65e22a0b09122069a160ebfac -SHA512 (xylib-1.0.tar.bz2) = 765f111729b2e4b42a3f127e2279fdb50da52a20ada9fff2baba55b27ba30406b0edf4c0b58287eacbf4ec20818641201b7b78324b8752c9094568179924fe31 -Size (xylib-1.0.tar.bz2) = 287286 bytes -SHA1 (patch-xylib_cache.h) = 100fb29385aa701621b5305a17386668247ba789 +SHA1 (xylib-1.5.tar.bz2) = 980b962cb07d93090c1cc6694ce9dc66952854aa +RMD160 (xylib-1.5.tar.bz2) = 881945873e8d927b8e058ebce634631b24b7d62b +SHA512 (xylib-1.5.tar.bz2) = 67da8653b422fa4b5ffdc9fe19d23f49e36e2692fb3aa98e130511cfe6db46b8e81b30d45cf302a1fe8b6d1a9b776d3c364ecdabb6489f1d7518e2736b6e2210 +Size (xylib-1.5.tar.bz2) = 365316 bytes +SHA1 (patch-xylib_util.cpp) = 822208cda9a88d1a0912908f1a5871800496e16f Added files: Index: pkgsrc/math/xylib/Makefile.common diff -u /dev/null pkgsrc/math/xylib/Makefile.common:1.1 --- /dev/null Tue Jan 7 13:03:50 2020 +++ pkgsrc/math/xylib/Makefile.common Tue Jan 7 13:03:50 2020 @@ -0,0 +1,22 @@ +# $NetBSD: Makefile.common,v 1.1 2020/01/07 13:03:50 nros Exp $ +# +# used by math/xylib/Makefile +# + +DISTNAME= xylib-1.5 +CATEGORIES= math +MASTER_SITES= ${MASTER_SITE_GITHUB:=wojdyr/} +GITHUB_RELEASE= v${PKGVERSION_NOREV} +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://xylib.sourceforge.net/ + +LICENSE= gnu-lgpl-v2 + +#DISTINFO_FILE= ../../math/xylib/distinfo +#PATCHDIR= ../../math/xylib/patches + +USE_LANGUAGES= c c++03 +USE_LIBTOOL= yes +GNU_CONFIGURE= yes Index: pkgsrc/math/xylib/patches/patch-xylib_util.cpp diff -u /dev/null pkgsrc/math/xylib/patches/patch-xylib_util.cpp:1.1 --- /dev/null Tue Jan 7 13:03:50 2020 +++ pkgsrc/math/xylib/patches/patch-xylib_util.cpp Tue Jan 7 13:03:50 2020 @@ -0,0 +1,14 @@ +$NetBSD: patch-xylib_util.cpp,v 1.1 2020/01/07 13:03:50 nros Exp $ + +* cstdlib needed for strol + +--- xylib/util.cpp.orig 2016-12-17 12:45:55.000000000 +0000 ++++ xylib/util.cpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + --_----------=_1578402230360--