From owner-svn-ports-all@freebsd.org Mon Mar 12 17:03:04 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C9C18F2BF03; Mon, 12 Mar 2018 17:03:04 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6F881862A6; Mon, 12 Mar 2018 17:03:04 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A9356882; Mon, 12 Mar 2018 17:03:04 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2CH34LC093076; Mon, 12 Mar 2018 17:03:04 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2CH342D093075; Mon, 12 Mar 2018 17:03:04 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201803121703.w2CH342D093075@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 12 Mar 2018 17:03:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464263 - head/graphics/povray37 X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/graphics/povray37 X-SVN-Commit-Revision: 464263 X-SVN-Commit-Repository: ports 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.25 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: Mon, 12 Mar 2018 17:03:05 -0000 Author: amdmi3 Date: Mon Mar 12 17:03:04 2018 New Revision: 464263 URL: https://svnweb.freebsd.org/changeset/ports/464263 Log: - Switch to USES=localbase - Switch to options helpers - Unsilence installation commands Approved by: portmgr blanket Modified: head/graphics/povray37/Makefile Modified: head/graphics/povray37/Makefile ============================================================================== --- head/graphics/povray37/Makefile Mon Mar 12 17:03:03 2018 (r464262) +++ head/graphics/povray37/Makefile Mon Mar 12 17:03:04 2018 (r464263) @@ -22,7 +22,7 @@ IO_DESC= Without I/O restrictions (security risk) EXAMPLES_DESC= Install example scenes DOCS_DESC= Install HTML documentation -USES= gmake +USES= gmake localbase GNU_CONFIGURE= yes VERSION_BASE= ${PORTVERSION:C/([0-9]+\.[0-9]+).*/\1/} @@ -32,30 +32,19 @@ EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}-${VE DATADIR= ${PREFIX}/share/${PORTNAME}-${VERSION_BASE} ETCDIR= ${PREFIX}/etc/${PORTNAME}/${VERSION_BASE} -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -lboost_system +LIBS+= -lboost_system CONFIGURE_ARGS= COMPILED_BY=${MAINTAINER} \ --program-transform-name='s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/' \ --disable-optimiz +X11_USE= XORG=xpm,sm,ice,x11 SDL=sdl +X11_CONFIGURE_OFF= --without-x +STATIC_CONFIGURE_ON= --enable-static +IO_CONFIGURE_ON= --disable-io-restrictions + .include -.if ${PORT_OPTIONS:MX11} -USE_XORG= xpm sm ice x11 -USE_SDL= sdl -.else -CONFIGURE_ARGS+= --without-x -.endif - -.if ${PORT_OPTIONS:MSTATIC} -CONFIGURE_ARGS+=--enable-static -.endif - -.if ${PORT_OPTIONS:MIO} -CONFIGURE_ARGS+=--disable-io-restrictions -.endif - .if ${PORT_OPTIONS:MPNG} .if ${PORT_OPTIONS:MSTATIC} BUILD_DEPENDS+= png>=1.4:graphics/png @@ -112,7 +101,7 @@ post-patch: ${WRKSRC}/vfe/vfepovms.cpp \ ${WRKSRC}/vfe/unix/platformbase.cpp \ ${WRKSRC}/vfe/vfesession.cpp - ${FIND} ${WRKSRC}/source/*end \( -name \*.h -o -name \*.cpp \) | \ + @${FIND} ${WRKSRC}/source/*end \( -name \*.h -o -name \*.cpp \) | \ ${XARGS} ${GREP} -l shared_ptr | ${SED} '/shellout/d' | \ ${XARGS} ${REINPLACE_CMD} -e 's|shared_ptr|boost::shared_ptr|g' @@ -123,7 +112,7 @@ pre-build: .endif do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/unix/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} + ${INSTALL_PROGRAM} ${WRKSRC}/unix/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}${PKGNAMESUFFIX}.1 @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR} @@ -132,18 +121,18 @@ do-install: ${MKDIR} ${STAGEDIR}${DATADIR}/$i cd ${WRKSRC}/$i && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/$i .endfor -.if ${PORT_OPTIONS:MX11} + +do-install-X11-on: @${MKDIR} ${STAGEDIR}${DATADIR}/icons cd ${WRKSRC}/icons && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/icons -.endif -.if ${PORT_OPTIONS:MEXAMPLES} + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/scenes && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -.endif -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} -.endif .include