Date: Sun, 10 Jan 2016 12:07:02 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405694 - in head/editors/codelite: . files Message-ID: <201601101207.u0AC72ER090955@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Sun Jan 10 12:07:01 2016 New Revision: 405694 URL: https://svnweb.freebsd.org/changeset/ports/405694 Log: - Update to 9.0 PR: 205203 Submitted by: ports fury Deleted: head/editors/codelite/files/ Modified: head/editors/codelite/Makefile head/editors/codelite/distinfo head/editors/codelite/pkg-plist Modified: head/editors/codelite/Makefile ============================================================================== --- head/editors/codelite/Makefile Sun Jan 10 10:47:50 2016 (r405693) +++ head/editors/codelite/Makefile Sun Jan 10 12:07:01 2016 (r405694) @@ -2,65 +2,96 @@ # $FreeBSD$ PORTNAME= codelite -DISTVERSION= 8.1 +PORTVERSION= 9.0 CATEGORIES= editors devel +MASTER_SITES= GH MAINTAINER= ports@FreeBSD.org COMMENT= Open Source IDE for C/C++ -LICENSE= GPLv2 +LICENSE= GPLv2 # (or later) -LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl RUN_DEPENDS= xterm:${PORTSDIR}/x11/xterm -BROKEN_FreeBSD_8= does not build on FreeBSD < 10.x -BROKEN_FreeBSD_9= does not build on FreeBSD < 10.x - -OPTIONS_DEFINE= CSCOPE CLANG NLS -CSCOPE_DESC= CScope integration -CLANG_DESC= Clang code-completion -OPTIONS_SUB= yes - USE_GITHUB= yes GH_ACCOUNT= eranif -USE_WX= 3.0 -WX_UNICODE= yes -USES= gettext cmake:outsource dos2unix execinfo shebangfix +USES= cmake:outsource compiler:c++11-lib dos2unix execinfo gettext \ + shebangfix DOS2UNIX_GLOB= *.cpp *.txt -USE_LDCONFIG= ${PREFIX}/lib/codelite -SHEBANG_FILES= Runtime/clg++ Runtime/clgcc Runtime/codelite_xterm +SHEBANG_FILES= Runtime/codelite_xterm bash_CMD= /bin/sh +USE_SQLITE= 3 +USE_WX= 3.0 +CMAKE_ARGS= -DENABLE_LLDB:STRING=0 \ + -DPREFIX:STRING="${PREFIX}" +USE_LDCONFIG= ${PREFIX}/lib/codelite INSTALLS_ICONS= yes -CMAKE_ARGS+= -DIS_FREEBSD=1 \ - -DENABLE_LLDB=0 \ - -DPREFIX=${PREFIX} +CXXFLAGS+= ${EXECINFO_CPPFLAGS} +LDFLAGS+= ${EXECINFO_LDFLAGS} -.include <bsd.port.options.mk> +OPTIONS_DEFINE= CSCOPE SFTP +OPTIONS_RADIO= CLANG +OPTIONS_RADIO_CLANG= CLANG34 CLANG35 CLANG36 +OPTIONS_SUB= yes + +CLANG_DESC= Clang code-completion +CLANG34_DESC= Clang 3.4.x +CLANG34_BUILD_DEPENDS= clang34>0:${PORTSDIR}/lang/clang34 +CLANG34_RUN_DEPENDS= clang34>0:${PORTSDIR}/lang/clang34 +CLANG35_DESC= Clang 3.5.x +CLANG35_BUILD_DEPENDS= clang35>0:${PORTSDIR}/lang/clang35 +CLANG35_RUN_DEPENDS= clang35>0:${PORTSDIR}/lang/clang35 +CLANG36_DESC= Clang 3.6.x +CLANG36_BUILD_DEPENDS= clang36>0:${PORTSDIR}/lang/clang36 +CLANG36_RUN_DEPENDS= clang36>0:${PORTSDIR}/lang/clang36 +CSCOPE_DESC= CScope integration +CSCOPE_RUN_DEPENDS= cscope:${PORTSDIR}/devel/cscope +SFTP_DESC= Secure FTP support via libssh +SFTP_LIB_DEPENDS= libssh.so:${PORTSDIR}/security/libssh +SFTP_CMAKE_OFF= -DENABLE_SFTP:STRING=0 -.if ${PORT_OPTIONS:MCSCOPE} -RUN_DEPENDS+= cscope:${PORTSDIR}/devel/cscope -.endif +.include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MCLANG} -BUILD_DEPENDS+= ${LOCALBASE}/llvm34/lib/libclang.so:${PORTSDIR}/lang/clang34 -RUN_DEPENDS+= ${LOCALBASE}/llvm34/lib/libclang.so:${PORTSDIR}/lang/clang34 -CMAKE_ARGS+= -DENABLE_CLANG=1 +.if ${PORT_OPTIONS:MCLANG34} || ${PORT_OPTIONS:MCLANG35} || ${PORT_OPTIONS:MCLANG36} +CMAKE_ARGS+= -DENABLE_CLANG:STRING=1 .else -CMAKE_ARGS+= -DENABLE_CLANG=0 +CMAKE_ARGS+= -DENABLE_CLANG:STRING=0 .endif post-patch: # Use the correct wx-config - ${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|share/man|man|' ${WRKSRC}/LiteEditor/CMakeLists.txt - ${REINPLACE_CMD} -e 's|codelitegcc|codelite-cc|' \ - ${WRKSRC}/Runtime/clgcc ${WRKSRC}/Runtime/clg++ + @${REINPLACE_CMD} -e \ + '/IS_FREEBSD/s|0|1| ; \ + /CL_WX_CONFIG/s|wx-config|${WX_CONFIG:T}| ; \ + /-O2/s|^|#| ; \ + s|"-s"|""|' \ + ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e \ + 's|"-lkvm"|"-lkvm -lutil"| ; \ + s|share/man|man|' \ + ${WRKSRC}/LiteEditor/CMakeLists.txt + @${REINPLACE_CMD} -e \ + 's|"-lutil"|"-lkvm -lutil"|' \ + ${WRKSRC}/codelite_terminal/CMakeLists.txt + @${REINPLACE_CMD} -e \ + '/ADDITIONAL_LIBRARIES/s|""|"-lexecinfo"|' \ + ${WRKSRC}/sdk/codelite_cppcheck/CMakeLists.txt + +post-patch-CLANG34-on: + @${REINPLACE_CMD} -e \ + 's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm34/|' \ + ${WRKSRC}/cmake/Modules/FindLibClang.cmake + +post-patch-CLANG35-on: + @${REINPLACE_CMD} -e \ + 's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm35/|' \ + ${WRKSRC}/cmake/Modules/FindLibClang.cmake + +post-patch-CLANG36-on: + @${REINPLACE_CMD} -e \ + 's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm36/|' \ + ${WRKSRC}/cmake/Modules/FindLibClang.cmake .include <bsd.port.mk> Modified: head/editors/codelite/distinfo ============================================================================== --- head/editors/codelite/distinfo Sun Jan 10 10:47:50 2016 (r405693) +++ head/editors/codelite/distinfo Sun Jan 10 12:07:01 2016 (r405694) @@ -1,2 +1,2 @@ -SHA256 (eranif-codelite-8.1_GH0.tar.gz) = 3d43e5a5b504937d6137311417447eabdc8398dccaad4eef1ccba4080e920270 -SIZE (eranif-codelite-8.1_GH0.tar.gz) = 72812631 +SHA256 (eranif-codelite-9.0_GH0.tar.gz) = 401ce3c8394aaee661fcae01330e5934ddeb10f5e4abc671d77f06602db05398 +SIZE (eranif-codelite-9.0_GH0.tar.gz) = 72878710 Modified: head/editors/codelite/pkg-plist ============================================================================== --- head/editors/codelite/pkg-plist Sun Jan 10 10:47:50 2016 (r405693) +++ head/editors/codelite/pkg-plist Sun Jan 10 12:07:01 2016 (r405694) @@ -1,5 +1,3 @@ -bin/clg++ -bin/clgcc bin/codelite bin/codelite-cc bin/codelite-echo @@ -23,6 +21,7 @@ lib/codelite/HelpPlugin.so lib/codelite/MemCheck.so lib/codelite/Outline.so lib/codelite/QMakePlugin.so +%%SFTP%%lib/codelite/SFTP.so lib/codelite/SnipWiz.so lib/codelite/SpellCheck.so lib/codelite/Subversion.so @@ -43,24 +42,11 @@ lib/codelite/liblibcodelite.so lib/codelite/libplugin.so lib/codelite/libwxshapeframework.so lib/codelite/libwxsqlite3.so -lib/codelite/resources/abbrev.png -lib/codelite/resources/compfile.png -lib/codelite/resources/connect_no.png -lib/codelite/resources/cppcheck.png -lib/codelite/resources/qt16_new.png -lib/codelite/resources/qt16_preferences.png -lib/codelite/resources/qt24_new.png -lib/codelite/resources/qt24_preferences.png -lib/codelite/resources/svn_diff.png -lib/codelite/resources/svn_settings.png -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 -man/man1/codelite-make.1.gz man/man1/codelite.1.gz +man/man1/codelite-make.1.gz man/man1/codelite_fix_files.1.gz +share/applications/codelite.desktop %%DATADIR%%/LICENSE %%DATADIR%%/PHP.zip %%DATADIR%%/astyle.sample @@ -101,6 +87,20 @@ man/man1/codelite_fix_files.1.gz %%DATADIR%%/javascript.zip %%DATADIR%%/lexers/lexers.json %%DATADIR%%/rc/menu.xrc +%%DATADIR%%/resources/abbrev.png +%%DATADIR%%/resources/compfile.png +%%DATADIR%%/resources/connect_no.png +%%DATADIR%%/resources/cppcheck.png +%%DATADIR%%/resources/qt16_new.png +%%DATADIR%%/resources/qt16_preferences.png +%%DATADIR%%/resources/qt24_new.png +%%DATADIR%%/resources/qt24_preferences.png +%%DATADIR%%/resources/svn_diff.png +%%DATADIR%%/resources/svn_settings.png +%%DATADIR%%/resources/svn_ssh.png +%%DATADIR%%/resources/wxfb_conflict.png +%%DATADIR%%/resources/wxfb_modified.png +%%DATADIR%%/resources/wxfb_ok.png %%DATADIR%%/templates/codedesigner/CDTemplate.cdp %%DATADIR%%/templates/codedesigner/HSCHTemplate.cdp %%DATADIR%%/templates/codedesigner/HSCHTemplateWithMain.cdp @@ -272,7 +272,6 @@ man/man1/codelite_fix_files.1.gz %%DATADIR%%/templates/projects/wxWidgets_ConsoleApp/wxWidgets_ConsoleApp.project %%DATADIR%%/templates/qmake/qmake.project %%DATADIR%%/unittest++1.3.tar.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601101207.u0AC72ER090955>