Update to 2.0.5

5 files changed, 29 insertions, 33 deletions

diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index 2a0c4be69c00..24b86b538fa0 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kst
-DISTVERSION=	2.0.4
+DISTVERSION=	2.0.5
 CATEGORIES=	science kde
 MASTER_SITES=	SF/${PORTNAME}/Kst%20${DISTVERSION:C/-r.*//}/
 
@@ -27,6 +27,7 @@ CMAKE_SOURCE_PATH=	${WRKSRC}/cmake
 CMAKE_ARGS+=	-Dkst_install_prefix=${PREFIX}
 
 MAN1=		kst2.1
+PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
 OPTIONS=	FITS "Support for data in FITS format" off \
 		NETCDF "Support for data in NetCDF format" off
diff --git a/science/kst2/distinfo b/science/kst2/distinfo
index fecb852e08b7..3bb7e9c78c1b 100644
--- a/science/kst2/distinfo
+++ b/science/kst2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kst-2.0.4.tar.gz) = 026774411ce919de6831139c378f632b2493bc31c39f901f5f4da712eb538da3
-SIZE (kst-2.0.4.tar.gz) = 10836992
+SHA256 (kst-2.0.5.tar.gz) = f64b0c44e2728afbb0a1c6fcf2fe792c9e412f1c8f15f882670463431cca353a
+SIZE (kst-2.0.5.tar.gz) = 11398465
diff --git a/science/kst2/files/patch-cmake__CMakeLists.txt b/science/kst2/files/patch-cmake__CMakeLists.txt
index a537f7f5027a..dba8d813ca73 100644
--- a/science/kst2/files/patch-cmake__CMakeLists.txt
+++ b/science/kst2/files/patch-cmake__CMakeLists.txt
@@ -1,24 +1,30 @@
---- ./cmake/CMakeLists.txt.orig	2011-09-12 15:34:28.000000000 +0000
-+++ ./cmake/CMakeLists.txt	2011-10-15 00:37:11.813906096 +0000
-@@ -37,7 +37,7 @@
+--- ./cmake/CMakeLists.txt.orig	2012-05-11 22:16:54.000000000 +0000
++++ ./cmake/CMakeLists.txt	2012-05-13 16:13:25.632207723 +0000
+@@ -41,19 +41,12 @@
+ message(STATUS)
+ 
+ 
+-if(kst_release)
+-	set(CMAKE_BUILD_TYPE Release)
+-else()
+-	set(CMAKE_BUILD_TYPE Debug)
+-endif()
+-
+-
+ set(kst_version_major 2)
+ if(kst_version_string)
  	set(kst_version ${kst_version_string})
  else()
  	set(kst_version_minor 0)
 -	set(kst_version_patch x)
-+	set(kst_version_patch 4)
++	set(kst_version_patch 5)
  	set(kst_version ${kst_version_major}.${kst_version_minor}.${kst_version_patch})
  endif()
  
-@@ -101,17 +101,6 @@
- 
+@@ -133,11 +126,6 @@
  # React on options
  
--if(kst_release)
--	set(CMAKE_BUILD_TYPE Release)
--else()
--	set(CMAKE_BUILD_TYPE Debug)
--endif()
--
+ 
 -if(kst_verbose)
 -	set(CMAKE_VERBOSE_MAKEFILE 1)
 -else()
@@ -27,7 +33,7 @@
  
  if(kst_install_prefix)
  	set(CMAKE_INSTALL_PREFIX ${kst_install_prefix} CACHE PATH "User's choice for install prefix" FORCE)
-@@ -135,7 +124,7 @@
+@@ -161,7 +149,7 @@
  endif()
  
  #path to install the .desktop files
@@ -36,7 +42,7 @@
  
  
  
-@@ -182,7 +171,9 @@
+@@ -210,7 +198,9 @@
  
  configure_file(${kst_dir}/cmake/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
  
@@ -47,11 +53,11 @@
  
  message(STATUS "Build summary----------------------------------")
  message(STATUS)
-@@ -208,7 +199,6 @@
+@@ -236,7 +226,6 @@
  endif()
  
  if (NOT APPLE)
 -	add_subdirectory(misc)
  endif()
  
- 
+ if(kst_python)
diff --git a/science/kst2/files/patch-r1250995.cpp b/science/kst2/files/patch-r1250995.cpp
deleted file mode 100644
index ac262bf55e61..000000000000
--- a/science/kst2/files/patch-r1250995.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/widgets/cclineedit.cpp	2011/08/31 19:42:34	1250623
-+++ ./src/widgets/cclineedit.cpp	2011/09/02 16:27:48	1250995
-@@ -582,7 +582,7 @@
- }
- 
- #define SIZE_LIMITED_NAME sizeLimitedName( (_cc&&_cc->_tableView)?_cc->_tableView->font():QFont(), \
--    (_cc&&_cc->_tableView)? ((_cc->_tableView->width()/2-50)): 900000000000)
-+    (_cc&&_cc->_tableView)? ((_cc->_tableView->width()/2-50)): INT_MAX)
- 
- void SVCCLineEdit::fillKstObjects()
- {
diff --git a/science/kst2/pkg-plist b/science/kst2/pkg-plist
index 11cea7fe807b..e1edc5d66e72 100644
--- a/science/kst2/pkg-plist
+++ b/science/kst2/pkg-plist
@@ -53,13 +53,13 @@ lib/kst2/plugins/libkst2_fits_sinusoid_weighted.so
 lib/libkst2app.a
 lib/libkst2core.so
 lib/libkst2core.so.2
-lib/libkst2core.so.2.0.4
+lib/libkst2core.so.%%SHLIB_VER%%
 lib/libkst2math.so
 lib/libkst2math.so.2
-lib/libkst2math.so.2.0.4
+lib/libkst2math.so.%%SHLIB_VER%%
 lib/libkst2widgets.so
 lib/libkst2widgets.so.2
-lib/libkst2widgets.so.2.0.4
+lib/libkst2widgets.so.%%SHLIB_VER%%
 share/applications/kst2.desktop
 share/icons/hicolor/128x128/apps/application-x-kst.png
 share/icons/hicolor/128x128/apps/kst.png