- Update to 1.0r3035

6 files changed, 62 insertions, 22 deletions

diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index b1eff797a7d0..e96b0a6ef8d5 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	codelite
 DISTVERSION=	1.0.${SVN_REVISION}
-PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION}
 
@@ -28,7 +27,7 @@ HAS_CONFIGURE=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
 
-SVN_REVISION=	2893
+SVN_REVISION=	3035
 
 .if defined(WITH_CSCOPE)
 RUN_DEPENDS+=	cscope:${PORTSDIR}/devel/cscope
diff --git a/editors/codelite/distinfo b/editors/codelite/distinfo
index d74fb8a453b8..cd0b3330daf7 100644
--- a/editors/codelite/distinfo
+++ b/editors/codelite/distinfo
@@ -1,3 +1,3 @@
-MD5 (codelite-1.0.2893.tar.gz) = 79a878c37639af09e054cd8c9ebee528
-SHA256 (codelite-1.0.2893.tar.gz) = 894bf9e7c926e426543dc0c56dfba94efc4735ef1d842fb238994bfe67bd884a
-SIZE (codelite-1.0.2893.tar.gz) = 5913609
+MD5 (codelite-1.0.3035.tar.gz) = 7893d581468b4281370b0e999867dfcf
+SHA256 (codelite-1.0.3035.tar.gz) = c39aa45f0fff018a33efe1fd254d6971842696172b56acb2b5875541cdf76f06
+SIZE (codelite-1.0.3035.tar.gz) = 6477746
diff --git a/editors/codelite/files/patch-CodeLite_clindexerprotocol.cpp b/editors/codelite/files/patch-CodeLite_clindexerprotocol.cpp
index e9ef76fd9202..d7a6e43ebb22 100644
--- a/editors/codelite/files/patch-CodeLite_clindexerprotocol.cpp
+++ b/editors/codelite/files/patch-CodeLite_clindexerprotocol.cpp
@@ -1,5 +1,5 @@
---- CodeLite/clindexerprotocol.cpp.orig	2009-05-26 14:27:26.000000000 +0200
-+++ CodeLite/clindexerprotocol.cpp	2009-05-26 14:30:37.000000000 +0200
+--- 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 @@
  	}
  
diff --git a/editors/codelite/files/patch-configure b/editors/codelite/files/patch-configure
index 9f25aa989935..2f191888d509 100644
--- a/editors/codelite/files/patch-configure
+++ b/editors/codelite/files/patch-configure
@@ -1,12 +1,21 @@
---- configure.orig	2009-03-12 13:14:45.000000000 +0100
-+++ configure	2009-05-23 00:58:21.000000000 +0200
-@@ -70,6 +70,9 @@
+--- configure.orig	2009-09-21 23:59:39.000000000 +0200
++++ configure	2009-11-18 14:04:34.000000000 +0100
+@@ -82,6 +82,9 @@
  	else
  		echo "CCFLAGS := \$(CCFLAGS) -D__APPLE__ -DMACOSX" >> Makefile
  	fi
 +	if [ "$os_name" = "FreeBSD" ]; then
 +		echo "LINK_FLAGS := \$(LINK_FLAGS) -lkvm" >> Makefile
 +	fi
- 	echo "INCLUDES := \$(INCLUDES) -I. -I${base_dir}/sdk/wxsqlite3/include -I${base_dir}/sdk/wxsqlite3/sqlite3/include -I${base_dir}/sdk/wxscintilla/include -I${base_dir}/sdk/wxscintilla/src/scintilla/include -I${base_dir}/sdk/wxpropgrid/include	 -I${base_dir}/sdk/wxscintilla/src/scintilla/src -I${base_dir}/Interfaces -I${base_dir}/Debugger -I${base_dir}/Plugin -I${base_dir}/CodeLite " >> Makefile
+ 	echo "INCLUDES := \$(INCLUDES) -I. -I${base_dir}/sdk/codelite_indexer/network -I${base_dir}/sdk/wxsqlite3/include -I${base_dir}/sdk/wxsqlite3/sqlite3/include -I${base_dir}/sdk/wxscintilla/include -I${base_dir}/sdk/wxscintilla/src/scintilla/include -I${base_dir}/sdk/wxpropgrid/include	 -I${base_dir}/sdk/wxscintilla/src/scintilla/src -I${base_dir}/Interfaces -I${base_dir}/Debugger -I${base_dir}/Plugin -I${base_dir}/CodeLite " >> Makefile
  	echo "" >> Makefile
  	echo "" >> Makefile
+@@ -308,7 +311,7 @@
+ 
+ 	## On FreeBSD, -ldl is part og libc
+ 	if [ "$os_name" = "FreeBSD" ]; then
+-		echo "	\$(CMP) -o codelite_indexer \$(codelite_indexer_objects) -lpthread " >> Makefile
++		echo "	\$(CMP) -o codelite_indexer \$(codelite_indexer_objects) -lpthread -lkvm" >> Makefile
+ 	else
+ 		echo "	\$(CMP) -o codelite_indexer \$(codelite_indexer_objects) -lpthread -ldl " >> Makefile
+ 	fi
diff --git a/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp b/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp
new file mode 100644
index 000000000000..497e10313c06
--- /dev/null
+++ b/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp
@@ -0,0 +1,19 @@
+--- sdk/codelite_indexer/utils.cpp.orig	2009-09-15 08:00:45.000000000 +0200
++++ sdk/codelite_indexer/utils.cpp	2009-11-19 16:00:54.000000000 +0100
+@@ -8,6 +8,16 @@
+ # include <process.h>

+ # include <Tlhelp32.h>

+ #endif

++
++#ifdef __FreeBSD__
++#include <fcntl.h>
++#include <paths.h>
++#include <kvm.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <sys/user.h>
++#endif
++
+ /**

+  * helper string methods

+  */

diff --git a/editors/codelite/pkg-plist b/editors/codelite/pkg-plist
index bc6c8cabf8ad..8c6cd93f96c2 100644
--- a/editors/codelite/pkg-plist
+++ b/editors/codelite/pkg-plist
@@ -1,4 +1,5 @@
 bin/codelite
+bin/codelite_cppcheck
 bin/codelite_exec
 bin/codelite_fix_files
 bin/codelite_indexer
@@ -46,8 +47,10 @@ bin/codelite_kill_children
 %%DATADIR%%/plugins/CodeFormatter.so
 %%DATADIR%%/plugins/ContinuousBuild.so
 %%DATADIR%%/plugins/Copyright.so
+%%DATADIR%%/plugins/CppCheck.so
 %%DATADIR%%/plugins/ExternalTools.so
 %%DATADIR%%/plugins/Gizmos.so
+%%DATADIR%%/plugins/QmakePlugin.so
 %%DATADIR%%/plugins/SnipWiz.so
 %%DATADIR%%/plugins/Subversion.so
 %%DATADIR%%/plugins/SymbolView.so
@@ -55,26 +58,26 @@ bin/codelite_kill_children
 %%DATADIR%%/plugins/abbreviation.so
 %%DATADIR%%/plugins/cscope.so
 %%DATADIR%%/plugins/debuggers/Debugger.so
+%%DATADIR%%/plugins/libcodeliteu.so
+%%DATADIR%%/plugins/libpluginu.so
+%%DATADIR%%/plugins/libwxpropgridu.so
+%%DATADIR%%/plugins/libwxscintillau.so
+%%DATADIR%%/plugins/libwxsqlite3u.so
 %%DATADIR%%/plugins/resources/abbrev.png
 %%DATADIR%%/plugins/resources/abbreviation.accelerators
 %%DATADIR%%/plugins/resources/compfile.png
+%%DATADIR%%/plugins/resources/cppcheck.png
 %%DATADIR%%/plugins/resources/external_tools.accelerators
-%%DATADIR%%/plugins/resources/qt24_preferences.png
-%%DATADIR%%/plugins/resources/qt24_new.png
-%%DATADIR%%/plugins/resources/qt16_preferences.png
 %%DATADIR%%/plugins/resources/qt16_new.png
+%%DATADIR%%/plugins/resources/qt16_preferences.png
+%%DATADIR%%/plugins/resources/qt24_new.png
+%%DATADIR%%/plugins/resources/qt24_preferences.png
 %%DATADIR%%/plugins/resources/svn_diff.png
 %%DATADIR%%/plugins/resources/svn_settings.png
 %%DATADIR%%/plugins/resources/svn_ssh.png
 %%DATADIR%%/plugins/resources/wxfb_conflict.png
 %%DATADIR%%/plugins/resources/wxfb_modified.png
 %%DATADIR%%/plugins/resources/wxfb_ok.png
-%%DATADIR%%/plugins/libwxsqlite3u.so
-%%DATADIR%%/plugins/libwxscintillau.so
-%%DATADIR%%/plugins/libwxpropgridu.so
-%%DATADIR%%/plugins/libpluginu.so
-%%DATADIR%%/plugins/libcodeliteu.so
-%%DATADIR%%/plugins/QmakePlugin.so
 %%DATADIR%%/plugins/wxformbuilder.so
 %%DATADIR%%/rc/menu.xrc
 %%DATADIR%%/src/unittest++1.3.tar.gz
@@ -98,8 +101,11 @@ bin/codelite_kill_children
 %%DATADIR%%/templates/projects/UnitTest++/main.cpp
 %%DATADIR%%/templates/projects/custom-makefile/custom-makefile.project
 %%DATADIR%%/templates/projects/custom-makefile/icon.png
+%%DATADIR%%/templates/projects/dynamic-library-wx-enabled/defs.h
 %%DATADIR%%/templates/projects/dynamic-library-wx-enabled/dynamic-library-wx-enabled.project
+%%DATADIR%%/templates/projects/dynamic-library-wx-enabled/dynamic-library-wx-enabled.project~
 %%DATADIR%%/templates/projects/dynamic-library-wx-enabled/icon.png
+%%DATADIR%%/templates/projects/dynamic-library-wx-enabled/main.cpp
 %%DATADIR%%/templates/projects/dynamic-library/dynamic-library.project
 %%DATADIR%%/templates/projects/dynamic-library/icon.png
 %%DATADIR%%/templates/projects/executable-console-wx-enabled/executable-console-wx-enabled.project
@@ -136,7 +142,9 @@ bin/codelite_kill_children
 %%DATADIR%%/templates/projects/executable/main.cpp
 %%DATADIR%%/templates/projects/non-code-project/icon.png
 %%DATADIR%%/templates/projects/non-code-project/non-code.project
+%%DATADIR%%/templates/projects/static-library-wx-enabled/defs.h
 %%DATADIR%%/templates/projects/static-library-wx-enabled/icon.png
+%%DATADIR%%/templates/projects/static-library-wx-enabled/main.cpp
 %%DATADIR%%/templates/projects/static-library-wx-enabled/static-library-wx-enabled.project
 %%DATADIR%%/templates/projects/static-library/icon.png
 %%DATADIR%%/templates/projects/static-library/static-library.project
@@ -148,11 +156,15 @@ bin/codelite_kill_children
 %%DATADIR%%/templates/projects/vc-static-lib/vc-static-lib.project
 %%DATADIR%%/templates/qmake/qmake.project
 share/applications/codelite.desktop
+@dirrmtry share/applications
+@dirrm %%DATADIR%%/templates/qmake
 @dirrm %%DATADIR%%/templates/projects/vc-static-lib
 @dirrm %%DATADIR%%/templates/projects/vc-executable
 @dirrm %%DATADIR%%/templates/projects/vc-dynamic-library
 @dirrm %%DATADIR%%/templates/projects/static-library-wx-enabled
 @dirrm %%DATADIR%%/templates/projects/static-library
+@dirrm %%DATADIR%%/templates/projects/qmake-gui
+@dirrm %%DATADIR%%/templates/projects/qmake-console
 @dirrm %%DATADIR%%/templates/projects/non-code-project
 @dirrm %%DATADIR%%/templates/projects/executable-wx-frame
 @dirrm %%DATADIR%%/templates/projects/executable-wx-enabled
@@ -162,12 +174,14 @@ share/applications/codelite.desktop
 @dirrm %%DATADIR%%/templates/projects/executable-gcc
 @dirrm %%DATADIR%%/templates/projects/executable-console-wx-enabled
 @dirrm %%DATADIR%%/templates/projects/executable
+@dirrm %%DATADIR%%/templates/projects/dynamic-library-wx-enabled-win
 @dirrm %%DATADIR%%/templates/projects/dynamic-library-wx-enabled
 @dirrm %%DATADIR%%/templates/projects/dynamic-library
 @dirrm %%DATADIR%%/templates/projects/custom-makefile
 @dirrm %%DATADIR%%/templates/projects/UnitTest++
+@dirrm %%DATADIR%%/templates/projects/QtConsole
+@dirrm %%DATADIR%%/templates/projects/QmakeTestTmpl
 @dirrm %%DATADIR%%/templates/projects
-@dirrm %%DATADIR%%/templates/qmake
 @dirrm %%DATADIR%%/templates/gizmos
 @dirrm %%DATADIR%%/templates/formbuilder
 @dirrm %%DATADIR%%/templates
@@ -182,4 +196,3 @@ share/applications/codelite.desktop
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
-@dirrmtry share/applications