Date: Wed, 17 Apr 2013 08:16:10 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315946 - in head/editors/codelite: . files Message-ID: <201304170816.r3H8GARm013160@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Wed Apr 17 08:16:10 2013 New Revision: 315946 URL: http://svnweb.freebsd.org/changeset/ports/315946 Log: - Update to 5.1 Release notes: http://sf.net/projects/codelite/files/Releases/codelite-5.1/ - Remove a few FreeBSD-specific patches which were applied upstream Feature safe: yes Added: head/editors/codelite/files/patch-CMakeLists.txt (contents, props changed) head/editors/codelite/files/patch-LiteEditor_CMakeLists.txt (contents, props changed) Deleted: head/editors/codelite/files/patch-CodeLite_unixprocess_impl.cpp head/editors/codelite/files/patch-Plugin_wxterminal.cpp head/editors/codelite/files/patch-Runtime_codelite_kill_children head/editors/codelite/files/patch-configure head/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp Modified: head/editors/codelite/Makefile head/editors/codelite/distinfo head/editors/codelite/files/patch-clang head/editors/codelite/pkg-plist Modified: head/editors/codelite/Makefile ============================================================================== --- head/editors/codelite/Makefile Wed Apr 17 08:13:58 2013 (r315945) +++ head/editors/codelite/Makefile Wed Apr 17 08:16:10 2013 (r315946) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= codelite -DISTVERSION= 5.0.${SVN_REVISION} +DISTVERSION= 5.1 CATEGORIES= editors devel -MASTER_SITES= SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION:R}/ +MASTER_SITES= SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-gtk.src MAINTAINER= gahr@FreeBSD.org @@ -15,7 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl RUN_DEPENDS= xterm:${PORTSDIR}/x11/xterm -OPTIONS_DEFINE= CSCOPE CLANG MYSQL PGSQL +OPTIONS_DEFINE= CSCOPE CLANG CSCOPE_DESC= CScope integration CLANG_DESC= Clang code-completion @@ -23,12 +23,12 @@ CLANG_DESC= Clang code-completion USE_WX= 2.9 WX_UNICODE= yes USE_DOS2UNIX= *.cpp -USE_GMAKE= yes -HAS_CONFIGURE= yes -CPPFLAGS+= -g -O0 -CONFIGURE_ARGS+=--enable-debug \ - --prefix=${PREFIX} -CONFIGURE_ENV+= WXCONFIG=${WX_CONFIG} +USE_GETTEXT= yes +USE_LDCONFIG= lib/codelite +USE_CMAKE= yes +CMAKE_OUTSOURCE=yes +CMAKE_ARGS+= -DIS_FREEBSD=1 \ + -DPREFIX=${PREFIX} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -41,42 +41,23 @@ RUN_DEPENDS+= cscope:${PORTSDIR}/devel/c .endif .if ${PORT_OPTIONS:MCLANG} -.if ${OSVERSION} < 1000026 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libclang.so:${PORTSDIR}/lang/clang -RUN_DEPENDS+= ${LOCALBASE}/lib/libclang.so:${PORTSDIR}/lang/clang -.endif +BUILD_DEPENDS+= ${LOCALBASE}/lib/libclang.so:${PORTSDIR}/lang/clang-devel +RUN_DEPENDS+= ${LOCALBASE}/lib/libclang.so:${PORTSDIR}/lang/clang-devel PLIST_SUB+= CLANG="" +CMAKE_ARGS+= -DENABLE_CLANG=1 .else -CONFIGURE_ARGS+=--without-clang -ENABLE_CLANG= \# PLIST_SUB+= CLANG="@comment " -.endif - -.if ${PORT_OPTIONS:MMYSQL} -CONFIGURE_ARGS+=--enable-mysql -USE_MYSQL= client -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " -.endif - -.if ${PORT_OPTIONS:MPGSQL} -CONFIGURE_ARGS+=--enable-postgres -USE_PGSQL= yes -PLIST_SUB+= POSTGRES="" -.else -PLIST_SUB+= POSTGRES="@comment " +CMAKE_ARGS+= -DENABLE_CLANG=0 .endif post-patch: # Use the correct wx-config - ${REINPLACE_CMD} -e 's|%%ENABLE_CLANG%%|${ENABLE_CLANG}|g; \ - s|%%LOCALBASE%%|${LOCALBASE}|g; s|666|644|' ${WRKSRC}/configure + ${REINPLACE_CMD} -e \ + 's|wx-config|${WX_CONFIG}|; \ + s|%%LOCALBASE%%|${LOCALBASE}|g; \ + /IS_FREEBSD/s|0|1|' \ + ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e 's|$${cur_rev}|${SVN_REVISION}|' \ ${WRKSRC}/le_makerevision.sh -# CTags already installed -.if exists(${LOCALBASE}/include/readtags.h) - ${RM} ${WRKSRC}/CodeLite/readtags.h -.endif .include <bsd.port.mk> Modified: head/editors/codelite/distinfo ============================================================================== --- head/editors/codelite/distinfo Wed Apr 17 08:13:58 2013 (r315945) +++ head/editors/codelite/distinfo Wed Apr 17 08:16:10 2013 (r315946) @@ -1,2 +1,2 @@ -SHA256 (codelite-5.0.6213-gtk.src.tar.gz) = 022f66bc9ea2d56c66592e26a0f3c003a36f0188c352c391c6450e02f14bcc34 -SIZE (codelite-5.0.6213-gtk.src.tar.gz) = 21883718 +SHA256 (codelite-5.1-gtk.src.tar.gz) = ba154f8f9e0bd5f55432c2383241e08da7ce60c5963e2caff38723bafbde844d +SIZE (codelite-5.1-gtk.src.tar.gz) = 22403559 Added: head/editors/codelite/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/codelite/files/patch-CMakeLists.txt Wed Apr 17 08:16:10 2013 (r315946) @@ -0,0 +1,15 @@ +--- CMakeLists.txt.orig 2013-04-02 15:50:03.000000000 +0200 ++++ CMakeLists.txt 2013-04-02 15:51:59.000000000 +0200 +@@ -212,9 +212,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%%/include" ) ++ set( CLANG_LIBRARY "-L%%LOCALBASE%%/lib/ -lclang" ) ++ set( CLANG_BINARY "%%LOCALBASE%%/lib/libclang.so") + endif() + + message( "-- clang link line ${CLANG_LIBRARY} ") Added: head/editors/codelite/files/patch-LiteEditor_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/codelite/files/patch-LiteEditor_CMakeLists.txt Wed Apr 17 08:16:10 2013 (r315946) @@ -0,0 +1,11 @@ +--- LiteEditor/CMakeLists.txt.orig 2013-04-03 11:54:27.000000000 +0200 ++++ LiteEditor/CMakeLists.txt 2013-04-03 11:54:07.000000000 +0200 +@@ -69,7 +69,7 @@ + + if (UNIX) + if ( IS_FREEBSD ) +- set(ADDITIONAL_LIBRARIES "-lkvm") ++ set(ADDITIONAL_LIBRARIES "-lkvm -lutil") + elseif ( UNIX AND NOT APPLE ) + set(ADDITIONAL_LIBRARIES "-ldl -lutil") + else ( ) Modified: head/editors/codelite/files/patch-clang ============================================================================== --- head/editors/codelite/files/patch-clang Wed Apr 17 08:13:58 2013 (r315945) +++ head/editors/codelite/files/patch-clang Wed Apr 17 08:16:10 2013 (r315946) @@ -1,33 +1,16 @@ ---- LiteEditor/clang_driver.cpp.orig 2013-02-01 17:27:10.000000000 +0100 -+++ LiteEditor/clang_driver.cpp 2013-02-01 17:28:50.000000000 +0100 -@@ -533,6 +533,7 @@ - tag->SetSignature (entrySignature); - - // Add support for clang comment parsing +--- 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__ - CXString BriefComment = clang_getCompletionBriefComment(str); - const char* comment = clang_getCString(BriefComment); - if( comment && comment[0] != '\0' ) { -@@ -540,6 +541,7 @@ - } - - clang_disposeString(BriefComment); ++ CXTranslationUnit_CXXPrecompiledPreamble | +#endif - - switch(kind) { - case CXCursor_EnumConstantDecl: ---- LiteEditor/clang_pch_maker_thread.cpp.orig 2013-02-01 17:29:21.000000000 +0100 -+++ LiteEditor/clang_pch_maker_thread.cpp 2013-02-01 17:32:18.000000000 +0100 -@@ -130,7 +130,11 @@ - task->GetColumn(), - usf.GetUnsavedFiles(), - usf.GetCount(), -- clang_defaultCodeCompleteOptions() | CXCodeComplete_IncludeBriefComments); -+ clang_defaultCodeCompleteOptions() -+#ifndef __FreeBSD__ -+ | CXCodeComplete_IncludeBriefComments -+#endif -+ ); - - cacheEntry.lastReparse = time(NULL); - ++ CXTranslationUnit_CacheCompletionResults + | CXTranslationUnit_PrecompiledPreamble + | CXTranslationUnit_Incomplete + | CXTranslationUnit_DetailedPreprocessingRecord Modified: head/editors/codelite/pkg-plist ============================================================================== --- head/editors/codelite/pkg-plist Wed Apr 17 08:13:58 2013 (r315945) +++ head/editors/codelite/pkg-plist Wed Apr 17 08:16:10 2013 (r315946) @@ -1,5 +1,4 @@ bin/codelite -bin/codelitegcc %%CLANG%%bin/codelite-clang bin/codelite_cppcheck bin/codelite_exec @@ -7,77 +6,31 @@ bin/codelite_fix_files bin/codelite_indexer bin/codelite_kill_children bin/codelite_xterm +bin/codelitegcc lib/codelite/CallGraph.so lib/codelite/CodeFormatter.so lib/codelite/ContinuousBuild.so lib/codelite/Copyright.so -lib/codelite/CppCheck.so lib/codelite/DatabaseExplorer.so lib/codelite/ExternalTools.so -lib/codelite/Gizmos.so lib/codelite/Outline.so -lib/codelite/QmakePlugin.so +lib/codelite/QMakePlugin.so lib/codelite/SnipWiz.so -lib/codelite/Subversion2.so -lib/codelite/UnitTestCPP.so +lib/codelite/Subversion.so +lib/codelite/UnitTestsPP.so +lib/codelite/Wizards.so lib/codelite/ZoomNavigator.so lib/codelite/abbreviation.so +lib/codelite/cppchecker.so lib/codelite/cscope.so -lib/codelite/debuggers/Debugger.so +lib/codelite/debuggers/DebuggerGDB.so lib/codelite/git.so -lib/codelite/libcodeliteud.so -lib/codelite/libdblayersqliteud.so -lib/codelite/libpluginud.so -lib/codelite/libwx_baseu-2.9.so -lib/codelite/libwx_baseu-2.9.so.4 -lib/codelite/libwx_baseu-2.9.so.4.0.0 -lib/codelite/libwx_baseu_net-2.9.so -lib/codelite/libwx_baseu_net-2.9.so.4 -lib/codelite/libwx_baseu_net-2.9.so.4.0.0 -lib/codelite/libwx_baseu_xml-2.9.so -lib/codelite/libwx_baseu_xml-2.9.so.4 -lib/codelite/libwx_baseu_xml-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_adv-2.9.so -lib/codelite/libwx_gtk2u_adv-2.9.so.4 -lib/codelite/libwx_gtk2u_adv-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_aui-2.9.so -lib/codelite/libwx_gtk2u_aui-2.9.so.4 -lib/codelite/libwx_gtk2u_aui-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_core-2.9.so -lib/codelite/libwx_gtk2u_core-2.9.so.4 -lib/codelite/libwx_gtk2u_core-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_gl-2.9.so -lib/codelite/libwx_gtk2u_gl-2.9.so.4 -lib/codelite/libwx_gtk2u_gl-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_html-2.9.so -lib/codelite/libwx_gtk2u_html-2.9.so.4 -lib/codelite/libwx_gtk2u_html-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_media-2.9.so -lib/codelite/libwx_gtk2u_media-2.9.so.4 -lib/codelite/libwx_gtk2u_media-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_propgrid-2.9.so -lib/codelite/libwx_gtk2u_propgrid-2.9.so.4 -lib/codelite/libwx_gtk2u_propgrid-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_qa-2.9.so -lib/codelite/libwx_gtk2u_qa-2.9.so.4 -lib/codelite/libwx_gtk2u_qa-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_ribbon-2.9.so -lib/codelite/libwx_gtk2u_ribbon-2.9.so.4 -lib/codelite/libwx_gtk2u_ribbon-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_richtext-2.9.so -lib/codelite/libwx_gtk2u_richtext-2.9.so.4 -lib/codelite/libwx_gtk2u_richtext-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_stc-2.9.so -lib/codelite/libwx_gtk2u_stc-2.9.so.4 -lib/codelite/libwx_gtk2u_stc-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_webview-2.9.so -lib/codelite/libwx_gtk2u_webview-2.9.so.4 -lib/codelite/libwx_gtk2u_webview-2.9.so.4.0.0 -lib/codelite/libwx_gtk2u_xrc-2.9.so -lib/codelite/libwx_gtk2u_xrc-2.9.so.4 -lib/codelite/libwx_gtk2u_xrc-2.9.so.4.0.0 -lib/codelite/libwxshapeframeworkud.so -lib/codelite/libwxsqlite3ud.so +%%CLANG%%lib/codelite/libclang.so +lib/codelite/libdatabaselayersqlite.so +lib/codelite/liblibcodelite.so +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 @@ -95,16 +48,21 @@ lib/codelite/resources/svn_ssh.png lib/codelite/resources/wxfb_conflict.png lib/codelite/resources/wxfb_modified.png lib/codelite/resources/wxfb_ok.png -lib/codelite/wxformbuilder.so +lib/codelite/wxFormBuilder.so %%DATADIR%%/LICENSE %%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/codelite.xml.default %%DATADIR%%/config/debuggers.xml.default -%%DATADIR%%/config/plugins.xml.default +%%DATADIR%%/gdb_printers/libstdcxx/__init__.py +%%DATADIR%%/gdb_printers/libstdcxx/v6/__init__.py +%%DATADIR%%/gdb_printers/libstdcxx/v6/printers.py +%%DATADIR%%/gdb_printers/qt4.py +%%DATADIR%%/gdb_printers/wx.py %%DATADIR%%/images/common_tasks.png %%DATADIR%%/images/cubes.png %%DATADIR%%/images/help_earth.png @@ -113,12 +71,10 @@ lib/codelite/wxformbuilder.so %%DATADIR%%/images/recent_files.png %%DATADIR%%/images/recent_workspaces.png %%DATADIR%%/images/splashscreen.png -%%DATADIR%%/index.html %%DATADIR%%/lexers/lexers_black.xml %%DATADIR%%/lexers/lexers_default.xml +%%DATADIR%%/lexers/lexers_zmrok.xml %%DATADIR%%/rc/menu.xrc -%%DATADIR%%/src/unittest++1.3.tar.gz -%%DATADIR%%/svnreport.html %%DATADIR%%/templates/codedesigner/CDTemplate.cdp %%DATADIR%%/templates/codedesigner/HSCHTemplate.cdp %%DATADIR%%/templates/codedesigner/HSCHTemplateWithMain.cdp @@ -266,23 +222,18 @@ lib/codelite/wxformbuilder.so %%DATADIR%%/templates/projects/vc-static-lib/icon.png %%DATADIR%%/templates/projects/vc-static-lib/vc-static-lib.project %%DATADIR%%/templates/qmake/qmake.project -%%CLANG%%lib/codelite/libclang.so -%%MYSQL%%lib/codelite/libdblayermysqlud.so -%%POSTGRES%%lib/codelite/libdblayerpostgresud.so +%%DATADIR%%/unittest++1.3.tar.gz +share/locale/cs/LC_MESSAGES/codelite.mo share/applications/codelite.desktop -@dirrmtry share/applications +@dirrm lib/codelite/resources +@dirrm lib/codelite/debuggers +@dirrm lib/codelite @dirrm %%DATADIR%%/templates/qmake -@dirrm %%DATADIR%%/templates/projects/cpp_gtkmm3_template -@dirrm %%DATADIR%%/templates/projects/cpp_gtkmm24_template -@dirrm %%DATADIR%%/templates/projects/c_gtk3_template -@dirrm %%DATADIR%%/templates/projects/c_gtk24_template @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-wxcrafter-frame @dirrm %%DATADIR%%/templates/projects/executable-wxcrafter-dialog @@ -295,28 +246,29 @@ share/applications/codelite.desktop @dirrm %%DATADIR%%/templates/projects/executable-console-wx-enabled @dirrm %%DATADIR%%/templates/projects/executable-cobra @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/cpp_gtkmm3_template +@dirrm %%DATADIR%%/templates/projects/cpp_gtkmm24_template @dirrm %%DATADIR%%/templates/projects/cobra-staticU @dirrm %%DATADIR%%/templates/projects/cobra-libraryU @dirrm %%DATADIR%%/templates/projects/cobra-executableU +@dirrm %%DATADIR%%/templates/projects/c_gtk3_template +@dirrm %%DATADIR%%/templates/projects/c_gtk24_template @dirrm %%DATADIR%%/templates/projects/UnitTest++ -@dirrm %%DATADIR%%/templates/projects/QtConsole -@dirrm %%DATADIR%%/templates/projects/QmakeTestTmpl @dirrm %%DATADIR%%/templates/projects @dirrm %%DATADIR%%/templates/gizmos @dirrm %%DATADIR%%/templates/formbuilder @dirrm %%DATADIR%%/templates/databaselayer @dirrm %%DATADIR%%/templates/codedesigner @dirrm %%DATADIR%%/templates -@dirrm %%DATADIR%%/src @dirrm %%DATADIR%%/rc -@dirrm lib/codelite/resources -@dirrm lib/codelite/debuggers -@dirrm lib/codelite @dirrm %%DATADIR%%/lexers @dirrm %%DATADIR%%/images +@dirrm %%DATADIR%%/gdb_printers/libstdcxx/v6 +@dirrm %%DATADIR%%/gdb_printers/libstdcxx +@dirrm %%DATADIR%%/gdb_printers @dirrm %%DATADIR%%/config @dirrm %%DATADIR%% +@dirrmtry share/applications
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304170816.r3H8GARm013160>