<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0925311fb58f8e3bf6016310e93c89666a083284">https://github.com/macports/macports-ports/commit/0925311fb58f8e3bf6016310e93c89666a083284</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0925311fb58 libnifalcon: Update to 1.1
</span>0925311fb58 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0925311fb58f8e3bf6016310e93c89666a083284
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jul 26 12:11:21 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> libnifalcon: Update to 1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55108
</span>---
devel/libnifalcon/Portfile | 38 ++++++++--------
devel/libnifalcon/files/CMakeLists.txt.patch | 52 ++++++++++++++++++++++
devel/libnifalcon/files/patch-CMakeLists.txt.diff | 13 ------
.../files/patch-examples-CMakeLists.txt.diff | 12 -----
.../files/patch-src-util-CMakeLists.txt.diff | 16 -------
5 files changed, 72 insertions(+), 59 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libnifalcon/Portfile b/devel/libnifalcon/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 521547d15a7..d3ce3f5eeaa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libnifalcon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libnifalcon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +1,37 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup boost 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libnifalcon libnifalcon 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 332b89727cb5ac62e44f2647f7e15e91ffb9fe3b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e9a311efae99ceba1d8616fe1298c2d29f6c5e1e63638f15b3cafcfca05410f7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3194465
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name libnifalcon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span> categories devel
platforms darwin
maintainers gmail.com:richardsjohnt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://qdot.github.com/libnifalcon/
</span> description Novint Falcon hardware support
long_description Driver and development library for the Novint Falcon haptic device
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/libnifalcon/libnifalcon/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 d2d226dad44ad2c98343cca5523e9f16 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 7ab7e2781a9224201da0e461e3fa34d21a8430e0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 eef75bf1834df6c1a812d0ef19399109e78cdd13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# libnifalcon uses the boost static libraries.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.depends_type build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.version 1.71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://libnifalcon.github.io/libnifalcon/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
depends_lib port:libusb
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-examples-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-util-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles CMakeLists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [split ${version}.0.0 .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for {set i 0} {$i < 3} {incr i} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@v${i}@|[lindex ${v} ${i}]|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2011
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libnifalcon/files/CMakeLists.txt.patch b/devel/libnifalcon/files/CMakeLists.txt.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9b6383ad3f9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libnifalcon/files/CMakeLists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix Libs in libnifalcon.pc file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/libnifalcon/libnifalcon/issues/57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix Version in libnifalcon.pc file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/libnifalcon/libnifalcon/issues/62
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not require existence of pkg-config executable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/libnifalcon/libnifalcon/issues/61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2016-07-04 16:07:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2021-07-26 11:52:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,9 +67,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ######################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #library definitions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(LIBNIFALCON_MAJOR_VERSION 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(LIBNIFALCON_MINOR_VERSION 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(LIBNIFALCON_BUILD_VERSION 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(LIBNIFALCON_MAJOR_VERSION @v0@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(LIBNIFALCON_MINOR_VERSION @v1@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(LIBNIFALCON_BUILD_VERSION @v2@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(LIBNIFALCON_VERSION ${LIBNIFALCON_MAJOR_VERSION}.${LIBNIFALCON_MINOR_VERSION}.${LIBNIFALCON_BUILD_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # LibNiFalcon Include directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,20 +106,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pkg-config (use the CPack information)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIND_PACKAGE(PkgConfig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(PKG_CONFIG_EXECUTABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PC_SHORT_NAME "libnifalcon")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PC_LONG_NAME "libnifalcon")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PC_LIBRARY_NAME "libnifalcon")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(PC_LIBRARY_NAME "nifalcon")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PC_DESCRIPTION "Open Source Driver for the Novint Falcon Haptic Controller")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PC_VERSION "${LIBNIFALCON_MAJOR_VERSION}.${LIBNIFALCON_MINOR_VERSION}.${LIBNIFALCON_BUILD_VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(LIBUSB_1_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PC_REQUIRES "${PC_REQUIRES}libusb-1.0 ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PC_LINK_FLAGS "${PC_LINK_FLAGS}-lnifalcon_comm_libusb ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(LIBUSB_1_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PC_LINK_FLAGS "${lib${PC_LIBRARY_NAME}_LINK_FLAGS} ${PC_LINK_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(PC_LINK_FLAGS "${lib${PC_LIBRARY_NAME}_LINK_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PC_LINK_FLAGS "-l${PC_LIBRARY_NAME} ${PC_LINK_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PC_COMPILE_FLAGS "${lib${PC_LIBRARY_NAME}_COMPILE_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PC_CONFIGURED_FILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,5 +130,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PKG_CONFIG_DIR "${LIBRARY_INSTALL_DIR}/pkgconfig")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES ${PC_CONFIGURED_FILE} DESTINATION ${PKG_CONFIG_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif(PKG_CONFIG_EXECUTABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libnifalcon/files/patch-CMakeLists.txt.diff b/devel/libnifalcon/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e5d59cc2b92..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libnifalcon/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/qdot/libnifalcon/issues/28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/qdot/libnifalcon/commit/217b724a3316be6b8bc1b82c182f5cff2ff01900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,7 +70,7 @@ IF(NOT Boost_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(FATAL_ERROR "libnifalcon requires a minimum of the Boost 1.33 headers to build")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(NOT Boost_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FIND_PACKAGE(Boost COMPONENTS program_options thread)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FIND_PACKAGE(Boost COMPONENTS program_options thread system)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ######################################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Project specific globals
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libnifalcon/files/patch-examples-CMakeLists.txt.diff b/devel/libnifalcon/files/patch-examples-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e7feb084948..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libnifalcon/files/patch-examples-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/qdot/libnifalcon/issues/28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/qdot/libnifalcon/commit/f54fba57d432fa3231619c711f5f80bf684c5173
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,6 +6,7 @@ SET(LIBNIFALCON_EXE_PO_LINK_LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libnifalcon_cli_base_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${LIBNIFALCON_EXE_LINK_LIBS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${Boost_PROGRAM_OPTIONS_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${Boost_SYSTEM_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ######################################################################################
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libnifalcon/files/patch-src-util-CMakeLists.txt.diff b/devel/libnifalcon/files/patch-src-util-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c1ac6baaf30..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libnifalcon/files/patch-src-util-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/qdot/libnifalcon/pull/29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/qdot/libnifalcon/commit/7e98c9f2bdf936d236260176921c865f8fd1b108
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/util/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/util/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,6 +36,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${Boost_THREAD_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Boost thread requires system since 1.5x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IF(Boost_SYSTEM_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIST(APPEND CPP_LINK_LIBS "${Boost_SYSTEM_LIBRARY}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(SRCS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "FalconDeviceBoostThread.cpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${LIBNIFALCON_INCLUDE_DIR}/falcon/util/FalconDeviceBoostThread.h"
</span></pre><pre style='margin:0'>
</pre>