[147181] trunk/dports/devel/codeblocks

[mojca at macports.org]

Revision: 147181
          https://trac.macports.org/changeset/147181
Author:   mojca at macports.org
Date:     2016-03-30 06:11:37 -0700 (Wed, 30 Mar 2016)
Log Message:
-----------
codeblocks: upgrade to version 16.01

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

Modified: trunk/dports/devel/codeblocks/Portfile
===================================================================
--- trunk/dports/devel/codeblocks/Portfile	2016-03-30 13:08:49 UTC (rev 147180)
+++ trunk/dports/devel/codeblocks/Portfile	2016-03-30 13:11:37 UTC (rev 147181)
@@ -2,21 +2,11 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           github 1.0
 PortGroup           wxWidgets 1.0
 
-# alternative unofficial mirror to allow fetching from a tarball
-# or: https://cgit.jenslody.de/codeblocks/snapshot/codeblocks-<checksum>.tar.xz
-github.setup        obfuscated codeblocks_sf 33d975c
 name                codeblocks
-version             13.12
-revision            3
+version             16.01
 
-# fetch.type        svn
-# svn.url           https://svn.code.sf.net/p/codeblocks/code/trunk
-# svn.revision      10305
-# worksrcdir        trunk
-
 platforms           darwin freebsd
 categories          devel aqua x11
 license             GPL-3+
@@ -30,23 +20,30 @@
                     extensible and configurable.
 
 homepage            http://www.codeblocks.org/
+master_sites        sourceforge:project/codeblocks/Sources/${version}
 
-checksums           rmd160  9af61b95628df2cbab91335f51f2402444c1e64c \
-                    sha256  730be0560e57e9b3de8e7ad29f90e6794b6ba78bfc6429e49439c4975b178d02
+distname            ${name}_${version}
+worksrcdir          ${name}-${version}.release
 
-depends_build       port:autoconf \
-                    port:automake \
-                    port:libtool \
-                    port:pkgconfig
+checksums           rmd160  e98b034eb8d6cf52a89312f2d5eaa10b17f1355e \
+                    sha256  30fb9d206df4ab3c2e2fec2451a0a7c9723bfed9a673cc9be71e881c529d5a03
 
+depends_build       port:pkgconfig
+
 depends_lib         port:boost \
                     port:hunspell
 
-patchfiles          patch-sdk-configmanager.cpp
-
+# TODO: for a weird reason CB tries to run autotools and fails
+#       once a bug is fixed, we'll no longer need these dependencies
+depends_build-append \
+                    port:autoconf \
+                    port:automake \
+                    port:libtool
 use_autoconf        yes
 autoconf.cmd        ./bootstrap
 
+patchfiles          patch-sdk-configmanager.cpp
+
 # FileManager requires "gamin" to be installed when using wxGTK,
 # not sure whether it works with Carbon/Cocoa at all,
 # so it was disabled for now
@@ -59,8 +56,8 @@
     system "strip -S ${destroot}${prefix}/lib/libcodeblocks*.dylib || true"
     system "strip -S ${destroot}${prefix}/lib/libwxsmithlib*.so || true"
     system "strip -S ${destroot}${prefix}/lib/libwxsmithlib*.dylib || true"
-    system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.so || true"
-    system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.dylib || true"
+#   system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.so || true"
+#   system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.dylib || true"
     system "strip -S ${destroot}${prefix}/lib/codeblocks/plugins/*.so"
 
     set appPath ${destroot}${applications_dir}/CodeBlocks.app/Contents
@@ -101,14 +98,6 @@
     configure.args-append   --disable-pch
 }
 
-# TODO: keep the old variants/descriptions?
-# variant aqua / x11
-# variant aqua conflicts x11 description "Use the wxMac port of wxWidgets"
-# variant x11 description "Use the wxGTK port of wxWidgets"
-
-variant aqua {}
-variant x11 {}
-
 variant wxwidgets30 conflicts wxwidgets28 wxgtk30 wxgtk28 description {Use Cocoa-based wxWidgets 3.0} {
     wxWidgets.use           wxWidgets-3.0
     depends_lib-append      port:${wxWidgets.port}
@@ -168,15 +157,9 @@
 }
 
 if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk30] && ![variant_isset wxgtk28]} {
-    if {[variant_isset aqua]} {
-        default_variants +wxwidgets28
-    } elseif {[variant_isset x11]} {
-        default_variants +wxgtk28
-    } else {
-        default_variants +wxwidgets30
-    }
+    default_variants +wxwidgets30
 }
 
 livecheck.type      regex
 livecheck.url       ${homepage}/downloads/source
-livecheck.regex     <p>${name}_(\[0-9.\]+)-\\d+${extract.suffix}</p>
+livecheck.regex     <p>${name}_(\[0-9.\]+)${extract.suffix}</p>

Modified: trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp	2016-03-30 13:08:49 UTC (rev 147180)
+++ trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp	2016-03-30 13:11:37 UTC (rev 147181)
@@ -4,7 +4,7 @@
 
 --- src/sdk/configmanager.cpp.orig
 +++ src/sdk/configmanager.cpp
-@@ -1504,8 +1504,10 @@ void ConfigManager::InitPaths()
+@@ -1503,8 +1503,10 @@ void ConfigManager::InitPaths()
  #ifdef CB_AUTOCONF
      if (plugin_path_global.IsEmpty())
      {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160330/dc7d1a80/attachment-0001.html>