Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Oct 2013 19:12:13 +0000 (UTC)
From:      Lars Engels <lme@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329361 - head/devel/lasi
Message-ID:  <201310041912.r94JCEAE093840@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lme
Date: Fri Oct  4 19:12:13 2013
New Revision: 329361
URL: http://svnweb.freebsd.org/changeset/ports/329361

Log:
  - 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

Modified:
  head/devel/lasi/Makefile
  head/devel/lasi/pkg-descr   (contents, props changed)
  head/devel/lasi/pkg-plist   (contents, props changed)

Modified: head/devel/lasi/Makefile
==============================================================================
--- head/devel/lasi/Makefile	Fri Oct  4 19:09:45 2013	(r329360)
+++ head/devel/lasi/Makefile	Fri Oct  4 19:12:13 2013	(r329361)
@@ -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>

Modified: head/devel/lasi/pkg-descr
==============================================================================
--- head/devel/lasi/pkg-descr	Fri Oct  4 19:09:45 2013	(r329360)
+++ head/devel/lasi/pkg-descr	Fri Oct  4 19:12:13 2013	(r329361)
@@ -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 Pang
 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/

Modified: head/devel/lasi/pkg-plist
==============================================================================
--- head/devel/lasi/pkg-plist	Fri Oct  4 19:09:45 2013	(r329360)
+++ head/devel/lasi/pkg-plist	Fri Oct  4 19:12:13 2013	(r329361)
@@ -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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310041912.r94JCEAE093840>