diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index 0f7f02f43280..450bb22fe695 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -1,46 +1,41 @@
 PORTNAME=	lasi
-PORTVERSION=	1.1.3
-PORTREVISION=	1
+DISTVERSION=	1.1.3
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 DISTNAME=	libLASi-${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	C++ stream output interface for creating Postscript documents
 WWW=		https://www.unifont.org/lasi/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz \
 		libltdl.so:devel/libltdl
 
 USES=		cmake compiler:c++11-lang gnome pathfix pkgconfig
 USE_CXXSTD=	c++14
 PATHFIX_CMAKELISTSTXT=	pkg-config.cmake
 USE_GNOME=	pango
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_DATADIR:PATH=${DATADIR}
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:devel/doxygen
-DOCS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-cmake+modules+lasi.cmake
+DOCS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-cmake_modules_lasi.cmake
 
-pre-install-EXAMPLES-off:
+post-patch:
 	@${REINPLACE_CMD} 's/^\(add_subdirectory(examples)\)/#\1/' \
 		${WRKSRC}/CMakeLists.txt
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/lib/libLASi.so.2.0.0 \
 		${STAGEDIR}${PREFIX}/lib/libLASi.so.2
 
-post-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${MV} ${STAGEDIR}${DATADIR}/examples/* ${STAGEDIR}${EXAMPLESDIR}/
-	@${RMDIR} ${STAGEDIR}${DATADIR}/examples
-
 .include <bsd.port.mk>
diff --git a/devel/lasi/files/extra-patch-cmake+modules+lasi.cmake b/devel/lasi/files/extra-patch-cmake_modules_lasi.cmake
similarity index 100%
rename from devel/lasi/files/extra-patch-cmake+modules+lasi.cmake
rename to devel/lasi/files/extra-patch-cmake_modules_lasi.cmake
diff --git a/devel/lasi/files/patch-cmake+modules+instdirs.cmake b/devel/lasi/files/patch-cmake_modules_instdirs.cmake
similarity index 100%
rename from devel/lasi/files/patch-cmake+modules+instdirs.cmake
rename to devel/lasi/files/patch-cmake_modules_instdirs.cmake
diff --git a/devel/lasi/pkg-plist b/devel/lasi/pkg-plist
index ae8be8b6987a..eb8eabac9cb9 100644
--- a/devel/lasi/pkg-plist
+++ b/devel/lasi/pkg-plist
@@ -1,180 +1,171 @@
 include/LASi.h
 lib/libLASi.so
 lib/libLASi.so.2
 libdata/pkgconfig/lasi.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/LASi_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/LASi_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/bc_s.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/bc_sd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/bdwn.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classContextMgr-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classContextMgr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classContextMgr.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classFreetypeGlyphMgr-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classFreetypeGlyphMgr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1PostscriptDocument-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1PostscriptDocument.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1PostscriptDocument_1_1GlyphId-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1PostscriptDocument_1_1GlyphId.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1PostscriptDocument_1_1write__glyph__routine__to__stream-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1PostscriptDocument_1_1write__glyph__routine__to__stream.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1oPostscriptStream-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1oPostscriptStream.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1oPostscriptStream.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1setFont-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1setFont.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1setFontSize-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1setFontSize.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1show-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classLASi_1_1show.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classManager-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classManager.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classStringDimensions-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classStringDimensions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/classes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/closed.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/contextMgr_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/contextMgr_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/dir_d44c64559bbebec7f509842c48db8b23.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/doc.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/docd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/doxygen.svg
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/drawGlyph_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/drawGlyph_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/drawGlyph_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/dynsections.js
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/files.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/folderclosed.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/folderopen.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/functions_rela.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/functions_type.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/functions_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/globals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/globals_defs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/globals_func.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/globals_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/glyphMgr_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/glyphMgr_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/glyphMgr_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/manager_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/manager_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/menu.js
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/menudata.js
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/namespaceLASi.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/namespacemembers.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/namespacemembers_enum.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/namespacemembers_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/namespacemembers_func.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/namespaces.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/nav_f.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/nav_fd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/nav_g.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/nav_h.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/nav_hd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/open.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/psDoc_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/splitbar.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/splitbard.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/stringDimensions_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/stringDimensions_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/structStateOfDrawGlyph-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/structStateOfDrawGlyph.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/sync_off.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/sync_on.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/tab_a.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/tab_ad.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/tab_b.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/tab_bd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/tab_h.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/tab_hd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/tab_s.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/tab_sd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/util_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/util_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developer/html/util_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/LASi_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/LASi_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/bc_s.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/bc_sd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/bdwn.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1PostscriptDocument-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1PostscriptDocument.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1PostscriptDocument_1_1GlyphId-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1PostscriptDocument_1_1GlyphId.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1PostscriptDocument_1_1write__glyph__routine__to__stream-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1PostscriptDocument_1_1write__glyph__routine__to__stream.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1oPostscriptStream-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1oPostscriptStream.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1oPostscriptStream.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1setFont-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1setFont.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1setFontSize-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1setFontSize.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1show-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classLASi_1_1show.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/classes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/closed.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/dir_d44c64559bbebec7f509842c48db8b23.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/doc.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/docd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/doxygen.svg
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/dynsections.js
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/files.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/folderclosed.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/folderopen.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/functions_rela.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/functions_type.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/globals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/globals_defs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/menu.js
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/menudata.js
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/namespaceLASi.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/namespacemembers.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/namespacemembers_enum.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/namespacemembers_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/namespacemembers_func.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/namespaces.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/nav_f.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/nav_fd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/nav_g.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/nav_h.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/nav_hd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/open.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/splitbar.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/splitbard.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/sync_off.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/sync_on.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/tab_a.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/tab_ad.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/tab_b.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/tab_bd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/tab_h.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/tab_hd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/tab_s.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/tab_sd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/tabs.css
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ComplexTextLayoutExample.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ComplexTextLayoutExample.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MissingGlyphExample.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MissingGlyphExample.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SimpleLASiExample.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SimpleLASiExample.png
-%%PORTEXAMPLES%%@dir %%DATADIR%%