CVS commit: pkgsrc/textproc/cmark-gfm

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/cmark-gfm
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 12 Feb 2025 09:25:41 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Feb 12 09:25:41 UTC 2025

Modified Files:
        pkgsrc/textproc/cmark-gfm: Makefile PLIST distinfo
        pkgsrc/textproc/cmark-gfm/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/textproc/cmark-gfm/patches: patch-extensions_CMakeLists.txt
            patch-src_CMakeLists.txt

Log Message:
cmark-gfm: remove gfm.N from shared library name to fix dylib handling; switch to cmake/build.mk; add TEST_TARGET; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/cmark-gfm/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/cmark-gfm/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/cmark-gfm/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/cmark-gfm/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/cmark-gfm/patches/patch-extensions_CMakeLists.txt \
    pkgsrc/textproc/cmark-gfm/patches/patch-src_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/cmark-gfm/Makefile
diff -u pkgsrc/textproc/cmark-gfm/Makefile:1.4 pkgsrc/textproc/cmark-gfm/Makefile:1.5
--- pkgsrc/textproc/cmark-gfm/Makefile:1.4      Sat Aug  5 09:46:11 2023
+++ pkgsrc/textproc/cmark-gfm/Makefile  Wed Feb 12 09:25:41 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2023/08/05 09:46:11 taca Exp $
+# $NetBSD: Makefile,v 1.5 2025/02/12 09:25:41 adam Exp $
 
 DISTNAME=      0.29.0.gfm.13
+PKGREVISION=   1
 PKGNAME=       ${GITHUB_PROJECT}-${DISTNAME}
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=github/}
@@ -9,14 +10,19 @@ GITHUB_TAG=  ${DISTNAME}
 DIST_SUBDIR=   ${GITHUB_PROJECT}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/github/cmark-gfm/
+HOMEPAGE=      https://github.com/github/cmark-gfm
 COMMENT=       GitHub fork of cmark
 LICENSE=       2-clause-bsd
 
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
-USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
 PKGCONFIG_OVERRIDE+=   src/libcmark-gfm.pc.in
 
+TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/src:${WRKSRC}/${CMAKE_BUILD_DIR}/extensions
+# For Darwin
+TEST_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/src:${WRKSRC}/${CMAKE_BUILD_DIR}/extensions
+TEST_TARGET=   test
+
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/cmark-gfm/PLIST
diff -u pkgsrc/textproc/cmark-gfm/PLIST:1.3 pkgsrc/textproc/cmark-gfm/PLIST:1.4
--- pkgsrc/textproc/cmark-gfm/PLIST:1.3 Sat Aug  5 09:46:11 2023
+++ pkgsrc/textproc/cmark-gfm/PLIST     Wed Feb 12 09:25:41 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2023/08/05 09:46:11 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/02/12 09:25:41 adam Exp $
 bin/cmark-gfm
 include/cmark-gfm-core-extensions.h
 include/cmark-gfm-extension_api.h
@@ -11,10 +11,10 @@ lib/cmake/cmark-gfm-release.cmake
 lib/cmake/cmark-gfm.cmake
 lib/libcmark-gfm-extensions.a
 lib/libcmark-gfm-extensions.so
-lib/libcmark-gfm-extensions.so.${PKGVERSION}
+lib/libcmark-gfm-extensions.so.0.29.0
 lib/libcmark-gfm.a
 lib/libcmark-gfm.so
-lib/libcmark-gfm.so.${PKGVERSION}
+lib/libcmark-gfm.so.0.29.0
 lib/pkgconfig/libcmark-gfm.pc
 man/man1/cmark-gfm.1
 man/man3/cmark-gfm.3

Index: pkgsrc/textproc/cmark-gfm/distinfo
diff -u pkgsrc/textproc/cmark-gfm/distinfo:1.5 pkgsrc/textproc/cmark-gfm/distinfo:1.6
--- pkgsrc/textproc/cmark-gfm/distinfo:1.5      Sat Aug  5 09:46:11 2023
+++ pkgsrc/textproc/cmark-gfm/distinfo  Wed Feb 12 09:25:41 2025
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2023/08/05 09:46:11 taca Exp $
+$NetBSD: distinfo,v 1.6 2025/02/12 09:25:41 adam Exp $
 
 BLAKE2s (cmark-gfm/0.29.0.gfm.13.tar.gz) = c7188c0d647eb4a1546480f3f649203d3440fdfdc6d79c7e6900d251493ddbf5
 SHA512 (cmark-gfm/0.29.0.gfm.13.tar.gz) = 435298fcf782dfc5b64c578ac839759b9d5cd0c08eb90d6702f26278062a0f4887c65c18e89e2c9f6be23f10dd835c769a7e0f8c934be068b6754dcca30cdd7c
 Size (cmark-gfm/0.29.0.gfm.13.tar.gz) = 300086 bytes
-SHA1 (patch-CMakeLists.txt) = 902d8299234ec0bf2a7a15aaa79cdbbfc49e148f
+SHA1 (patch-CMakeLists.txt) = d814ef219b0b878c4314ca44378b6fabf115a86c
+SHA1 (patch-extensions_CMakeLists.txt) = 6dafd060f2c21f7b2c859151a6bc2185b943c78b
+SHA1 (patch-src_CMakeLists.txt) = fe5a567353b94c291e1702dd1330f7dadf1e801e

Index: pkgsrc/textproc/cmark-gfm/patches/patch-CMakeLists.txt
diff -u pkgsrc/textproc/cmark-gfm/patches/patch-CMakeLists.txt:1.1 pkgsrc/textproc/cmark-gfm/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/textproc/cmark-gfm/patches/patch-CMakeLists.txt:1.1  Wed Jan 15 06:29:59 2020
+++ pkgsrc/textproc/cmark-gfm/patches/patch-CMakeLists.txt      Wed Feb 12 09:25:41 2025
@@ -1,17 +1,15 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2020/01/15 06:29:59 pho Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2025/02/12 09:25:41 adam Exp $
 
-Allow in-source building.
+Remove gfm.N from shared library name.
 
---- CMakeLists.txt.orig        2019-04-08 06:15:49.000000000 +0000
+--- CMakeLists.txt.orig        2025-02-11 13:30:26.767639843 +0000
 +++ CMakeLists.txt
-@@ -10,10 +10,6 @@ set(PROJECT_VERSION ${PROJECT_VERSION_MA
+@@ -5,7 +5,7 @@ set(PROJECT_VERSION_MAJOR 0)
+ set(PROJECT_VERSION_MINOR 29)
+ set(PROJECT_VERSION_PATCH 0)
+ set(PROJECT_VERSION_GFM 13)
+-set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM})
++set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
+ 
  include("FindAsan.cmake")
  include("CheckFileOffsetBits.cmake")
- 
--if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
--    message(FATAL_ERROR "Do not build in-source.\nPlease remove CMakeCache.txt and the CMakeFiles/ directory.\nThen: mkdir build ; cd build ; cmake .. ; make")
--endif()
--
- option(CMARK_TESTS "Build cmark-gfm tests and enable testing" ON)
- option(CMARK_STATIC "Build static libcmark-gfm library" ON)
- option(CMARK_SHARED "Build shared libcmark-gfm library" ON)

Added files:

Index: pkgsrc/textproc/cmark-gfm/patches/patch-extensions_CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/cmark-gfm/patches/patch-extensions_CMakeLists.txt:1.1
--- /dev/null   Wed Feb 12 09:25:41 2025
+++ pkgsrc/textproc/cmark-gfm/patches/patch-extensions_CMakeLists.txt   Wed Feb 12 09:25:41 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-extensions_CMakeLists.txt,v 1.1 2025/02/12 09:25:41 adam Exp $
+
+Remove gfm.N from shared library name.
+
+--- extensions/CMakeLists.txt.orig     2025-02-11 13:35:45.852099558 +0000
++++ extensions/CMakeLists.txt
+@@ -28,7 +28,7 @@ if (CMARK_SHARED)
+   set_target_properties(${LIBRARY} PROPERTIES
+     OUTPUT_NAME "cmark-gfm-extensions"
+     DEFINE_SYMBOL "cmark-gfm"
+-    SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM}
++    SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
+     VERSION ${PROJECT_VERSION})
+ 
+   set_property(TARGET ${LIBRARY}
Index: pkgsrc/textproc/cmark-gfm/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/cmark-gfm/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null   Wed Feb 12 09:25:41 2025
+++ pkgsrc/textproc/cmark-gfm/patches/patch-src_CMakeLists.txt  Wed Feb 12 09:25:41 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2025/02/12 09:25:41 adam Exp $
+
+Remove gfm.N from shared library name.
+
+--- src/CMakeLists.txt.orig    2025-02-11 13:34:59.916569647 +0000
++++ src/CMakeLists.txt
+@@ -103,7 +103,7 @@ if (CMARK_SHARED)
+   # Include minor version and patch level in soname for now.
+   set_target_properties(${LIBRARY} PROPERTIES
+     OUTPUT_NAME "cmark-gfm"
+-    SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM}
++    SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
+     VERSION ${PROJECT_VERSION})
+ 
+   set_property(TARGET ${LIBRARY}

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/textproc/py-cmarkgfm
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/textproc/py-cmarkgfm
Indexes:

Home | Main Index | Thread Index | Old Index