pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

csv2: fix pc file and install licenses in docdir



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Mon Feb 28 10:21:38 2022 +0100
Changeset:	d551a51d57e10d4c59871bfbed823d11d55aa98e

Modified Files:
	csv2/PLIST
	csv2/distinfo
Added Files:
	csv2/patches/patch-CMakeLists.txt

Log Message:
csv2: fix pc file and install licenses in docdir

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d551a51d57e10d4c59871bfbed823d11d55aa98e

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

diffstat:
 csv2/PLIST                        |  4 ++--
 csv2/distinfo                     |  1 +
 csv2/patches/patch-CMakeLists.txt | 29 +++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diffs:
diff --git a/csv2/PLIST b/csv2/PLIST
index c99193b9c4..aeea4973e5 100644
--- a/csv2/PLIST
+++ b/csv2/PLIST
@@ -7,5 +7,5 @@ lib/cmake/csv2/csv2Config.cmake
 lib/cmake/csv2/csv2ConfigVersion.cmake
 lib/cmake/csv2/csv2Targets.cmake
 lib/pkgconfig/csv2.pc
-share/licenses/csv2/LICENSE
-share/licenses/csv2/LICENSE.mio
+share/doc/csv2/LICENSE
+share/doc/csv2/LICENSE.mio
diff --git a/csv2/distinfo b/csv2/distinfo
index 0724b296df..451318a7e8 100644
--- a/csv2/distinfo
+++ b/csv2/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
 BLAKE2s (csv2-0.1.tar.gz) = 83305103da0a635f89e3c870870065c531cfcce07a36ecfdca12dbaf0237e1bb
 SHA512 (csv2-0.1.tar.gz) = d44279ed3955b4ebfb303ad266537e4d8d68916d2eac77ef654686628cf0353dd2d26b7a5e414b76ba50f368c25e7fb31bba422a60f70a4bb2816bf139235093
 Size (csv2-0.1.tar.gz) = 168636 bytes
+SHA1 (patch-CMakeLists.txt) = 66390a1331f06721f09a50010e1ed68310bc346d
diff --git a/csv2/patches/patch-CMakeLists.txt b/csv2/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..b18d6a9991
--- /dev/null
+++ b/csv2/patches/patch-CMakeLists.txt
@@ -0,0 +1,29 @@
+$NetBSD$
+
+* Set description and url in pkg-config file
+* Install licenses in docdir as share/licenses are not used in pkgsrc
+
+--- CMakeLists.txt.orig	2020-07-27 15:19:54.000000000 +0000
++++ CMakeLists.txt
+@@ -4,7 +4,11 @@ if(DEFINED PROJECT_NAME)
+   set(CSV2_SUBPROJECT ON)
+ endif()
+ 
+-project(csv2 VERSION 1.8.0 LANGUAGES CXX)
++project(csv2
++        VERSION 1.8.0
++        DESCRIPTION "Fast CSV parser and writer for Modern C++"
++        HOMEPAGE_URL "https://github.com/p-ranav/csv2";
++        LANGUAGES CXX)
+   
+ if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
+     include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
+@@ -54,7 +58,7 @@ if(NOT CSV2_SUBPROJECT)
+           USE_SOURCE_PERMISSIONS
+           PATTERN "*.hpp")
+   install(FILES LICENSE LICENSE.mio
+-          DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/licenses/csv2)
++          DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ 
+   if(EXISTS "${PROJECT_SOURCE_DIR}/.gitignore")
+     # Simple glob to regex conversion (.gitignore => CPACK_SOURCE_IGNORE_FILES)


Home | Main Index | Thread Index | Old Index