CVS commit: pkgsrc/math

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/math
From: "Niclas Rosenvik" <nros%netbsd.org@localhost>
Date: Tue, 7 Jan 2020 13:35:44 +0000

Module Name:    pkgsrc
Committed By:   nros
Date:           Tue Jan  7 13:35:44 UTC 2020

Modified Files:
        pkgsrc/math: Makefile
        pkgsrc/math/xylib: Makefile.common distinfo
Added Files:
        pkgsrc/math/xyconvert: DESCR Makefile PLIST
        pkgsrc/math/xylib/patches: patch-Makefile.in patch-gui_xyconvert.cpp

Log Message:
Add xyconvert 1.5 to pkgsrc-current

xyconvert is a converter gui for powder diffraction files. It is distributed
with the xylib library.


To generate a diff of this commit:
cvs rdiff -u -r1.450 -r1.451 pkgsrc/math/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/math/xyconvert/DESCR \
    pkgsrc/math/xyconvert/Makefile pkgsrc/math/xyconvert/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/xylib/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/xylib/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/math/xylib/patches/patch-Makefile.in \
    pkgsrc/math/xylib/patches/patch-gui_xyconvert.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/Makefile
diff -u pkgsrc/math/Makefile:1.450 pkgsrc/math/Makefile:1.451
--- pkgsrc/math/Makefile:1.450  Fri Jan  3 05:15:55 2020
+++ pkgsrc/math/Makefile        Tue Jan  7 13:35:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.450 2020/01/03 05:15:55 pho Exp $
+# $NetBSD: Makefile,v 1.451 2020/01/07 13:35:44 nros Exp $
 
 COMMENT=       Mathematics
 
@@ -413,6 +413,7 @@ SUBDIR+=    xldlas
 SUBDIR+=       xlife
 SUBDIR+=       xlispstat
 SUBDIR+=       xmgr
+SUBDIR+=       xyconvert
 SUBDIR+=       xylib
 SUBDIR+=       yacas
 SUBDIR+=       yices2

Index: pkgsrc/math/xylib/Makefile.common
diff -u pkgsrc/math/xylib/Makefile.common:1.1 pkgsrc/math/xylib/Makefile.common:1.2
--- pkgsrc/math/xylib/Makefile.common:1.1       Tue Jan  7 13:03:50 2020
+++ pkgsrc/math/xylib/Makefile.common   Tue Jan  7 13:35:44 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.1 2020/01/07 13:03:50 nros Exp $
-#
+# $NetBSD: Makefile.common,v 1.2 2020/01/07 13:35:44 nros Exp $
 # used by math/xylib/Makefile
-#
+# used by math/xyconvert/Makefile
 
 DISTNAME=      xylib-1.5
 CATEGORIES=    math
@@ -14,9 +13,6 @@ 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/distinfo
diff -u pkgsrc/math/xylib/distinfo:1.8 pkgsrc/math/xylib/distinfo:1.9
--- pkgsrc/math/xylib/distinfo:1.8      Tue Jan  7 13:03:50 2020
+++ pkgsrc/math/xylib/distinfo  Tue Jan  7 13:35:44 2020
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.8 2020/01/07 13:03:50 nros Exp $
+$NetBSD: distinfo,v 1.9 2020/01/07 13:35:44 nros Exp $
 
 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-Makefile.in) = 607a06800f945aa5e406e4b0e4f32809e48ed2cf
+SHA1 (patch-gui_xyconvert.cpp) = 6739098920d2abbb63a8b0abd9dd89b0b4f4684e
 SHA1 (patch-xylib_util.cpp) = 822208cda9a88d1a0912908f1a5871800496e16f

Added files:

Index: pkgsrc/math/xyconvert/DESCR
diff -u /dev/null pkgsrc/math/xyconvert/DESCR:1.1
--- /dev/null   Tue Jan  7 13:35:44 2020
+++ pkgsrc/math/xyconvert/DESCR Tue Jan  7 13:35:44 2020
@@ -0,0 +1,22 @@
+xyconvert is a gui program for converting files that contain x-y data from
+powder diffraction, spectroscopy or other experimental methods.
+
+Supported formats:
+
+-  plain text (CSV or TSV or space-separated-values)
+-  Crystallographic Information File for Powder Diffraction (pdCIF)
+-  Siemens/Bruker UXD
+-  Siemens/Bruker RAW ver. 1/2/3/4
+-  Philips UDF
+-  Philips RD (raw scan) V3
+-  Rigaku DAT
+-  Sietronics Sieray CPI
+-  DBWS/DMPLOT data file
+-  Canberra MCA *(only one of Canberra MCA formats?)*
+-  XFIT/Koalariet XDD
+-  RIET7/LHPM/CSRIET/ILL\_D1A5/PSI\_DMC DAT
+-  Vamas ISO14976
+   *(only experiment modes: SEM or MAPSV or MAPSVDP are supported;
+   only REGULAR scan_mode is supported)*
+-  Princeton Instruments WinSpec SPE
+   *(only 1-D data is supported)*
Index: pkgsrc/math/xyconvert/Makefile
diff -u /dev/null pkgsrc/math/xyconvert/Makefile:1.1
--- /dev/null   Tue Jan  7 13:35:44 2020
+++ pkgsrc/math/xyconvert/Makefile      Tue Jan  7 13:35:44 2020
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2020/01/07 13:35:44 nros Exp $
+#
+
+.include "../../math/xylib/Makefile.common"
+
+PKGNAME=       ${DISTNAME:S/lib/convert/g}
+COMMENT=       Converter for x-y (powder diffraction) data files
+BUILD_TARGET=  gui/xyconvert
+
+DISTINFO_FILE= ../../math/xylib/distinfo
+PATCHDIR=      ../../math/xylib/patches
+
+do-install:
+       ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/gui/xyconvert \
+               ${DESTDIR}${PREFIX}/bin
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../math/xylib/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/xyconvert/PLIST
diff -u /dev/null pkgsrc/math/xyconvert/PLIST:1.1
--- /dev/null   Tue Jan  7 13:35:44 2020
+++ pkgsrc/math/xyconvert/PLIST Tue Jan  7 13:35:44 2020
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2020/01/07 13:35:44 nros Exp $
+bin/xyconvert

Index: pkgsrc/math/xylib/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/math/xylib/patches/patch-Makefile.in:1.1
--- /dev/null   Tue Jan  7 13:35:44 2020
+++ pkgsrc/math/xylib/patches/patch-Makefile.in Tue Jan  7 13:35:44 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/01/07 13:35:44 nros Exp $
+
+* make converters/xyconvert link with pkgsrc xylib
+
+--- Makefile.in.orig   2016-12-17 12:46:01.000000000 +0000
++++ Makefile.in
+@@ -121,7 +121,7 @@ am__dirstamp = $(am__leading_dot)dirstam
+ gui_xyconvert_OBJECTS = $(am_gui_xyconvert_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @BUILD_GUI_TRUE@gui_xyconvert_DEPENDENCIES = $(xyconvert_res) \
+-@BUILD_GUI_TRUE@      $(am__DEPENDENCIES_1) xylib/libxy.la
++@BUILD_GUI_TRUE@      $(am__DEPENDENCIES_1)
+ 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
+ @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
+ all: config.h
+       $(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
Index: pkgsrc/math/xylib/patches/patch-gui_xyconvert.cpp
diff -u /dev/null pkgsrc/math/xylib/patches/patch-gui_xyconvert.cpp:1.1
--- /dev/null   Tue Jan  7 13:35:44 2020
+++ pkgsrc/math/xylib/patches/patch-gui_xyconvert.cpp   Tue Jan  7 13:35:44 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-gui_xyconvert.cpp,v 1.1 2020/01/07 13:35:44 nros Exp $
+
+* show icon in about window
+
+--- gui/xyconvert.cpp.orig     2019-12-29 17:13:23.528063482 +0000
++++ gui/xyconvert.cpp
+@@ -277,6 +277,7 @@ void App::OnAbout(wxCommandEvent&)
+     adi.SetDescription(desc);
+     adi.SetWebSite("http://xylib.sf.net/";);
+     adi.SetCopyright("(C) 2008-2015 Marcin Wojdyr <wojdyr%gmail.com@localhost>");
++    adi.SetIcon(wxIcon(xyconvert48_xpm));
+     wxAboutBox(adi);
+ }
+

Prev by Date: CVS commit: pkgsrc/mail/opendkim
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/mail/opendkim
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index