pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
update deviceatlas to 2.1.4
Module Name: pkgsrc-wip
Committed By: David Carlier <devnexen%gmail.com@localhost>
Pushed By: devnexen
Date: Sun Sep 30 20:10:13 2018 +0100
Changeset: e3166f9c50aa85f13c3933222b60b130456c13ba
Modified Files:
deviceatlas-enterprise-c/Makefile
deviceatlas-enterprise-c/PLIST
deviceatlas-enterprise-c/distinfo
Added Files:
deviceatlas-enterprise-c/patches/patch-Examples_CMakeLists.txt
deviceatlas-enterprise-c/patches/patch-Src_CMakeLists.txt
Removed Files:
deviceatlas-enterprise-c/patches/patch-CMakeLists.txt
deviceatlas-enterprise-c/patches/patch-examples_CMakeLists.txt
Log Message:
update deviceatlas to 2.1.4
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e3166f9c50aa85f13c3933222b60b130456c13ba
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
deviceatlas-enterprise-c/Makefile | 5 +-
deviceatlas-enterprise-c/PLIST | 180 +--------------------
deviceatlas-enterprise-c/distinfo | 11 +-
.../patches/patch-CMakeLists.txt | 23 ---
.../patches/patch-Examples_CMakeLists.txt | 10 ++
.../patches/patch-Src_CMakeLists.txt | 27 ++++
.../patches/patch-examples_CMakeLists.txt | 12 --
7 files changed, 55 insertions(+), 213 deletions(-)
diffs:
diff --git a/deviceatlas-enterprise-c/Makefile b/deviceatlas-enterprise-c/Makefile
index 5a90afd431..85d9541122 100644
--- a/deviceatlas-enterprise-c/Makefile
+++ b/deviceatlas-enterprise-c/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.6 2015/08/10 05:51:35 devnexen Exp $
EXTRACT_SUFX= .zip
-DISTNAME= deviceatlas-enterprise-c-2.1
+DISTNAME= deviceatlas-enterprise-c-2.1.4
PKGREVISION= 5
CATEGORIES= net devel
MASTER_SITES= #
@@ -27,6 +27,9 @@ PKG_DESTDIR_SUPPORT= destdir
INSTALLATION_DIRS= lib include
+CMAKE_ARGS+= -DSKIP_INSTALL_RPATH=ON \
+ -DBUILD_WITH_INSTALL_RPATH=ON
+
FETCH_MESSAGE= "Please fetch ${DISTFILES} manually from"
FETCH_MESSAGE+= "${HOMEPAGE}"
FETCH_MESSAGE+= "and put into"
diff --git a/deviceatlas-enterprise-c/PLIST b/deviceatlas-enterprise-c/PLIST
index 71d5b693b8..7330d9bbca 100644
--- a/deviceatlas-enterprise-c/PLIST
+++ b/deviceatlas-enterprise-c/PLIST
@@ -1,182 +1,18 @@
@comment $NetBSD: PLIST,v 1.2 2015/07/07 15:13:37 devnexen Exp $
include/dac.h
include/dac_json.h
+include/ci.h
+include/ci_fwd.h
+include/ci_priv.h
lib/libda.so
-share/doc/deviceatlas-enterprise-c/ApiDocs/annotated.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/arrowdown.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/arrowright.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/bc_s.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/bdwn.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/classes.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/closed.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a019442ae3fde38aa28b254b21bf9e269.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a06c2b226ae6b397baeb9aa8b26abb77e.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a06d05d2c11a91ee32725d9c2a4763b11.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a06fc87d81c62e9abb8790b6e5713c55b.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a0b2696786cf079443dcb81ff69946138.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a17b5eb6563bc86a1f912b44b2ca640ab.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a1dddfe400c7a7d0a557b8caafbda36ec.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a1ebacd72beff98a60c877e85b1e21ad2.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a21a8f211f621a7df73bb5ac9ea6784ac.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a259737627eebea4cd418610d6ea8677d.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a2a182c9714e85b77dc6c462bfcd42d58.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a2a4ae76b9d8f8bb018fb88e671e81828.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a2eb87ba7f137f2f541eb1087722af066.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a2ebcf6fcbe7002935df4757c38a72cae.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a30b90786e2f149f1a6837074f8381414.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a37537d673f7ac1fd1746bc0103cc0d4a.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a37b2349f4fddc3967e740304a706f621.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a407c8942e8043862125edd21cce0f1a1.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a476aa987cf78c72941b9fefee6e55b10.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a4f9a8f62db1cad7693aced372b8ff3b9.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a631d0feb27811b79aa1147f508711172.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a69f0a2059c442541cdfe75e5afceac63.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a6c0c215038a75b042b5bc6d3af53d9b4.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a6f206c4d51ea77bf37c48170a609f94d.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a6ff9e48dcc53b7031e589b5ee2c4ad67.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a71e811099fb245c5a15fd71668ce557c.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a748f32745153bab132e432ecc4df7025.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a74e80ff424218e041f9f966420fb5758.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a7d3b5f08173de85ce70e081cba116511.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a803f3943e026baf1bd5b272962e879b3.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a81a4326d9b6fd3e6c09bb08a7e8753ef.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a89bb11ba0d89ed51f7852fd439ab5e54.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a8a701927c6b9a395fcef0705d6a3f16a.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a8e9a7b02f27bf102d8f740e9db36eab5.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a9179c4a47073592090f7639f1d3964fb.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a957e72f600e612b09e326f8e86bb8d58.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a999a28d6f45b7fcdb923eb1c76e15d33.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a9a8713d99c002ba8dadeed22f9a3c86b.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_a9aa5c02de0e81aaa1dae0bf01b520947.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_aafa13736dc93b9ba58e5329572bcdb50.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_abedcbdb21852b28880b006a2d8443a4d.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_ac1876ca873a2a64bf76cb406425f687b.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_ad5f26e5ed4b0dc16f935a82a65c9d509.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_adcb1c8fec0ee9bf80ccaa4f289bcc204.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_adf764cbdea00d65edcd07bb9953ad2b7.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_ae37d73b5dde45eb0d197c4163d11781a.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_ae5902fa6e81257a7549d845a5c781910.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_aeb1e01f371623217f7a60625b078cc2f.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_afe6c57eda28e859a4fbb334eb560bd29.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/dac_8h_source.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/doc.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/doxygen.css
-share/doc/deviceatlas-enterprise-c/ApiDocs/doxygen.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/dynsections.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/files.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/folderclosed.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/folderopen.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/functions.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/functions_vars.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/globals.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/globals_enum.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/globals_eval.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/globals_func.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/globals_type.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/index.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/jquery.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/nav_f.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/nav_g.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/nav_h.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/open.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_0.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_0.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_1.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_1.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_2.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_2.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_3.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_3.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_4.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_4.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_5.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_5.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_6.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_6.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_7.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_7.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_8.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_8.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_9.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_9.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_a.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_a.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_b.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_b.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_c.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_c.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_d.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_d.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_e.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/all_e.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/classes_0.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/classes_0.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/close.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/enums_0.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/enums_0.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/enumvalues_0.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/enumvalues_0.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/files_0.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/files_0.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/functions_0.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/functions_0.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/mag_sel.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/nomatches.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/search.css
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/search.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/search_l.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/search_m.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/search_r.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/searchdata.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/typedefs_0.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/typedefs_0.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_0.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_0.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_1.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_1.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_2.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_2.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_3.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_3.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_4.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_4.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_5.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_5.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_6.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_6.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_7.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_7.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_8.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_8.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_9.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_9.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_a.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_a.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_b.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_b.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_c.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_c.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_d.html
-share/doc/deviceatlas-enterprise-c/ApiDocs/search/variables_d.js
-share/doc/deviceatlas-enterprise-c/ApiDocs/splitbar.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/sync_off.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/sync_on.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/tab_a.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/tab_b.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/tab_h.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/tab_s.png
-share/doc/deviceatlas-enterprise-c/ApiDocs/tabs.css
-share/doc/deviceatlas-enterprise-c/README.ClientSide.html
-share/doc/deviceatlas-enterprise-c/README.DeviceApi.html
-share/doc/deviceatlas-enterprise-c/README.html
+lib/libci.so
+lib/libda.so.2.1.4
+lib/libci.so.1.1.0
share/doc/deviceatlas-enterprise-c/examples/daexutil.h
-share/doc/deviceatlas-enterprise-c/examples/example0
share/doc/deviceatlas-enterprise-c/examples/example0.c
-share/doc/deviceatlas-enterprise-c/examples/example1
share/doc/deviceatlas-enterprise-c/examples/example1.c
-share/doc/deviceatlas-enterprise-c/examples/example2
share/doc/deviceatlas-enterprise-c/examples/example2.c
-share/doc/deviceatlas-enterprise-c/examples/example3
share/doc/deviceatlas-enterprise-c/examples/example3.c
+share/doc/deviceatlas-enterprise-c/examples/example4.c
+share/doc/deviceatlas-enterprise-c/examples/ci-example.c
share/doc/deviceatlas-enterprise-c/examples/util.c
diff --git a/deviceatlas-enterprise-c/distinfo b/deviceatlas-enterprise-c/distinfo
index 15fbd71fec..3a2066a0cc 100644
--- a/deviceatlas-enterprise-c/distinfo
+++ b/deviceatlas-enterprise-c/distinfo
@@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.5 2015/08/10 05:51:35 devnexen Exp $
-SHA1 (deviceatlas-enterprise-c-2.1.zip) = fbd4a4198307616d51518e50d09666aeac2eea29
-RMD160 (deviceatlas-enterprise-c-2.1.zip) = fc4b78bc18c80cc19e36fa5b8776cbf8b959abd7
-Size (deviceatlas-enterprise-c-2.1.zip) = 504286 bytes
-SHA1 (patch-CMakeLists.txt) = 04a5cb463a708d2803e0900d23e2b3cc0a76162a
-SHA1 (patch-examples_CMakeLists.txt) = fa31fa30800b5739c0359f021b5e86ebdc1babd5
+SHA1 (deviceatlas-enterprise-c-2.1.4.zip) = a9c274f934a64928971a1edd0095cee9a9cb40d8
+RMD160 (deviceatlas-enterprise-c-2.1.4.zip) = 7a09091f09857c00e6bb021361d3f83879b2e989
+SHA512 (deviceatlas-enterprise-c-2.1.4.zip) = f1a2b0d3e01edd4510ee294b864c5282d10bf1ee237d3fae81192ec630a27c9c0f7ae3bd27d5345afe6716ab9a364825dc17c9c3bcec362c0ae1ab605a52a237
+Size (deviceatlas-enterprise-c-2.1.4.zip) = 66404 bytes
+SHA1 (patch-Examples_CMakeLists.txt) = 871eb7eefb4cde2a8fad591b4a185ce5110d8a05
+SHA1 (patch-Src_CMakeLists.txt) = 49d0fd70e80c57c4f459b8ff5863f8f9106e8f2e
diff --git a/deviceatlas-enterprise-c/patches/patch-CMakeLists.txt b/deviceatlas-enterprise-c/patches/patch-CMakeLists.txt
deleted file mode 100644
index 2dd576a4b5..0000000000
--- a/deviceatlas-enterprise-c/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2015/08/10 05:32:18 devnexen Exp $
-cmake install library, C headers and documentation.
---- CMakeLists.txt.orig 2015-08-10 06:03:52.000000000 +0100
-+++ CMakeLists.txt 2015-08-10 06:04:51.000000000 +0100
-@@ -28,6 +28,10 @@
- add_library (da ${LIBTYPE} json.c dac.c)
- target_link_libraries(da ${PCRELIB})
- set_target_properties(da PROPERTIES SOVERSION 2.1)
-+set(CMAKE_SKIP_RPATH FALSE)
-+set(CMAKE_SKIP_INSTALL_RPATH FALSE)
-+set(CMAKE_INSTALL_RPATH_USE_LINK_RPATH TRUE)
-+set(CMAKE_INSTALL_RPATH "${INSTALL_PREFIX}/lib")
-
- add_subdirectory(examples)
-
-@@ -49,3 +53,7 @@
- add_executable(dasample dasample.c)
- target_link_libraries(dasample da)
- endif()
-+
-+install(TARGETS da DESTINATION ${INSTALL_PREFIX}/lib)
-+install(FILES dac.h dac_json.h DESTINATION ${INSTALL_PREFIX}/include)
-+install(DIRECTORY Documentation/ DESTINATION ${INSTALL_PREFIX}/share/doc/deviceatlas-enterprise-c)
diff --git a/deviceatlas-enterprise-c/patches/patch-Examples_CMakeLists.txt b/deviceatlas-enterprise-c/patches/patch-Examples_CMakeLists.txt
new file mode 100644
index 0000000000..5a8e6474a2
--- /dev/null
+++ b/deviceatlas-enterprise-c/patches/patch-Examples_CMakeLists.txt
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- Examples/CMakeLists.txt.orig 2018-09-30 18:30:05.000000000 +0000
++++ Examples/CMakeLists.txt
+@@ -16,3 +16,5 @@ endwhile()
+
+ add_executable(ci-example ci-example.c "ci-example.c")
+ target_link_libraries(ci-example ci)
++file(GLOB EXAMPLES *.c *.h)
++install(FILES ${EXAMPLES} DESTINATION ${INSTALL_PREFIX}/share/doc/deviceatlas-enterprise-c/examples)
diff --git a/deviceatlas-enterprise-c/patches/patch-Src_CMakeLists.txt b/deviceatlas-enterprise-c/patches/patch-Src_CMakeLists.txt
new file mode 100644
index 0000000000..c9fb77be70
--- /dev/null
+++ b/deviceatlas-enterprise-c/patches/patch-Src_CMakeLists.txt
@@ -0,0 +1,27 @@
+$NetBSD$
+
+--- Src/CMakeLists.txt.orig 2018-09-30 18:30:05.000000000 +0000
++++ Src/CMakeLists.txt
+@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.6)
+ set(DA_API_VERSION 2.1.4)
+ set(CI_API_VERSION 1.1.0)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
++set(CMAKE_INSTALL_RPATH "${INSTALL_PREFIX}/lib")
+
+ find_package(pcre REQUIRED)
+ include(Checkbool)
+@@ -33,11 +34,11 @@ set_target_properties(ci PROPERTIES SOVE
+
+ if(UNIX)
+ if(NOT APPLE)
+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libda.so ${CMAKE_CURRENT_BINARY_DIR}/libda.so.${DA_API_VERSION} DESTINATION /usr/local/lib)
+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libci.so ${CMAKE_CURRENT_BINARY_DIR}/libci.so.${CI_API_VERSION} DESTINATION /usr/local/lib)
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libda.so ${CMAKE_CURRENT_BINARY_DIR}/libda.so.${DA_API_VERSION} DESTINATION ${INSTALL_PREFIX}/lib)
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libci.so ${CMAKE_CURRENT_BINARY_DIR}/libci.so.${CI_API_VERSION} DESTINATION ${INSTALL_PREFIX}/lib)
+ else()
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libda.dylib ${CMAKE_CURRENT_BINARY_DIR}/libda.${DA_API_VERSION}.dylib DESTINATION /usr/local/lib)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libci.dylib ${CMAKE_CURRENT_BINARY_DIR}/libci.${CI_API_VERSION}.dylib DESTINATION /usr/local/lib)
+ endif()
+- install(FILES dac.h dac_json.h ci.h ci_priv.h ci_fwd.h DESTINATION /usr/local/include)
++ install(FILES dac.h dac_json.h ci.h ci_priv.h ci_fwd.h DESTINATION ${INSTALL_PREFIX}/include)
+ endif()
diff --git a/deviceatlas-enterprise-c/patches/patch-examples_CMakeLists.txt b/deviceatlas-enterprise-c/patches/patch-examples_CMakeLists.txt
deleted file mode 100644
index 396d98abc4..0000000000
--- a/deviceatlas-enterprise-c/patches/patch-examples_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-examples_CMakeLists.txt,v 1.3 2015/08/10 05:32:18 devnexen Exp $
-cmake install compiled examples and their source codes.
---- examples/CMakeLists.txt.orig 2015-08-10 06:04:00.000000000 +0100
-+++ examples/CMakeLists.txt 2015-08-10 06:05:25.000000000 +0100
-@@ -12,3 +12,7 @@
- target_link_libraries(example${N} da ${LIBOMP})
- MATH(EXPR N "${N} + 1")
- endwhile()
-+
-+file(GLOB EXAMPLES *.c *.h)
-+install(TARGETS example0 example1 example2 example3 DESTINATION ${INSTALL_PREFIX}/share/doc/deviceatlas-enterprise-c/examples)
-+install(FILES ${EXAMPLES} DESTINATION ${INSTALL_PREFIX}/share/doc/deviceatlas-enterprise-c/examples)
- Prev by Date:
wtfpl -> public-domain
- Next by Date:
Remove love07, love08, love09, love010, libaom, mrrescue,
- Previous by Thread:
wtfpl -> public-domain
- Next by Thread:
Remove love07, love08, love09, love010, libaom, mrrescue,
- Indexes:
Home |
Main Index |
Thread Index |
Old Index