- Support staging

- Use new PORT_OPTIONS syntax for DOCS and EXAMPLES
- Use a single space for WWW in pkg-descr
- Break lines at 80 chars

3 files changed, 29 insertions, 27 deletions

diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index 0664f5442e25..0b74f6fbd7ff 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -22,33 +22,37 @@ USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_DATADIR:PATH=${DATADIR}
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmake+modules+lasi.cmake
 .endif
 
-NO_STAGE=	yes
 pre-install:
-.if defined(NOPORTEXAMPLES)
-	@${REINPLACE_CMD} 's/^\(add_subdirectory(examples)\)/#\1/' ${WRKSRC}/CMakeLists.txt
+.if ! ${PORT_OPTIONS:MEXAMPLES}
+	@${REINPLACE_CMD} 's/^\(add_subdirectory(examples)\)/#\1/' \
+		${WRKSRC}/CMakeLists.txt
 .endif
 
 post-install:
-	@${MV} ${PREFIX}/lib/libLASi.so.1.0.0 ${PREFIX}/lib/libLASi.so.1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${MV} ${DATADIR}/doc/* ${DOCSDIR}/
-	@${RMDIR} ${DATADIR}/doc
+	@${MV} ${STAGEDIR}${PREFIX}/lib/libLASi.so.1.0.0 \
+		${STAGEDIR}${PREFIX}/lib/libLASi.so.1
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MV} ${STAGEDIR}${DATADIR}/doc/* ${STAGEDIR}${DOCSDIR}/
+	@${RMDIR} ${STAGEDIR}${DATADIR}/doc
 .endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${MV} ${DATADIR}/examples/* ${EXAMPLESDIR}/
-	@${RMDIR} ${DATADIR}/examples
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${MV} ${STAGEDIR}${DATADIR}/examples/* ${STAGEDIR}${EXAMPLESDIR}/
+	@${RMDIR} ${STAGEDIR}${DATADIR}/examples
 .endif
-.if !defined(NOPORTEXAMPLES) && !defined(NOPORTDOCS)
-	@${RM} -rf ${DATADIR}/*
+.if ! ${PORT_OPTIONS:MDOCS} && ! ${PORT_OPTIONS:MEXAMPLES}
+	@${RM} -rf ${STAGEDIR}${DATADIR}/*
 .endif
-	@${TEST} -d ${DATADIR} && ${RMDIR} ${DATADIR} || ${TRUE}
+	@${TEST} -d ${STAGEDIR}${DATADIR} && \
+		${RMDIR} ${STAGEDIR}${DATADIR} || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/devel/lasi/pkg-descr b/devel/lasi/pkg-descr
index 8d280f11e9d0..953cb9bdfa30 100644
--- a/devel/lasi/pkg-descr
+++ b/devel/lasi/pkg-descr
@@ -1,5 +1,3 @@
-LASi
-________
 libLASi is a library written by Larry Siden  that provides a C++ stream
 output interface ( with operator << ) for creating Postscript documents 
 that can contain characters from any of the scripts and symbol blocks
@@ -11,4 +9,4 @@ supported to the extent provided by Pango and by the OpenType fonts
 installed on your system. All of this is provided without need for any
 special configuration or layout calculation on the programmer's part.
 
-WWW:	http://www.unifont.org/lasi/
+WWW: http://www.unifont.org/lasi/
diff --git a/devel/lasi/pkg-plist b/devel/lasi/pkg-plist
index 275b705631f9..f44070f4500c 100644
--- a/devel/lasi/pkg-plist
+++ b/devel/lasi/pkg-plist
@@ -133,11 +133,11 @@ libdata/pkgconfig/lasi.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/MissingGlyphExample.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/SimpleLASiExample.cpp
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/libLASi-1.1.1/html/user/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/libLASi-1.1.1/html/user
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/libLASi-1.1.1/html/developer/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/libLASi-1.1.1/html/developer
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/libLASi-1.1.1/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/libLASi-1.1.1
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/libLASi-1.1.1/html/user/html
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/libLASi-1.1.1/html/user
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/libLASi-1.1.1/html/developer/html
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/libLASi-1.1.1/html/developer
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/libLASi-1.1.1/html
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/libLASi-1.1.1
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%