diff options
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/codelite/Makefile | 10 | ||||
| -rw-r--r-- | editors/codelite/distinfo | 4 | ||||
| -rw-r--r-- | editors/codelite/files/patch-CMakeLists.txt | 13 | ||||
| -rw-r--r-- | editors/codelite/files/patch-Runtime_codelite_xterm | 12 | ||||
| -rw-r--r-- | editors/codelite/files/patch-clang | 16 | ||||
| -rw-r--r-- | editors/codelite/files/patch-commit-7ebf3e0 | 16 | ||||
| -rw-r--r-- | editors/codelite/files/patch-commit-b618667 | 10 | ||||
| -rw-r--r-- | editors/codelite/files/patch-sdk_codelite_cppcheck_CMakeLists.txt | 11 | ||||
| -rw-r--r-- | editors/codelite/pkg-plist | 141 |
9 files changed, 37 insertions, 196 deletions
diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile index e6048aa7e0bd..4ad59ee8793d 100644 --- a/editors/codelite/Makefile +++ b/editors/codelite/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= codelite -DISTVERSION= 6.1.1 -PORTREVISION= 1 +DISTVERSION= 8.1 CATEGORIES= editors devel MAINTAINER= ports@FreeBSD.org @@ -27,12 +26,13 @@ GH_ACCOUNT= eranif USE_WX= 3.0 WX_UNICODE= yes -USES= gettext cmake:outsource dos2unix shebangfix +USES= gettext cmake:outsource dos2unix execinfo shebangfix DOS2UNIX_GLOB= *.cpp *.txt USE_LDCONFIG= ${PREFIX}/lib/codelite -SHEBANG_FILES= Runtime/clg++ Runtime/clgcc +SHEBANG_FILES= Runtime/clg++ Runtime/clgcc Runtime/codelite_xterm +bash_CMD= /bin/sh +INSTALLS_ICONS= yes -CXXFLAGS+= -I${LOCALBASE}/include CMAKE_ARGS+= -DIS_FREEBSD=1 \ -DENABLE_LLDB=0 \ -DPREFIX=${PREFIX} diff --git a/editors/codelite/distinfo b/editors/codelite/distinfo index 2f9e91048f23..339c8d3eab7d 100644 --- a/editors/codelite/distinfo +++ b/editors/codelite/distinfo @@ -1,2 +1,2 @@ -SHA256 (eranif-codelite-6.1.1_GH0.tar.gz) = 2cea7b43a1a060529ee0d8f25d0e82b4c52eef8c98f12716c334c0cccd973006 -SIZE (eranif-codelite-6.1.1_GH0.tar.gz) = 100814996 +SHA256 (eranif-codelite-8.1_GH0.tar.gz) = 3d43e5a5b504937d6137311417447eabdc8398dccaad4eef1ccba4080e920270 +SIZE (eranif-codelite-8.1_GH0.tar.gz) = 72812631 diff --git a/editors/codelite/files/patch-CMakeLists.txt b/editors/codelite/files/patch-CMakeLists.txt index 9939fcaf0960..46805334928a 100644 --- a/editors/codelite/files/patch-CMakeLists.txt +++ b/editors/codelite/files/patch-CMakeLists.txt @@ -22,16 +22,3 @@ if ( UNIX ) execute_process(COMMAND pwd OUTPUT_VARIABLE BUILD_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE) -@@ -329,9 +329,9 @@ - set( CLANG_BINARY "${CL_SRC_ROOT}/sdk/clang/lib/libclang.dylib") - - elseif (UNIX) -- set( CLANG_INCLUDE "${CL_SRC_ROOT}/sdk/clang/Linux/${ARCH_NAME}/include" ) -- set( CLANG_LIBRARY "-L${CL_SRC_ROOT}/sdk/clang/Linux/${ARCH_NAME}/lib -lclang" ) -- set( CLANG_BINARY "${CL_SRC_ROOT}/sdk/clang/Linux/${ARCH_NAME}/lib/libclang.so") -+ set( CLANG_INCLUDE "%%LOCALBASE%%/llvm34/include" ) -+ set( CLANG_LIBRARY "-L%%LOCALBASE%%/llvm34/lib/ -lclang" ) -+ set( CLANG_BINARY "%%LOCALBASE%%/llvm34/lib/libclang.so") - endif() - - message( "-- clang link line ${CLANG_LIBRARY} ") diff --git a/editors/codelite/files/patch-Runtime_codelite_xterm b/editors/codelite/files/patch-Runtime_codelite_xterm index 83e64c4638dd..b2b8fa8a9d35 100644 --- a/editors/codelite/files/patch-Runtime_codelite_xterm +++ b/editors/codelite/files/patch-Runtime_codelite_xterm @@ -1,17 +1,11 @@ --- Runtime/codelite_xterm.orig 2012-06-18 14:05:30.000000000 +0200 +++ Runtime/codelite_xterm 2012-06-18 14:05:45.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - ## A wrapper script around the xterm utility - ## which allows codelite to export LD_LIBRARY_PATH into the exterm @@ -17,7 +17,7 @@ ## Run xterm without the bash wrapper - xterm -T "$program_title" -e $2 2> /dev/null + ${terminal} -T "$program_title" -e $2 2> /dev/null else -- xterm -T "$program_title" -e /bin/bash -c 'export LD_LIBRARY_PATH=$0;shift;$@' $LD_LIBRARY_PATH "$@" 2> /dev/null -+ xterm -T "$program_title" -e /bin/sh -c 'export LD_LIBRARY_PATH=$0;shift;$@' $LD_LIBRARY_PATH "$@" 2> /dev/null +- ${terminal} -T "$program_title" -e /bin/bash -c 'export LD_LIBRARY_PATH=$0;shift;$@' $LD_LIBRARY_PATH "$@" 2> /dev/null ++ ${terminal} -T "$program_title" -e /bin/sh -c 'export LD_LIBRARY_PATH=$0;shift;$@' $LD_LIBRARY_PATH "$@" 2> /dev/null fi fi diff --git a/editors/codelite/files/patch-clang b/editors/codelite/files/patch-clang deleted file mode 100644 index 6992273a531e..000000000000 --- a/editors/codelite/files/patch-clang +++ /dev/null @@ -1,16 +0,0 @@ ---- LiteEditor/clang_pch_maker_thread.cpp.orig 2013-04-02 16:55:25.000000000 +0200 -+++ LiteEditor/clang_pch_maker_thread.cpp 2013-04-02 17:16:02.000000000 +0200 -@@ -391,8 +391,11 @@ - // First time, need to create it - unsigned flags; - if(reparse) { -- flags = CXTranslationUnit_CXXPrecompiledPreamble -- | CXTranslationUnit_CacheCompletionResults -+ flags = -+#ifndef __FreeBSD__ -+ CXTranslationUnit_CXXPrecompiledPreamble | -+#endif -+ CXTranslationUnit_CacheCompletionResults - | CXTranslationUnit_PrecompiledPreamble - | CXTranslationUnit_Incomplete - | CXTranslationUnit_DetailedPreprocessingRecord diff --git a/editors/codelite/files/patch-commit-7ebf3e0 b/editors/codelite/files/patch-commit-7ebf3e0 deleted file mode 100644 index 3c988ba09c89..000000000000 --- a/editors/codelite/files/patch-commit-7ebf3e0 +++ /dev/null @@ -1,16 +0,0 @@ ---- codelite_terminal/MainFrame.cpp.orig 2014-01-22 16:15:29.000000000 +0100 -+++ codelite_terminal/MainFrame.cpp 2014-01-22 16:17:57.000000000 +0100 -@@ -8,7 +8,12 @@ - #include <wx/filedlg.h> - - #ifndef __WXMSW__ --#if defined(__WXGTK__) -+#if defined(__FreeBSD__) -+# include <sys/types.h> -+# include <sys/ioctl.h> -+# include <termios.h> -+# include <libutil.h> -+#elif defined(__WXGTK__) - # include <pty.h> - #else - # include <util.h> diff --git a/editors/codelite/files/patch-commit-b618667 b/editors/codelite/files/patch-commit-b618667 deleted file mode 100644 index 0b2856fc08d7..000000000000 --- a/editors/codelite/files/patch-commit-b618667 +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/files/patch-sdk_codelite_cppcheck_CMakeLists.txt b/editors/codelite/files/patch-sdk_codelite_cppcheck_CMakeLists.txt new file mode 100644 index 000000000000..6a9138047f96 --- /dev/null +++ b/editors/codelite/files/patch-sdk_codelite_cppcheck_CMakeLists.txt @@ -0,0 +1,11 @@ +--- sdk/codelite_cppcheck/CMakeLists.txt.orig 2015-08-12 19:34:10.488143000 +0300 ++++ sdk/codelite_cppcheck/CMakeLists.txt 2015-08-12 19:34:37.287109000 +0300 +@@ -8,7 +8,7 @@ + # Include paths + include_directories("${CL_SRC_ROOT}/sdk/codelite_cppcheck/lib" "${CL_SRC_ROOT}/sdk/codelite_cppcheck/cli") + +-set( ADDITIONAL_LIBRARIES "" ) ++set( ADDITIONAL_LIBRARIES "-lexecinfo" ) + + if(WIN32) + set(ADDITIONAL_LIBRARIES "-lshlwapi") diff --git a/editors/codelite/pkg-plist b/editors/codelite/pkg-plist index fe3d21295372..bc011cb99dc3 100644 --- a/editors/codelite/pkg-plist +++ b/editors/codelite/pkg-plist @@ -22,6 +22,7 @@ lib/codelite/ContinuousBuild.so lib/codelite/Copyright.so lib/codelite/DatabaseExplorer.so lib/codelite/ExternalTools.so +lib/codelite/HelpPlugin.so lib/codelite/MemCheck.so lib/codelite/Outline.so lib/codelite/QMakePlugin.so @@ -30,9 +31,12 @@ lib/codelite/SpellCheck.so lib/codelite/Subversion.so lib/codelite/Tweaks.so lib/codelite/UnitTestsPP.so +lib/codelite/WebTools.so lib/codelite/Wizards.so +lib/codelite/WordCompletion.so lib/codelite/ZoomNavigator.so lib/codelite/abbreviation.so +lib/codelite/codelitephp.so lib/codelite/cppchecker.so lib/codelite/cscope.so lib/codelite/debuggers/DebuggerGDB.so @@ -43,12 +47,9 @@ lib/codelite/libplugin.so lib/codelite/libwxshapeframework.so lib/codelite/libwxsqlite3.so lib/codelite/resources/abbrev.png -lib/codelite/resources/abbreviation.accelerators lib/codelite/resources/compfile.png lib/codelite/resources/connect_no.png lib/codelite/resources/cppcheck.png -lib/codelite/resources/cscope.accelerators -lib/codelite/resources/external_tools.accelerators lib/codelite/resources/qt16_new.png lib/codelite/resources/qt16_preferences.png lib/codelite/resources/qt24_new.png @@ -64,15 +65,18 @@ man/man1/codelite-make.1.gz man/man1/codelite.1.gz man/man1/codelite_fix_files.1.gz %%DATADIR%%/LICENSE +%%DATADIR%%/PHP.zip %%DATADIR%%/astyle.sample %%DATADIR%%/codelite-icons-dark.zip %%DATADIR%%/codelite-icons-fresh-farm.zip %%DATADIR%%/codelite-icons.zip %%DATADIR%%/config/accelerators.conf.default %%DATADIR%%/config/build_settings.xml.default +%%DATADIR%%/config/cfg/avr.cfg %%DATADIR%%/config/cfg/gtk.cfg %%DATADIR%%/config/cfg/posix.cfg %%DATADIR%%/config/cfg/qt.cfg +%%DATADIR%%/config/cfg/sdl.cfg %%DATADIR%%/config/cfg/std.cfg %%DATADIR%%/config/cfg/windows.cfg %%DATADIR%%/config/codelite.xml.default @@ -81,6 +85,9 @@ man/man1/codelite_fix_files.1.gz %%DATADIR%%/dics/en_GB.dic %%DATADIR%%/dics/en_US.aff %%DATADIR%%/dics/en_US.dic +%%DATADIR%%/gdb_printers/boost/__init__.py +%%DATADIR%%/gdb_printers/boost/printers.py +%%DATADIR%%/gdb_printers/helper.py %%DATADIR%%/gdb_printers/libstdcxx/__init__.py %%DATADIR%%/gdb_printers/libstdcxx/v6/__init__.py %%DATADIR%%/gdb_printers/libstdcxx/v6/printers.py @@ -94,128 +101,8 @@ man/man1/codelite_fix_files.1.gz %%DATADIR%%/images/recent_files.png %%DATADIR%%/images/recent_workspaces.png %%DATADIR%%/images/splashscreen.png -%%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%%/javascript.zip +%%DATADIR%%/lexers/lexers.json %%DATADIR%%/rc/menu.xrc %%DATADIR%%/templates/codedesigner/CDTemplate.cdp %%DATADIR%%/templates/codedesigner/HSCHTemplate.cdp @@ -242,6 +129,7 @@ man/man1/codelite_fix_files.1.gz %%DATADIR%%/templates/formbuilder/DialogTemplateWithButtons.fbp %%DATADIR%%/templates/formbuilder/FrameTemplate.fbp %%DATADIR%%/templates/formbuilder/PanelTemplate.fbp +%%DATADIR%%/templates/gizmos/CMakeLists.txt.plugin.wizard %%DATADIR%%/templates/gizmos/app.cpp.wizard %%DATADIR%%/templates/gizmos/app.h.wizard %%DATADIR%%/templates/gizmos/gui-dialog.cpp.wizard @@ -390,3 +278,6 @@ man/man1/codelite_fix_files.1.gz %%NLS%%share/locale/cs/LC_MESSAGES/codelite.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/codelite.mo share/applications/codelite.desktop +share/icons/hicolor/32x32/apps/codelite.png +share/locale/cs/LC_MESSAGES/codelite.mo +share/locale/zh_CN/LC_MESSAGES/codelite.mo |