From owner-svn-ports-all@FreeBSD.ORG Thu Jan 23 08:59:47 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87C191EA; Thu, 23 Jan 2014 08:59:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 680CF144E; Thu, 23 Jan 2014 08:59:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0N8xlVL043612; Thu, 23 Jan 2014 08:59:47 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0N8xkB7043606; Thu, 23 Jan 2014 08:59:46 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401230859.s0N8xkB7043606@svn.freebsd.org> From: Pietro Cerutti Date: Thu, 23 Jan 2014 08:59:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340815 - in head/editors/codelite: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jan 2014 08:59:47 -0000 Author: gahr Date: Thu Jan 23 08:59:45 2014 New Revision: 340815 URL: http://svnweb.freebsd.org/changeset/ports/340815 QAT: https://qat.redports.org/buildarchive/r340815/ Log: - Update to 5.4 Release notes: http://codelite.org/LiteEditor/ReleaseNotesCodeLite54 Added: head/editors/codelite/files/patch-codelite_terminal_CMakeLists.txt (contents, props changed) head/editors/codelite/files/patch-codelite_terminal_MainFrame.cpp (contents, props changed) Deleted: head/editors/codelite/files/patch-CodeLite_cpptoken.h Modified: head/editors/codelite/Makefile head/editors/codelite/distinfo head/editors/codelite/files/patch-CMakeLists.txt head/editors/codelite/pkg-plist Modified: head/editors/codelite/Makefile ============================================================================== --- head/editors/codelite/Makefile Thu Jan 23 08:58:23 2014 (r340814) +++ head/editors/codelite/Makefile Thu Jan 23 08:59:45 2014 (r340815) @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= codelite -DISTVERSION= 5.2 +DISTVERSION= 5.4 CATEGORIES= editors devel -MASTER_SITES= SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION}/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-gtk.src MAINTAINER= gahr@FreeBSD.org COMMENT= An Open Source IDE for C/C++ @@ -15,22 +13,30 @@ LICENSE= GPLv2 LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl RUN_DEPENDS= xterm:${PORTSDIR}/x11/xterm -OPTIONS_DEFINE= CSCOPE CLANG - +OPTIONS_DEFINE= CSCOPE CLANG NLS CSCOPE_DESC= CScope integration CLANG_DESC= Clang code-completion +OPTIONS_SUB= yes + +USE_GITHUB= yes +GH_ACCOUNT= eranif +GH_PROJECT= ${PORTNAME} +GH_COMMIT= 41e98e5 +GH_TAGNAME= 5.4 -USE_WX= 2.9 +USE_WX= 3.0 WX_UNICODE= yes -USES= gettext cmake:outsource dos2unix +USES= gettext cmake:outsource dos2unix shebangfix +DOS2UNIX_GLOB= *.cpp *.txt USE_LDCONFIG= ${PREFIX}/lib/codelite +SHEBANG_FILES= Runtime/clg++ Runtime/clgcc + +CXXFLAGS+= -I${LOCALBASE}/include CMAKE_ARGS+= -DIS_FREEBSD=1 \ -DPREFIX=${PREFIX} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -SVN_REVISION= 6213 - .include .if ${PORT_OPTIONS:MCSCOPE} @@ -40,10 +46,8 @@ RUN_DEPENDS+= cscope:${PORTSDIR}/devel/c .if ${PORT_OPTIONS:MCLANG} BUILD_DEPENDS+= ${LOCALBASE}/llvm-devel/lib/libclang.so:${PORTSDIR}/lang/clang-devel RUN_DEPENDS+= ${LOCALBASE}/llvm-devel/lib/libclang.so:${PORTSDIR}/lang/clang-devel -PLIST_SUB+= CLANG="" CMAKE_ARGS+= -DENABLE_CLANG=1 .else -PLIST_SUB+= CLANG="@comment " CMAKE_ARGS+= -DENABLE_CLANG=0 .endif @@ -52,9 +56,8 @@ post-patch: ${REINPLACE_CMD} -e \ 's|wx-config|${WX_CONFIG}|; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ + s|%%PREFIX%%|${PREFIX}|g; \ /IS_FREEBSD/s|0|1|' \ ${WRKSRC}/CMakeLists.txt - ${REINPLACE_CMD} -e 's|$${cur_rev}|${SVN_REVISION}|' \ - ${WRKSRC}/le_makerevision.sh .include Modified: head/editors/codelite/distinfo ============================================================================== --- head/editors/codelite/distinfo Thu Jan 23 08:58:23 2014 (r340814) +++ head/editors/codelite/distinfo Thu Jan 23 08:59:45 2014 (r340815) @@ -1,2 +1,2 @@ -SHA256 (codelite-5.2-gtk.src.tar.gz) = 8fdb4bb1bcb984aacead7b7d3c7087f2008303297ea90a6299e4deff196cf084 -SIZE (codelite-5.2-gtk.src.tar.gz) = 22710705 +SHA256 (codelite-5.4.tar.gz) = 2bdb6cfd1239a7fcaf476a215c9f7d775e8814f0930828b66e9acd4799cc5002 +SIZE (codelite-5.4.tar.gz) = 37950862 Modified: head/editors/codelite/files/patch-CMakeLists.txt ============================================================================== --- head/editors/codelite/files/patch-CMakeLists.txt Thu Jan 23 08:58:23 2014 (r340814) +++ head/editors/codelite/files/patch-CMakeLists.txt Thu Jan 23 08:59:45 2014 (r340815) @@ -1,6 +1,28 @@ ---- 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 @@ +--- CMakeLists.txt.orig 2014-01-22 15:20:56.000000000 +0100 ++++ CMakeLists.txt 2014-01-22 17:21:28.000000000 +0100 +@@ -34,7 +34,7 @@ + ############################################# + project( "CodeLite" ) + +-set( CL_PREFIX "/usr" ) ++set( CL_PREFIX "%%PREFIX%%" ) + if (CMAKE_CURRENT_LIST_DIR) # since cmake 2.8.3 + set( CL_SRC_ROOT ${CMAKE_CURRENT_LIST_DIR}) + else() +@@ -42,10 +42,10 @@ + endif() + + set( USE_CLANG 1 ) +-set( IS_FREEBSD 0 ) ++set( IS_FREEBSD 1 ) + set( BUILD_WXC 0 ) + set( CL_COPY_WX_LIBS 0 ) +-set( WITH_SFTP 1 ) ++set( WITH_SFTP 0 ) + + 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) Added: head/editors/codelite/files/patch-codelite_terminal_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/codelite/files/patch-codelite_terminal_CMakeLists.txt Thu Jan 23 08:59:45 2014 (r340815) @@ -0,0 +1,11 @@ +--- codelite_terminal/CMakeLists.txt.orig 2014-01-22 16:36:20.000000000 +0100 ++++ codelite_terminal/CMakeLists.txt 2014-01-22 16:36:35.000000000 +0100 +@@ -28,7 +28,7 @@ + add_executable(codelite-terminal ${SRCS}) + set ( UTIL_LIB "" ) + if ( UNIX ) +- set( UTIL_LIB "-lutil") ++ set( UTIL_LIB "-lutil -lkvm") + endif ( UNIX ) + + target_link_libraries(codelite-terminal ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} ${UTIL_LIB} ) Added: head/editors/codelite/files/patch-codelite_terminal_MainFrame.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/codelite/files/patch-codelite_terminal_MainFrame.cpp Thu Jan 23 08:59:45 2014 (r340815) @@ -0,0 +1,16 @@ +--- 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 + + #ifndef __WXMSW__ +-#if defined(__WXGTK__) ++#if defined(__FreeBSD__) ++# include ++# include ++# include ++# include ++#elif defined(__WXGTK__) + # include + #else + # include Modified: head/editors/codelite/pkg-plist ============================================================================== --- head/editors/codelite/pkg-plist Thu Jan 23 08:58:23 2014 (r340814) +++ head/editors/codelite/pkg-plist Thu Jan 23 08:59:45 2014 (r340815) @@ -1,4 +1,6 @@ bin/codelite +bin/codelite-make +bin/codelite-terminal %%CLANG%%bin/codelite-clang bin/clg++ bin/clgcc @@ -9,6 +11,7 @@ bin/codelite_indexer bin/codelite_kill_children bin/codelite_xterm bin/codelitegcc +lib/codelite/CMakePlugin.so lib/codelite/CallGraph.so lib/codelite/CodeFormatter.so lib/codelite/ContinuousBuild.so @@ -19,6 +22,7 @@ lib/codelite/Outline.so lib/codelite/QMakePlugin.so lib/codelite/SnipWiz.so lib/codelite/Subversion.so +lib/codelite/Tweaks.so lib/codelite/UnitTestsPP.so lib/codelite/Wizards.so lib/codelite/ZoomNavigator.so @@ -125,10 +129,10 @@ lib/codelite/wxFormBuilder.so %%DATADIR%%/templates/gizmos/wxmain.project.wizard %%DATADIR%%/templates/gizmos/wxproject-fb.project.wizard %%DATADIR%%/templates/gizmos/wxproject.project.wizard -%%DATADIR%%/templates/projects/ConsoleClang/ConsoleClang.project -%%DATADIR%%/templates/projects/ConsoleClang/main.c %%DATADIR%%/templates/projects/ConsoleClang++/ConsoleClang++.project %%DATADIR%%/templates/projects/ConsoleClang++/main.cpp +%%DATADIR%%/templates/projects/ConsoleClang/ConsoleClang.project +%%DATADIR%%/templates/projects/ConsoleClang/main.c %%DATADIR%%/templates/projects/UnitTest++/UnitTest++.project %%DATADIR%%/templates/projects/UnitTest++/icon.png %%DATADIR%%/templates/projects/UnitTest++/main.cpp @@ -157,8 +161,10 @@ lib/codelite/wxFormBuilder.so %%DATADIR%%/templates/projects/custom-makefile/custom-makefile.project %%DATADIR%%/templates/projects/custom-makefile/icon.png %%DATADIR%%/templates/projects/dynamic-library-wx-enabled/dynamic-library-wx-enabled.project +%%DATADIR%%/templates/projects/dynamic-library-wx-enabled/dynamic-library-wx-enabled.project.windows %%DATADIR%%/templates/projects/dynamic-library-wx-enabled/icon.png %%DATADIR%%/templates/projects/dynamic-library/dynamic-library.project +%%DATADIR%%/templates/projects/dynamic-library/dynamic-library.project.windows %%DATADIR%%/templates/projects/dynamic-library/icon.png %%DATADIR%%/templates/projects/executable-cobra/executable-cobra.project %%DATADIR%%/templates/projects/executable-cobra/main.cobra @@ -181,6 +187,7 @@ lib/codelite/wxFormBuilder.so %%DATADIR%%/templates/projects/executable-wx-dialog/icon.png %%DATADIR%%/templates/projects/executable-wx-dialog/main.cpp %%DATADIR%%/templates/projects/executable-wx-dialog/main.h +%%DATADIR%%/templates/projects/executable-wx-dialog/win_resources.rc %%DATADIR%%/templates/projects/executable-wx-enabled/executable-wx-enabled.project %%DATADIR%%/templates/projects/executable-wx-enabled/icon.png %%DATADIR%%/templates/projects/executable-wx-enabled/main.cpp @@ -191,6 +198,7 @@ lib/codelite/wxFormBuilder.so %%DATADIR%%/templates/projects/executable-wx-frame/icon.png %%DATADIR%%/templates/projects/executable-wx-frame/main.cpp %%DATADIR%%/templates/projects/executable-wx-frame/main.h +%%DATADIR%%/templates/projects/executable-wx-frame/win_resources.rc %%DATADIR%%/templates/projects/executable-wxcrafter-dialog/MainDialog.cpp %%DATADIR%%/templates/projects/executable-wxcrafter-dialog/MainDialog.h %%DATADIR%%/templates/projects/executable-wxcrafter-dialog/icon.png @@ -227,14 +235,20 @@ lib/codelite/wxFormBuilder.so %%DATADIR%%/templates/projects/vc-executable/vc-executable.project %%DATADIR%%/templates/projects/vc-static-lib/icon.png %%DATADIR%%/templates/projects/vc-static-lib/vc-static-lib.project +%%DATADIR%%/templates/projects/wxWidgets_ConsoleApp/icon.png +%%DATADIR%%/templates/projects/wxWidgets_ConsoleApp/main_app.cpp +%%DATADIR%%/templates/projects/wxWidgets_ConsoleApp/main_app.h +%%DATADIR%%/templates/projects/wxWidgets_ConsoleApp/wxWidgets_ConsoleApp.project %%DATADIR%%/templates/qmake/qmake.project %%DATADIR%%/unittest++1.3.tar.gz -share/locale/cs/LC_MESSAGES/codelite.mo +%%NLS%%share/locale/cs/LC_MESSAGES/codelite.mo +%%NLS%%share/locale/cz/LC_MESSAGES/codelite.mo share/applications/codelite.desktop @dirrm lib/codelite/resources @dirrm lib/codelite/debuggers @dirrm lib/codelite @dirrm %%DATADIR%%/templates/qmake +@dirrm %%DATADIR%%/templates/projects/wxWidgets_ConsoleApp @dirrm %%DATADIR%%/templates/projects/vc-static-lib @dirrm %%DATADIR%%/templates/projects/vc-executable @dirrm %%DATADIR%%/templates/projects/vc-dynamic-library @@ -279,3 +293,5 @@ share/applications/codelite.desktop @dirrm %%DATADIR%%/gdb_printers @dirrm %%DATADIR%%/config @dirrm %%DATADIR%% +@dirrmtry share/locale/cz/LC_MESSAGES +@dirrmtry share/locale/cz