Update to version 2.6

10 files changed, 14 insertions, 58 deletions

diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile
index ddbf06132c43..57a7e7b48638 100644
--- a/deskutils/kchmviewer-kde4/Makefile
+++ b/deskutils/kchmviewer-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kchmviewer
-PORTVERSION=	2.5
+PORTVERSION=	2.6
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/kchmviewer-kde4/distinfo b/deskutils/kchmviewer-kde4/distinfo
index 1711e0ab88e6..7d7517b1a0a4 100644
--- a/deskutils/kchmviewer-kde4/distinfo
+++ b/deskutils/kchmviewer-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kchmviewer-2.5.tar.gz) = 31aa10f89b92ec5323fef7c26b1e1eed
-SHA256 (kchmviewer-2.5.tar.gz) = 760dcbbaf426113ff6f0a4c5ea3c5023c597b2ec096d2bde8e15635d58827197
-SIZE (kchmviewer-2.5.tar.gz) = 659755
+MD5 (kchmviewer-2.6.tar.gz) = 7898095c413b4262c5aff6bf5fcaf25b
+SHA256 (kchmviewer-2.6.tar.gz) = 25201d7ddb685f9c4ee55d134f61b239e786193cabaa263b4951aeba45045266
+SIZE (kchmviewer-2.6.tar.gz) = 671666
diff --git a/deskutils/kchmviewer-kde4/files/patch-kchmsearchtoolbar.cpp b/deskutils/kchmviewer-kde4/files/patch-kchmsearchtoolbar.cpp
deleted file mode 100644
index c1214cce424a..000000000000
--- a/deskutils/kchmviewer-kde4/files/patch-kchmsearchtoolbar.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/kchmsearchtoolbar.cpp.orig	Sun Dec 11 20:04:40 2005
-+++ src/kchmsearchtoolbar.cpp	Sun Dec 11 20:06:22 2005
-@@ -19,6 +19,9 @@
-  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-  ***************************************************************************/
- 
-+#include <sys/types.h>
-+#include <unistd.h>
-+
- #include <qtoolbutton.h>
- #include <qcombobox.h>
- #include <qlineedit.h>
diff --git a/deskutils/kchmviewer-kde4/files/patch-kqtempfile.cpp b/deskutils/kchmviewer-kde4/files/patch-kqtempfile.cpp
deleted file mode 100644
index a88f4c854c62..000000000000
--- a/deskutils/kchmviewer-kde4/files/patch-kqtempfile.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/kqtempfile.cpp.orig	Sun Dec 11 20:11:50 2005
-+++ src/kqtempfile.cpp	Sun Dec 11 20:12:53 2005
-@@ -20,6 +20,7 @@
-  ***************************************************************************/
- 
- #include <unistd.h>
-+#include <time.h>
- 
- #include "kqtempfile.h"
- 
diff --git a/deskutils/kchmviewer-kde4/files/patch-src-xchmfile.cpp b/deskutils/kchmviewer-kde4/files/patch-src-xchmfile.cpp
index 01e4543826da..8ad9bc4278aa 100644
--- a/deskutils/kchmviewer-kde4/files/patch-src-xchmfile.cpp
+++ b/deskutils/kchmviewer-kde4/files/patch-src-xchmfile.cpp
@@ -1,6 +1,6 @@
---- src/xchmfile.cpp.orig	Mon Jul 25 12:27:20 2005
-+++ src/xchmfile.cpp	Mon Jul 25 12:28:16 2005
-@@ -1189,7 +1189,7 @@
+--- src/xchmfile.cpp.orig	Mon Jul 10 11:44:50 2006
++++ src/xchmfile.cpp	Mon Jul 10 11:45:49 2006
+@@ -1278,7 +1278,7 @@
  		FIXENDIAN32(off_url);
  
  		if ( RetrieveObject ( &m_chmURLSTR, buf, off_url + 8, sizeof(buf) - 1) == 0 )
diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
index ddbf06132c43..57a7e7b48638 100644
--- a/deskutils/kchmviewer/Makefile
+++ b/deskutils/kchmviewer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kchmviewer
-PORTVERSION=	2.5
+PORTVERSION=	2.6
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/kchmviewer/distinfo b/deskutils/kchmviewer/distinfo
index 1711e0ab88e6..7d7517b1a0a4 100644
--- a/deskutils/kchmviewer/distinfo
+++ b/deskutils/kchmviewer/distinfo
@@ -1,3 +1,3 @@
-MD5 (kchmviewer-2.5.tar.gz) = 31aa10f89b92ec5323fef7c26b1e1eed
-SHA256 (kchmviewer-2.5.tar.gz) = 760dcbbaf426113ff6f0a4c5ea3c5023c597b2ec096d2bde8e15635d58827197
-SIZE (kchmviewer-2.5.tar.gz) = 659755
+MD5 (kchmviewer-2.6.tar.gz) = 7898095c413b4262c5aff6bf5fcaf25b
+SHA256 (kchmviewer-2.6.tar.gz) = 25201d7ddb685f9c4ee55d134f61b239e786193cabaa263b4951aeba45045266
+SIZE (kchmviewer-2.6.tar.gz) = 671666
diff --git a/deskutils/kchmviewer/files/patch-kchmsearchtoolbar.cpp b/deskutils/kchmviewer/files/patch-kchmsearchtoolbar.cpp
deleted file mode 100644
index c1214cce424a..000000000000
--- a/deskutils/kchmviewer/files/patch-kchmsearchtoolbar.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/kchmsearchtoolbar.cpp.orig	Sun Dec 11 20:04:40 2005
-+++ src/kchmsearchtoolbar.cpp	Sun Dec 11 20:06:22 2005
-@@ -19,6 +19,9 @@
-  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-  ***************************************************************************/
- 
-+#include <sys/types.h>
-+#include <unistd.h>
-+
- #include <qtoolbutton.h>
- #include <qcombobox.h>
- #include <qlineedit.h>
diff --git a/deskutils/kchmviewer/files/patch-kqtempfile.cpp b/deskutils/kchmviewer/files/patch-kqtempfile.cpp
deleted file mode 100644
index a88f4c854c62..000000000000
--- a/deskutils/kchmviewer/files/patch-kqtempfile.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/kqtempfile.cpp.orig	Sun Dec 11 20:11:50 2005
-+++ src/kqtempfile.cpp	Sun Dec 11 20:12:53 2005
-@@ -20,6 +20,7 @@
-  ***************************************************************************/
- 
- #include <unistd.h>
-+#include <time.h>
- 
- #include "kqtempfile.h"
- 
diff --git a/deskutils/kchmviewer/files/patch-src-xchmfile.cpp b/deskutils/kchmviewer/files/patch-src-xchmfile.cpp
index 01e4543826da..8ad9bc4278aa 100644
--- a/deskutils/kchmviewer/files/patch-src-xchmfile.cpp
+++ b/deskutils/kchmviewer/files/patch-src-xchmfile.cpp
@@ -1,6 +1,6 @@
---- src/xchmfile.cpp.orig	Mon Jul 25 12:27:20 2005
-+++ src/xchmfile.cpp	Mon Jul 25 12:28:16 2005
-@@ -1189,7 +1189,7 @@
+--- src/xchmfile.cpp.orig	Mon Jul 10 11:44:50 2006
++++ src/xchmfile.cpp	Mon Jul 10 11:45:49 2006
+@@ -1278,7 +1278,7 @@
  		FIXENDIAN32(off_url);
  
  		if ( RetrieveObject ( &m_chmURLSTR, buf, off_url + 8, sizeof(buf) - 1) == 0 )