3 files changed, 21 insertions, 25 deletions

diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index 5315adef09a3..7b6e47118346 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	fityk
-PORTVERSION=	0.7.4
+PORTVERSION=	0.7.5
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,16 +16,16 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free peak fitting software
 
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-LIB_DEPENDS=	boost_thread.3:${PORTSDIR}/devel/boost \
-		wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
+LIB_DEPENDS=	boost_thread.3:${PORTSDIR}/devel/boost
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget gtk20
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS+=	--with-wx-config=wxgtk2-2.6-config
 
 MAN1=		fityk.1
 PLIST_FILES=	bin/cfityk \
diff --git a/math/fityk/distinfo b/math/fityk/distinfo
index dc6a32fc7d2b..0fa74f982f35 100644
--- a/math/fityk/distinfo
+++ b/math/fityk/distinfo
@@ -1,3 +1,3 @@
-MD5 (fityk-0.7.4.tar.bz2) = 4424655063ec577d9c6f0914c185dfce
-SHA256 (fityk-0.7.4.tar.bz2) = 8c22fee225c9ebaf3c33bc28322cd924b6912719d9369cac6a2fb67235329f5f
-SIZE (fityk-0.7.4.tar.bz2) = 1036838
+MD5 (fityk-0.7.5.tar.bz2) = 5c172310ca92e18284996f690088cd04
+SHA256 (fityk-0.7.5.tar.bz2) = 32e5f5368ce618f50167dd57eac9cc620de21f02ac319d119b2fde46c3791879
+SIZE (fityk-0.7.5.tar.bz2) = 1055535
diff --git a/math/fityk/pkg-descr b/math/fityk/pkg-descr
index 8974ff305c64..786ad3f7d422 100644
--- a/math/fityk/pkg-descr
+++ b/math/fityk/pkg-descr
@@ -1,22 +1,18 @@
-Fityk is a general-purpose nonlinear curve fitting and data analysis software.
+Fityk is a program for nonlinear fitting of analytical functions (especially 
+peak-shaped) to data (usually experimental data). There are also people using
+it only to display data or to remove baseline from data.
 
-Although it is being developed to analyze powder diffraction patterns, it can
-be used to fit analytical functions to any kind of data: crystallographic
-module is an independent part of the program. Apart from crystallography fityk
-is reported to be used also in chromatography, photoluminescence, infrared and
-Raman spectroscopy, and in other fields.
+It is reported to be used in crystallography, chromatography,
+photoluminescence, infrared and Raman spectroscopy and other fields.
 
-At present fityk knows only about common peak-shaped functions (Gaussian,
-Lorentzian, Voigt, Pearson VII etc.) and polynomial. User-defined functions
-will be implemented in 2005.
+Fityk knows about common peak-shaped functions (Gaussian, Lorentzian, Voigt,
+Pearson VII, bifurcated Gaussian, EMG, Doniach-Sunjic, etc.) and polynomials.
+It also supports user-defined functions.
 
-In terms of powder diffraction fityk will fit the data with a set of position-
-correlated peaks to give the refined lattice parameters, zero-shift, sample
-displacement and wavelength.
+Fityk offers intuitive graphical interface (and also command line interface),
+variouse optimization methods (standard Marquardt least-square algorithm,
+Genetic Algorithms, Nelder-Mead simplex), equality constraints, modelling
+error of x coordinate of points (eg. zero-shift of instrument), handling
+series of datasets, automation of common tasks with scripts, and more.
 
-Fityk offers everything a decent refinement program should offer but first of
-all intuitive graphical interface. Apart from the standard Marquardt least-
-square algorithm one may choose a genetic algorithm or Nelder-Mead simplex
-method for complex or unstable cases.
-
-WWW: http://fityk.sourceforge.net/
+WWW: http://www.unipress.waw.pl/fityk/