4 files changed, 58 insertions, 28 deletions

diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index 7a0c5fd5a5d1..3fcfe82e8b89 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -6,28 +6,29 @@
 #
 
 PORTNAME=	codelite
-DISTVERSION=	r${SVN_REVISION}
+DISTVERSION=	${REL_VERSION}.r${SVN_REVISION}
 PORTREVISION=	1
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	gahr
+MASTER_SITES=	SF
+DISTNAME=	CodeLite-rev${SVN_REVISION}-v${REL_VERSION}.src
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	An Open Source IDE for C/C++
 
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
+
 OPTIONS=	CSCOPE	"Enable CScope integration" OFF
 
-WRKSRC=	${WRKDIR}/${PORTNAME}
+WRKSRC=	${WRKDIR}/CodeLite-Rev${SVN_REVISION}-V${REL_VERSION}
 
-USE_BZIP2=	yes
+USE_ZIP=	yes
 USE_WX=	2.8
 WX_UNICODE=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 
-SVN_REVISION=	1599
-
-GNU_CONFIGURE=	yes
+REL_VERSION=	1.0
+SVN_REVISION=	1789
 
 .include <bsd.port.pre.mk>
 
@@ -42,11 +43,19 @@ post-patch:
 	    ${WRKSRC}/configure ${WRKSRC}/makefile.base
 	${REINPLACE_CMD} -e 's|$${cur_rev}|${SVN_REVISION}|' \
 		${WRKSRC}/le_makerevision.sh
+	# CTags already installed
+	(if [ -f ${LOCALBASE}/include/readtags.h ]; then \
+	    ${RM} ${WRKSRC}/CodeLite/readtags.h; \
+	 fi; \
+	)
 .if ${ARCH} == "amd64"
 	${REINPLACE_CMD} -e 's|-Wall|-fPIC -Wall|g' \
 		${WRKSRC}/configure ${WRKSRC}/makefile.base
 .endif
 
+do-configure:
+	(cd ${WRKSRC} && ${SH} ${CONFIGURE_SCRIPT})
+
 do-install:
 	${MKDIR} ${DATADIR}
 	${MKDIR} ${DATADIR}/config
@@ -56,6 +65,7 @@ do-install:
 	${MKDIR} ${DATADIR}/debuggers
 	${MKDIR} ${DATADIR}/plugins
 	${MKDIR} ${DATADIR}/images
+	${MKDIR} ${PREFIX}/include/UnitTest++
 	${INSTALL_PROGRAM} ${WRKSRC}/Runtime/CodeLiteUR ${PREFIX}/bin/CodeLite
 	${INSTALL_SCRIPT} ${WRKSRC}/Runtime/le_dos2unix.sh ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/Runtime/le_exec.sh ${PREFIX}/bin/
@@ -66,7 +76,9 @@ do-install:
 	(cd ${WRKSRC}/Runtime/templates && ${COPYTREE_SHARE} \* ${DATADIR}/templates)
 	(cd ${WRKSRC}/Runtime/lexers && ${COPYTREE_SHARE} \* ${DATADIR}/lexers)
 	${INSTALL_DATA} ${WRKSRC}/lib/Debugger.so ${DATADIR}/debuggers
-.for lib in CodeFormatter Subversion ReferenceAnalyser cscope Gizmos
+	${INSTALL_DATA} ${WRKSRC}/Runtime/sdk/lib/unix/libUnitTest++.a ${PREFIX}/lib
+	(cd ${WRKSRC}/Runtime/sdk/include/UnitTest++ &&  ${COPYTREE_SHARE} \* ${PREFIX}/include/UnitTest++)
+.for lib in CodeFormatter Subversion cscope Gizmos
 	${INSTALL_DATA} ${WRKSRC}/lib/${lib}.so ${DATADIR}/plugins
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/Runtime/index.html ${DATADIR}
diff --git a/editors/codelite/distinfo b/editors/codelite/distinfo
index 26404873d8dc..af2c55e978f6 100644
--- a/editors/codelite/distinfo
+++ b/editors/codelite/distinfo
@@ -1,3 +1,3 @@
-MD5 (codelite-r1599.tar.bz2) = ff602727bc09d6bf61dc4ab007f9c2bb
-SHA256 (codelite-r1599.tar.bz2) = d4e77d6db81eb79074d58684a536bae2ef4beb98aae677af3cc0a11b2646ebb1
-SIZE (codelite-r1599.tar.bz2) = 5262642
+MD5 (CodeLite-rev1789-v1.0.src.zip) = a826e0edf5de7bc4ae7db981b03afa63
+SHA256 (CodeLite-rev1789-v1.0.src.zip) = a3fd65c174d86d81fa9effa04aa6bc53dcb22678309525d97cc8d08a7522a5cf
+SIZE (CodeLite-rev1789-v1.0.src.zip) = 7289149
diff --git a/editors/codelite/files/patch-configure b/editors/codelite/files/patch-configure
index d0349b3aa7cc..1b5838f7b602 100644
--- a/editors/codelite/files/patch-configure
+++ b/editors/codelite/files/patch-configure
@@ -1,20 +1,5 @@
 --- configure.orig	2008-05-14 19:24:35.000000000 +0200
 +++ configure	2008-05-15 21:48:27.000000000 +0200
-@@ -83,11 +83,9 @@
- 		echo "INCLUDES := \$(INCLUDES) -ILiteEditor " >> Makefile 
- 	fi
- 	echo "" >> Makefile
--	if [ "$os_name" = "Linux" ]; then
--		echo "INCLUDES := \$(INCLUDES) \$(shell pkg-config --cflags gtk+-2.0)" >> Makefile
--		echo "LINK_FLAGS := \$(LINK_FLAGS) \$(shell pkg-config --libs gtk+-2.0)" >> Makefile
--	fi
--	echo "INCLUDES := \$(INCLUDES) -I. -I${base_dir}/sdk/wxsqlite3/include -I${base_dir}/sdk/wxsqlite3/sqlite3/include -I${base_dir}/sdk/wxscintilla/include -I${base_dir}/sdk/wxscintilla/src/scintilla/include	 -I${base_dir}/sdk/wxscintilla/src/scintilla/src -I${base_dir}/Interfaces -I${base_dir}/Debugger -I${base_dir}/Plugin -I${base_dir}/CodeLite -I${base_dir}/sdk/wxflatnotebook/include" >> Makefile 
-+	echo "INCLUDES := \$(INCLUDES) \$(shell pkg-config --cflags gtk+-2.0)" >> Makefile
-+	echo "LINK_FLAGS := \$(LINK_FLAGS) \$(shell pkg-config --libs gtk+-2.0)" >> Makefile
-+	echo "INCLUDES := -I. -I${base_dir}/sdk/wxsqlite3/include -I${base_dir}/sdk/wxsqlite3/sqlite3/include -I${base_dir}/sdk/wxscintilla/include -I${base_dir}/sdk/wxscintilla/src/scintilla/include	 -I${base_dir}/sdk/wxscintilla/src/scintilla/src -I${base_dir}/Interfaces -I${base_dir}/Debugger -I${base_dir}/Plugin -I${base_dir}/CodeLite -I${base_dir}/sdk/wxflatnotebook/include \$(INCLUDES)" >> Makefile 
- 	echo "" >> Makefile
- 	echo "" >> Makefile
- }
 @@ -381,12 +383,10 @@
  
  createEndMessage() 
diff --git a/editors/codelite/pkg-plist b/editors/codelite/pkg-plist
index 1887866cd382..759488b1ed23 100644
--- a/editors/codelite/pkg-plist
+++ b/editors/codelite/pkg-plist
@@ -20,6 +20,8 @@ bin/ctags-le
 %%DATADIR%%/templates/projects/dynamic-library-wx-enabled/dynamic-library-wx-enabled.project
 %%DATADIR%%/templates/projects/vc-dynamic-library/vc-dynamic-library.project
 %%DATADIR%%/templates/projects/static-library-wx-enabled/static-library-wx-enabled.project
+%%DATADIR%%/templates/projects/UnitTest++/UnitTest++.project
+%%DATADIR%%/templates/projects/UnitTest++/main.cpp
 %%DATADIR%%/templates/gizmos/wxmain.project.wizard
 %%DATADIR%%/templates/gizmos/mainframe.cpp.wizard
 %%DATADIR%%/templates/gizmos/app.cpp.wizard
@@ -32,7 +34,6 @@ bin/ctags-le
 %%DATADIR%%/templates/gizmos/plugin.cpp.wizard
 %%DATADIR%%/plugins/CodeFormatter.so
 %%DATADIR%%/plugins/Subversion.so
-%%DATADIR%%/plugins/ReferenceAnalyser.so
 %%DATADIR%%/plugins/cscope.so
 %%DATADIR%%/plugins/Gizmos.so
 %%DATADIR%%/rc/menu.xrc
@@ -68,6 +69,34 @@ bin/ctags-le
 %%DATADIR%%/index.html
 %%DATADIR%%/astyle.sample
 %%DATADIR%%/svnreport.html
+include/UnitTest++/AssertException.h
+include/UnitTest++/CheckMacros.h
+include/UnitTest++/Checks.h
+include/UnitTest++/Config.h
+include/UnitTest++/DeferredTestReporter.h
+include/UnitTest++/DeferredTestResult.h
+include/UnitTest++/MemoryOutStream.h
+include/UnitTest++/Posix/SignalTranslator.cpp
+include/UnitTest++/Posix/SignalTranslator.h
+include/UnitTest++/Posix/TimeHelpers.cpp
+include/UnitTest++/Posix/TimeHelpers.h
+include/UnitTest++/ReportAssert.h
+include/UnitTest++/Test.h
+include/UnitTest++/TestDetails.h
+include/UnitTest++/TestList.h
+include/UnitTest++/TestMacros.h
+include/UnitTest++/TestReporter.h
+include/UnitTest++/TestReporterStdout.h
+include/UnitTest++/TestResults.h
+include/UnitTest++/TestRunner.h
+include/UnitTest++/TestSuite.h
+include/UnitTest++/TimeConstraint.h
+include/UnitTest++/TimeHelpers.h
+include/UnitTest++/UnitTest++.h
+include/UnitTest++/Win32/TimeHelpers.cpp
+include/UnitTest++/Win32/TimeHelpers.h
+include/UnitTest++/XmlTestReporter.h
+lib/libUnitTest++.a
 share/applications/codelite.desktop
 @dirrm %%DATADIR%%/templates/projects/vc-static-lib
 @dirrm %%DATADIR%%/templates/projects/vc-executable
@@ -77,6 +106,7 @@ share/applications/codelite.desktop
 @dirrm %%DATADIR%%/templates/projects/executable
 @dirrm %%DATADIR%%/templates/projects/dynamic-library-wx-enabled
 @dirrm %%DATADIR%%/templates/projects/dynamic-library
+@dirrm %%DATADIR%%/templates/projects/UnitTest++
 @dirrm %%DATADIR%%/templates/projects
 @dirrm %%DATADIR%%/templates/gizmos
 @dirrm %%DATADIR%%/templates
@@ -89,4 +119,7 @@ share/applications/codelite.desktop
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
+@dirrm include/UnitTest++/Win32
+@dirrm include/UnitTest++/Posix
+@dirrm include/UnitTest++/
 @dirrmtry share/applications