diff options
| author | ryoon <ryoon@pkgsrc.org> | 2019-05-14 12:54:17 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2019-05-14 12:54:17 +0000 |
| commit | 98e90fe4c5b440abbe9ed835c35dd049dc5ed57b (patch) | |
| tree | fe6aac0206afd721b0280294ad22df18d691639d /textproc/uncrustify | |
| parent | 707d6999140a207c753d8c8e293776f78b595578 (diff) | |
| download | pkgsrc-98e90fe4c5b440abbe9ed835c35dd049dc5ed57b.tar.gz | |
Update to 0.69.0
* Use CMake
* Install cfg files like before
Changelog:
Change highlights in uncrustify-0.69.0 (May 2019)
-------------------------------------------------------------------------------
Changing option:
- The option name is changed from 'align_assign_func_proto' to 'align_assign_func_proto_span'
Mar 4 17:19:40 2019
New options:
- align_constr_value_gap Apr 24 2019
- align_constr_value_span Apr 24 2019
- align_constr_value_thresh Apr 24 2019
- align_func_proto_thresh Apr 5 2019
- indent_col1_multi_string_literal Mar 31 2019
- sp_paren_noexcept Jan 13 2019
- sp_paren_qualifier Jan 11 2019
- sp_type_question Jan 11 2019
- sp_inside_angle_empty Dec 27 2018
- nl_fdef_brace_cond Nov 29 2018
- nl_func_call_start Nov 29 2018
Change highlights in uncrustify-0.68 (November 2018)
-------------------------------------------------------------------------------
New options:
- align_same_func_call_params_span Nov 9
- align_same_func_call_params_thresh Nov 9
- nl_class_leave_one_liner_groups Oct 17
- nl_inside_namespace Aug 26
- sp_return_brace Aug 21
- align_assign_decl_func Jul 24
- sp_brace_brace Jul 23
- sp_after_decltype Jul 22
- sp_decltype_paren Jul 22
- align_right_cmt_same_level Jul 14
- nl_oc_mdef_brace Jul 8
- mod_enum_last_comma Jul 8
- sp_type_ellipsis Jun 15
- sp_paren_ellipsis Jun 15
- sp_sizeof_ellipsis Jun 15
- sp_sizeof_ellipsis_paren Jun 15
- indent_continue_class_head May 30
Bugfix:
- Issue # 1709, 1713, 1729, 1736, 1739, 1740, 1748, 1752, 1755, 1758, 1760,
1762, 1763, 1776, 1778, 1782, 1783, 1784, 1786, 1788, 1789, 1804, 1827,
1832, 1838, 1839, 1854, 1865, 1867, 1870, 1875, 1876, 1888, 1904, 1916,
1917, 1918, 1919, 1942, 1946, 1947, 1958, 1960, 1962, 1965, 1969, 1979,
1982, 1985, 1997, 2000, 2001, 2009, 2014, 2015, 2024, 2028, 2032, 2033,
2035, 2037, 2046, 2055
Change highlights in uncrustify-0.67 (May 2018)
-------------------------------------------------------------------------------
Changing option:
Removed option:
New options:
- indent_first_for_expr Apr 29
- indent_semicolon_for_paren Apr 29
- nl_oc_interface_brace Apr 13
- nl_oc_implementation_brace Apr 13
- indent_cpp_lambda_only_once Mar 24
- indent_cs_delegate_body Mar 18
- sp_after_noexcept Mar 18
- indent_single_newlines Mar 6
- sp_after_ptr_block_caret Feb 24
- sp_after_oc_synchronized Feb 24
- sp_inside_square_oc_array Feb 23
- sp_oc_catch_paren Feb 23
- sp_oc_catch_brace Feb 23
- sp_oc_brace_catch Feb 23
- nl_oc_catch_brace Feb 23
- nl_oc_brace_catch Feb 23
- nl_cs_property_leave_one_liners Feb 16
- indent_member_single Feb 10
- sp_func_call_user_paren_paren Feb 5
- sp_func_call_user_inside_fparen Feb 5
- sp_inside_braces_oc_dict Feb 5
- nl_create_func_def_one_liner Jan 17
- nl_namespace_two_to_one_liner Jan 15
- nl_squeeze_paren_close Jan 15
- sp_fparen_brace_initializer Jan 12
- sp_cpp_before_struct_binding 2018 Jan 12
- indent_align_paren Dec 14
- nl_tsquare_brace Dec 9
- indent_single_after_return Nov 28
- indent_off_after_return_new Nov 28
- indent_ignore_asm_block 2017 Nov 05
New keyword:
- __unused Apr 21
- @synchronized Feb 24
- @available Feb 23
- fixed Feb 16
- @protected Feb 4
- @public Feb 4
- __autoreleasing Feb 4
- __bridge Feb 4
- __bridge_retained Feb 4
- __bridge_transfer Feb 4
- __declspec Feb 4
- __has_include Feb 4
- __has_include_next Feb 4
- __strong Feb 4
- __typeof Feb 4
- __unsafe_unretained Feb 4
- __weak Feb 4
- self Feb 4
- unsafe_unretained 2018 Feb 4
- where 2017 Dec 6
Bugfix:
- Debian issue #881249 "FTBFS on armel/i386/mips64el/s390x: cpp_33057 fails"
is fixed
- Adopt many bugfix and tests from UT:
10000, 10002, 10003, 10004, 10005, 10006, 10007, 10008, 10009, 10011,
10012, 10013, 10014, 10015, 10016, 10018, 10019, 10020, 10021, 10022,
10023, 10024, 10025, 10027, 10028, 10029, 10030, 10031, 10032, 10033,
10034, 10035, 10036, 10039, 10044, 10045, 10046, 10047, 10048, 10049,
10050, 10051, 10052, 10053, 10054, 10054, 10055, 10056, 10057, 10058,
10060, 10062, 10063, 10065, 10066, 10067, 10069, 10070, 10071, 10072,
10073, 10074, 10075, 10076, 10077, 10078, 10079, 10080, 10100, 10102,
10103, 10104,
60001, 60002, 60003, 60004, 60005, 60006, 60007, 60008, 60009, 60011,
60012, 60013, 60014, 60015, 60016, 60017, 60018, 60019, 60020, 60021,
60022, 60023, 60024, 60025, 60026, 60027, 60028, 60029, 60030, 60031,
60032, 60033, 60034, 60036, 60037, 60038, 60039, 60040
New:
- Add crash handling for Windows
Change highlights in uncrustify-0.66 (November 2017)
-------------------------------------------------------------------------------
New options:
- sp_arith_additive Oct 17
- sp_angle_colon Oct 17
- nl_func_call_empty Sep 30
- nl_func_call_paren_empty Sep 30
- align_func_params_span Sep 29
- align_func_params_thresh Sep 29
- align_func_params_gap Sep 29
- nl_func_call_paren Jul 25
- indent_paren_after_func_def Jul 21
- indent_paren_after_func_decl Jul 21
- indent_paren_after_func_call Jul 21
- nl_func_paren_empty Jul 07
- nl_func_def_paren_empty Jul 07
- indent_switch_pp Jun 22
- pp_indent_case Jun 22
- pp_indent_func_def Jun 22
- pp_indent_extern Jun 22
- pp_indent_brace Jun 22
Changing option:
- The option name is changed from 'align_number_left' to 'align_number_right'
Bugfix:
- Issue # 548, 1098, 1103, 1108, 1112, 1127, 1134, 1158, 1165, 1170, 1187,
1200, 1203, 1236, 1249, 1310, 1315, 1340, 1349, 1352, 1366 are fixed
Change highlights in uncrustify-0.65 (May 2017)
-------------------------------------------------------------------------------
New options:
- nl_before_if_closing_paren May 12
- sp_after_type_brace_init_lst_open May 09
- sp_before_type_brace_init_lst_close May 09
- sp_inside_type_brace_init_lst May 09
- sp_type_brace_init_lst May 09
- nl_type_brace_init_lst May 09
- nl_type_brace_init_lst_open May 09
- nl_type_brace_init_lst_close May 09
- mod_sort_oc_property_class_weight May 05
- mod_full_brace_nl_block_rem_mlcond Mar 17
- sp_inside_newop_paren_open Mar 13
- sp_inside_newop_paren Mar 13
- sp_after_newop_paren Mar 13
- sp_inside_newop_paren_close Mar 13
- pp_ignore_define_body Feb 18
- sp_enum_colon Feb 13
- nl_enum_class Feb 13
- nl_enum_class_identifier Feb 13
- nl_enum_identifier_colon Feb 13
- nl_enum_colon_type Feb 13
- indent_param Feb 01
- include_category_0 Jan 24
- include_category_1 Jan 24
- include_category_2 2017 Jan 24
- force_tab_after_define 2016 Dec 29
- nl_max_blank_in_func Nov 26
- indent_ternary_operator Nov 24
- indent_using_block Oct 20
New:
- emscripten interface
- removal of autogen / configure build
- list options that are now AT_UNUM type
- change option name from align_number_left to align_number_right
Removed option:
- dont_protect_xcode_code_placeholders
Removed MS calling convention keywords:
- __cdecl, __clrcall, __fastcall, __stdcall, __thiscall, __vectorcall
Bugfix:
- Issue # 324, 398, 404, 497, 525, 575, 633, 638, 643, 646, 663, 666,
679, 682, 687, 726, 752, 753, 793, 815, 825, 842, 857, 859, 869, 870,
889, 902, 916, 917, 928, 935, 938, 940, 972, 1002, 1005, 1020, 1030,
1032, 1041, 1068, 1117, 1139 are fixed
- Proposal #381, 876 are adopted.
Change highlights in uncrustify-0.64 (October 2016)
-------------------------------------------------------------------------------
New:
- Support for new C#6 language elements. (Bug #672)
Expression filter with the keyword 'when' in try/catch is now supported.
Null conditional operator (?.) is now supported.
New options:
- align_var_class_span Aug 23
- align_var_class_thresh Aug 23
- align_var_class_gap Aug 23
- pos_enum_comma Aug 14
- indent_token_after_brace Aug 3
- cmt_multi_first_len_minimum Aug 2
- nl_enum_own_lines Aug 1
- nl_func_class_scope Jul 26
- nl_squeeze_ifdef_top_level Jul 24
- sp_super_paren Jul 21
- sp_this_paren Jul 21
- sp_angle_paren_empty Jul 21
- sp_after_operator_sym_empty Jul 20
- sp_skip_vbrace_tokens Jul 13
- indent_cs_delegate_brace Jul 9
- cmt_insert_before_inlines Jun 29
- cmt_insert_before_ctor_dtor Jun 29
- mod_full_brace_if_chain_only Jun 28
- nl_func_decl_start_multi_line Jun 28
- nl_func_def_start_multi_line Jun 28
- nl_func_decl_args_multi_line Jun 28
- nl_func_def_args_multi_line Jun 28
- nl_func_decl_end_multi_line Jun 28
- nl_func_def_end_multi_line Jun 28
- nl_func_call_start_multi_line Jun 28
- nl_func_call_args_multi_line Jun 28
- nl_func_call_end_multi_line Jun 28
- use_options_overriding_for_qt_macros Jun 16
- sp_func_def_paren_empty Jun 15
- sp_func_proto_paren_empty Jun 15
- sp_func_class_paren_empty Jun 15
- nl_oc_block_brace May 26
- nl_split_if_one_liner May 26
- nl_split_for_one_line May 24
- nl_split_while_one_liner May 24
- nl_after_func_class_proto May 12
- nl_after_func_class_proto_group May 12 2016
Bugfix:
- Bugs #620, #651, #654, #662, #663, #664, #670, #671, #672, #674 are fixed
- Issues #322, #323, #359, #405, #408, #412, #478, #481, #495, #503, #509, #512, #513, #514,
#518, #519, #520, #521, #522, #524, #529, #530, #533, #536, #539, #542,
#543, #544, #546, #568 are fixed
- Proposals #409, #477 are implemented
- Issue #411 is partialy fixed
Change highlights in uncrustify-0.63 (Mar 2016)
-------------------------------------------------------------------------------
New:
- The branch uncrustify4Qt is now merged.
- A configuration file for the sources of uncrustify is provided:
forUncrustifySources.cfg
- Some considerations about the problem "stable" are described at
forUncrustifySources.txt
- Simplify expressions such as:
if ((cpd.lang_flags & LANG_PAWN) != 0)
to
if (cpd.lang_flags & LANG_PAWN)
- introduce CT_STDCALL to work with typedef void (__stdcall *func)(); Bug # 633
- introduce some more MS calling conventions: __cdecl, __clrcall, __fastcall, __thiscall, __vectorcall
https://msdn.microsoft.com/en-us/library/984x0h58.aspx
New options:
- nl_before_func_class_def Apr 16
- nl_before_func_class_proto Apr 16
- nl_before_func_body_def Apr 25
- nl_before_func_body_proto Apr 25
- use_indent_continue_only_once Mar 7 2016
Bugfix:
- Simplify some more expressions.
- Bugfix for win32 for the flags.
- make test c/ 00617 stable
- make test c/ 02501 stable
- The issue #467 and the test tests/output/c/02100-i2c-core.c are not yet fixed.
- uncrustify all the sources with forUncrustifySources.cfg
- better descriptions for options
- bug #631 is fixed
- produce a better dump output
- DbConfig::configuredDatabase()->apply(db); is NOT a declaration of a variable
- bug # 657 is fixed: change 'mode' if necessary for 'pos_class_comma'
- fix 3 calls of unc_add_option for "align_oc_msg_colon_span",
"indent_oc_block_msg", "indent_oc_msg_colon"
- bugs #664, #662, #654, #653, #651 and #633 are fixed
Reverse:
- space: drop vbrace tokens... 2014-09-01 06:33:17
I cannot anderstand this change.
It makes some troubles: Bug # 637
No test file for it found
Reverse the change until more informations could be found
Change:
- CT_DC_MEMBER + CT_FOR into CT_DC_MEMBER + CT_FUNC_CALL
Some more Qt-macros:
- Q_GADGET
- for_each
Change highlights in uncrustify4Qt-0.62 (Oct 2015)
-------------------------------------------------------------------------------
This is an extention of uncrustify to support Qt-macros
- Q_OBJECT
- Q_EMIT
- SLOT
- SIGNAL
- Q_FOREACH
- Q_FOREVER
Change highlights in uncrustify4Qt-0.62 (Oct 2015)
-------------------------------------------------------------------------------
New options:
- use_indent_func_call_param
Change highlights in uncrustify-0.62 (2 Feb 2016)
-------------------------------------------------------------------------------
This release is just a roll-up of the past year.
Many bugs were squashed and many options were added.
New options:
- string_replace_tab_chars
- disable_processing_cmt
- enable_processing_cmt
- enable_digraphs
- indent_class_on_colon
- indent_shift
- indent_min_vbrace_open
- indent_vbrace_open_on_tabstop
- sp_after_mdatype_commas
- sp_before_mdatype_commas
- sp_between_mdatype_commas
- sp_cmt_cpp_doxygen
- sp_cmt_cpp_qttr
- sp_between_new_paren
- nl_while_leave_one_liners
- nl_synchronized_brace
- nl_before_synchronized
- nl_after_synchronized
- nl_after_label_colon
Change highlights in uncrustify-0.61 (22 Dec 2014)
-------------------------------------------------------------------------------
This release is just a roll-up of the past two years.
Many bugs were squashed and many options were added.
New options:
- indent_paren_open_brace
- indent_namespace_single_indent
- indent_constr_colon
- indent_oc_msg_prioritize_first_colon
- indent_oc_block_msg_xcode_style
- indent_oc_block_msg_from_keyword
- indent_oc_block_msg_from_colon
- indent_oc_block_msg_from_caret
- indent_oc_block_msg_from_brace
- sp_enum_paren
- sp_cparen_oparen
- sp_after_ptr_star_qualifier
- sp_after_constr_colon
- sp_before_constr_colon
- sp_fparen_dbrace
- sp_word_brace
- sp_word_brace_ns
- sp_cond_colon_before
- sp_cond_colon_after
- sp_cond_question_before
- sp_cond_question_after
- sp_cond_ternary_short
- align_keep_extra_space
- nl_cpp_lambda_leave_one_liners
- nl_brace_square
- nl_brace_fparen
- nl_constr_init_args
- nl_cpp_ldef_brace
- nl_paren_dbrace_open
- nl_constr_colon
- pos_constr_comma
- pos_constr_colon
- mod_add_long_namespace_closebrace_comment
- cmt_convert_tab_to_spaces
Diffstat (limited to 'textproc/uncrustify')
| -rw-r--r-- | textproc/uncrustify/Makefile | 18 | ||||
| -rw-r--r-- | textproc/uncrustify/PLIST | 10 | ||||
| -rw-r--r-- | textproc/uncrustify/distinfo | 11 | ||||
| -rw-r--r-- | textproc/uncrustify/patches/patch-CMakeLists.txt | 17 |
4 files changed, 46 insertions, 10 deletions
diff --git a/textproc/uncrustify/Makefile b/textproc/uncrustify/Makefile index 4ef5ba11c65..6287f461f12 100644 --- a/textproc/uncrustify/Makefile +++ b/textproc/uncrustify/Makefile @@ -1,15 +1,25 @@ -# $NetBSD: Makefile,v 1.2 2014/03/31 08:31:44 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2019/05/14 12:54:17 ryoon Exp $ -DISTNAME= uncrustify-0.60 +DISTNAME= uncrustify-uncrustify-0.69.0 +PKGNAME= ${DISTNAME:S/uncrustify-//} CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=uncrustify/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=uncrustify/} +GITHUB_PROJECT= uncrustify +GITHUB_TAG= uncrustify-0.69.0 MAINTAINER= ryoon@NetBSD.org HOMEPAGE= http://uncrustify.sourceforge.net/ COMMENT= Source Code Beautifier for C-like languages LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes +USE_CMAKE= yes USE_LANGUAGES= c c++ +OBJDIR= ${WRKSRC}/build +CONFIGURE_DIRS= ${OBJDIR} +CMAKE_ARG_PATH= ${WRKSRC} + +pre-configure: + ${MKDIR} ${WRKSRC}/build + .include "../../mk/bsd.pkg.mk" diff --git a/textproc/uncrustify/PLIST b/textproc/uncrustify/PLIST index 4584af4be75..5a2e47c74f6 100644 --- a/textproc/uncrustify/PLIST +++ b/textproc/uncrustify/PLIST @@ -1,12 +1,20 @@ -@comment $NetBSD: PLIST,v 1.1 2013/01/13 04:22:34 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2019/05/14 12:54:17 ryoon Exp $ bin/uncrustify man/man1/uncrustify.1 +share/uncrustify/MS-calling_conventions.cfg +share/uncrustify/amxmodx.cfg share/uncrustify/ben.cfg +share/uncrustify/ben2.cfg share/uncrustify/d.cfg share/uncrustify/defaults.cfg +share/uncrustify/freebsd.cfg share/uncrustify/gnu-indent.cfg +share/uncrustify/klaus.cfg share/uncrustify/kr-indent.cfg share/uncrustify/linux-indent.cfg share/uncrustify/linux.cfg share/uncrustify/mono.cfg +share/uncrustify/msvc.cfg +share/uncrustify/objc.cfg +share/uncrustify/sun.cfg share/uncrustify/xsupplicant.cfg diff --git a/textproc/uncrustify/distinfo b/textproc/uncrustify/distinfo index 09f8dbdf1cf..67ca7cbf226 100644 --- a/textproc/uncrustify/distinfo +++ b/textproc/uncrustify/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 02:00:14 agc Exp $ +$NetBSD: distinfo,v 1.5 2019/05/14 12:54:17 ryoon Exp $ -SHA1 (uncrustify-0.60.tar.gz) = 769a7649a1cefb80beff9b67b11b4b87a8cc8e0e -RMD160 (uncrustify-0.60.tar.gz) = 5770265558adaeecf5b66334fe91389e75b19674 -SHA512 (uncrustify-0.60.tar.gz) = 5ff3ac05d607420e6a140369b44407caae4b1dd4601d387375babeb0cfe0fe0501052a80acfc0a28bad53ee55f181f182cb9560f90d7735b2ba879a3a64b35fe -Size (uncrustify-0.60.tar.gz) = 1037433 bytes +SHA1 (uncrustify-uncrustify-0.69.0.tar.gz) = 4956ef18bb53037f0cfcb4881f34b4c210372ee0 +RMD160 (uncrustify-uncrustify-0.69.0.tar.gz) = f1ecfefbfd8ad8ac75e3345c6f5951c0d8921775 +SHA512 (uncrustify-uncrustify-0.69.0.tar.gz) = 06eb985b941bd595c037c71becd277ed68298bebb56e9cdaba5da8315812a43a1455eba8635f370e2b039e665fa89891042f520933b7de5677bdcfb2dd69e6cb +Size (uncrustify-uncrustify-0.69.0.tar.gz) = 1600390 bytes +SHA1 (patch-CMakeLists.txt) = 4715199cfdfceb60828d9996f91bf6a45cb46cd4 diff --git a/textproc/uncrustify/patches/patch-CMakeLists.txt b/textproc/uncrustify/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..48608389013 --- /dev/null +++ b/textproc/uncrustify/patches/patch-CMakeLists.txt @@ -0,0 +1,17 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2019/05/14 12:54:17 ryoon Exp $ + +* Install cfg files under non-Windows platforms + +--- CMakeLists.txt.orig 2019-05-13 14:46:13.000000000 +0000 ++++ CMakeLists.txt +@@ -459,6 +459,10 @@ else() + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/uncrustify.1" + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" + ) ++ install(DIRECTORY "${PROJECT_SOURCE_DIR}/etc/" ++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/uncrustify" ++ FILES_MATCHING PATTERN "*.cfg" ++ ) + endif() + + # |