From owner-svn-ports-head@freebsd.org Tue Jul 21 22:01:08 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 183D73694D8; Tue, 21 Jul 2020 22:01:08 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BBCGW6xfTz4JhG; Tue, 21 Jul 2020 22:01:07 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D1D552534D; Tue, 21 Jul 2020 22:01:07 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06LM17R0001774; Tue, 21 Jul 2020 22:01:07 GMT (envelope-from bsam@FreeBSD.org) Received: (from bsam@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06LM177Z001771; Tue, 21 Jul 2020 22:01:07 GMT (envelope-from bsam@FreeBSD.org) Message-Id: <202007212201.06LM177Z001771@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bsam set sender to bsam@FreeBSD.org using -f From: Boris Samorodov Date: Tue, 21 Jul 2020 22:01:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542811 - in head/devel/libftdi1: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bsam X-SVN-Commit-Paths: in head/devel/libftdi1: . files X-SVN-Commit-Revision: 542811 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jul 2020 22:01:08 -0000 Author: bsam Date: Tue Jul 21 22:01:06 2020 New Revision: 542811 URL: https://svnweb.freebsd.org/changeset/ports/542811 Log: devel/libftdi1: fix paths when FTDIPP is set Incorporate an upstream fix: http://developer.intra2net.com/mailarchive/html/libftdi-git/2020/msg00024.html This should fix devel/libsigrok build. PR: 248043 Submitted by: manu Modified: head/devel/libftdi1/Makefile head/devel/libftdi1/files/patch-CMakeLists.txt head/devel/libftdi1/pkg-plist Modified: head/devel/libftdi1/Makefile ============================================================================== --- head/devel/libftdi1/Makefile Tue Jul 21 21:48:35 2020 (r542810) +++ head/devel/libftdi1/Makefile Tue Jul 21 22:01:06 2020 (r542811) @@ -2,6 +2,7 @@ PORTNAME= libftdi1 PORTVERSION= 1.5 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.intra2net.com/en/developer/libftdi/download/ Modified: head/devel/libftdi1/files/patch-CMakeLists.txt ============================================================================== --- head/devel/libftdi1/files/patch-CMakeLists.txt Tue Jul 21 21:48:35 2020 (r542810) +++ head/devel/libftdi1/files/patch-CMakeLists.txt Tue Jul 21 22:01:06 2020 (r542811) @@ -1,5 +1,14 @@ --- CMakeLists.txt.orig 2020-07-07 19:32:55 UTC +++ CMakeLists.txt +@@ -136,7 +136,7 @@ endif () + + add_subdirectory(src) + if ( FTDIPP ) +- project(libftdipp1 C CXX) ++ project(libftdi1 C CXX) + add_subdirectory(ftdipp) + endif () + if ( PYTHON_BINDINGS ) @@ -168,7 +168,7 @@ endif(${WIN32}) configure_file(${CMAKE_SOURCE_DIR}/libftdi1.pc.in ${CMAKE_BINARY_DIR}/libftdi1.pc @ONLY) configure_file(${CMAKE_SOURCE_DIR}/libftdipp1.pc.in ${CMAKE_BINARY_DIR}/libftdipp1.pc @ONLY) Modified: head/devel/libftdi1/pkg-plist ============================================================================== --- head/devel/libftdi1/pkg-plist Tue Jul 21 21:48:35 2020 (r542810) +++ head/devel/libftdi1/pkg-plist Tue Jul 21 22:01:06 2020 (r542811) @@ -17,7 +17,7 @@ lib/cmake/libftdi1/LibFTDI1Config.cmake lib/cmake/libftdi1/LibFTDI1ConfigVersion.cmake lib/cmake/libftdi1/UseLibFTDI1.cmake include/libftdi1/ftdi.h -%%BOOST%%include/libftdipp1/ftdi.hpp +%%BOOST%%include/libftdi1/ftdi.hpp lib/libftdi1.a lib/libftdi1.so lib/libftdi1.so.2 @@ -26,7 +26,7 @@ lib/libftdi1.so.2.5.0 %%BOOST%%lib/libftdipp1.so %%BOOST%%lib/libftdipp1.so.3 %%BOOST%%lib/libftdipp1.so.2.5.0 -share/doc/libftdipp1/example.conf +%%PORTDOCS%%%%DOCSDIR%%/example.conf %%PYTHON%%%%PYTHON_SITELIBDIR%%/_ftdi1.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/ftdi1.py %%PYTHON%%share/libftdi/examples/cbus.py