4 files changed, 69 insertions, 37 deletions

diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index 78a466ea6d7d..a573ba665fe5 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	codelite
-DISTVERSION=	4.0.${SVN_REVISION}
+DISTVERSION=	4.1.${SVN_REVISION}
 CATEGORIES=	editors devel
 MASTER_SITES=	SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION:R}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-gtk.src
@@ -14,13 +14,15 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-gtk.src
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	An Open Source IDE for C/C++
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	xterm:${PORTSDIR}/x11/xterm
 
-OPTIONS=	CSCOPE	"Enable CScope integration" OFF \
-		CLANG "Enable clang code-completion" OFF \
-		MYSQL "Enable MySQL in DB Explorer plugin" OFF \
-		POSTGRES "Enable PostgreSQL in DB Explorer plugin" OFF
+OPTIONS_DEFINE=	CSCOPE CLANG MYSQL PGSQL
+
+CSCOPE_DESC=	CScope integration
+CLANG_DESC=	Clang code-completion
 
 USE_WX=		2.8
 WX_UNICODE=	yes
@@ -30,15 +32,15 @@ CONFIGURE_ARGS+=--enable-debug
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.include <bsd.port.pre.mk>
+SVN_REVISION=	5770
 
-SVN_REVISION=	5589
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CSCOPE)
+.if ${PORT_OPTIONS:MCSCOPE}
 RUN_DEPENDS+=	cscope:${PORTSDIR}/devel/cscope
 .endif
 
-.if defined(WITH_CLANG)
+.if ${PORT_OPTIONS:MCLANG}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libclang.so:${PORTSDIR}/lang/clang
 RUN_DEPENDS+=	${LOCALBASE}/lib/libclang.so:${PORTSDIR}/lang/clang
 PLIST_SUB+=	CLANG=""
@@ -47,7 +49,7 @@ ENABLE_CLANG=	\#
 PLIST_SUB+=	CLANG="@comment "
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 CONFIGURE_ARGS+=--enable-mysql
 USE_MYSQL=	client
 PLIST_SUB+=	MYSQL=""
@@ -55,7 +57,7 @@ PLIST_SUB+=	MYSQL=""
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.if defined(WITH_POSTGRES)
+.if ${PORT_OPTIONS:MPGSQL}
 CONFIGURE_ARGS+=--enable-postgres
 USE_PGSQL=	yes
 PLIST_SUB+=	POSTGRES=""
@@ -77,4 +79,4 @@ post-patch:
 	${RM} ${WRKSRC}/CodeLite/readtags.h
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/codelite/distinfo b/editors/codelite/distinfo
index ce5d239e893b..7ea2e7c56c6b 100644
--- a/editors/codelite/distinfo
+++ b/editors/codelite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (codelite-4.0.5589-gtk.src.tar.gz) = 9b6dc38bdf441eaa77a4cdd6453821771c6773bfe277e8896065555d88f2afe5
-SIZE (codelite-4.0.5589-gtk.src.tar.gz) = 18374651
+SHA256 (codelite-4.1.5770-gtk.src.tar.gz) = 35f7ca260441977cfbf63d89ce4e2ef59a5a30fa35e08fb17f468ea2158fdf92
+SIZE (codelite-4.1.5770-gtk.src.tar.gz) = 21608418
diff --git a/editors/codelite/files/patch-clang31 b/editors/codelite/files/patch-clang31
index 0cbe62567825..9693d496a558 100644
--- a/editors/codelite/files/patch-clang31
+++ b/editors/codelite/files/patch-clang31
@@ -1,22 +1,29 @@
---- LiteEditor/clang_pch_maker_thread.cpp.orig	2012-06-18 14:58:00.000000000 +0200
-+++ LiteEditor/clang_pch_maker_thread.cpp	2012-06-18 14:58:08.000000000 +0200
-@@ -385,7 +385,6 @@
- 		        | CXTranslationUnit_CXXChainedPCH;
- 	} else {
- 		flags = CXTranslationUnit_Incomplete
--		        | CXTranslationUnit_SkipFunctionBodies
- 		        | CXTranslationUnit_DetailedPreprocessingRecord;
- 	}
- 
---- codelite_clang/clang.cpp.orig	2012-06-18 14:44:20.000000000 +0200
-+++ codelite_clang/clang.cpp	2012-06-18 14:44:27.000000000 +0200
-@@ -204,8 +204,7 @@
- 	                       | CXTranslationUnit_PrecompiledPreamble
- 	                       | CXTranslationUnit_Incomplete
- 	                       | CXTranslationUnit_DetailedPreprocessingRecord
--	                       | CXTranslationUnit_CXXChainedPCH
--	                       | CXTranslationUnit_SkipFunctionBodies);
-+	                       | CXTranslationUnit_CXXChainedPCH);
- 	if(TU) {
- 
- 		//ClangUtils::printDiagnosticsToLog(TU);
+--- LiteEditor/clang_driver.cpp.orig	2012-08-30 10:23:36.000000000 +0200
++++ LiteEditor/clang_driver.cpp	2012-08-30 10:24:08.000000000 +0200
+@@ -670,6 +670,7 @@
+         tag->SetSignature (entrySignature);
+         
+         // Add support for clang comment parsing
++        /*
+         CXString BriefComment = clang_getCompletionBriefComment(str);
+         const char* comment = clang_getCString(BriefComment);
+         if( comment && comment[0] != '\0' ) {
+@@ -677,6 +678,7 @@
+         }
+         
+         clang_disposeString(BriefComment);
++        */
+         
+         switch(kind) {
+         case CXCursor_EnumConstantDecl:
+--- LiteEditor/clang_pch_maker_thread.cpp.orig	2012-08-30 10:24:32.000000000 +0200
++++ LiteEditor/clang_pch_maker_thread.cpp	2012-08-30 10:24:51.000000000 +0200
+@@ -130,7 +130,7 @@
+ 		                                      task->GetColumn(),
+ 		                                      usf.GetUnsavedFiles(),
+ 		                                      usf.GetCount(),
+-		                                      clang_defaultCodeCompleteOptions() | CXCodeComplete_IncludeBriefComments);
++		                                      clang_defaultCodeCompleteOptions() /*| CXCodeComplete_IncludeBriefComments*/);
+ 		
+ 		cacheEntry.lastReparse = time(NULL);
+ 		
diff --git a/editors/codelite/pkg-plist b/editors/codelite/pkg-plist
index 16480d116828..c46bc114329a 100644
--- a/editors/codelite/pkg-plist
+++ b/editors/codelite/pkg-plist
@@ -1,4 +1,5 @@
 bin/codelite
+bin/codelitegcc
 %%CLANG%%bin/codelite-clang
 bin/codelite_cppcheck
 bin/codelite_exec
@@ -34,10 +35,10 @@ bin/codelite_xterm
 %%DATADIR%%/plugins/DatabaseExplorer.so
 %%DATADIR%%/plugins/ExternalTools.so
 %%DATADIR%%/plugins/Gizmos.so
+%%DATADIR%%/plugins/Outline.so
 %%DATADIR%%/plugins/QmakePlugin.so
 %%DATADIR%%/plugins/SnipWiz.so
 %%DATADIR%%/plugins/Subversion2.so
-%%DATADIR%%/plugins/SymbolView.so
 %%DATADIR%%/plugins/UnitTestCPP.so
 %%DATADIR%%/plugins/abbreviation.so
 %%DATADIR%%/plugins/cscope.so
@@ -152,6 +153,26 @@ bin/codelite_xterm
 %%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-wxcrafter-dialog/MainDialog.cpp
+%%DATADIR%%/templates/projects/executable-wxcrafter-dialog/MainDialog.h
+%%DATADIR%%/templates/projects/executable-wxcrafter-dialog/icon.png
+%%DATADIR%%/templates/projects/executable-wxcrafter-dialog/main.cpp
+%%DATADIR%%/templates/projects/executable-wxcrafter-dialog/win_resources.rc
+%%DATADIR%%/templates/projects/executable-wxcrafter-dialog/wxCrafter_MainDialog.project
+%%DATADIR%%/templates/projects/executable-wxcrafter-dialog/wxcrafter.cpp
+%%DATADIR%%/templates/projects/executable-wxcrafter-dialog/wxcrafter.h
+%%DATADIR%%/templates/projects/executable-wxcrafter-dialog/wxcrafter.wxcp
+%%DATADIR%%/templates/projects/executable-wxcrafter-dialog/wxcrafter_bitmaps.cpp
+%%DATADIR%%/templates/projects/executable-wxcrafter-frame/MainFrame.cpp
+%%DATADIR%%/templates/projects/executable-wxcrafter-frame/MainFrame.h
+%%DATADIR%%/templates/projects/executable-wxcrafter-frame/icon.png
+%%DATADIR%%/templates/projects/executable-wxcrafter-frame/main.cpp
+%%DATADIR%%/templates/projects/executable-wxcrafter-frame/win_resources.rc
+%%DATADIR%%/templates/projects/executable-wxcrafter-frame/wxCrafter_MainFrame.project
+%%DATADIR%%/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp
+%%DATADIR%%/templates/projects/executable-wxcrafter-frame/wxcrafter.h
+%%DATADIR%%/templates/projects/executable-wxcrafter-frame/wxcrafter.wxcp
+%%DATADIR%%/templates/projects/executable-wxcrafter-frame/wxcrafter_bitmaps.cpp
 %%DATADIR%%/templates/projects/executable/executable.project
 %%DATADIR%%/templates/projects/executable/icon.png
 %%DATADIR%%/templates/projects/executable/main.cpp
@@ -183,6 +204,8 @@ share/applications/codelite.desktop
 @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
 @dirrm %%DATADIR%%/templates/projects/executable-wx-frame
 @dirrm %%DATADIR%%/templates/projects/executable-wx-enabled
 @dirrm %%DATADIR%%/templates/projects/executable-wx-dialog