- Update to 6.1.1

  Release notes:
  * http://codelite.org/LiteEditor/ReleaseNotesCodeLite60
  * http://codelite.org/LiteEditor/ReleaseNotesCodeLite61

5 files changed, 149 insertions, 12 deletions

diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index 3abee1067fd2..47bd716d4faf 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	codelite
-DISTVERSION=	6.0.1
+DISTVERSION=	6.1.1
 CATEGORIES=	editors devel
 
 MAINTAINER=	gahr@FreeBSD.org
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	eranif
 GH_PROJECT=	${PORTNAME}
-GH_COMMIT=	5bc3080
+GH_COMMIT=	ae5704e
 
 USE_WX=		3.0
 WX_UNICODE=	yes
diff --git a/editors/codelite/distinfo b/editors/codelite/distinfo
index a350cc5012b2..96ebcde263b8 100644
--- a/editors/codelite/distinfo
+++ b/editors/codelite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (codelite-6.0.1.tar.gz) = 42bdd3ac31188905098e9fa56279429ac536d884ff7d5834d3468ae6f4fd22df
-SIZE (codelite-6.0.1.tar.gz) = 93524403
+SHA256 (codelite-6.1.1.tar.gz) = 8f82132cdd4b663dd235d15ed05d6746e27bc246b5c20096beeb7ed49c36d320
+SIZE (codelite-6.1.1.tar.gz) = 100813920
diff --git a/editors/codelite/files/patch-codelite_terminal_MainFrame.cpp b/editors/codelite/files/patch-commit-7ebf3e0
index 3c988ba09c89..3c988ba09c89 100644
--- a/editors/codelite/files/patch-codelite_terminal_MainFrame.cpp
+++ b/editors/codelite/files/patch-commit-7ebf3e0
diff --git a/editors/codelite/files/patch-commit-b618667 b/editors/codelite/files/patch-commit-b618667
new file mode 100644
index 000000000000..0b2856fc08d7
--- /dev/null
+++ b/editors/codelite/files/patch-commit-b618667
@@ -0,0 +1,10 @@
+--- Subversion2/svn_console.cpp.orig	2014-09-02 12:19:50.000000000 +0200
++++ Subversion2/svn_console.cpp	2014-09-02 12:20:43.000000000 +0200
+@@ -39,6 +39,7 @@
+ #include "notebook_ex.h"
+ #include "event_notifier.h"
+ #include <wx/regex.h>
++#include <wx/settings.h>
+ 
+ //-------------------------------------------------------------
+ BEGIN_EVENT_TABLE(SvnConsole, wxEvtHandler)
diff --git a/editors/codelite/pkg-plist b/editors/codelite/pkg-plist
index 8a4e95d9ac05..0f8d8989e0f2 100644
--- a/editors/codelite/pkg-plist
+++ b/editors/codelite/pkg-plist
@@ -1,4 +1,6 @@
 %%CLANG%%bin/codelite-clang
+%%CLANG%%bin/codelite-clang-format
+%%CLANG%%lib/codelite/libclang.so
 bin/clg++
 bin/clgcc
 bin/codelite
@@ -12,20 +14,19 @@ bin/codelite_fix_files
 bin/codelite_indexer
 bin/codelite_kill_children
 bin/codelite_xterm
-lib/codelite/CodeLiteDiff.so
-man/man1/codelite-make.1.gz
-man/man1/codelite.1.gz
-man/man1/codelite_fix_files.1.gz
 lib/codelite/CMakePlugin.so
 lib/codelite/CallGraph.so
 lib/codelite/CodeFormatter.so
+lib/codelite/CodeLiteDiff.so
 lib/codelite/ContinuousBuild.so
 lib/codelite/Copyright.so
 lib/codelite/DatabaseExplorer.so
 lib/codelite/ExternalTools.so
+lib/codelite/MemCheck.so
 lib/codelite/Outline.so
 lib/codelite/QMakePlugin.so
 lib/codelite/SnipWiz.so
+lib/codelite/SpellCheck.so
 lib/codelite/Subversion.so
 lib/codelite/Tweaks.so
 lib/codelite/UnitTestsPP.so
@@ -36,7 +37,6 @@ lib/codelite/cppchecker.so
 lib/codelite/cscope.so
 lib/codelite/debuggers/DebuggerGDB.so
 lib/codelite/git.so
-%%CLANG%%lib/codelite/libclang.so
 lib/codelite/libdatabaselayersqlite.so
 lib/codelite/liblibcodelite.so
 lib/codelite/libplugin.so
@@ -60,6 +60,9 @@ lib/codelite/resources/wxfb_conflict.png
 lib/codelite/resources/wxfb_modified.png
 lib/codelite/resources/wxfb_ok.png
 lib/codelite/wxFormBuilder.so
+man/man1/codelite-make.1.gz
+man/man1/codelite.1.gz
+man/man1/codelite_fix_files.1.gz
 %%DATADIR%%/LICENSE
 %%DATADIR%%/astyle.sample
 %%DATADIR%%/codelite-icons-dark.zip
@@ -74,6 +77,10 @@ lib/codelite/wxFormBuilder.so
 %%DATADIR%%/config/cfg/windows.cfg
 %%DATADIR%%/config/codelite.xml.default
 %%DATADIR%%/config/debuggers.xml.default
+%%DATADIR%%/dics/en_GB.aff
+%%DATADIR%%/dics/en_GB.dic
+%%DATADIR%%/dics/en_US.aff
+%%DATADIR%%/dics/en_US.dic
 %%DATADIR%%/gdb_printers/libstdcxx/__init__.py
 %%DATADIR%%/gdb_printers/libstdcxx/v6/__init__.py
 %%DATADIR%%/gdb_printers/libstdcxx/v6/printers.py
@@ -87,9 +94,128 @@ lib/codelite/wxFormBuilder.so
 %%DATADIR%%/images/recent_files.png
 %%DATADIR%%/images/recent_workspaces.png
 %%DATADIR%%/images/splashscreen.png
-%%DATADIR%%/lexers/lexers_black.xml
-%%DATADIR%%/lexers/lexers_default.xml
-%%DATADIR%%/lexers/lexers_zmrok.xml
+%%DATADIR%%/lexers/lexer_assembly_darktheme.xml
+%%DATADIR%%/lexers/lexer_assembly_default.xml
+%%DATADIR%%/lexers/lexer_assembly_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_batch_darktheme.xml
+%%DATADIR%%/lexers/lexer_batch_default.xml
+%%DATADIR%%/lexers/lexer_batch_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_c++_ambients.xml
+%%DATADIR%%/lexers/lexer_c++_android_developer.xml
+%%DATADIR%%/lexers/lexer_c++_back_to_school__green_chalkboard_.xml
+%%DATADIR%%/lexers/lexer_c++_black_background.xml
+%%DATADIR%%/lexers/lexer_c++_blackboard.xml
+%%DATADIR%%/lexers/lexer_c++_brightnight.xml
+%%DATADIR%%/lexers/lexer_c++_c++_theme.xml
+%%DATADIR%%/lexers/lexer_c++_cobalt.xml
+%%DATADIR%%/lexers/lexer_c++_codding_horror.xml
+%%DATADIR%%/lexers/lexer_c++_code_blocks_dark.xml
+%%DATADIR%%/lexers/lexer_c++_colorcode.xml
+%%DATADIR%%/lexers/lexer_c++_dark_flash_builder.xml
+%%DATADIR%%/lexers/lexer_c++_dark_pastel.xml
+%%DATADIR%%/lexers/lexer_c++_darktheme.xml
+%%DATADIR%%/lexers/lexer_c++_default.xml
+%%DATADIR%%/lexers/lexer_c++_desert.xml
+%%DATADIR%%/lexers/lexer_c++_dracula.xml
+%%DATADIR%%/lexers/lexer_c++_dresden__python__c++_.xml
+%%DATADIR%%/lexers/lexer_c++_dusk__xcode_.xml
+%%DATADIR%%/lexers/lexer_c++_easy_for_eyes.xml
+%%DATADIR%%/lexers/lexer_c++_easyontheeyes.xml
+%%DATADIR%%/lexers/lexer_c++_ergo.xml
+%%DATADIR%%/lexers/lexer_c++_gedit_original_oblivion.xml
+%%DATADIR%%/lexers/lexer_c++_gedit_original_obsidian_variant.xml
+%%DATADIR%%/lexers/lexer_c++_github.xml
+%%DATADIR%%/lexers/lexer_c++_google_code_browser_like.xml
+%%DATADIR%%/lexers/lexer_c++_havenjark_slight_return.xml
+%%DATADIR%%/lexers/lexer_c++_humane-ist.xml
+%%DATADIR%%/lexers/lexer_c++_intellij_dracula.xml
+%%DATADIR%%/lexers/lexer_c++_intellij_idea_dark.xml
+%%DATADIR%%/lexers/lexer_c++_jonel.xml
+%%DATADIR%%/lexers/lexer_c++_monokai_2.xml
+%%DATADIR%%/lexers/lexer_c++_monokai__textmate_.xml
+%%DATADIR%%/lexers/lexer_c++_mr-10.xml
+%%DATADIR%%/lexers/lexer_c++_netbeans_6++.xml
+%%DATADIR%%/lexers/lexer_c++_netbeans_7_0.xml
+%%DATADIR%%/lexers/lexer_c++_new_zenburn.xml
+%%DATADIR%%/lexers/lexer_c++_nightlion_aptana_theme.xml
+%%DATADIR%%/lexers/lexer_c++_obisidian-notepad++_style.xml
+%%DATADIR%%/lexers/lexer_c++_oblivion.xml
+%%DATADIR%%/lexers/lexer_c++_oblivion_v2.xml
+%%DATADIR%%/lexers/lexer_c++_obsidian.xml
+%%DATADIR%%/lexers/lexer_c++_orionxa.xml
+%%DATADIR%%/lexers/lexer_c++_papaconductor.xml
+%%DATADIR%%/lexers/lexer_c++_pydev_oblivion.xml
+%%DATADIR%%/lexers/lexer_c++_relax_your_eyes.xml
+%%DATADIR%%/lexers/lexer_c++_retta.xml
+%%DATADIR%%/lexers/lexer_c++_roboticket.xml
+%%DATADIR%%/lexers/lexer_c++_schuss.xml
+%%DATADIR%%/lexers/lexer_c++_sharvi.xml
+%%DATADIR%%/lexers/lexer_c++_solarized-light-aptana.xml
+%%DATADIR%%/lexers/lexer_c++_son_of_obsidian.xml
+%%DATADIR%%/lexers/lexer_c++_sublime_text_2.xml
+%%DATADIR%%/lexers/lexer_c++_sunburst.xml
+%%DATADIR%%/lexers/lexer_c++_textmate_twilight.xml
+%%DATADIR%%/lexers/lexer_c++_twilight_iii.xml
+%%DATADIR%%/lexers/lexer_c++_vibrant_ink.xml
+%%DATADIR%%/lexers/lexer_c++_vim_dark.xml
+%%DATADIR%%/lexers/lexer_c++_webstorm_dark_3.xml
+%%DATADIR%%/lexers/lexer_c++_wombat.xml
+%%DATADIR%%/lexers/lexer_c++_zenburn.xml
+%%DATADIR%%/lexers/lexer_c++_zend_5_5_1_default.xml
+%%DATADIR%%/lexers/lexer_c++_zmonodevelop.xml
+%%DATADIR%%/lexers/lexer_c++_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_cmake_darktheme.xml
+%%DATADIR%%/lexers/lexer_cmake_default.xml
+%%DATADIR%%/lexers/lexer_cmake_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_cobra_darktheme.xml
+%%DATADIR%%/lexers/lexer_cobra_default.xml
+%%DATADIR%%/lexers/lexer_cobra_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_cobraalt_default.xml
+%%DATADIR%%/lexers/lexer_css_darktheme.xml
+%%DATADIR%%/lexers/lexer_css_default.xml
+%%DATADIR%%/lexers/lexer_css_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_diff_darktheme.xml
+%%DATADIR%%/lexers/lexer_diff_default.xml
+%%DATADIR%%/lexers/lexer_diff_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_fortran_darktheme.xml
+%%DATADIR%%/lexers/lexer_fortran_default.xml
+%%DATADIR%%/lexers/lexer_fortran_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_html_darktheme.xml
+%%DATADIR%%/lexers/lexer_html_default.xml
+%%DATADIR%%/lexers/lexer_html_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_innosetup_darktheme.xml
+%%DATADIR%%/lexers/lexer_innosetup_default.xml
+%%DATADIR%%/lexers/lexer_innosetup_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_java_darktheme.xml
+%%DATADIR%%/lexers/lexer_java_default.xml
+%%DATADIR%%/lexers/lexer_java_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_lua_darktheme.xml
+%%DATADIR%%/lexers/lexer_lua_default.xml
+%%DATADIR%%/lexers/lexer_lua_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_makefile_darktheme.xml
+%%DATADIR%%/lexers/lexer_makefile_default.xml
+%%DATADIR%%/lexers/lexer_makefile_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_perl_darktheme.xml
+%%DATADIR%%/lexers/lexer_perl_default.xml
+%%DATADIR%%/lexers/lexer_perl_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_properties_darktheme.xml
+%%DATADIR%%/lexers/lexer_properties_default.xml
+%%DATADIR%%/lexers/lexer_properties_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_python_darktheme.xml
+%%DATADIR%%/lexers/lexer_python_default.xml
+%%DATADIR%%/lexers/lexer_python_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_script_darktheme.xml
+%%DATADIR%%/lexers/lexer_script_default.xml
+%%DATADIR%%/lexers/lexer_script_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_sql_darktheme.xml
+%%DATADIR%%/lexers/lexer_sql_default.xml
+%%DATADIR%%/lexers/lexer_sql_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_text_darktheme.xml
+%%DATADIR%%/lexers/lexer_text_default.xml
+%%DATADIR%%/lexers/lexer_text_zmrok-like.xml
+%%DATADIR%%/lexers/lexer_xml_darktheme.xml
+%%DATADIR%%/lexers/lexer_xml_default.xml
+%%DATADIR%%/lexers/lexer_xml_zmrok-like.xml
 %%DATADIR%%/rc/menu.xrc
 %%DATADIR%%/templates/codedesigner/CDTemplate.cdp
 %%DATADIR%%/templates/codedesigner/HSCHTemplate.cdp
@@ -315,4 +441,5 @@ share/applications/codelite.desktop
 @dirrm %%DATADIR%%/gdb_printers
 @dirrm %%DATADIR%%/config/cfg
 @dirrm %%DATADIR%%/config
+@dirrm %%DATADIR%%/dics
 @dirrm %%DATADIR%%