diff --git a/textproc/cmark/Makefile b/textproc/cmark/Makefile index ec3aeb0112273..c79d77ffadbbe 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 48257e1737218..88510f55a54c0 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 3ca3767bfcdf8..0c3dd65fc7648 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 b56aa3c6d7495..0000000000000 --- 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 0f3f42e69891d..0000000000000 --- 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(" ");