3 files changed, 163 insertions, 10 deletions

diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index e3ce6a2006b5..8b07847cb800 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lasi
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 DISTNAME=	libLASi-${PORTVERSION}
@@ -27,13 +27,31 @@ CMAKE_ARGS+=	${WRKSRC}	\
 		-DCMAKE_INSTALL_PREFIX=${PREFIX}	\
 		-DCMAKE_INSTALL_DATADIR:PATH=${DATADIR}
 
-post-install:
-	${MV} ${PREFIX}/lib/libLASi.so.0.0.1 ${PREFIX}/lib/libLASi.so.0
-.ifdef NOPORTEXAMPLES
-	${RM} -rf ${DATADIR}
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 .else
-	${MV} ${DATADIR}/examples ${EXAMPLESDIR}
-	${RMDIR} ${DATADIR}
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmake+modules+lasi.cmake
+.endif
+
+pre-install:
+.if defined(NOPORTEXAMPLES)
+	@${REINPLACE_CMD} 's/^\(add_subdirectory(examples)\)/#\1/' ${WRKSRC}/CMakeLists.txt
 .endif
 
+post-install:
+	@${MV} ${PREFIX}/lib/libLASi.so.0.0.1 ${PREFIX}/lib/libLASi.so.0
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${MV} ${DATADIR}/doc/* ${DOCSDIR}/
+	@${RMDIR} ${DATADIR}/doc
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	@${MV} ${DATADIR}/examples/* ${EXAMPLESDIR}/
+	@${RMDIR} ${DATADIR}/examples
+.endif
+.if !defined(NOPORTEXAMPLES) && !defined(NOPORTDOCS)
+	@${RM} -rf ${DATADIR}/*
+.endif
+	@${TEST} -d ${DATADIR} && ${RMDIR} ${DATADIR} || ${TRUE}
 .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
new file mode 100644
index 000000000000..72d2e748de8d
--- /dev/null
+++ b/devel/lasi/files/extra-patch-cmake+modules+lasi.cmake
@@ -0,0 +1,17 @@
+--- ./cmake/modules/lasi.cmake.orig	2009-11-06 18:00:00.106405553 +0100
++++ ./cmake/modules/lasi.cmake	2009-11-06 18:00:11.236964944 +0100
+@@ -120,10 +120,10 @@
+ # doxygen support
+ # =======================================================================
+ 
+-find_package(Doxygen)
+-if(NOT DOXYGEN_EXECUTABLE)
+-  message(STATUS "WARNING: Doxygen not found so documentation not generated.")
+-endif(NOT DOXYGEN_EXECUTABLE)
++#find_package(Doxygen)
++#if(NOT DOXYGEN_EXECUTABLE)
++#  message(STATUS "WARNING: Doxygen not found so documentation not generated.")
++#endif(NOT DOXYGEN_EXECUTABLE)
+ 
+ # =======================================================================
+ # Prepare summary macro that is used later.
diff --git a/devel/lasi/pkg-plist b/devel/lasi/pkg-plist
index 4de19806f1f3..f452ee123a81 100644
--- a/devel/lasi/pkg-plist
+++ b/devel/lasi/pkg-plist
@@ -2,11 +2,129 @@ include/LASi.h
 lib/libLASi.so
 lib/libLASi.so.0
 libdata/pkgconfig/lasi.pc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MissingGlyphExample.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SimpleLASiExample.cpp
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/LASi_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/LASi_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classContextMgr-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classContextMgr.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classContextMgr.png
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classFreetypeGlyphMgr-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classFreetypeGlyphMgr.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1PostscriptDocument-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1PostscriptDocument.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1PostscriptDocument_1_1GlyphId-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1PostscriptDocument_1_1GlyphId.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1PostscriptDocument_1_1write__glyph__routine__to__stream-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1PostscriptDocument_1_1write__glyph__routine__to__stream.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1oPostscriptStream-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1oPostscriptStream.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1setFont-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1setFont.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1setFontSize-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1setFontSize.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1show-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classLASi_1_1show.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classManager-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classManager.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classStringDimensions-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/classStringDimensions.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/contextMgr_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/contextMgr_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/dir_844ccf4c9c5f524017223c512b74160f.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/dir_ced8ec04faf1f39c38b8acccde1582aa.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/dirs.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/drawGlyph_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/drawGlyph_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/drawGlyph_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/files.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/functions_func.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/functions_rela.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/functions_type.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/globals_defs.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/globals_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/glyphMgr_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/glyphMgr_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/glyphMgr_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/hierarchy.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/manager_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/manager_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/namespaceLASi.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/namespacemembers.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/namespacemembers_enum.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/namespacemembers_eval.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/namespacemembers_func.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/namespaces.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/namespacestd.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/psDoc_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/stringDimensions_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/stringDimensions_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/structStateOfDrawGlyph-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/structStateOfDrawGlyph.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/tab_b.gif
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/tab_l.gif
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/tab_r.gif
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/tabs.css
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/util_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/util_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/developer/html/util_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/LASi_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/LASi_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1PostscriptDocument-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1PostscriptDocument.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1PostscriptDocument_1_1GlyphId-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1PostscriptDocument_1_1GlyphId.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1PostscriptDocument_1_1write__glyph__routine__to__stream-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1PostscriptDocument_1_1write__glyph__routine__to__stream.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1oPostscriptStream-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1oPostscriptStream.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1setFont-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1setFont.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1setFontSize-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1setFontSize.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1show-members.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/classLASi_1_1show.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/dir_ced8ec04faf1f39c38b8acccde1582aa.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/dirs.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/files.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/functions_func.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/functions_rela.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/functions_type.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/globals_defs.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/namespaceLASi.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/namespacemembers.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/namespacemembers_enum.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/namespacemembers_eval.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/namespacemembers_func.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/namespaces.html
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/tab_b.gif
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/tab_l.gif
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/tab_r.gif
+%%PORTDOCS%%%%DOCSDIR%%/libLASi-1.1.0/html/user/html/tabs.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ComplexTextLayoutExample.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Example_1_Result.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Example_2_Result.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MissingGlyphExample.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SimpleLASiExample.cpp
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/libLASi-1.1.0/html/user/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/libLASi-1.1.0/html/user
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/libLASi-1.1.0/html/developer/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/libLASi-1.1.0/html/developer
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/libLASi-1.1.0/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/libLASi-1.1.0
+%%PORTDOCS%%@dirrm %%DOCSDIR%%