6 files changed, 52 insertions, 10 deletions

diff --git a/science/kst/Makefile b/science/kst/Makefile
index f06cc59308d1..b93a0600c17b 100644
--- a/science/kst/Makefile
+++ b/science/kst/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kst
-PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTVERSION=	1.7.0
 CATEGORIES=	science kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/apps/KDE3.x/scientific
diff --git a/science/kst/distinfo b/science/kst/distinfo
index c36efff634c4..a8a96b21dc8d 100644
--- a/science/kst/distinfo
+++ b/science/kst/distinfo
@@ -1,3 +1,3 @@
-MD5 (kst-1.6.0.tar.gz) = 450824ca26e19e5b71358c6740152015
-SHA256 (kst-1.6.0.tar.gz) = 15ea2a7e0e36d4335f181c74ce9eea574fd0925419e8b90ee41c5e90d48f23c0
-SIZE (kst-1.6.0.tar.gz) = 17412258
+MD5 (kst-1.7.0.tar.gz) = 69db059134c9f9df0875ce89f5b178f7
+SHA256 (kst-1.7.0.tar.gz) = 8325c248675e5bbfa0367de25971ae62dad45bf76524676b95fa1d0b812ae637
+SIZE (kst-1.7.0.tar.gz) = 27908251
diff --git a/science/kst/pkg-plist b/science/kst/pkg-plist
index 7bcd02201e10..b0a50de34d5a 100644
--- a/science/kst/pkg-plist
+++ b/science/kst/pkg-plist
@@ -79,6 +79,9 @@ lib/kde3/kstobject_binnedmap.so
 lib/kde3/kstobject_chop.a
 lib/kde3/kstobject_chop.la
 lib/kde3/kstobject_chop.so
+lib/kde3/kstobject_combine.a
+lib/kde3/kstobject_combine.la
+lib/kde3/kstobject_combine.so
 lib/kde3/kstobject_convolve.a
 lib/kde3/kstobject_convolve.la
 lib/kde3/kstobject_convolve.so
@@ -136,6 +139,9 @@ lib/kde3/kstobject_statistics.so
 lib/kde3/kstobject_syncbin.a
 lib/kde3/kstobject_syncbin.la
 lib/kde3/kstobject_syncbin.so
+lib/kde3/kstobject_trim.a
+lib/kde3/kstobject_trim.la
+lib/kde3/kstobject_trim.so
 lib/kde3/kstplugins/butterworth_bandpass.a
 lib/kde3/kstplugins/butterworth_bandpass.la
 lib/kde3/kstplugins/butterworth_bandpass.so
@@ -308,7 +314,12 @@ share/config/colors/IDL 38 Rainbow18
 share/config/colors/IDL 39 Rainbow-White
 share/config/colors/IDL 40 Rainbow-Black
 share/config/colors/Kst Colors
+share/config/colors/Kst Gamma0.3
+share/config/colors/Kst Gamma0.4
+share/config/colors/Kst Gamma0.5
+share/config/colors/Kst Gamma0.7
 share/config/colors/Kst Grayscale 256
+share/config/colors/Kst Log Greyscale
 share/config/colors/Kst Spectrum 1021
 share/doc/HTML/da/kst/additionalformats-chapter.docbook
 share/doc/HTML/da/kst/commandline-chapter.docbook
@@ -380,6 +391,7 @@ share/doc/HTML/en/kst/Icon-kst-string.png
 share/doc/HTML/en/kst/Icon-kst-tiedzoom.png
 share/doc/HTML/en/kst/Icon-kst-xmousezoom.png
 share/doc/HTML/en/kst/Icon-kst-xymousezoom.png
+share/doc/HTML/en/kst/KstHandbook.pdf
 share/doc/HTML/en/kst/Screenshot-ch3-spect-eg.png
 share/doc/HTML/en/kst/Screenshot-icons-changedatafile.png
 share/doc/HTML/en/kst/Screenshot-icons-changedatasamplerange.png
@@ -577,13 +589,21 @@ share/doc/HTML/en/kst/additionalformats-chapter.docbook
 share/doc/HTML/en/kst/commandline-chapter.docbook
 share/doc/HTML/en/kst/common
 share/doc/HTML/en/kst/commontasks-chapter.docbook
+share/doc/HTML/en/kst/creatingcplugin.html
+share/doc/HTML/en/kst/creatingdataobjectplugin.html
+share/doc/HTML/en/kst/creatingnonlinearfitplugin.html
 share/doc/HTML/en/kst/creatingplugins-chapter.docbook
 share/doc/HTML/en/kst/data-chapter.docbook
+share/doc/HTML/en/kst/data-sources.html
+share/doc/HTML/en/kst/data-tools.html
+share/doc/HTML/en/kst/data-types.html
+share/doc/HTML/en/kst/data.html
 share/doc/HTML/en/kst/dcop-chapter.docbook
 share/doc/HTML/en/kst/equation-appendix.docbook
 share/doc/HTML/en/kst/extensions-chapter.docbook
 share/doc/HTML/en/kst/index.cache.bz2
 share/doc/HTML/en/kst/index.docbook
+share/doc/HTML/en/kst/index.html
 share/doc/HTML/en/kst/install-chapter.docbook
 share/doc/HTML/en/kst/intro-chapter.docbook
 share/doc/HTML/en/kst/kst.1
@@ -1040,6 +1060,7 @@ share/services/kst/kstobject_autocorrelate.desktop
 share/services/kst/kstobject_bin.desktop
 share/services/kst/kstobject_binnedmap.desktop
 share/services/kst/kstobject_chop.desktop
+share/services/kst/kstobject_combine.desktop
 share/services/kst/kstobject_convolve.desktop
 share/services/kst/kstobject_crosscorrelate.desktop
 share/services/kst/kstobject_crossspectrum.desktop
@@ -1059,6 +1080,7 @@ share/services/kst/kstobject_polynomial.desktop
 share/services/kst/kstobject_shift.desktop
 share/services/kst/kstobject_statistics.desktop
 share/services/kst/kstobject_syncbin.desktop
+share/services/kst/kstobject_trim.desktop
 share/servicetypes/kst/kstbasicplugin.desktop
 share/servicetypes/kst/kstdataobjectplugin.desktop
 share/servicetypes/kst/kstdatasourceplugin.desktop
diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index f06cc59308d1..b93a0600c17b 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kst
-PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTVERSION=	1.7.0
 CATEGORIES=	science kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/apps/KDE3.x/scientific
diff --git a/science/kst2/distinfo b/science/kst2/distinfo
index c36efff634c4..a8a96b21dc8d 100644
--- a/science/kst2/distinfo
+++ b/science/kst2/distinfo
@@ -1,3 +1,3 @@
-MD5 (kst-1.6.0.tar.gz) = 450824ca26e19e5b71358c6740152015
-SHA256 (kst-1.6.0.tar.gz) = 15ea2a7e0e36d4335f181c74ce9eea574fd0925419e8b90ee41c5e90d48f23c0
-SIZE (kst-1.6.0.tar.gz) = 17412258
+MD5 (kst-1.7.0.tar.gz) = 69db059134c9f9df0875ce89f5b178f7
+SHA256 (kst-1.7.0.tar.gz) = 8325c248675e5bbfa0367de25971ae62dad45bf76524676b95fa1d0b812ae637
+SIZE (kst-1.7.0.tar.gz) = 27908251
diff --git a/science/kst2/pkg-plist b/science/kst2/pkg-plist
index 7bcd02201e10..b0a50de34d5a 100644
--- a/science/kst2/pkg-plist
+++ b/science/kst2/pkg-plist
@@ -79,6 +79,9 @@ lib/kde3/kstobject_binnedmap.so
 lib/kde3/kstobject_chop.a
 lib/kde3/kstobject_chop.la
 lib/kde3/kstobject_chop.so
+lib/kde3/kstobject_combine.a
+lib/kde3/kstobject_combine.la
+lib/kde3/kstobject_combine.so
 lib/kde3/kstobject_convolve.a
 lib/kde3/kstobject_convolve.la
 lib/kde3/kstobject_convolve.so
@@ -136,6 +139,9 @@ lib/kde3/kstobject_statistics.so
 lib/kde3/kstobject_syncbin.a
 lib/kde3/kstobject_syncbin.la
 lib/kde3/kstobject_syncbin.so
+lib/kde3/kstobject_trim.a
+lib/kde3/kstobject_trim.la
+lib/kde3/kstobject_trim.so
 lib/kde3/kstplugins/butterworth_bandpass.a
 lib/kde3/kstplugins/butterworth_bandpass.la
 lib/kde3/kstplugins/butterworth_bandpass.so
@@ -308,7 +314,12 @@ share/config/colors/IDL 38 Rainbow18
 share/config/colors/IDL 39 Rainbow-White
 share/config/colors/IDL 40 Rainbow-Black
 share/config/colors/Kst Colors
+share/config/colors/Kst Gamma0.3
+share/config/colors/Kst Gamma0.4
+share/config/colors/Kst Gamma0.5
+share/config/colors/Kst Gamma0.7
 share/config/colors/Kst Grayscale 256
+share/config/colors/Kst Log Greyscale
 share/config/colors/Kst Spectrum 1021
 share/doc/HTML/da/kst/additionalformats-chapter.docbook
 share/doc/HTML/da/kst/commandline-chapter.docbook
@@ -380,6 +391,7 @@ share/doc/HTML/en/kst/Icon-kst-string.png
 share/doc/HTML/en/kst/Icon-kst-tiedzoom.png
 share/doc/HTML/en/kst/Icon-kst-xmousezoom.png
 share/doc/HTML/en/kst/Icon-kst-xymousezoom.png
+share/doc/HTML/en/kst/KstHandbook.pdf
 share/doc/HTML/en/kst/Screenshot-ch3-spect-eg.png
 share/doc/HTML/en/kst/Screenshot-icons-changedatafile.png
 share/doc/HTML/en/kst/Screenshot-icons-changedatasamplerange.png
@@ -577,13 +589,21 @@ share/doc/HTML/en/kst/additionalformats-chapter.docbook
 share/doc/HTML/en/kst/commandline-chapter.docbook
 share/doc/HTML/en/kst/common
 share/doc/HTML/en/kst/commontasks-chapter.docbook
+share/doc/HTML/en/kst/creatingcplugin.html
+share/doc/HTML/en/kst/creatingdataobjectplugin.html
+share/doc/HTML/en/kst/creatingnonlinearfitplugin.html
 share/doc/HTML/en/kst/creatingplugins-chapter.docbook
 share/doc/HTML/en/kst/data-chapter.docbook
+share/doc/HTML/en/kst/data-sources.html
+share/doc/HTML/en/kst/data-tools.html
+share/doc/HTML/en/kst/data-types.html
+share/doc/HTML/en/kst/data.html
 share/doc/HTML/en/kst/dcop-chapter.docbook
 share/doc/HTML/en/kst/equation-appendix.docbook
 share/doc/HTML/en/kst/extensions-chapter.docbook
 share/doc/HTML/en/kst/index.cache.bz2
 share/doc/HTML/en/kst/index.docbook
+share/doc/HTML/en/kst/index.html
 share/doc/HTML/en/kst/install-chapter.docbook
 share/doc/HTML/en/kst/intro-chapter.docbook
 share/doc/HTML/en/kst/kst.1
@@ -1040,6 +1060,7 @@ share/services/kst/kstobject_autocorrelate.desktop
 share/services/kst/kstobject_bin.desktop
 share/services/kst/kstobject_binnedmap.desktop
 share/services/kst/kstobject_chop.desktop
+share/services/kst/kstobject_combine.desktop
 share/services/kst/kstobject_convolve.desktop
 share/services/kst/kstobject_crosscorrelate.desktop
 share/services/kst/kstobject_crossspectrum.desktop
@@ -1059,6 +1080,7 @@ share/services/kst/kstobject_polynomial.desktop
 share/services/kst/kstobject_shift.desktop
 share/services/kst/kstobject_statistics.desktop
 share/services/kst/kstobject_syncbin.desktop
+share/services/kst/kstobject_trim.desktop
 share/servicetypes/kst/kstbasicplugin.desktop
 share/servicetypes/kst/kstdataobjectplugin.desktop
 share/servicetypes/kst/kstdatasourceplugin.desktop