don't install unwanted files, cleanup

PR:		205632
Submitted by:	amdmi3

2 files changed, 28 insertions, 48 deletions

diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index 4fddbba40194..9aaa8f2a812d 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -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 <bsd.port.options.mk>
-
-.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
+OPTIONS_DEFINE=	BOOST DOCS
+OPTIONS_SUB=	yes
 
-.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 <bsd.port.mk>
diff --git a/graphics/ogre3d/pkg-plist b/graphics/ogre3d/pkg-plist
index 644d2097c144..64e190a19b38 100644
--- a/graphics/ogre3d/pkg-plist
+++ b/graphics/ogre3d/pkg-plist
@@ -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/OgreDefaultWorkQueue.h
 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/ssao_ps.glsles
 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/DualQuaternionSkinning_Shadow.material
 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/triplanarReferenceVS.cg
 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