Index: head/devel/libftdi1/Makefile
===================================================================
--- head/devel/libftdi1/Makefile	(revision 542810)
+++ head/devel/libftdi1/Makefile	(revision 542811)
@@ -1,79 +1,80 @@
 # $FreeBSD$
 
 PORTNAME=	libftdi1
 PORTVERSION=	1.5
+PORTREVISION=	1
 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 LGPL21
 LICENSE_COMB=		multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPL
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
 BROKEN_sparc64=	Does not build: fails to link
 
 LIB_DEPENDS=	libconfuse.so:devel/libconfuse
 
 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
 
 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/files/patch-CMakeLists.txt
===================================================================
--- head/devel/libftdi1/files/patch-CMakeLists.txt	(revision 542810)
+++ head/devel/libftdi1/files/patch-CMakeLists.txt	(revision 542811)
@@ -1,11 +1,20 @@
 --- 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)
  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/pkg-plist
===================================================================
--- head/devel/libftdi1/pkg-plist	(revision 542810)
+++ head/devel/libftdi1/pkg-plist	(revision 542811)
@@ -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/libftdipp1/ftdi.hpp
+%%BOOST%%include/libftdi1/ftdi.hpp
 lib/libftdi1.a
 lib/libftdi1.so
 lib/libftdi1.so.2
 lib/libftdi1.so.2.5.0
 %%BOOST%%lib/libftdipp1.a
 %%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
 %%PYTHON%%share/libftdi/examples/complete.py
 %%PYTHON%%share/libftdi/examples/simple.py