Updated textproc/cmark 0.24.1 to 0.26.1

---------------------------------------
cmark 0.26.1

@jgm jgm released this Jul 16, 2016 . 18 commits to master since this release

  * Removed unnecessary typedef that caused build failure on some platforms.
  * Use $(MAKE) in Makefile instead of hardcoded make (#146, Tobias Kortkamp).

cmark 0.26.0

@jgm jgm released this Jul 15, 2016 . 23 commits to master since this release

  * Implement spec changes for list items:
      + Empty list items cannot interrupt paragraphs.
      + Ordered lists cannot interrupt paragraphs unless they start with 1.
      + Removed "two blank lines break out of a list" feature.
  * Fix sourcepos for blockquotes (#142).
  * Fix sourcepos for atx headers (#141).
  * Fix ATX headers and thematic breaks to allow tabs as well as spaces.
  * Fix chunk_set_cstr with suffix of current string (#139, Nick Wellnhofer).
    It's possible that cmark_chunk_set_cstr is called with a substring (suffix)
    of the current string. Delay freeing of the chunk content to handle this
    case correctly.
  * Export targets on installation (Jonathan M?ller). This allows using them in
    other cmake projects.
  * Fix cmake warning about CMP0048 (Jonathan M?ller).
  * commonmark renderer: Ensure we don't have a blank line before a code block
    when it's the first thing in a list item.
  * Change parsing of strong/emph in response to spec changes. process_emphasis
    now gets better results in corner cases. The change is this: when
    considering matches between an interior delimiter run (one that can open
    and can close) and another delimiter run, we require that the sum of the
    lengths of the two delimiter runs mod 3 is not 0.
  * Ported Robin Stocker's changes to link parsing in jgm/CommonMark#101. This
    uses a separate stack for brackets, instead of putting them on the
    delimiter stack. This avoids the need for looking through the delimiter
    stack for the next bracket.
  * cmark_reference_lookup: Return NULL if reference is null string.
  * Fix character type detection in commonmark.c (Nick Wellnhofer). Fixes test
    failures on Windows and undefined behavior.
      + Implement cmark_isalpha.
      + Check for ASCII character before implicit cast to char.
      + Use internal ctype functions in commonmark.c.
  * Better documentation of memory-freeing responsibilities. in cmark.h and its
    man page (#124).
  * Use library functions to insert nodes in emphasis/link processing.
    Previously we did this manually, which introduces many places where errors
    can creep in.
  * Correctly handle list marker followed only by spaces. Previously when a
    list marker was followed only by spaces, cmark expected the following
    content to be indented by the same number of spaces. But in this case we
    should treat the line just like a blank line and set list padding
    accordingly.
  * Fixed a number of issues relating to line wrapping.
      + Extend CMARK_OPT_NOBREAKS to all renderers and add --nobreaks.
      + Do not autowrap, regardless of width parameter, if CMARK_OPT_NOBREAKS
        is set.
      + Fixed CMARK_OPT_HARDBREAKS for LaTeX and man renderers.
      + Ensure that no auto-wrapping occurs if CMARK_OPT_NOBREAKS is enabled,
        or if output is CommonMark and CMARK_OPT_HARDBREAKS is enabled.
  * Set stdin to binary mode on Windows (Nick Wellnhofer, #113). This fixes
    EOLs when reading from stdin.
  * Add library option to render softbreaks as spaces (Pavlo Kapyshin). Note
    that the NOBREAKS option is HTML-only
  * renderer: no_linebreaks instead of no_wrap. We generally want this option
    to prohibit any breaking in things like headers (not just wraps, but
    softbreaks).
  * Coerce realurllen to int. This is an alternate solution for pull request #
    132, which introduced a new warning on the comparison (Benedict Cohen).
  * Remove unused variable link_text (Mathiew Duponchelle).
  * Improved safety checks in buffer (Vicent Marti).
  * Add new interface allowing specification of custom memory allocator for
    nodes (Vicent Marti). Added cmark_node_new_with_mem,
    cmark_parser_new_with_mem, cmark_mem to API.
  * Reduce storage size for nodes by using bit flags instead of separate
    booleans (Vicent Marti).
  * config: Add SSIZE_T compat for Win32 (Vicent Marti).
  * cmake: Global handler for OOM situations (Vicent Marti).
  * Add tests for memory exhaustion (Vicent Marti).
  * Document in man page and public header that one should use the same memory
    allocator for every node in a tree.
  * Fix ctypes in Python FFI calls (Nick Wellnhofer). This didn't cause
    problems so far because all types are 32-bit on 32-bit systems and
    arguments are passed in registers on x86-64. The wrong types could cause
    crashes on other platforms, though.
  * Remove spurious failures in roundtrip tests. In the commonmark writer we
    separate lists, and lists and indented code, using a dummy HTML comment. So
    in evaluating the round-trip tests, we now strip out these comments. We
    also normalize HTML to avoid issues having to do with line breaks.
  * Add 2016 to copyright (Kevin Burke).
  * Added to_commonmark in test/cmark.py (for round-trip tests).
  * spec_test.py - parameterize do_test with converter.
  * spec_tests.py: exit code is now sum of failures and errors. This ensures
    that a failing exit code will be given when there are errors, not just with
    failures.
  * Fixed round trip tests. Previously they actually ran cmark instead of the
    round-trip version, since there was a bug in setting the ROUNDTRIP variable
    (#131).
  * Added new roundtrip_tests.py. This replaces the old use of simple shell
    scripts. It is much faster, and more flexible. (We will be able to do
    custom normalization and skip certain tests.)
  * Fix tests under MinGW (Nick Wellnhofer).
  * Fix leak in api_test (Mathieu Duponchelle).
  * Makefile: have leakcheck stop on first error instead of going through all
    the formats and options and probably getting the same output.
  * Add regression tests (Nick Wellnhofer).

cmark 0.25.2

@jgm jgm released this Mar 26, 2016 . 114 commits to master since this release

  * Open files in binary mode (#113, Nick Wellnhofer). Now that cmark supports
    different line endings, files must be openend in binary mode on Windows.
  * Reset partially_consumed_tab on every new line (#114, Nick Wellnhofer).
  * Handle buffer split across a CRLF line ending (#117). Adds an internal
    field to the parser struct to keep track of last_buffer_ended_with_cr.
    Added test.

cmark 0.25.1

@jgm jgm released this Mar 25, 2016 . 122 commits to master since this release

  * Release with no code changes. cmark version was mistakenly set to 0.25.1 in
    the 0.25.0 release (#112), so this release just ensures that this will
    cause no confusion later.

cmark 0.25.0

@jgm jgm released this Mar 25, 2016 . 124 commits to master since this release

  * Fixed tabs in indentation (#101). This patch fixes S_advance_offset so that
    it doesn't gobble a tab character when advancing less than the width of a
    tab.
  * Added partially_consumed_tab to parser. This keeps track of when we have
    gotten partway through a tab when consuming initial indentation.
  * Simplified add_line (only need parser parameter).
  * Properly handle partially consumed tab. E.g. in

    - foo

     <TAB><TAB>bar

    we should consume two spaces from the second tab, including two spaces
    in the code block.

  * Properly handle tabs with blockquotes and fenced blocks.
  * Fixed handling of tabs in lists.
  * Clarified logic in S_advance_offset.
  * Use an assertion to check for in-range html_block_type. It's a programming
    error if the type is out of range.
  * Refactored S_processLines to make the logic easier to understand, and added
    documentation (Mathieu Duponchelle).
  * Removed unnecessary check for empty string_content.
  * Factored out contains_inlines.
  * Moved the cmake minimum version to top line of CMakeLists.txt (tinysun212).
  * Fix ctype(3) usage on NetBSD (Kamil Rytarowski). We need to cast value
    passed to isspace(3) to unsigned char to explicitly prevent possibly
    undefined behavior.
  * Compile in plain C mode with MSVC 12.0 or newer (Nick Wellnhofer). Under
    MSVC, we used to compile in C++ mode to get some C99 features like mixing
    declarations and code. With newer MSVC versions, it's possible to build in
    plain C mode.
  * Switched from "inline" to "CMARK_INLINE" (Nick Wellnhofer). Newer MSVC
    versions support enough of C99 to be able to compile cmark in plain C mode.
    Only the "inline" keyword is still unsupported. We have to use "__inline"
    instead.
  * Added include guards to config.h
  * config.h.in - added compatibility snprintf, vsnprintf for MSVC.
  * Replaced sprintf with snprintf (Marco Benelli).
  * config.h: include stdio.h for _vscprintf etc.
  * Include starg.h when needed in config.h.
  * Removed an unnecessary C99-ism in buffer.c. This helps compiling on systems
    like luarocks that don't have all the cmake configuration goodness (thanks
    to carlmartus).
  * Don't use variable length arrays (Nick Wellnhofer). They're not supported
    by MSVC.
  * Test with multiple MSVC versions under Appveyor (Nick Wellnhofer).
  * Fix installation dir of man-pages on NetBSD (Kamil Rytarowski).
  * Fixed typo in cmark.h comments (Chris Eidhof).
  * Clarify in man page that cmark_node_free frees a node's children too.
  * Fixed documentation of --width in man page.
  * Require re2c >= 1.14.2 (#102).
  * Generated scanners.c with more recent re2c.

(pkgsrc changes)
 - Drop two patches accepted to upstream

5 files changed, 10 insertions, 51 deletions

diff --git a/textproc/cmark/Makefile b/textproc/cmark/Makefile
index ec3aeb01122..c79d77ffadb 100644
--- a/textproc/cmark/Makefile
+++ b/textproc/cmark/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2016/06/09 06:23:40 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/09/17 11:45:14 mef Exp $
 
-DISTNAME=	cmark-0.24.1
+DISTNAME=	cmark-0.26.1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jgm/}
 
diff --git a/textproc/cmark/PLIST b/textproc/cmark/PLIST
index 48257e17372..88510f55a54 100644
--- a/textproc/cmark/PLIST
+++ b/textproc/cmark/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2016/02/28 13:33:58 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/09/17 11:45:14 mef Exp $
 bin/cmark
 include/cmark.h
 include/cmark_export.h
 include/cmark_version.h
+lib/cmake/cmark-release.cmake
+lib/cmake/cmark.cmake
 lib/libcmark.a
 lib/libcmark.so
 lib/libcmark.so.${PKGVERSION}
diff --git a/textproc/cmark/distinfo b/textproc/cmark/distinfo
index 3ca3767bfcd..0c3dd65fc76 100644
--- a/textproc/cmark/distinfo
+++ b/textproc/cmark/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1 2016/02/28 13:33:58 kamil Exp $
+$NetBSD: distinfo,v 1.2 2016/09/17 11:45:14 mef Exp $
 
-SHA1 (cmark-0.24.1.tar.gz) = bfd17ef9cae14a74a7b2d1c3f171ced3ce9a5c8a
-RMD160 (cmark-0.24.1.tar.gz) = 70dbf24b47c9f9b8b4c8e2d55bcfa92d636056a6
-SHA512 (cmark-0.24.1.tar.gz) = ad6381b0a876472d85fa68e538caeebe3ee2f042c7cd479da1e025164f1ada7ee25ccbdb2d97cc2198de8c903950ba1648f39cef868f9c4f3ccd37db3c9c33b9
-Size (cmark-0.24.1.tar.gz) = 205568 bytes
-SHA1 (patch-man_CMakeLists.txt) = 2b6e1ce1a7a95fb026d9344628be7b8583e6378d
-SHA1 (patch-src_commonmark.c) = 1b60ecbeba5fa173264ff765730e66bde78a04c7
+SHA1 (cmark-0.26.1.tar.gz) = 2d697e4a4961db9d19e5f39b2d2e4dfe2d670830
+RMD160 (cmark-0.26.1.tar.gz) = 793fa4e972454dbcd283742a9eae43627213caa9
+SHA512 (cmark-0.26.1.tar.gz) = c10fe1a9450a97dafc09179c059773aa1ae1269b247785e67f0cce959a6b12a4b0fdf91a6ad22dd6a100b892777b5a48b59227bc7ada043828b26e2be73bc059
+Size (cmark-0.26.1.tar.gz) = 214151 bytes
diff --git a/textproc/cmark/patches/patch-man_CMakeLists.txt b/textproc/cmark/patches/patch-man_CMakeLists.txt
deleted file mode 100644
index b56aa3c6d74..00000000000
--- a/textproc/cmark/patches/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-man_CMakeLists.txt,v 1.1 2016/02/28 13:33:58 kamil Exp $
-
-Patch accepted upstream.
-
-Fix installation of man-pages.
-
---- man/CMakeLists.txt.orig	2016-01-18 05:53:29.000000000 +0000
-+++ man/CMakeLists.txt
-@@ -1,8 +1,10 @@
- if (NOT MSVC)
-+
-+include(GNUInstallDirs)
-+
-   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man1/cmark.1
--    DESTINATION share/man/man1)
-+    DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
- 
-   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man3/cmark.3
--    DESTINATION share/man/man3)
-+    DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
- endif(NOT MSVC)
--
diff --git a/textproc/cmark/patches/patch-src_commonmark.c b/textproc/cmark/patches/patch-src_commonmark.c
deleted file mode 100644
index 0f3f42e6989..00000000000
--- a/textproc/cmark/patches/patch-src_commonmark.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_commonmark.c,v 1.1 2016/02/28 13:33:58 kamil Exp $
-
-Patch accepted upstream.
-
-Fix usage of ctype(3) functions.
-
---- src/commonmark.c.orig	2016-01-18 05:53:29.000000000 +0000
-+++ src/commonmark.c
-@@ -270,8 +270,8 @@ static int S_render_node(cmark_renderer 
-     // begin or end with a blank line, and code isn't
-     // first thing in a list item
-     if (info_len == 0 &&
--        (code_len > 2 && !isspace(code[0]) &&
--         !(isspace(code[code_len - 1]) && isspace(code[code_len - 2]))) &&
-+        (code_len > 2 && !isspace((unsigned char)code[0]) &&
-+         !(isspace((unsigned char)code[code_len - 1]) && isspace((unsigned char)code[code_len - 2]))) &&
-         !(node->prev == NULL && node->parent &&
-           node->parent->type == CMARK_NODE_ITEM)) {
-       LIT("    ");