From owner-svn-ports-head@freebsd.org Fri Jan 1 11:36:12 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DEBF1A59F12; Fri, 1 Jan 2016 11:36:12 +0000 (UTC) (envelope-from oliver@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 mx1.freebsd.org (Postfix) with ESMTPS id B80431C58; Fri, 1 Jan 2016 11:36:12 +0000 (UTC) (envelope-from oliver@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u01BaBl9013875; Fri, 1 Jan 2016 11:36:11 GMT (envelope-from oliver@FreeBSD.org) Received: (from oliver@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u01BaBX9013873; Fri, 1 Jan 2016 11:36:11 GMT (envelope-from oliver@FreeBSD.org) Message-Id: <201601011136.u01BaBX9013873@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oliver set sender to oliver@FreeBSD.org using -f From: Oliver Lehmann Date: Fri, 1 Jan 2016 11:36:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404982 - head/graphics/ogre3d X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2016 11:36:13 -0000 Author: oliver Date: Fri Jan 1 11:36:11 2016 New Revision: 404982 URL: https://svnweb.freebsd.org/changeset/ports/404982 Log: don't install unwanted files, cleanup PR: 205632 Submitted by: amdmi3 Modified: head/graphics/ogre3d/Makefile head/graphics/ogre3d/pkg-plist Modified: head/graphics/ogre3d/Makefile ============================================================================== --- head/graphics/ogre3d/Makefile Fri Jan 1 11:31:08 2016 (r404981) +++ head/graphics/ogre3d/Makefile Fri Jan 1 11:36:11 2016 (r404982) @@ -3,48 +3,36 @@ PORTNAME= ogre3d PORTVERSION= 1.9.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics devel MASTER_SITES= https://bitbucket.org/sinbad/ogre/get/ DISTNAME= v1-9-0 -WRKSRC= ${WRKDIR}/sinbad-ogre-dd30349ea667 MAINTAINER= oliver@FreeBSD.org COMMENT= Scene-oriented, flexible 3D engine written in C++ +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libzzip.so:${PORTSDIR}/devel/zziplib \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfreeimage.so:${PORTSDIR}/graphics/freeimage -OPTIONS_DEFINE= BOOST DOCS +BROKEN_powerpc= does not install USE_LDCONFIG= yes -USES= tar:bzip2 cmake pkgconfig compiler:c++11-lib +USES= tar:bzip2 cmake:outsource pkgconfig compiler:c++11-lib USE_SDL= sdl USE_XORG= xaw xrandr +WRKSRC= ${WRKDIR}/sinbad-ogre-dd30349ea667 -.include +OPTIONS_DEFINE= BOOST DOCS +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MBOOST} -BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs -RUN_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs -PLIST_SUB+= BOOSTTRUE="" -PLIST_SUB+= BOOSTFALSE="@comment " -.else -PLIST_SUB+= BOOSTTRUE="@comment " -PLIST_SUB+= BOOSTFALSE="" -.endif - -.if ${ARCH} == "powerpc" -BROKEN= Does not install on powerpc -.endif +BOOST_BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs +BOOST_RUN_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs post-patch: -.if ! ${PORT_OPTIONS:MBOOST} - @${REINPLACE_CMD} -e 's|Boost|No_Boost|g' \ - ${WRKSRC}/CMake/Dependencies.cmake -.endif - # disable OIS, POCO, TBB detection @${REINPLACE_CMD} -e 's|include(FindPkgMacros)|return()|g' \ ${WRKSRC}/CMake/Packages/FindOIS.cmake \ ${WRKSRC}/CMake/Packages/FindPOCO.cmake \ @@ -57,10 +45,14 @@ post-patch: s,defined(__x86_64__),& || defined(__powerpc__) || defined(__sparc64__) || defined(__amd64__),' \ ${WRKSRC}/OgreMain/include/OgrePlatform.h -post-install: +post-patch-BOOST-off: + @${REINPLACE_CMD} -e 's|Boost|No_Boost|g' \ + ${WRKSRC}/CMake/Dependencies.cmake + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for docfile in README COPYING AUTHORS - @${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} .endfor .include Modified: head/graphics/ogre3d/pkg-plist ============================================================================== --- head/graphics/ogre3d/pkg-plist Fri Jan 1 11:31:08 2016 (r404981) +++ head/graphics/ogre3d/pkg-plist Fri Jan 1 11:36:11 2016 (r404982) @@ -1,14 +1,8 @@ -%%BOOSTFALSE%%include/OGRE/OgreThreadDefinesNone.h -%%BOOSTFALSE%%include/OGRE/Threading/OgreThreadDefinesNone.h -%%BOOSTTRUE%%include/OGRE/OgreThreadDefinesBoost.h -%%BOOSTTRUE%%include/OGRE/OgreThreadHeadersBoost.h -%%BOOSTTRUE%%include/OGRE/Property/OgreProperty.h -%%BOOSTTRUE%%include/OGRE/Property/OgrePropertyPrerequisites.h -%%BOOSTTRUE%%include/OGRE/Threading/OgreThreadDefinesBoost.h -%%BOOSTTRUE%%include/OGRE/Threading/OgreThreadHeadersBoost.h -%%BOOSTTRUE%%lib/libOgreProperty.so -%%BOOSTTRUE%%lib/libOgreProperty.so.1.9.0 -%%BOOSTTRUE%%libdata/pkgconfig/OGRE-Property.pc +%%BOOST%%include/OGRE/Property/OgreProperty.h +%%BOOST%%include/OGRE/Property/OgrePropertyPrerequisites.h +%%BOOST%%lib/libOgreProperty.so +%%BOOST%%lib/libOgreProperty.so.1.9.0 +%%BOOST%%libdata/pkgconfig/OGRE-Property.pc bin/OgreMeshUpgrader bin/OgreXMLConverter include/OGRE/ExampleApplication.h @@ -256,11 +250,12 @@ include/OGRE/OgreTexture.h include/OGRE/OgreTextureManager.h include/OGRE/OgreTextureUnitState.h include/OGRE/OgreThreadDefines.h -include/OGRE/OgreThreadDefinesBoost.h +%%BOOST%%include/OGRE/OgreThreadDefinesBoost.h +%%NO_BOOST%%include/OGRE/OgreThreadDefinesNone.h include/OGRE/OgreThreadDefinesPoco.h include/OGRE/OgreThreadDefinesTBB.h include/OGRE/OgreThreadHeaders.h -include/OGRE/OgreThreadHeadersBoost.h +%%BOOST%%include/OGRE/OgreThreadHeadersBoost.h include/OGRE/OgreThreadHeadersPoco.h include/OGRE/OgreThreadHeadersTBB.h include/OGRE/OgreTimer.h @@ -512,11 +507,12 @@ include/OGRE/Threading/OgreDefaultWorkQu include/OGRE/Threading/OgreDefaultWorkQueueStandard.h include/OGRE/Threading/OgreDefaultWorkQueueTBB.h include/OGRE/Threading/OgreThreadDefines.h -include/OGRE/Threading/OgreThreadDefinesBoost.h +%%BOOST%%include/OGRE/Threading/OgreThreadDefinesBoost.h +%%NO_BOOST%%include/OGRE/Threading/OgreThreadDefinesNone.h include/OGRE/Threading/OgreThreadDefinesPoco.h include/OGRE/Threading/OgreThreadDefinesTBB.h include/OGRE/Threading/OgreThreadHeaders.h -include/OGRE/Threading/OgreThreadHeadersBoost.h +%%BOOST%%include/OGRE/Threading/OgreThreadHeadersBoost.h include/OGRE/Threading/OgreThreadHeadersPoco.h include/OGRE/Threading/OgreThreadHeadersTBB.h include/OGRE/Volume/OgreVolumeCSGSource.h @@ -578,8 +574,6 @@ libdata/pkgconfig/OGRE-RTShaderSystem.pc libdata/pkgconfig/OGRE-Terrain.pc libdata/pkgconfig/OGRE-Volume.pc libdata/pkgconfig/OGRE.pc -share/OGRE/Media/CMakeFiles/CMakeDirectoryInformation.cmake -share/OGRE/Media/CMakeFiles/progress.marks share/OGRE/Media/DeferredShadingMedia/COPYING share/OGRE/Media/DeferredShadingMedia/DeferredShading/post/Ambient_ps.cg share/OGRE/Media/DeferredShadingMedia/DeferredShading/post/Ambient_ps.glsl @@ -634,7 +628,6 @@ share/OGRE/Media/DeferredShadingMedia/ss share/OGRE/Media/DeferredShadingMedia/ssao_sm4.cg share/OGRE/Media/DeferredShadingMedia/ssao_vs.glsl share/OGRE/Media/DeferredShadingMedia/ssao_vs.glsles -share/OGRE/Media/Makefile share/OGRE/Media/PCZAppMedia/Carpet_Diamond_Olive.jpg share/OGRE/Media/PCZAppMedia/Metal_Brass_Ceiling.jpg share/OGRE/Media/PCZAppMedia/Metal_Embossed.jpg @@ -769,7 +762,6 @@ share/OGRE/Media/RTShaderLib/materials/D share/OGRE/Media/RTShaderLib/materials/HardwareSkinningShadow.material share/OGRE/Media/RTShaderLib/materials/RTShaderSystem.material share/OGRE/Media/RTShaderLib/materials/TriplanarTexturing.material -share/OGRE/Media/cmake_install.cmake share/OGRE/Media/materials/programs/Cg/ASCIIFP.cg share/OGRE/Media/materials/programs/Cg/Combine_fp.cg share/OGRE/Media/materials/programs/Cg/Common.cg @@ -1548,15 +1540,11 @@ share/OGRE/Media/volumeTerrain/triplanar share/OGRE/Media/volumeTerrain/triplanarReferenceVS.glsl share/OGRE/Media/volumeTerrain/volumeTerrain.cfg share/OGRE/Media/volumeTerrain/volumeTerrainBig.zip -share/OGRE/docs/CMakeFiles/CMakeDirectoryInformation.cmake -share/OGRE/docs/CMakeFiles/progress.marks share/OGRE/docs/CMakeLists.txt share/OGRE/docs/ChangeLog.html share/OGRE/docs/CodingStandards.html share/OGRE/docs/License.html -share/OGRE/docs/Makefile share/OGRE/docs/ReadMe.html -share/OGRE/docs/cmake_install.cmake share/OGRE/docs/licenses/bsd.txt share/OGRE/docs/licenses/freeimage.txt share/OGRE/docs/licenses/freetype.txt