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

7 files changed, 52 insertions, 48 deletions

diff --git a/math/xylib/Makefile b/math/xylib/Makefile
index 549d3b03cc0..63285eddba9 100644
--- a/math/xylib/Makefile
+++ b/math/xylib/Makefile
@@ -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"
diff --git a/math/xylib/Makefile.common b/math/xylib/Makefile.common
new file mode 100644
index 00000000000..34cd4e93a0a
--- /dev/null
+++ b/math/xylib/Makefile.common
@@ -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
diff --git a/math/xylib/PLIST b/math/xylib/PLIST
index a344d63aaf2..ae61465003f 100644
--- a/math/xylib/PLIST
+++ b/math/xylib/PLIST
@@ -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
diff --git a/math/xylib/buildlink3.mk b/math/xylib/buildlink3.mk
index ea80237ddb0..3a32e3072ac 100644
--- a/math/xylib/buildlink3.mk
+++ b/math/xylib/buildlink3.mk
@@ -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"
diff --git a/math/xylib/distinfo b/math/xylib/distinfo
index b777b1e1f55..2e0945676e0 100644
--- a/math/xylib/distinfo
+++ b/math/xylib/distinfo
@@ -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
diff --git a/math/xylib/patches/patch-xylib_cache.h b/math/xylib/patches/patch-xylib_cache.h
deleted file mode 100644
index 09902cf1713..00000000000
--- a/math/xylib/patches/patch-xylib_cache.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-xylib_cache.h,v 1.2 2019/12/23 19:54:51 nros Exp $
-
-* use std::shared_prt on gcc 6 and above since they implicitly use c++14
-
---- xylib/cache.h.orig	2012-07-25 22:25:14.000000000 +0000
-+++ xylib/cache.h
-@@ -28,7 +28,16 @@
- #define XYLIB_USE_TR1_MEMORY 1
- #endif
- 
--#if XYLIB_USE_TR1_MEMORY
-+#ifdef __GNUC__
-+#if __GNUC__ >= 6
-+#define __GNU_V6__
-+#endif
-+#endif
-+
-+#if defined(_LIBCPP_VERSION) || defined(__GNU_V6__)
-+# include <memory>
-+using std::shared_ptr;
-+#elif XYLIB_USE_TR1_MEMORY
- # include <tr1/memory>
-   using std::tr1::shared_ptr;
- #else
diff --git a/math/xylib/patches/patch-xylib_util.cpp b/math/xylib/patches/patch-xylib_util.cpp
new file mode 100644
index 00000000000..0188343329d
--- /dev/null
+++ b/math/xylib/patches/patch-xylib_util.cpp
@@ -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 <limits>
+ #include <cassert>
+ #include <cerrno>
++#include <cstdlib>
+ #include <boost/detail/endian.hpp>
+ #include <boost/cstdint.hpp>
+