[95406] trunk/dports/devel/uncrustify

[ryandesign at macports.org]

Revision: 95406
          https://trac.macports.org/changeset/95406
Author:   ryandesign at macports.org
Date:     2012-07-11 21:16:40 -0700 (Wed, 11 Jul 2012)
Log Message:
-----------
uncrustify: apply an upstream patch to fix Objective-C indentation (#35161)

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

Added Paths:
-----------
    trunk/dports/devel/uncrustify/files/
    trunk/dports/devel/uncrustify/files/patch-src-align.cpp.diff

Modified: trunk/dports/devel/uncrustify/Portfile
===================================================================
--- trunk/dports/devel/uncrustify/Portfile	2012-07-12 04:11:22 UTC (rev 95405)
+++ trunk/dports/devel/uncrustify/Portfile	2012-07-12 04:16:40 UTC (rev 95406)
@@ -5,6 +5,7 @@
 
 name                uncrustify
 version             0.59
+revision            1
 categories          devel
 platforms           darwin
 maintainers         nomaintainer
@@ -22,6 +23,8 @@
                     sha1    233e4f6cb34ef7020ce49e5b5d14f0d46f277e31 \
                     rmd160  433a04ddd3d477173fa31f16d05fd0a264436e64
 
+patchfiles          patch-src-align.cpp.diff
+
 livecheck.type      regex
 livecheck.url       http://sourceforge.net/projects/uncrustify/files/
 livecheck.regex     "(0\\.\\d+)"

Added: trunk/dports/devel/uncrustify/files/patch-src-align.cpp.diff
===================================================================
--- trunk/dports/devel/uncrustify/files/patch-src-align.cpp.diff	                        (rev 0)
+++ trunk/dports/devel/uncrustify/files/patch-src-align.cpp.diff	2012-07-12 04:16:40 UTC (rev 95406)
@@ -0,0 +1,38 @@
+https://github.com/bengardner/uncrustify/commit/d519bfa85552cebc5388b979668ea7c5d1c53853
+--- src/align.cpp.orig	2011-09-03 12:06:05.000000000 -0500
++++ src/align.cpp	2012-07-11 23:12:46.000000000 -0500
+@@ -247,11 +247,6 @@
+       align_oc_msg_colons();
+    }
+ 
+-   if (cpd.settings[UO_align_oc_decl_colon].b)
+-   {
+-      align_oc_decl_colon();
+-   }
+-
+    /* Align variable definitions */
+    if ((cpd.settings[UO_align_var_def_span].n > 0) ||
+        (cpd.settings[UO_align_var_struct_span].n > 0))
+@@ -283,6 +278,12 @@
+       align_oc_msg_spec(cpd.settings[UO_align_oc_msg_spec_span].n);
+    }
+ 
++   /* Align OC colons */
++   if (cpd.settings[UO_align_oc_decl_colon].b)
++   {
++      align_oc_decl_colon();
++   }
++
+    /* Align variable defs in function prototypes */
+    if (cpd.settings[UO_align_func_params].b)
+    {
+@@ -1939,7 +1940,8 @@
+                 &&
+                 ((tmp->type == CT_WORD) ||
+                  (tmp->type == CT_TYPE) ||
+-                 (tmp->type == CT_OC_MSG_DECL))
++                 (tmp->type == CT_OC_MSG_DECL) ||
++                 (tmp->type == CT_OC_MSG_SPEC))
+                 &&
+                 ((tmp2->type == CT_WORD) ||
+                  (tmp2->type == CT_TYPE) ||
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120711/f46739c0/attachment.html>