- Update to 3.5.5375

  Release notes: http://sf.net/projects/codelite/files/Releases/codelite-3.5/README
- Add options to enable MySQL and/or PostgreSQL in DB Explorer plugin
- Add option to enable clang-based code completion (needs clang from ports)
- Add devel to CATEGORIES

8 files changed, 116 insertions, 28 deletions

diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index 37f5279b3524..7bb459e259f7 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	codelite
-DISTVERSION=	3.0.0.${SVN_REVISION}
-CATEGORIES=	editors
-MASTER_SITES=	SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION:R:R}
+DISTVERSION=	3.5.${SVN_REVISION}
+CATEGORIES=	editors devel
+MASTER_SITES=	SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION:R}/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-gtk.src
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	An Open Source IDE for C/C++
@@ -16,23 +17,55 @@ COMMENT=	An Open Source IDE for C/C++
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	xterm:${PORTSDIR}/x11/xterm
 
-OPTIONS=	CSCOPE	"Enable CScope integration" OFF
+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
 
 USE_WX=		2.8
 WX_UNICODE=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=--enable-debug
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-SVN_REVISION=	5041
+SVN_REVISION=	5375
 
 .if defined(WITH_CSCOPE)
 RUN_DEPENDS+=	cscope:${PORTSDIR}/devel/cscope
 .endif
 
+.if defined(WITH_CLANG)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libclang.so:${PORTSDIR}/lang/clang
+RUN_DEPENDS+=	${LOCALBASE}/lib/libclang.so:${PORTSDIR}/lang/clang
+PLIST_SUB+=	CLANG=""
+.else
+ENABLE_CLANG=	\#
+PLIST_SUB+=	CLANG="@comment "
+.endif
+
+.if defined(WITH_MYSQL)
+CONFIGURE_ARGS+=--enable-mysql
+USE_MYSQL=	client
+PLIST_SUB+=	MYSQL=""
+.else
+PLIST_SUB+=	MYSQL="@comment "
+.endif
+
+.if defined(WITH_POSTGRES)
+CONFIGURE_ARGS+=--enable-postgres
+USE_PGSQL=	yes
+PLIST_SUB+=	POSTGRES=""
+.else
+PLIST_SUB+=	POSTGRES="@comment "
+.endif
+
 post-patch:
-	${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|g' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|g; s|%%ENABLE_CLANG%%|${ENABLE_CLANG}|g; \
+	   s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
 #	Configure script does not respect --prefix
 	${REINPLACE_CMD} -e '/^prefix/s|/usr|${PREFIX}|; \
 	    /^plugins_dir/s|/usr/lib/codelite|${DATADIR}/plugins|' \
diff --git a/editors/codelite/distinfo b/editors/codelite/distinfo
index 4ae813551ac8..886b724a5219 100644
--- a/editors/codelite/distinfo
+++ b/editors/codelite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (codelite-3.0.0.5041.tar.gz) = e93188b62af84d2ffd8f92a82135fd8573bb281d841a126c5ae1c8f634864321
-SIZE (codelite-3.0.0.5041.tar.gz) = 8082209
+SHA256 (codelite-3.5.5375-gtk.src.tar.gz) = e87b0872a535af2333549b6a8ccda2098bb04dc905c80d1a77eec00fe2f56692
+SIZE (codelite-3.5.5375-gtk.src.tar.gz) = 15857819
diff --git a/editors/codelite/files/patch-CodeLite_unixprocess_impl.cpp b/editors/codelite/files/patch-CodeLite_unixprocess_impl.cpp
index d87f333e4281..af5b4c65c2f7 100644
--- a/editors/codelite/files/patch-CodeLite_unixprocess_impl.cpp
+++ b/editors/codelite/files/patch-CodeLite_unixprocess_impl.cpp
@@ -1,7 +1,7 @@
---- CodeLite/unixprocess_impl.cpp.orig	2010-11-11 11:14:08.000000000 +0000
-+++ CodeLite/unixprocess_impl.cpp	2010-11-11 11:14:57.000000000 +0000
-@@ -12,8 +12,14 @@
- #include <sys/wait.h>
+--- CodeLite/unixprocess_impl.cpp.orig	2011-10-11 18:58:27.000000000 +0200
++++ CodeLite/unixprocess_impl.cpp	2012-02-17 17:14:25.000000000 +0100
+@@ -15,8 +15,14 @@
+ #include "procutils.h"
  
  #ifdef __WXGTK__
 +#ifdef __FreeBSD__
diff --git a/editors/codelite/files/patch-Plugin_wxterminal.cpp b/editors/codelite/files/patch-Plugin_wxterminal.cpp
index 05b4259974c0..281ddc0e2a33 100644
--- a/editors/codelite/files/patch-Plugin_wxterminal.cpp
+++ b/editors/codelite/files/patch-Plugin_wxterminal.cpp
@@ -1,6 +1,6 @@
---- Plugin/wxterminal.cpp.orig	2011-01-03 17:42:09.000000000 +0100
-+++ Plugin/wxterminal.cpp	2011-01-03 17:43:05.000000000 +0100
-@@ -21,7 +21,13 @@
+--- Plugin/wxterminal.cpp.orig	2011-06-09 22:23:36.000000000 +0200
++++ Plugin/wxterminal.cpp	2012-02-17 17:15:06.000000000 +0100
+@@ -22,7 +22,13 @@
  #endif

  

  #if defined(__WXGTK__)

diff --git a/editors/codelite/files/patch-Runtime_codelite_xterm b/editors/codelite/files/patch-Runtime_codelite_xterm
index 6913aa486f6e..74e693fb30dc 100644
--- a/editors/codelite/files/patch-Runtime_codelite_xterm
+++ b/editors/codelite/files/patch-Runtime_codelite_xterm
@@ -1,5 +1,5 @@
---- Runtime/codelite_xterm.orig	2010-04-06 08:38:16.000000000 +0000
-+++ Runtime/codelite_xterm	2010-04-06 08:38:44.000000000 +0000
+--- Runtime/codelite_xterm.orig	2011-09-24 06:10:58.000000000 +0200
++++ Runtime/codelite_xterm	2012-02-24 15:33:29.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/bash 
 +#!/bin/sh
@@ -10,7 +10,7 @@
  	## Run xterm without the bash wrapper
  	xterm -T "$program_title" -e $2 2> /dev/null
  else
--	xterm -T "$program_title" -e /bin/bash -c 'export LD_LIBRARY_PATH=$0;shift;$@' $LD_LIBRARY_PATH $@ 2> /dev/null
-+	xterm -T "$program_title" -e /bin/sh -c 'export LD_LIBRARY_PATH=$0;shift;$@' $LD_LIBRARY_PATH $@ 2> /dev/null
+-	xterm -T "$program_title" -e /bin/bash -c 'export LD_LIBRARY_PATH=$0;shift;$@' $LD_LIBRARY_PATH "$@" 2> /dev/null
++	xterm -T "$program_title" -e /bin/sh -c 'export LD_LIBRARY_PATH=$0;shift;$@' $LD_LIBRARY_PATH "$@" 2> /dev/null
  fi
  
diff --git a/editors/codelite/files/patch-configure b/editors/codelite/files/patch-configure
new file mode 100644
index 000000000000..38e0ffe4b21c
--- /dev/null
+++ b/editors/codelite/files/patch-configure
@@ -0,0 +1,52 @@
+--- configure.orig	2011-11-30 10:40:33.000000000 +0100
++++ configure	2012-02-29 16:28:53.000000000 +0100
+@@ -50,6 +50,20 @@
+                         with_clang="yes"
+ 
+ 		fi
++   elif [ "$os_name" = "FreeBSD" ]; then
++      arch=$(uname -m)
++      if [ $arch = "amd64" -o $arch = "sparc64" ]; then
++			compiler_extras="-m64 -DON_64_BIT "
++			c_compiler_extras="-m64 -DON_64_BIT "
++      else
++			compiler_extras="-m32 "
++			c_compiler_extras="-m32 "
++      fi
++      ## clang
++%%ENABLE_CLANG%%      with_clang="yes"
++%%ENABLE_CLANG%%      lib_clang_cmp_flags=" -DHAS_LIBCLANG -I%%LOCALBASE%%/include "
++%%ENABLE_CLANG%%      lib_clang_link_flags=" -L%%LOCALBASE%%/lib -lclang "
++%%ENABLE_CLANG%%      lib_clang="%%LOCALBASE%%/lib/libclang.so"
+ 	else # Not darwin
+ 		if [ "$is_64bit" = "yes" ]; then
+ 			
+@@ -96,14 +110,14 @@
+ 		debug_flag=" -g "
+ 		ext=ud
+ 		optimization=" -DREGEXP_UNICODE "
+-		wxcfg="--unicode=yes --debug=yes"
++		wxcfg="--unicode=yes "
+ 	else
+ 		objects_dir="Release_gcc_unicode"
+ 		configuration="Release_gcc_unicode"
+ 		ext=u
+ 		debug_flag=""
+ 		optimization=" -O3 -DREGEXP_UNICODE "
+-		wxcfg="--unicode=yes --debug=no"
++		wxcfg="--unicode=yes "
+ 	fi
+ 
+ 	echo "OPT=${optimization}" >> Makefile
+@@ -465,9 +479,9 @@
+ 	elif [ "$rule_name" = "DatabaseLayerSQLite" ] ; then
+ 	  	createVariables "yes" "-I${base_dir}/sdk/databaselayer/src/sqlite3"
+ 	elif [ "$rule_name" = "DatabaseLayerMySQL" ] ; then
+-	  	createVariables "yes" "-I/usr/include/mysql"
++	  	createVariables "yes" "-I%%LOCALBASE%%/include/mysql"
+ 	elif [ "$rule_name" = "DatabaseLayerPostgres" ] ; then
+-	  	createVariables "yes" "-I/usr/include/postgresql"
++	  	createVariables "yes" "-I%%LOCALBASE%%/include/postgresql"
+ 	elif [ "$rule_name" = "DatabaseExplorer" ] ; then
+ 		
+ 		if [ "$os_name" != "Darwin" ];then
diff --git a/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp b/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp
index 7254ae22bba4..815e206b4b45 100644
--- a/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp
+++ b/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp
@@ -1,6 +1,6 @@
---- sdk/codelite_indexer/utils.cpp.orig	2009-12-07 16:27:20.000000000 +0100
-+++ sdk/codelite_indexer/utils.cpp	2009-12-07 16:26:55.000000000 +0100
-@@ -11,6 +11,15 @@
+--- sdk/codelite_indexer/utils.cpp.orig	2010-08-02 08:43:19.000000000 +0200
++++ sdk/codelite_indexer/utils.cpp	2012-02-17 17:18:13.000000000 +0100
+@@ -17,6 +17,15 @@
  #    include <signal.h>

  #endif

  

diff --git a/editors/codelite/pkg-plist b/editors/codelite/pkg-plist
index db51917e6b31..c80f0ef37115 100644
--- a/editors/codelite/pkg-plist
+++ b/editors/codelite/pkg-plist
@@ -39,12 +39,12 @@ bin/codelite_xterm
 %%DATADIR%%/plugins/cscope.so
 %%DATADIR%%/plugins/debuggers/Debugger.so
 %%DATADIR%%/plugins/git.so
-%%DATADIR%%/plugins/libcodeliteu.so
-%%DATADIR%%/plugins/libdblayersqliteu.so
-%%DATADIR%%/plugins/libpluginu.so
-%%DATADIR%%/plugins/libwxscintillau.so
-%%DATADIR%%/plugins/libwxshapeframeworku.so
-%%DATADIR%%/plugins/libwxsqlite3u.so
+%%DATADIR%%/plugins/libcodeliteud.so
+%%DATADIR%%/plugins/libdblayersqliteud.so
+%%DATADIR%%/plugins/libpluginud.so
+%%DATADIR%%/plugins/libwxscintillaud.so
+%%DATADIR%%/plugins/libwxshapeframeworkud.so
+%%DATADIR%%/plugins/libwxsqlite3ud.so
 %%DATADIR%%/plugins/resources/abbrev.png
 %%DATADIR%%/plugins/resources/abbreviation.accelerators
 %%DATADIR%%/plugins/resources/compfile.png
@@ -165,6 +165,9 @@ bin/codelite_xterm
 %%DATADIR%%/templates/projects/vc-static-lib/icon.png
 %%DATADIR%%/templates/projects/vc-static-lib/vc-static-lib.project
 %%DATADIR%%/templates/qmake/qmake.project
+%%CLANG%%%%DATADIR%%/plugins/libclang.so
+%%MYSQL%%%%DATADIR%%/plugins/libdblayermysqlud.so
+%%POSTGRES%%%%DATADIR%%/plugins/libdblayerpostgresud.so
 share/applications/codelite.desktop
 @dirrmtry share/applications
 @dirrm %%DATADIR%%/templates/qmake