pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
md4c: fix find_package(md4c)
Module Name: pkgsrc-wip
Committed By: Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By: nros
Date: Mon Jan 11 15:18:15 2021 +0000
Changeset: 493b0e3e298a952d232d28f81ba6a75fd69b7e08
Modified Files:
md4c/Makefile
md4c/PLIST
md4c/distinfo
Added Files:
md4c/patches/patch-src_CMakeLists.txt
Log Message:
md4c: fix find_package(md4c)
fix use of find_package(md4c) in the md4c package
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=493b0e3e298a952d232d28f81ba6a75fd69b7e08
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
md4c/Makefile | 2 +-
md4c/PLIST | 2 --
md4c/distinfo | 1 +
md4c/patches/patch-src_CMakeLists.txt | 37 +++++++++++++++++++++++++++++++++++
4 files changed, 39 insertions(+), 3 deletions(-)
diffs:
diff --git a/md4c/Makefile b/md4c/Makefile
index cbca465848..fd8d7951cc 100644
--- a/md4c/Makefile
+++ b/md4c/Makefile
@@ -13,7 +13,7 @@ HOMEPAGE= https://github.com/mity/md4c/
COMMENT= Markdown for C library and parser
LICENSE= mit
-WRKSRC= ${WRKDIR}/md4c-release-0.4.7
+WRKSRC= ${WRKDIR}/md4c-release-${PKGVERSION_NOREV}
USE_CMAKE= yes
USE_TOOLS+= pkg-config
diff --git a/md4c/PLIST b/md4c/PLIST
index 27ee1db0b8..64822b105b 100644
--- a/md4c/PLIST
+++ b/md4c/PLIST
@@ -2,8 +2,6 @@
bin/md2html
include/md4c-html.h
include/md4c.h
-lib/cmake/md4c-html/md4cHtmlConfig-release.cmake
-lib/cmake/md4c-html/md4cHtmlConfig.cmake
lib/cmake/md4c/md4cConfig-release.cmake
lib/cmake/md4c/md4cConfig.cmake
lib/libmd4c-html.so
diff --git a/md4c/distinfo b/md4c/distinfo
index 5c4f075887..7d7f84b01a 100644
--- a/md4c/distinfo
+++ b/md4c/distinfo
@@ -4,3 +4,4 @@ SHA1 (md4c/md4c-release-0.4.7.tar.gz) = 9b85772b0a4fbed49d718086d52092e6fe84a58f
RMD160 (md4c/md4c-release-0.4.7.tar.gz) = 180ee3c94c60a33cea56d81b67b1e1537d9f0a0b
SHA512 (md4c/md4c-release-0.4.7.tar.gz) = 90e6f4c91ff5a0faafcea3e50f6a3f3ed6ba9a42cb779b373e82b8a6a09ed4b19ed7221036a4a32171aa5ef19ee6824d3830fb9ab613bd59174b7db51bd1099b
Size (md4c/md4c-release-0.4.7.tar.gz) = 228223 bytes
+SHA1 (patch-src_CMakeLists.txt) = 347a9ea8c71c7bc8e77a37073181a7ec5bb5406d
diff --git a/md4c/patches/patch-src_CMakeLists.txt b/md4c/patches/patch-src_CMakeLists.txt
new file mode 100644
index 0000000000..80e5eda971
--- /dev/null
+++ b/md4c/patches/patch-src_CMakeLists.txt
@@ -0,0 +1,37 @@
+$NetBSD$
+
+* fix use of find_package(md4c), applied upstream
+ https://github.com/mity/pd4c/pull/146
+
+--- src/CMakeLists.txt.orig 2020-12-24 14:04:35.000000000 +0000
++++ src/CMakeLists.txt
+@@ -17,7 +17,6 @@ set_target_properties(md4c PROPERTIES
+ PUBLIC_HEADER md4c.h
+ )
+
+-
+ # Build rules for HTML renderer library
+
+ configure_file(md4c-html.pc.in md4c-html.pc @ONLY)
+@@ -39,18 +38,17 @@ install(
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ )
+ install(FILES ${CMAKE_BINARY_DIR}/src/md4c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+-install(EXPORT md4cConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/md4c/)
+
+ install(
+ TARGETS md4c-html
+- EXPORT md4cHtmlConfig
++ EXPORT md4cConfig
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ )
+ install(FILES ${CMAKE_BINARY_DIR}/src/md4c-html.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+-install(EXPORT md4cHtmlConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/md4c-html/)
+-
++install(EXPORT md4cConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/md4c/ NAMESPACE md4c::)
Home |
Main Index |
Thread Index |
Old Index