[73383] trunk/dports/devel/codeblocks

[afb at macports.org]

Revision: 73383
          http://trac.macports.org/changeset/73383
Author:   afb at macports.org
Date:     2010-11-11 14:12:02 -0800 (Thu, 11 Nov 2010)
Log Message:
-----------
codeblocks: fix +aqua plugin loading (+petty fixes)

Modified Paths:
--------------
    trunk/dports/devel/codeblocks/Portfile

Added Paths:
-----------
    trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp

Modified: trunk/dports/devel/codeblocks/Portfile
===================================================================
--- trunk/dports/devel/codeblocks/Portfile	2010-11-11 20:34:20 UTC (rev 73382)
+++ trunk/dports/devel/codeblocks/Portfile	2010-11-11 22:12:02 UTC (rev 73383)
@@ -4,6 +4,7 @@
 
 name			codeblocks
 version			10.05
+revision		1
 platforms		darwin freebsd
 categories		devel aqua x11
 maintainers		afb
@@ -25,7 +26,7 @@
 
 configure.args  --with-contrib-plugins=all
 
-patchfiles	patch-HexEditor-HexEditPanel.cpp patch-MouseSap-Makefile.am
+patchfiles	patch-HexEditor-HexEditPanel.cpp patch-MouseSap-Makefile.am patch-sdk-configmanager.cpp
 
 post-destroot {
 	system "strip -S ${destroot}${prefix}/bin/codeblocks"
@@ -53,8 +54,8 @@
     patchfiles-append codeblocks-splashscreen.diff codeblocks-keybinder.diff codeblocks-debugger.diff
 
     post-destroot {
-	xinstall -d -m 0755 ${destroot}/Applications/MacPorts
-	set appPath ${destroot}/Applications/MacPorts/CodeBlocks.app/Contents
+	xinstall -d -m 0755 ${destroot}${applications_dir}
+	set appPath ${destroot}${applications_dir}/CodeBlocks.app/Contents
 
 	xinstall -d -m 0755 ${appPath}
 	file copy -force ${worksrcpath}/codeblocks.plist \
@@ -85,9 +86,11 @@
 	ln -sf ${prefix}/bin/codeblocks ${appPath}/MacOS/CodeBlocks
 	xinstall -d -m 0755 ${appPath}/Resources/share
 	ln -sf ${prefix}/share/codeblocks ${appPath}/Resources/share/codeblocks
+	xinstall -d -m 0755 ${appPath}/Resources/lib
+	ln -sf ${prefix}/lib/codeblocks ${appPath}/Resources/lib/codeblocks
 	
 	delete ${destroot}${prefix}/share/applications/codeblocks.desktop
-	delete ${destroot}${prefix}/share/icons/gnome
+	delete ${destroot}${prefix}/share/icons/hicolor
 	delete ${destroot}${prefix}/share/mime/packages/codeblocks.xml
 	delete ${destroot}${prefix}/share/pixmaps/codeblocks.png
     }

Added: trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp	                        (rev 0)
+++ trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp	2010-11-11 22:12:02 UTC (rev 73383)
@@ -0,0 +1,14 @@
+--- src/sdk/configmanager.cpp.orig	2010-05-22 12:10:05.000000000 +0200
++++ src/sdk/configmanager.cpp	2010-11-11 22:27:20.000000000 +0100
+@@ -1442,8 +1442,10 @@ void ConfigManager::InitPaths()
+ #ifdef CB_AUTOCONF
+     if (plugin_path_global.IsEmpty())
+     {
+-        if(platform::windows || platform::macosx)
++        if(platform::windows)
+             ConfigManager::plugin_path_global = data_path_global;
++        else if(platform::macosx)
++            ConfigManager::plugin_path_global = res_path + _T("/lib/codeblocks/plugins");
+         else
+         {
+             ConfigManager::plugin_path_global = wxStandardPathsBase::Get().GetPluginsDir() + _T("/plugins");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101111/2710282e/attachment.html>