From b0d9fa717d4ed26b94ff079fa4ba0af54d0ffde2 Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Thu, 11 Nov 2010 18:53:13 +0000
Subject: - Update to 2.8.0.4537   Release notes:
 http://codelite.org/forum/viewtopic.php?f=9&t=1169

---
 editors/codelite/Makefile                          |  4 +--
 editors/codelite/distinfo                          |  5 ++-
 .../files/patch-CodeLite_clindexerprotocol.cpp     | 38 ----------------------
 .../files/patch-CodeLite_unixprocess_impl.cpp      | 17 ++++++++++
 4 files changed, 21 insertions(+), 43 deletions(-)
 delete mode 100644 editors/codelite/files/patch-CodeLite_clindexerprotocol.cpp
 create mode 100644 editors/codelite/files/patch-CodeLite_unixprocess_impl.cpp

(limited to 'editors')

diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index c0324732617e..35e506f232db 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	codelite
-DISTVERSION=	2.7.0.${SVN_REVISION}
+DISTVERSION=	2.8.0.${SVN_REVISION}
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION:R:R}
 
@@ -25,7 +25,7 @@ HAS_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
-SVN_REVISION=	4375
+SVN_REVISION=	4537
 
 .if defined(WITH_CSCOPE)
 RUN_DEPENDS+=	cscope:${PORTSDIR}/devel/cscope
diff --git a/editors/codelite/distinfo b/editors/codelite/distinfo
index c46eb6e03a34..a287d885940b 100644
--- a/editors/codelite/distinfo
+++ b/editors/codelite/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (codelite-2.8.0.4537.tar.gz) = f8a7c25a68ccba1f2f24c9b96ee997b59ba2700a1b331323d2d92831bfc3ef72
+SIZE (codelite-2.8.0.4537.tar.gz) = 6010439
diff --git a/editors/codelite/files/patch-CodeLite_clindexerprotocol.cpp b/editors/codelite/files/patch-CodeLite_clindexerprotocol.cpp
deleted file mode 100644
index 64e576bc9628..000000000000
--- a/editors/codelite/files/patch-CodeLite_clindexerprotocol.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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/files/patch-CodeLite_unixprocess_impl.cpp b/editors/codelite/files/patch-CodeLite_unixprocess_impl.cpp
new file mode 100644
index 000000000000..d87f333e4281
--- /dev/null
+++ b/editors/codelite/files/patch-CodeLite_unixprocess_impl.cpp
@@ -0,0 +1,17 @@
+--- CodeLite/unixprocess_impl.cpp.orig	2010-11-11 11:14:08.000000000 +0000
++++ CodeLite/unixprocess_impl.cpp	2010-11-11 11:14:57.000000000 +0000
+@@ -12,8 +12,14 @@
+ #include <sys/wait.h>
+ 
+ #ifdef __WXGTK__
++#ifdef __FreeBSD__
++#    include <sys/ioctl.h>
++#    include <termios.h>
++#    include <libutil.h>
++#else
+ #    include <pty.h>
+ #    include <utmp.h>
++#endif
+ #else
+ #    include <util.h>
+ #endif
-- 
cgit v1.2.3