From owner-svn-ports-all@FreeBSD.ORG Fri Oct 4 19:12:14 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A2E60A2B; Fri, 4 Oct 2013 19:12:14 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9038C2128; Fri, 4 Oct 2013 19:12:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r94JCE1H093844; Fri, 4 Oct 2013 19:12:14 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r94JCEAE093840; Fri, 4 Oct 2013 19:12:14 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201310041912.r94JCEAE093840@svn.freebsd.org> From: Lars Engels Date: Fri, 4 Oct 2013 19:12:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329361 - head/devel/lasi X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Oct 2013 19:12:14 -0000 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 + +.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 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%%