- Update to 2.7.0.4375

  Announcement and changelog available here:
  http://www.codelite.org/forum/viewtopic.php?f=9&t=1075

4 files changed, 47 insertions, 79 deletions

diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index b87a6e6928ba..c0324732617e 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	codelite
-DISTVERSION=	2.6.0.${SVN_REVISION}
+DISTVERSION=	2.7.0.${SVN_REVISION}
 CATEGORIES=	editors
-MASTER_SITES=	SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION:R}
+MASTER_SITES=	SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION:R:R}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	An Open Source IDE for C/C++
@@ -25,7 +25,7 @@ HAS_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
-SVN_REVISION=	4189
+SVN_REVISION=	4375
 
 .if defined(WITH_CSCOPE)
 RUN_DEPENDS+=	cscope:${PORTSDIR}/devel/cscope
diff --git a/editors/codelite/distinfo b/editors/codelite/distinfo
index df522b5fabef..c46eb6e03a34 100644
--- a/editors/codelite/distinfo
+++ b/editors/codelite/distinfo
@@ -1,3 +1,3 @@
-MD5 (codelite-2.6.0.4189.tar.gz) = 17416a3bb47d6875ac6b178647032bca
-SHA256 (codelite-2.6.0.4189.tar.gz) = 3ff229bb766d77e57c8f5375abe13300fd3adec38d51e11b3e9364e81ad65a8d
-SIZE (codelite-2.6.0.4189.tar.gz) = 6136106
+MD5 (codelite-2.7.0.4375.tar.gz) = 169427f810ee2dd09f8cf015da7153d5
+SHA256 (codelite-2.7.0.4375.tar.gz) = 38806e6321f6386880a04697352a7eb295d6a35a13b3fbd48293ccd9bc3cff67
+SIZE (codelite-2.7.0.4375.tar.gz) = 5919663
diff --git a/editors/codelite/files/patch-CodeLite_clindexerprotocol.cpp b/editors/codelite/files/patch-CodeLite_clindexerprotocol.cpp
index d7a6e43ebb22..64e576bc9628 100644
--- a/editors/codelite/files/patch-CodeLite_clindexerprotocol.cpp
+++ b/editors/codelite/files/patch-CodeLite_clindexerprotocol.cpp
@@ -1,38 +1,38 @@
---- sdk/codelite_indexer/network/clindexerprotocol.cpp.orig	2009-05-26 14:27:26.000000000 +0200
-+++ sdk/codelite_indexer/network/clindexerprotocol.cpp	2009-05-26 14:30:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 	}
- 
- 	if (actual_read != sizeof(buff_len)) {
--		fprintf(stderr, "ERROR: ReadReply: Protocol error: expected %d bytes, got %d. reason: %d\n",
-+		fprintf(stderr, "ERROR: ReadReply: Protocol error: expected %zu bytes, got %zu. reason: %d\n",
- 				sizeof(buff_len),
- 				actual_read,
- 				conn->getLastError());
-@@ -39,7 +39,7 @@
- 	size_t bytes_read(0);
- 	while (bytes_left > 0) {
- 		if ( !conn->read(data+bytes_read, bytes_left, &actual_read, 10000) ) {
--			fprintf(stderr, "ERROR: Protocol error: expected %d bytes, got %d\n", buff_len, actual_read);
-+			fprintf(stderr, "ERROR: Protocol error: expected %zu bytes, got %zu\n", buff_len, actual_read);
- 			return false;
- 		}
- 		bytes_left -= actual_read;
-@@ -71,7 +71,7 @@
- 	}
- 
- 	if (actual_read != sizeof(buff_len)) {
--		fprintf(stderr, "ERROR: Protocol error: expected %d bytes, got %d\n", sizeof(buff_len), actual_read);
-+		fprintf(stderr, "ERROR: Protocol error: expected %zu bytes, got %zu\n", sizeof(buff_len), actual_read);
- 		return false;
- 	}
- 
-@@ -82,7 +82,7 @@
- 	size_t bytes_read(0);
- 	while (bytes_left > 0) {
- 		if ( !conn->read(data+bytes_read, bytes_left, &actual_read, -1) ) {
--			fprintf(stderr, "ERROR: [%s] Protocol error: expected %d bytes, got %d\n", __PRETTY_FUNCTION__, buff_len, actual_read);
-+			fprintf(stderr, "ERROR: [%s] Protocol error: expected %zu bytes, got %zu\n", __PRETTY_FUNCTION__, buff_len, actual_read);
- 			return false;
- 		}
- 		bytes_left -= actual_read;
+--- sdk/codelite_indexer/network/clindexerprotocol.cpp.orig	2010-09-15 11:53:03.000000000 +0000
++++ sdk/codelite_indexer/network/clindexerprotocol.cpp	2010-09-15 11:54:50.000000000 +0000
+@@ -36,7 +36,7 @@
+ 	}

+ 

+ 	if (actual_read != sizeof(buff_len)) {

+-		fprintf(stderr, "ERROR: ReadReply: Protocol error: expected %u bytes, got %u. reason: %d\n",

++		fprintf(stderr, "ERROR: ReadReply: Protocol error: expected %zu bytes, got %zu. reason: %d\n",

+ 				sizeof(buff_len),

+ 				actual_read,

+ 				conn->getLastError());

+@@ -55,7 +55,7 @@
+ 	size_t bytes_read(0);

+ 	while (bytes_left > 0) {

+ 		if ( !conn->read(data+bytes_read, bytes_left, &actual_read, 10000) ) {

+-			fprintf(stderr, "ERROR: Protocol error: expected %u bytes, got %u\n", buff_len, actual_read);

++			fprintf(stderr, "ERROR: Protocol error: expected %zu bytes, got %zu\n", buff_len, actual_read);

+ 			return false;

+ 		}

+ 		bytes_left -= actual_read;

+@@ -78,7 +78,7 @@
+ 	}

+ 

+ 	if (actual_read != sizeof(buff_len)) {

+-		fprintf(stderr, "ERROR: Protocol error: expected %u bytes, got %u\n", sizeof(buff_len), actual_read);

++		fprintf(stderr, "ERROR: Protocol error: expected %zu bytes, got %zu\n", sizeof(buff_len), actual_read);

+ 		return false;

+ 	}

+ 

+@@ -92,7 +92,7 @@
+ 	size_t bytes_read(0);

+ 	while (bytes_left > 0) {

+ 		if ( !conn->read(data+bytes_read, bytes_left, &actual_read, -1) ) {

+-			fprintf(stderr, "ERROR: [%s] Protocol error: expected %u bytes, got %u\n", __PRETTY_FUNCTION__, buff_len, actual_read);

++			fprintf(stderr, "ERROR: [%s] Protocol error: expected %zu bytes, got %zu\n", __PRETTY_FUNCTION__, buff_len, actual_read);

+ 			return false;

+ 		}

+ 		bytes_left -= actual_read;

diff --git a/editors/codelite/pkg-plist b/editors/codelite/pkg-plist
index ba0576533006..3fdd306a82cf 100644
--- a/editors/codelite/pkg-plist
+++ b/editors/codelite/pkg-plist
@@ -6,6 +6,7 @@ bin/codelite_indexer
 bin/codelite_kill_children
 bin/codelite_xterm
 %%DATADIR%%/astyle.sample
+%%DATADIR%%/codelite-icons.zip
 %%DATADIR%%/config/accelerators.conf.default
 %%DATADIR%%/config/build_settings.xml.default
 %%DATADIR%%/config/codelite.xml.default
@@ -20,39 +21,8 @@ bin/codelite_xterm
 %%DATADIR%%/images/recent_workspaces.png
 %%DATADIR%%/images/splashscreen.png
 %%DATADIR%%/index.html
-%%DATADIR%%/lexers/BlackTheme/lexer_asm.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_batch.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_cobra.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_cpp.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_default.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_diff.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_html.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_inno.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_java.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_lua.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_makefile.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_perl.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_properties.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_python.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_script.xml
-%%DATADIR%%/lexers/BlackTheme/lexer_xml.xml
-%%DATADIR%%/lexers/Default/lexer_asm.xml
-%%DATADIR%%/lexers/Default/lexer_batch.xml
-%%DATADIR%%/lexers/Default/lexer_cobra.xml
-%%DATADIR%%/lexers/Default/lexer_cobraAlt.xml
-%%DATADIR%%/lexers/Default/lexer_cpp.xml
-%%DATADIR%%/lexers/Default/lexer_default.xml
-%%DATADIR%%/lexers/Default/lexer_diff.xml
-%%DATADIR%%/lexers/Default/lexer_html.xml
-%%DATADIR%%/lexers/Default/lexer_inno.xml
-%%DATADIR%%/lexers/Default/lexer_java.xml
-%%DATADIR%%/lexers/Default/lexer_lua.xml
-%%DATADIR%%/lexers/Default/lexer_makefile.xml
-%%DATADIR%%/lexers/Default/lexer_perl.xml
-%%DATADIR%%/lexers/Default/lexer_properties.xml
-%%DATADIR%%/lexers/Default/lexer_python.xml
-%%DATADIR%%/lexers/Default/lexer_script.xml
-%%DATADIR%%/lexers/Default/lexer_xml.xml
+%%DATADIR%%/lexers/lexers_black.xml
+%%DATADIR%%/lexers/lexers_default.xml
 %%DATADIR%%/plugins/CodeFormatter.so
 %%DATADIR%%/plugins/ContinuousBuild.so
 %%DATADIR%%/plugins/Copyright.so
@@ -225,8 +195,6 @@ share/applications/codelite.desktop
 @dirrm %%DATADIR%%/plugins/resources
 @dirrm %%DATADIR%%/plugins/debuggers
 @dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/lexers/Default
-@dirrm %%DATADIR%%/lexers/BlackTheme
 @dirrm %%DATADIR%%/lexers
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/config