Add xyconvert 1.5 to pkgsrc-current

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

4 files changed, 43 insertions, 7 deletions

diff --git a/math/xylib/Makefile.common b/math/xylib/Makefile.common
index 34cd4e93a0a..8b966a41c73 100644
--- a/math/xylib/Makefile.common
+++ b/math/xylib/Makefile.common
@@ -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
diff --git a/math/xylib/distinfo b/math/xylib/distinfo
index 2e0945676e0..7a2c7d771ca 100644
--- a/math/xylib/distinfo
+++ b/math/xylib/distinfo
@@ -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
diff --git a/math/xylib/patches/patch-Makefile.in b/math/xylib/patches/patch-Makefile.in
new file mode 100644
index 00000000000..4501abba757
--- /dev/null
+++ b/math/xylib/patches/patch-Makefile.in
@@ -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
+ 
diff --git a/math/xylib/patches/patch-gui_xyconvert.cpp b/math/xylib/patches/patch-gui_xyconvert.cpp
new file mode 100644
index 00000000000..c3bcf9a70bb
--- /dev/null
+++ b/math/xylib/patches/patch-gui_xyconvert.cpp
@@ -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>");
++    adi.SetIcon(wxIcon(xyconvert48_xpm));
+     wxAboutBox(adi);
+ }
+