CVS commit: pkgsrc/math

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jun  7 06:58:46 UTC 2023

Modified Files:
        pkgsrc/math/xyconvert: Makefile
        pkgsrc/math/xylib: Makefile.common PLIST distinfo
        pkgsrc/math/xylib/patches: patch-Makefile.in
Removed Files:
        pkgsrc/math/xylib/patches: patch-configure patch-configure.ac
            patch-gui_xyconvert.cpp patch-xylib_util.cpp

Log Message:
xylib, xyconvert: update to 1.6

1.6

    added XSYG format from Freiberg Instruments' lexsyg (Johannes Friedrich)
    added Bruker SPC binary format (Sebastian Kreutzer)
    added PANalytical XRDML


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/math/xyconvert/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/xylib/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/xylib/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/math/xylib/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/xylib/patches/patch-Makefile.in
cvs rdiff -u -r1.1 -r0 pkgsrc/math/xylib/patches/patch-configure \
    pkgsrc/math/xylib/patches/patch-configure.ac \
    pkgsrc/math/xylib/patches/patch-gui_xyconvert.cpp
cvs rdiff -u -r1.2 -r0 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.

Modified files:

Index: pkgsrc/math/xyconvert/Makefile
diff -u pkgsrc/math/xyconvert/Makefile:1.16 pkgsrc/math/xyconvert/Makefile:1.17
--- pkgsrc/math/xyconvert/Makefile:1.16 Wed Apr 19 08:10:47 2023
+++ pkgsrc/math/xyconvert/Makefile      Wed Jun  7 06:58:46 2023
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.16 2023/04/19 08:10:47 adam Exp $
-#
+# $NetBSD: Makefile,v 1.17 2023/06/07 06:58:46 wiz Exp $
 
-PKGREVISION= 13
 .include "../../math/xylib/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/lib/convert/g}

Index: pkgsrc/math/xylib/Makefile.common
diff -u pkgsrc/math/xylib/Makefile.common:1.4 pkgsrc/math/xylib/Makefile.common:1.5
--- pkgsrc/math/xylib/Makefile.common:1.4       Fri Mar 20 11:58:01 2020
+++ pkgsrc/math/xylib/Makefile.common   Wed Jun  7 06:58:46 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2020/03/20 11:58:01 nia Exp $
+# $NetBSD: Makefile.common,v 1.5 2023/06/07 06:58:46 wiz Exp $
 # used by math/xylib/Makefile
 # used by math/xyconvert/Makefile
 
-DISTNAME=      xylib-1.5
+DISTNAME=      xylib-1.6
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=wojdyr/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
@@ -13,6 +13,6 @@ HOMEPAGE=     http://xylib.sourceforge.net/
 
 LICENSE=       gnu-lgpl-v2
 
-USE_LANGUAGES= c c++03
+USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
 GNU_CONFIGURE= yes

Index: pkgsrc/math/xylib/PLIST
diff -u pkgsrc/math/xylib/PLIST:1.5 pkgsrc/math/xylib/PLIST:1.6
--- pkgsrc/math/xylib/PLIST:1.5 Tue Jan  7 13:03:50 2020
+++ pkgsrc/math/xylib/PLIST     Wed Jun  7 06:58:46 2023
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2020/01/07 13:03:50 nros Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/06/07 06:58:46 wiz Exp $
 bin/xyconv
 include/xylib/bruker_raw.h
+include/xylib/bruker_spc.h
 include/xylib/cache.h
 include/xylib/canberra_cnf.h
 include/xylib/canberra_mca.h
@@ -8,7 +9,6 @@ include/xylib/chiplot.h
 include/xylib/cpi.h
 include/xylib/csv.h
 include/xylib/dbws.h
-include/xylib/gsas.h
 include/xylib/pdcif.h
 include/xylib/philips_raw.h
 include/xylib/philips_udf.h
@@ -21,6 +21,8 @@ include/xylib/uxd.h
 include/xylib/vamas.h
 include/xylib/winspec_spe.h
 include/xylib/xfit_xdd.h
+include/xylib/xrdml.h
+include/xylib/xsyg.h
 include/xylib/xylib.h
 lib/libxy.la
 man/man1/xyconv.1

Index: pkgsrc/math/xylib/distinfo
diff -u pkgsrc/math/xylib/distinfo:1.12 pkgsrc/math/xylib/distinfo:1.13
--- pkgsrc/math/xylib/distinfo:1.12     Tue Oct 26 10:56:12 2021
+++ pkgsrc/math/xylib/distinfo  Wed Jun  7 06:58:46 2023
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 10:56:12 nia Exp $
+$NetBSD: distinfo,v 1.13 2023/06/07 06:58:46 wiz Exp $
 
-BLAKE2s (xylib-1.5.tar.bz2) = 9a3dd67772a7859c9c57057a84aeb47d295574e0a0c436c89c709ba021082bc3
-SHA512 (xylib-1.5.tar.bz2) = 67da8653b422fa4b5ffdc9fe19d23f49e36e2692fb3aa98e130511cfe6db46b8e81b30d45cf302a1fe8b6d1a9b776d3c364ecdabb6489f1d7518e2736b6e2210
-Size (xylib-1.5.tar.bz2) = 365316 bytes
-SHA1 (patch-Makefile.in) = 607a06800f945aa5e406e4b0e4f32809e48ed2cf
-SHA1 (patch-configure) = 6ff770c0ccae9ed19514a7abba6c47e030296617
-SHA1 (patch-configure.ac) = cc05a0ec1abf7cca08719c831398eaaa43957cf4
-SHA1 (patch-gui_xyconvert.cpp) = 6739098920d2abbb63a8b0abd9dd89b0b4f4684e
-SHA1 (patch-xylib_util.cpp) = dbdecf2f2694f6febb036be0c9720260eb93f898
+BLAKE2s (xylib-1.6.tar.bz2) = 1458401311e31b230bd95cfbaeb8c9026049d32b2e2647a8e1ea87a9fe8113f8
+SHA512 (xylib-1.6.tar.bz2) = 9861cbf03f8b921a93a2d32a529ff94d77723e2510cd61096b4b85f91af4be6330ed82e8da94bc45dbca7f9814077360d1dae204315b28c2b6d85e3d2c7f6696
+Size (xylib-1.6.tar.bz2) = 370765 bytes
+SHA1 (patch-Makefile.in) = a2baddfb61b80b5a6d781755e97fcac5b2851cf9

Index: pkgsrc/math/xylib/patches/patch-Makefile.in
diff -u pkgsrc/math/xylib/patches/patch-Makefile.in:1.1 pkgsrc/math/xylib/patches/patch-Makefile.in:1.2
--- pkgsrc/math/xylib/patches/patch-Makefile.in:1.1     Tue Jan  7 13:35:44 2020
+++ pkgsrc/math/xylib/patches/patch-Makefile.in Wed Jun  7 06:58:46 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.in,v 1.1 2020/01/07 13:35:44 nros Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2023/06/07 06:58:46 wiz Exp $
 
-* make converters/xyconvert link with pkgsrc xylib
+Link against pkgsrc libxy.
 
---- Makefile.in.orig   2016-12-17 12:46:01.000000000 +0000
+--- Makefile.in.orig   2020-09-14 07:56:17.000000000 +0000
 +++ Makefile.in
 @@ -121,7 +121,7 @@ am__dirstamp = $(am__leading_dot)dirstam
  gui_xyconvert_OBJECTS = $(am_gui_xyconvert_OBJECTS)
@@ -13,12 +13,12 @@ $NetBSD: patch-Makefile.in,v 1.1 2020/01
  AM_V_lt = $(am__v_lt_@AM_V@)
  am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
-@@ -464,7 +464,7 @@ xyconv_LDADD = xylib/libxy.la -lm
+@@ -465,7 +465,7 @@ xyconv_LDADD = xylib/libxy.la -lm
  @BUILD_GUI_TRUE@                      gui/uplot.cpp gui/uplot.h
  
  @BUILD_GUI_TRUE@gui_xyconvert_CPPFLAGS = $(WX_CPPFLAGS) -DXYCONVERT
 -@BUILD_GUI_TRUE@gui_xyconvert_LDADD = $(xyconvert_res) $(WX_LIBS) xylib/libxy.la -lm
-+@BUILD_GUI_TRUE@gui_xyconvert_LDADD = $(xyconvert_res) $(WX_LIBS) -lxy  -lm
++@BUILD_GUI_TRUE@gui_xyconvert_LDADD = $(xyconvert_res) $(WX_LIBS) -lxy -lm
  all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive