svn commit: r542811 - in head/devel/libftdi1: . files

[Boris Samorodov]

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