Index: head/devel/libftdi1/Makefile
===================================================================
--- head/devel/libftdi1/Makefile	(revision 542077)
+++ head/devel/libftdi1/Makefile	(revision 542078)
@@ -1,77 +1,79 @@
 # $FreeBSD$
 
 PORTNAME=	libftdi1
-PORTVERSION=	1.4
-PORTREVISION=	15
+PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.intra2net.com/en/developer/libftdi/download/
 
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Library (using libusb) to talk to FTDI chips
 
-LICENSE=	GPLv2
+LICENSE=		GPLv2 LGPL21
+LICENSE_COMB=		multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPL
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
-BROKEN_sparc64=		Does not build: fails to link
+BROKEN_sparc64=	Does not build: fails to link
 
 LIB_DEPENDS=	libconfuse.so:devel/libconfuse
 
-OPTIONS_DEFINE=		PYTHON BOOST DOCS EXAMPLES
-OPTIONS_DEFAULT=	PYTHON BOOST
-OPTIONS_SUB=		yes
+USES=		cmake:insource compiler:c++11-lang gettext-runtime pkgconfig tar:bzip2
+USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	PYTHON BOOST DOCS EXAMPLES
+OPTIONS_DEFAULT=PYTHON BOOST
+OPTIONS_SUB=	yes
+
 BOOST_DESC=	Build with boost
 PYTHON_DESC=	Build Python bindings
 
-USES=		cmake:insource compiler:c++11-lang gettext-runtime pkgconfig tar:bzip2
-USE_LDCONFIG=	yes
-
-PORTDOCS=	COPYING.LIB ChangeLog README
+PORTDOCS=	ChangeLog README
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 CMAKE_ARGS+=	-DDOCUMENTATION:BOOL=true \
 		-DPYTHON_BINDINGS:BOOL=false
 .else
 CMAKE_ARGS+=	-DDOCUMENTATION:BOOL=false
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 CMAKE_ARGS+=	-DEXAMPLES:BOOL=true
 .else
 CMAKE_ARGS+=	-DEXAMPLES:BOOL=false
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python
 CMAKE_ARGS+=	-DPYTHON_BINDINGS:BOOL=true \
 		-DDOCUMENTATION:BOOL=false
 BUILD_DEPENDS+=	swig:devel/swig
 .else
 CMAKE_ARGS+=	-DPYTHON_BINDINGS:BOOL=false
 .endif
 
 .if ${PORT_OPTIONS:MBOOST}
 CMAKE_ARGS+=		-DFTDIPP:BOOL=true
 LIB_DEPENDS+=	libboost_system.so:devel/boost-libs
 .else
 CMAKE_ARGS+=		-DFTDIPP:BOOL=false
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
 .for fname in baud_test bitbang bitbang2 bitbang_cbus bitbang_ft2232 eeprom find_all serial_test simple stream_test
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/${fname} ${STAGEDIR}${PREFIX}/bin/ftdi1_${fname}_example
 .endfor
 .if ${PORT_OPTIONS:MBOOST}
 .for fname in find_all_pp
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/${fname} ${STAGEDIR}${PREFIX}/bin/ftdi1_${fname}_example
 .endfor
 .endif
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
Index: head/devel/libftdi1/distinfo
===================================================================
--- head/devel/libftdi1/distinfo	(revision 542077)
+++ head/devel/libftdi1/distinfo	(revision 542078)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503139208
-SHA256 (libftdi1-1.4.tar.bz2) = ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74
-SIZE (libftdi1-1.4.tar.bz2) = 109521
+TIMESTAMP = 1594555669
+SHA256 (libftdi1-1.5.tar.bz2) = 7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049
+SIZE (libftdi1-1.5.tar.bz2) = 116297
Index: head/devel/libftdi1/files/patch-CMakeLists.txt
===================================================================
--- head/devel/libftdi1/files/patch-CMakeLists.txt	(revision 542077)
+++ head/devel/libftdi1/files/patch-CMakeLists.txt	(revision 542078)
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2014-08-02 12:32:47.000000000 +0200
-+++ CMakeLists.txt	2014-08-02 12:34:30.000000000 +0200
-@@ -168,7 +168,7 @@
+--- CMakeLists.txt.orig	2020-07-07 19:32:55 UTC
++++ CMakeLists.txt
+@@ -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)
  install(FILES ${CMAKE_BINARY_DIR}/libftdi1.pc ${CMAKE_BINARY_DIR}/libftdipp1.pc
 -        DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 +        DESTINATION libdata${LIB_SUFFIX}/pkgconfig)
-
+ 
  if (UNIX OR MINGW)
    configure_file ( libftdi1-config.in ${CMAKE_CURRENT_BINARY_DIR}/libftdi1-config @ONLY )
Index: head/devel/libftdi1/files/patch-cmake__FindUSB1.cmake
===================================================================
--- head/devel/libftdi1/files/patch-cmake__FindUSB1.cmake	(revision 542077)
+++ head/devel/libftdi1/files/patch-cmake__FindUSB1.cmake	(revision 542078)
@@ -1,11 +1,11 @@
---- cmake/FindUSB1.cmake.orig	2014-08-02 12:05:59.000000000 +0200
-+++ cmake/FindUSB1.cmake	2014-08-02 12:06:34.000000000 +0200
-@@ -26,7 +26,7 @@
+--- cmake/FindUSB1.cmake.orig	2020-07-07 19:32:55 UTC
++++ cmake/FindUSB1.cmake
+@@ -26,7 +26,7 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
      PATH_SUFFIXES libusb-1.0
      PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
-
+ 
 -  FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0
 +  FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0 usb
      PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
-
+ 
    include(FindPackageHandleStandardArgs)
Index: head/devel/libftdi1/files/patch-examples__CMakeLists.txt
===================================================================
--- head/devel/libftdi1/files/patch-examples__CMakeLists.txt	(revision 542077)
+++ head/devel/libftdi1/files/patch-examples__CMakeLists.txt	(revision 542078)
@@ -1,13 +1,13 @@
---- examples/CMakeLists.txt.orig	2014-08-03 23:07:13.000000000 +0200
-+++ examples/CMakeLists.txt	2014-08-03 23:08:06.000000000 +0200
-@@ -36,8 +36,8 @@
-     if(FTDI_BUILD_CPP)
-         if(Boost_FOUND)
-             message(STATUS "Building libftdi++ examples.")
--            include_directories(BEFORE ${CMAKE_SOURCE_DIR}/ftdipp
--                                ${Boost_INCLUDE_DIRS})
-+            include_directories(BEFORE ${CMAKE_SOURCE_DIR}/ftdipp)
-+            include_directories(AFTER ${Boost_INCLUDE_DIRS})
+--- examples/CMakeLists.txt.orig	2020-07-07 19:32:55 UTC
++++ examples/CMakeLists.txt
+@@ -33,8 +33,8 @@ target_link_libraries(purge_test ftdi1)
  
-             # Target
-             add_executable(find_all_pp find_all_pp.cpp)
+ # libftdi++ examples
+ if( FTDIPP )
+-	include_directories(BEFORE ${CMAKE_SOURCE_DIR}/ftdipp
+-			${Boost_INCLUDE_DIRS})
++	include_directories(BEFORE ${CMAKE_SOURCE_DIR}/ftdipp)
++	include_directories(AFTER ${Boost_INCLUDE_DIRS})
+ 
+ 	# Target
+ 	add_executable(find_all_pp find_all_pp.cpp)
Index: head/devel/libftdi1/files/patch-test_CMakeLists.txt
===================================================================
--- head/devel/libftdi1/files/patch-test_CMakeLists.txt	(revision 542077)
+++ head/devel/libftdi1/files/patch-test_CMakeLists.txt	(revision 542078)
@@ -1,11 +1,11 @@
---- test/CMakeLists.txt.orig	2017-08-07 14:52:39 UTC
+--- test/CMakeLists.txt.orig	2020-07-07 19:32:55 UTC
 +++ test/CMakeLists.txt
-@@ -10,7 +10,7 @@ if(BUILD_TESTS)
+@@ -2,7 +2,7 @@ find_package(Boost COMPONENTS unit_test_framework REQU
  
-         enable_testing()
+ enable_testing()
  
--        INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/src ${Boost_INCLUDE_DIRS})
-+        INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src)
+-INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/src ${Boost_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src)
  
-         set(cpp_tests
-             basic.cpp
+ set(cpp_tests basic.cpp baudrate.cpp)
+ 
Index: head/devel/libftdi1/pkg-plist
===================================================================
--- head/devel/libftdi1/pkg-plist	(revision 542077)
+++ head/devel/libftdi1/pkg-plist	(revision 542078)
@@ -1,34 +1,34 @@
 bin/ftdi_eeprom
 bin/libftdi1-config
 %%EXAMPLES%%bin/ftdi1_baud_test_example
 %%EXAMPLES%%bin/ftdi1_bitbang2_example
 %%EXAMPLES%%bin/ftdi1_bitbang_cbus_example
 %%EXAMPLES%%bin/ftdi1_bitbang_example
 %%EXAMPLES%%bin/ftdi1_bitbang_ft2232_example
 %%EXAMPLES%%bin/ftdi1_eeprom_example
 %%EXAMPLES%%bin/ftdi1_find_all_example
 %%EXAMPLES%%%%BOOST%%bin/ftdi1_find_all_pp_example
 %%EXAMPLES%%bin/ftdi1_serial_test_example
 %%EXAMPLES%%bin/ftdi1_simple_example
 %%EXAMPLES%%bin/ftdi1_stream_test_example
 libdata/pkgconfig/libftdi1.pc
 libdata/pkgconfig/libftdipp1.pc
 lib/cmake/libftdi1/LibFTDI1Config.cmake
 lib/cmake/libftdi1/LibFTDI1ConfigVersion.cmake
 lib/cmake/libftdi1/UseLibFTDI1.cmake
 include/libftdi1/ftdi.h
-%%BOOST%%include/libftdi1/ftdi.hpp
+%%BOOST%%include/libftdipp1/ftdi.hpp
 lib/libftdi1.a
 lib/libftdi1.so
 lib/libftdi1.so.2
-lib/libftdi1.so.2.4.0
+lib/libftdi1.so.2.5.0
 %%BOOST%%lib/libftdipp1.a
 %%BOOST%%lib/libftdipp1.so
 %%BOOST%%lib/libftdipp1.so.3
-%%BOOST%%lib/libftdipp1.so.2.4.0
-%%PORTDOCS%%%%DOCSDIR%%/example.conf
+%%BOOST%%lib/libftdipp1.so.2.5.0
+share/doc/libftdipp1/example.conf
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_ftdi1.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/ftdi1.py
 %%PYTHON%%share/libftdi/examples/cbus.py
 %%PYTHON%%share/libftdi/examples/complete.py
 %%PYTHON%%share/libftdi/examples/simple.py