From ebe8559316bfe6e7a6740722c26cddd8d1595fa5 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Mon, 31 Mar 2014 08:31:44 +0000
Subject: Update to 0.60:

Change highlights in uncrustify-0.60 (1 Jan 2013)
-------------------------------------------------------------------------------
Objective C support was greatly enhanced in this release.
Many bugs were squashed and many options were added.

New options:
 - align_oc_msg_colon_first
 - align_pp_define_together
 - indent_ctor_init_leading
 - indent_func_def_force_col1
 - indent_oc_block
 - indent_oc_block_msg
 - indent_oc_msg_colon
 - ls_code_width
 - nl_after_annotation
 - nl_before_return
 - nl_between_annotation
 - nl_brace_struct_var
 - nl_oc_msg_args
 - nl_oc_msg_leave_one_liner
 - nl_remove_extra_newlines
 - nl_scope_brace
 - nl_typedef_blk_end
 - nl_typedef_blk_in
 - nl_typedef_blk_start
 - nl_unittest_brace
 - nl_var_def_blk_end
 - nl_var_def_blk_in
 - nl_var_def_blk_start
 - nl_version_brace
 - sp_after_for_colon
 - sp_after_oc_dict_colon
 - sp_after_oc_msg_receiver
 - sp_after_oc_property
 - sp_after_throw
 - sp_after_tparen_close
 - sp_annotation_paren
 - sp_before_for_colon
 - sp_before_oc_dict_colon
 - sp_before_pp_stringify
 - sp_before_template_paren
 - sp_cpp_lambda_assign
 - sp_cpp_lambda_paren
 - sp_extern_paren
 - sp_inside_sparen_open
 - sp_inside_tparen
 - sp_permit_cpp11_shift
 - sp_ptr_star_paren

Changed default:
 - sp_pp_stringify = ignore (was add)
---
 textproc/uncrustify/Makefile                         |  5 ++---
 textproc/uncrustify/distinfo                         |  9 ++++-----
 textproc/uncrustify/patches/patch-src_uncrustify.cpp | 12 ------------
 3 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 textproc/uncrustify/patches/patch-src_uncrustify.cpp

(limited to 'textproc/uncrustify')

diff --git a/textproc/uncrustify/Makefile b/textproc/uncrustify/Makefile
index 475ee42c5a1..4ef5ba11c65 100644
--- a/textproc/uncrustify/Makefile
+++ b/textproc/uncrustify/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2013/01/13 04:22:34 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.2 2014/03/31 08:31:44 wiz Exp $
 
-DISTNAME=	uncrustify-0.59
+DISTNAME=	uncrustify-0.60
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=uncrustify/}
 
diff --git a/textproc/uncrustify/distinfo b/textproc/uncrustify/distinfo
index b1526b44294..c26f51db46e 100644
--- a/textproc/uncrustify/distinfo
+++ b/textproc/uncrustify/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2013/04/29 21:31:13 joerg Exp $
+$NetBSD: distinfo,v 1.3 2014/03/31 08:31:44 wiz Exp $
 
-SHA1 (uncrustify-0.59.tar.gz) = 233e4f6cb34ef7020ce49e5b5d14f0d46f277e31
-RMD160 (uncrustify-0.59.tar.gz) = 433a04ddd3d477173fa31f16d05fd0a264436e64
-Size (uncrustify-0.59.tar.gz) = 983822 bytes
-SHA1 (patch-src_uncrustify.cpp) = efbf6c9856bad5cf3130e00a25fe2bf7b73ef16c
+SHA1 (uncrustify-0.60.tar.gz) = 769a7649a1cefb80beff9b67b11b4b87a8cc8e0e
+RMD160 (uncrustify-0.60.tar.gz) = 5770265558adaeecf5b66334fe91389e75b19674
+Size (uncrustify-0.60.tar.gz) = 1037433 bytes
diff --git a/textproc/uncrustify/patches/patch-src_uncrustify.cpp b/textproc/uncrustify/patches/patch-src_uncrustify.cpp
deleted file mode 100644
index 48f5379dd9f..00000000000
--- a/textproc/uncrustify/patches/patch-src_uncrustify.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_uncrustify.cpp,v 1.1 2013/04/29 21:31:13 joerg Exp $
-
---- src/uncrustify.cpp.orig	2013-04-29 19:04:36.000000000 +0000
-+++ src/uncrustify.cpp
-@@ -25,6 +25,7 @@
- #include <cstring>
- #include <cerrno>
- #include <fcntl.h>
-+#include <unistd.h>
- #include "unc_ctype.h"
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
-- 
cgit v1.2.3