8 files changed, 42 insertions, 36 deletions

diff --git a/science/kst/Makefile b/science/kst/Makefile
index 0b03c7069f1d..b81c7368941c 100644
--- a/science/kst/Makefile
+++ b/science/kst/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	kst
-PORTVERSION=	1.4.0
+PORTVERSION=	1.5.0
 CATEGORIES=	science kde
-MASTER_SITES=	${MASTER_SITE_KDE} \
-		http://omega.astro.utoronto.ca/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/apps/KDE3.x/scientific
 
-MAINTAINER=	kay_lehmann@web.de
+MAINTAINER=	makc@issp.ac.ru
 COMMENT=	Data viewing program for KDE
 
 LIB_DEPENDS=	cfitsio.0:${PORTSDIR}/astro/cfitsio \
@@ -19,7 +18,8 @@ LIB_DEPENDS=	cfitsio.0:${PORTSDIR}/astro/cfitsio \
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_PERL5_BUILD=yes
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
@@ -41,7 +41,6 @@ PLIST_SUB+=	NETCDF="@comment "
 
 .if defined(WITH_CDF)
 CONFIGURE_ARGS+=LDFLAGS="-lm"
-MAKE_ARGS+=	AUTOMAKE="${TRUE}"
 LIB_DEPENDS+=	cdf.0:${PORTSDIR}/science/cdf
 PLIST_SUB+=	CDF=""
 .else
@@ -49,9 +48,10 @@ CONFIGURE_ARGS+=	--without-cdf
 PLIST_SUB+=	CDF="@comment "
 .endif
 
-post-patch:
-#	@${TOUCH} ${WRKSRC}/kst/kst/ksttimers.h.in
-	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+pre-configure:
+	@(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist)
+	@${REINPLACE_CMD} -e 's|@kde_widgetdir@|@prefix@/lib/kde3/plugins/designer|' \
+		${WRKSRC}/kst/src/widgets/Makefile.in
 .if !defined(WITH_NETCDF)
 	@${REINPLACE_CMD} -e 's| netcdf||g' ${WRKSRC}/kst/src/datasources/Makefile.in
 .endif
diff --git a/science/kst/distinfo b/science/kst/distinfo
index d8dd221585e5..09332ecacd99 100644
--- a/science/kst/distinfo
+++ b/science/kst/distinfo
@@ -1,3 +1,3 @@
-MD5 (kst-1.4.0.tar.gz) = edf8ef2e2f4434722eef1177c1a3a212
-SHA256 (kst-1.4.0.tar.gz) = 215290598556776acf0a969143f261e16f50a4e912ef2a81ee917ee96cf85d93
-SIZE (kst-1.4.0.tar.gz) = 17257929
+MD5 (kst-1.5.0.tar.gz) = 7616e6923635b779016a9822d0ff47d6
+SHA256 (kst-1.5.0.tar.gz) = 993c72a06178236ff61a6553dcc849dfb728256a638f621f957d789c6e98ec53
+SIZE (kst-1.5.0.tar.gz) = 18254051
diff --git a/science/kst/pkg-descr b/science/kst/pkg-descr
index 811af6d549e2..5b92a2f23f32 100644
--- a/science/kst/pkg-descr
+++ b/science/kst/pkg-descr
@@ -15,5 +15,4 @@ for rapid access to plotting data in files. kst can read data from stdin.
 It provides a DCOP interface for remote manipulation, and supports several
 file formats in use in scientific projects around the world.
 
-WWW: http://omega.astro.utoronto.ca/kst/
-WWW: http://extragear.kde.org/apps/kst/
+WWW: http://kst.kde.org/
diff --git a/science/kst/pkg-plist b/science/kst/pkg-plist
index 97859d841a38..4782f197d16d 100644
--- a/science/kst/pkg-plist
+++ b/science/kst/pkg-plist
@@ -19,9 +19,9 @@ include/rwlock.h
 lib/kde3/kstdata_ascii.a
 lib/kde3/kstdata_ascii.la
 lib/kde3/kstdata_ascii.so
-%%CDF%%lib/kde3/kstdata_cdf.so
-%%CDF%%lib/kde3/kstdata_cdf.la
 %%CDF%%lib/kde3/kstdata_cdf.a
+%%CDF%%lib/kde3/kstdata_cdf.la
+%%CDF%%lib/kde3/kstdata_cdf.so
 lib/kde3/kstdata_dirfile.a
 lib/kde3/kstdata_dirfile.la
 lib/kde3/kstdata_dirfile.so
@@ -40,9 +40,9 @@ lib/kde3/kstdata_indirect.so
 lib/kde3/kstdata_lfiio.a
 lib/kde3/kstdata_lfiio.la
 lib/kde3/kstdata_lfiio.so
-%%NETCDF%%lib/kde3/kstdata_netcdf.so
-%%NETCDF%%lib/kde3/kstdata_netcdf.la
 %%NETCDF%%lib/kde3/kstdata_netcdf.a
+%%NETCDF%%lib/kde3/kstdata_netcdf.la
+%%NETCDF%%lib/kde3/kstdata_netcdf.so
 lib/kde3/kstdata_qimagesource.a
 lib/kde3/kstdata_qimagesource.la
 lib/kde3/kstdata_qimagesource.so
@@ -70,6 +70,9 @@ lib/kde3/kstobject_autocorrelate.so
 lib/kde3/kstobject_bin.a
 lib/kde3/kstobject_bin.la
 lib/kde3/kstobject_bin.so
+lib/kde3/kstobject_binnedmap.a
+lib/kde3/kstobject_binnedmap.la
+lib/kde3/kstobject_binnedmap.so
 lib/kde3/kstobject_chop.a
 lib/kde3/kstobject_chop.la
 lib/kde3/kstobject_chop.so
@@ -931,6 +934,7 @@ share/services/kst/kstobject_akima.desktop
 share/services/kst/kstobject_akima_periodic.desktop
 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_convolve.desktop
 share/services/kst/kstobject_crosscorrelate.desktop
diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index 0b03c7069f1d..b81c7368941c 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	kst
-PORTVERSION=	1.4.0
+PORTVERSION=	1.5.0
 CATEGORIES=	science kde
-MASTER_SITES=	${MASTER_SITE_KDE} \
-		http://omega.astro.utoronto.ca/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/apps/KDE3.x/scientific
 
-MAINTAINER=	kay_lehmann@web.de
+MAINTAINER=	makc@issp.ac.ru
 COMMENT=	Data viewing program for KDE
 
 LIB_DEPENDS=	cfitsio.0:${PORTSDIR}/astro/cfitsio \
@@ -19,7 +18,8 @@ LIB_DEPENDS=	cfitsio.0:${PORTSDIR}/astro/cfitsio \
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_PERL5_BUILD=yes
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
@@ -41,7 +41,6 @@ PLIST_SUB+=	NETCDF="@comment "
 
 .if defined(WITH_CDF)
 CONFIGURE_ARGS+=LDFLAGS="-lm"
-MAKE_ARGS+=	AUTOMAKE="${TRUE}"
 LIB_DEPENDS+=	cdf.0:${PORTSDIR}/science/cdf
 PLIST_SUB+=	CDF=""
 .else
@@ -49,9 +48,10 @@ CONFIGURE_ARGS+=	--without-cdf
 PLIST_SUB+=	CDF="@comment "
 .endif
 
-post-patch:
-#	@${TOUCH} ${WRKSRC}/kst/kst/ksttimers.h.in
-	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+pre-configure:
+	@(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist)
+	@${REINPLACE_CMD} -e 's|@kde_widgetdir@|@prefix@/lib/kde3/plugins/designer|' \
+		${WRKSRC}/kst/src/widgets/Makefile.in
 .if !defined(WITH_NETCDF)
 	@${REINPLACE_CMD} -e 's| netcdf||g' ${WRKSRC}/kst/src/datasources/Makefile.in
 .endif
diff --git a/science/kst2/distinfo b/science/kst2/distinfo
index d8dd221585e5..09332ecacd99 100644
--- a/science/kst2/distinfo
+++ b/science/kst2/distinfo
@@ -1,3 +1,3 @@
-MD5 (kst-1.4.0.tar.gz) = edf8ef2e2f4434722eef1177c1a3a212
-SHA256 (kst-1.4.0.tar.gz) = 215290598556776acf0a969143f261e16f50a4e912ef2a81ee917ee96cf85d93
-SIZE (kst-1.4.0.tar.gz) = 17257929
+MD5 (kst-1.5.0.tar.gz) = 7616e6923635b779016a9822d0ff47d6
+SHA256 (kst-1.5.0.tar.gz) = 993c72a06178236ff61a6553dcc849dfb728256a638f621f957d789c6e98ec53
+SIZE (kst-1.5.0.tar.gz) = 18254051
diff --git a/science/kst2/pkg-descr b/science/kst2/pkg-descr
index 811af6d549e2..5b92a2f23f32 100644
--- a/science/kst2/pkg-descr
+++ b/science/kst2/pkg-descr
@@ -15,5 +15,4 @@ for rapid access to plotting data in files. kst can read data from stdin.
 It provides a DCOP interface for remote manipulation, and supports several
 file formats in use in scientific projects around the world.
 
-WWW: http://omega.astro.utoronto.ca/kst/
-WWW: http://extragear.kde.org/apps/kst/
+WWW: http://kst.kde.org/
diff --git a/science/kst2/pkg-plist b/science/kst2/pkg-plist
index 97859d841a38..4782f197d16d 100644
--- a/science/kst2/pkg-plist
+++ b/science/kst2/pkg-plist
@@ -19,9 +19,9 @@ include/rwlock.h
 lib/kde3/kstdata_ascii.a
 lib/kde3/kstdata_ascii.la
 lib/kde3/kstdata_ascii.so
-%%CDF%%lib/kde3/kstdata_cdf.so
-%%CDF%%lib/kde3/kstdata_cdf.la
 %%CDF%%lib/kde3/kstdata_cdf.a
+%%CDF%%lib/kde3/kstdata_cdf.la
+%%CDF%%lib/kde3/kstdata_cdf.so
 lib/kde3/kstdata_dirfile.a
 lib/kde3/kstdata_dirfile.la
 lib/kde3/kstdata_dirfile.so
@@ -40,9 +40,9 @@ lib/kde3/kstdata_indirect.so
 lib/kde3/kstdata_lfiio.a
 lib/kde3/kstdata_lfiio.la
 lib/kde3/kstdata_lfiio.so
-%%NETCDF%%lib/kde3/kstdata_netcdf.so
-%%NETCDF%%lib/kde3/kstdata_netcdf.la
 %%NETCDF%%lib/kde3/kstdata_netcdf.a
+%%NETCDF%%lib/kde3/kstdata_netcdf.la
+%%NETCDF%%lib/kde3/kstdata_netcdf.so
 lib/kde3/kstdata_qimagesource.a
 lib/kde3/kstdata_qimagesource.la
 lib/kde3/kstdata_qimagesource.so
@@ -70,6 +70,9 @@ lib/kde3/kstobject_autocorrelate.so
 lib/kde3/kstobject_bin.a
 lib/kde3/kstobject_bin.la
 lib/kde3/kstobject_bin.so
+lib/kde3/kstobject_binnedmap.a
+lib/kde3/kstobject_binnedmap.la
+lib/kde3/kstobject_binnedmap.so
 lib/kde3/kstobject_chop.a
 lib/kde3/kstobject_chop.la
 lib/kde3/kstobject_chop.so
@@ -931,6 +934,7 @@ share/services/kst/kstobject_akima.desktop
 share/services/kst/kstobject_akima_periodic.desktop
 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_convolve.desktop
 share/services/kst/kstobject_crosscorrelate.desktop