CVS commit: pkgsrc/math/fityk

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jun  7 07:03:43 UTC 2023

Modified Files:
        pkgsrc/math/fityk: Makefile PLIST distinfo
Removed Files:
        pkgsrc/math/fityk/patches: patch-aa patch-src_GAfit.cpp
            patch-src_common.h patch-src_data.cpp patch-src_eparser.cpp
            patch-src_guess.cpp patch-src_wxgui_ceria.cpp
            patch-src_wxgui_dload.cpp patch-src_wxgui_frame.cpp

Log Message:
fityk: update to 1.3.2.

User-visible changes in version 1.3.2  (2022-08-06):
* SNIP background (Cristiano Fontana)
* GUI: fixed layout with GTK3
* bug fixes

User-visible changes in version 1.3.1  (2016-12-21):
* GUI: more options in the peak-top menu
* GUI: Tools > XPS KE <-> BE
* added utilities F.findx(), F.extremum(), centile(N, expr), %peak.IB
* bug fixes, as always

User-visible changes in version 1.3.0  (2015-05-25):
* support filenames with non-ascii characters
* simple-variable ~NUM can be followed by domain, e.g.: %f=Linear(~3[2:5], ~8)
  and also default parameters can have domain (...shape=~0.5 [0:1],...),
  Voigt and PseudoVoigt have now shape with default domain [0:1]
* if variable has a domain (example: $a = ~1.2 [-3:4]) then
   "$a = ~3" keeps domain of $a (also "a={$a}; $a=~{a}" preserves domain)
   "$a = ~3 [:]" unsets domain
   "$a = copy($x) - copy $x with domain
* new boolean box_constraints option decides if domains are used as box
  constraints in fitting methods that support it (default: on)
* GUI: added auto-completion to Lua script editor
* xyConvert is now part of xylib (removed flag --disable-xyconvert)
* command "reset" does not reset Lua VM (to allow "reset" from Lua scripts)
* Lua: add Python-style formatting (e.g."%d pigs" % 3) using __mod for strings

User-visible changes in version 1.2.9  (2014-04-13):
* fitting:
  - a few optimization methods from the NLopt library have been added
  - MPFIT and NLopt methods support box constraints
  - simplifications that made using external libraries easier:
    - removed stopping criterium based on iterations. The max. number of
      WSSR evaluations can be used instead.
    - removed fit continuation (fit +N)
* new function Sigmoid and new category of functions (S-shaped/step/sigmoidal)
* GUI: added menu Session > Recent Scripts
* GUI: added checkbox to Functions > Export Peak Parameters
* GUI: added "decimal comma" option to Data > Load dialogs.

User-visible changes in version 1.2.1  (2012-11-05):
* added commands '=' and 'exec=' - shorthands 'lua return' and 'lua F:execute'
* API: default dataset in a few functions changed from @0 to the currently used
* GUI: new dialog GUI > Configure > Default Directories
* a few tweaks and fixes related to printing, and other bug fixes

User-visible changes in version 1.2.0  (2012-05-24):
* added fitting method "mpfit" -- wrapper around MINPACK-1 based MPFIT library
  (http://www.physics.wisc.edu/~craigm/idl/cmpfit.html)
* changed public API of libfityk; now cfityk uses only public API
* added C API and Ruby and Java bindings to libfityk
* enhanced Python API and added Python equivalent of cfityk (samples/cfityk.py)
* CLI: cfityk can be built with libedit (but it works better with readline)
* in scripts, backslash (\) at the end of line means line continuation
* bug fixes, as usually

User-visible changes in version 1.1.1  (2011-09-28):
* option exit_on_warning=0/1 was replaced with on_error=stop/exit; new option
  on_error=nothing allows to ignore errors in script.
* current working directory can be changed using new option `cwd'
* GUI: a new dialog for Model > Export Formula
* minor bug fixes

User-visible changes in version 1.1.0  (2011-07-18):
* embedded Lua (lightweight programming language)
* syntax changes and enhancements in dataset transformations (@n = ...);
  example: "@0 = @0 - 0.23 * @1" removes (background) @1 with y's scaled
  by factor 0.23 from dataset @0; if @0 and @1 have different x's, linear
  interpolation is used.
* added calculation of Polyline derivatives, what enables weighted least
  squares approximation by broken lines
* gzipped fit files can be read directly (extension .fit.gz or .fityk.gz)
* new option max_fitting_time -- stopping criterium based on elapsed time
* GUI: mouse wheel and mouse extra buttons can be used to zoom in/out
* Mac GUI: added Session > New Window that opens new window (open -n Fityk.app)
* GUI: added optional, configurable description in the corner of the main plot
* GUI: Session > Copy to Clipboard works differently and on all platforms now
* GUI: enhanced file dialogs: Data > Quick Load and Session > Save as Image
* fixed all reported bugs

User-visible changes in version 1.0.2  (2011-06-08):
* changed Data > Load File dialog
* fixed a few minor problems and a major one (GUI not working on OSX 10.5)

User-visible changes in version 1.0.1  (2011-03-30):
* corrected calculation of Exponentially Modified Gaussian
* added calculation of confidence intervals
* GUI: anti-aliasing (can be switched off in menu GUI > Anti-aliasing)
* added (experimental) option guess_uses_weights that changes peak "guessing"
* as usually, a few bug fixes and minor changes in the GUI

User-visible changes in version 1.0.0  (2011-03-18):
* fixed bugs: several bugs in the powder diffraction add-on,
  problem with negative simple-variables, crash when the status bar has an
  extra value set
* GUI: several changes necessary to make the program working on OSX (>= 10.4)
* GUI: new configuration dialogs for plots
* GUI: all configs including the default one are now stored in .fityk/configs/
* samples are always installed, removed configure option --with-samples,
  added menu Help > Examples in the GUI
* requires wxWidgets >= 2.9.1

User-visible changes in version 0.9.8  (2011-06-08):
* several bug fixes ported from version 1.0.2
  (unlike 1.x, this version can be built with wxWidgets 2.8)


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/math/fityk/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/fityk/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/math/fityk/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/math/fityk/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/math/fityk/patches/patch-src_GAfit.cpp \
    pkgsrc/math/fityk/patches/patch-src_common.h \
    pkgsrc/math/fityk/patches/patch-src_data.cpp \
    pkgsrc/math/fityk/patches/patch-src_eparser.cpp \
    pkgsrc/math/fityk/patches/patch-src_guess.cpp \
    pkgsrc/math/fityk/patches/patch-src_wxgui_ceria.cpp \
    pkgsrc/math/fityk/patches/patch-src_wxgui_dload.cpp \
    pkgsrc/math/fityk/patches/patch-src_wxgui_frame.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/fityk/Makefile
diff -u pkgsrc/math/fityk/Makefile:1.48 pkgsrc/math/fityk/Makefile:1.49
--- pkgsrc/math/fityk/Makefile:1.48     Sun Jan 29 21:17:03 2023
+++ pkgsrc/math/fityk/Makefile  Wed Jun  7 07:03:43 2023
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2023/01/29 21:17:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.49 2023/06/07 07:03:43 wiz Exp $
 
-DISTNAME=      fityk-0.9.7
-PKGREVISION=   33
+DISTNAME=      fityk-1.3.2
 CATEGORIES=    math
-#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fityk/}
-MASTER_SITES=  https://cloud.github.com/downloads/wojdyr/fityk/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=wojdyr/}
 EXTRACT_SUFX=  .tar.bz2
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://fityk.nieto.pl/
@@ -15,14 +14,12 @@ LICENSE=    gnu-lgpl-v2
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
-# XXX: xyconvert requires wxWidgets >= 2.9
-CONFIGURE_ARGS+=       --disable-xyconvert
-
-CFLAGS.FreeBSD+=       -D_WITH_GETLINE
 
 .include "../../devel/boost-headers/buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+BUILDLINK_API_DEPENDS.xylib+=  xylib>=1.6
 .include "../../math/xylib/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/fityk/PLIST
diff -u pkgsrc/math/fityk/PLIST:1.3 pkgsrc/math/fityk/PLIST:1.4
--- pkgsrc/math/fityk/PLIST:1.3 Fri Mar 11 13:00:12 2011
+++ pkgsrc/math/fityk/PLIST     Wed Jun  7 07:03:43 2023
@@ -1,101 +1,71 @@
-@comment $NetBSD: PLIST,v 1.3 2011/03/11 13:00:12 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/06/07 07:03:43 wiz Exp $
 bin/cfityk
 bin/fityk
-include/fityk.h
+include/fityk/fityk.h
+include/fityk/ui_api.h
 lib/libfityk.la
 man/man1/fityk.1
+share/appdata/fityk.appdata.xml
 share/applications/fityk.desktop
 share/fityk/html/_images/add_peak_icon.png
 share/fityk/html/_images/copyfunc_icon.png
+share/fityk/html/_images/eq_fwhm_icon.png
+share/fityk/html/_images/eq_shape_icon.png
 share/fityk/html/_images/fit_icon.png
 share/fityk/html/_images/fityk-with-tooltip.png
-share/fityk/html/_images/fityk076.png
-share/fityk/html/_images/ico-osx.png
-share/fityk/html/_images/ico-tux.png
-share/fityk/html/_images/ico-win.png
 share/fityk/html/_images/load_data_icon.png
 share/fityk/html/_images/lock_icon.png
-share/fityk/html/_images/math/150d0ed7bec340267e1b148159a2e70ffa5983a7.png
-share/fityk/html/_images/math/19f15eacccc345c3179259320491956f3f23887a.png
-share/fityk/html/_images/math/1ab39d761413804680d26d972381f028001562f5.png
-share/fityk/html/_images/math/23decadd8b245289f5fa993f2c99e0ac9cff56dc.png
-share/fityk/html/_images/math/340fc244db3ba9529e48c3b43d3e3d1d56ab13ac.png
-share/fityk/html/_images/math/349202f044a9aca8885d8084005ea099f1816b94.png
-share/fityk/html/_images/math/38b394ef8f2ecd34817add552d9daa3fe8b9e017.png
-share/fityk/html/_images/math/3dd0773863fdeacd262d797c931a040801c71e90.png
-share/fityk/html/_images/math/412787c048e28774dc63fc27db42dc52ca858de7.png
-share/fityk/html/_images/math/441e7ddea6580ae19be0583f35b648340340f789.png
-share/fityk/html/_images/math/486938d1819df5972cb80ef2d101517b20412366.png
-share/fityk/html/_images/math/566b01428cbc7f85e5dcac822761913d6fd48795.png
-share/fityk/html/_images/math/572b65ebc3f438b176b4ca4a890799f2f72564af.png
-share/fityk/html/_images/math/5e97a8af68fbc8e357d3ee0eba452022b06c1875.png
-share/fityk/html/_images/math/61c594c97b61f72af93af4e61894b3f16a3bbb30.png
-share/fityk/html/_images/math/695f416425dbcafe8c762a1e8c533023350a525d.png
-share/fityk/html/_images/math/707fc7dbf98d8f4f39c6bdf3f6c025ed948789c9.png
-share/fityk/html/_images/math/727873d2cbeda3d30f41bee18cb2bf5ea1071fa1.png
-share/fityk/html/_images/math/7508455f7c089e149392451dec57d771370d63ce.png
-share/fityk/html/_images/math/7532b41a34c9ca592694135d1de65eeb8d9ce036.png
-share/fityk/html/_images/math/7567e40901ed423f42f5fc972bca0fd2d311ec40.png
-share/fityk/html/_images/math/75870e6ce52429cdac61f596a15826f179ae817e.png
-share/fityk/html/_images/math/98327fe212a6e72966017a3e21780935b66080f8.png
-share/fityk/html/_images/math/9e9c8a0fb6a92d4c3f969ab7a959a80f3069e3c9.png
-share/fityk/html/_images/math/9f4a323840470c45eb00c5896ba579edc0f0799f.png
-share/fityk/html/_images/math/9fabdcba50c720ea1ae42cd0b4f1d3eb5f367e56.png
-share/fityk/html/_images/math/a1f49d0ef1ed40eddc5de7055dc1378db1e4a95c.png
-share/fityk/html/_images/math/a61c1e51680e27d35d05bebed87d474972fc70bd.png
-share/fityk/html/_images/math/b57aa88ab6df026b38afcb2ab1261d9a05d36bf5.png
-share/fityk/html/_images/math/b72439b28d639f1999aeecd537d21df605ad8db8.png
-share/fityk/html/_images/math/bcdaf43e7130e8f85d7721440139a9481b23e631.png
-share/fityk/html/_images/math/bea4d576937a04ec200b1037fc8ee33e8f744cb1.png
-share/fityk/html/_images/math/c1bc1d463e6642b69aecd742fefeb4bce4bd3d52.png
-share/fityk/html/_images/math/c2ec895a1a42f04814ac1e370c4b8ca8fb702167.png
-share/fityk/html/_images/math/d3d29774850d1fa81d750fef3ed9b65ee66c524e.png
-share/fityk/html/_images/math/d3e7d7cd926970086d34700ac3f979eac398132a.png
-share/fityk/html/_images/math/d953af3188b3c252a5220e76255e375ee0afaf07.png
-share/fityk/html/_images/math/db9d47c742259fffb7665882158a7b507cb9f052.png
-share/fityk/html/_images/math/deaf305680f8dc36524842ef15f13f33789dbbd4.png
-share/fityk/html/_images/math/e847b12d44bdb9991047fa3001a2d1f23a077769.png
-share/fityk/html/_images/math/ee5c7c921b3334f6ecf58c241eeea42acf0ce71e.png
 share/fityk/html/_images/mode_add_icon.png
 share/fityk/html/_images/mode_bg_icon.png
 share/fityk/html/_images/mode_range_icon.png
+share/fityk/html/_images/mode_zoom.png
 share/fityk/html/_images/open_lock_icon.png
 share/fityk/html/_images/strip_bg_icon.png
 share/fityk/html/_images/zoom_all.png
-share/fityk/html/_sources/data.txt
-share/fityk/html/_sources/fit.txt
-share/fityk/html/_sources/fityk-manual.txt
-share/fityk/html/_sources/getstarted.txt
-share/fityk/html/_sources/index.txt
-share/fityk/html/_sources/intro.txt
-share/fityk/html/_sources/lang.txt
-share/fityk/html/_sources/model.txt
-share/fityk/html/_sources/ref.txt
+share/fityk/html/_static/_sphinx_javascript_frameworks_compat.js
 share/fityk/html/_static/basic.css
-share/fityk/html/_static/contents.png
 share/fityk/html/_static/doctools.js
+share/fityk/html/_static/documentation_options.js
 share/fityk/html/_static/file.png
-share/fityk/html/_static/fityk-banner.png
-share/fityk/html/_static/fityk.css
+share/fityk/html/_static/fitheme.css
+share/fityk/html/_static/fityk-logo.png
 share/fityk/html/_static/fityk.ico
+share/fityk/html/_static/jquery-3.6.0.js
 share/fityk/html/_static/jquery.js
+share/fityk/html/_static/language_data.js
 share/fityk/html/_static/minus.png
-share/fityk/html/_static/navigation.png
+share/fityk/html/_static/mouse16.png
 share/fityk/html/_static/plus.png
 share/fityk/html/_static/pygments.css
 share/fityk/html/_static/searchtools.js
-share/fityk/html/_static/sphinxdoc.css
+share/fityk/html/_static/underscore-1.13.1.js
 share/fityk/html/_static/underscore.js
 share/fityk/html/data.html
 share/fityk/html/fit.html
 share/fityk/html/fityk-manual.html
 share/fityk/html/getstarted.html
-share/fityk/html/index.html
 share/fityk/html/intro.html
-share/fityk/html/lang.html
 share/fityk/html/model.html
 share/fityk/html/ref.html
+share/fityk/html/script.html
 share/fityk/html/search.html
 share/fityk/html/searchindex.js
+share/fityk/samples/README
+share/fityk/samples/SiC_Zn.dat
+share/fityk/samples/SiC_Zn.fit
+share/fityk/samples/cfityk.py
+share/fityk/samples/enso.dat
+share/fityk/samples/enso.fit
+share/fityk/samples/hello.c
+share/fityk/samples/hello.cc
+share/fityk/samples/hello.java
+share/fityk/samples/hello.lua
+share/fityk/samples/hello.pl
+share/fityk/samples/hello.py
+share/fityk/samples/hello.rb
+share/fityk/samples/nacl01.dat
+share/fityk/samples/nacl01.fit
+share/fityk/samples/read-shockley.fit
+share/icons/hicolor/32x32/apps/fityk.png
+share/icons/hicolor/scalable/apps/fityk.svg
 share/mime/packages/fityk.xml
-share/pixmaps/fityk.png

Index: pkgsrc/math/fityk/distinfo
diff -u pkgsrc/math/fityk/distinfo:1.10 pkgsrc/math/fityk/distinfo:1.11
--- pkgsrc/math/fityk/distinfo:1.10     Tue Oct 26 10:55:40 2021
+++ pkgsrc/math/fityk/distinfo  Wed Jun  7 07:03:43 2023
@@ -1,14 +1,5 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:55:40 nia Exp $
+$NetBSD: distinfo,v 1.11 2023/06/07 07:03:43 wiz Exp $
 
-BLAKE2s (fityk-0.9.7.tar.bz2) = be30c77b80d910399a3c3f264926d3f6b53d47aaf4ac701f809d01511d1e0102
-SHA512 (fityk-0.9.7.tar.bz2) = bb5a5ce05a8cf0557e638470123b367c00892d87cc2d503879cf6b393dd820c6a5cf78980c9680cfc2d547be367a9c968334c95170f420e42be4e7025bf14a4c
-Size (fityk-0.9.7.tar.bz2) = 1146628 bytes
-SHA1 (patch-aa) = c923919db013ca9ddb8370617bf0b4b0aaa31922
-SHA1 (patch-src_GAfit.cpp) = 6543899d3861853d0738bbb5ced2cc9f59fda6db
-SHA1 (patch-src_common.h) = 1ab3f9d0c72c1f4bb0740a22ccc7960fb18b4c90
-SHA1 (patch-src_data.cpp) = b3aa6c9561a117b93e0447786c9fb4ca50d9438f
-SHA1 (patch-src_eparser.cpp) = 6120b71f1bcafc1efc5b774426955084739a42c0
-SHA1 (patch-src_guess.cpp) = 2379b3bc3de4d24a8c5a2781c27b8eeccbb516c2
-SHA1 (patch-src_wxgui_ceria.cpp) = d3d07180b20b563c67d1bb7316d38ef64ff91a8a
-SHA1 (patch-src_wxgui_dload.cpp) = 08df6c1d5d7cc859927e452450379363710f0a0a
-SHA1 (patch-src_wxgui_frame.cpp) = d3b24c7babb143f0a4e50186b418c45e908e26de
+BLAKE2s (fityk-1.3.2.tar.bz2) = 93302037871d833b696f204f58d2bbb154d3719cb22f37bcddf125bb798a199a
+SHA512 (fityk-1.3.2.tar.bz2) = 6871358cc1d12479f4ae8d76260412095fa17247b2bd76d7b036be330d73b8aac6d242239aea5c086a2eefad1bc387caa83e5a61452016cd77ea6a88e387aee3
+Size (fityk-1.3.2.tar.bz2) = 1611794 bytes