svn commit: r337130 - in branches/2014Q1/games/irrlamb: . files

[Mathieu Arnold]

Author: mat
Date: Sat Dec 21 10:29:32 2013
New Revision: 337130
URL: http://svnweb.freebsd.org/changeset/ports/337130

Log:
  MFH: r337111
  
  - Support staging
  - Fix build on 10.x
  
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/games/irrlamb/files/patch-src-objects-orb.cpp
     - copied unchanged from r337111, head/games/irrlamb/files/patch-src-objects-orb.cpp
  branches/2014Q1/games/irrlamb/files/patch-src-objects-player.cpp
     - copied unchanged from r337111, head/games/irrlamb/files/patch-src-objects-player.cpp
Modified:
  branches/2014Q1/games/irrlamb/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/games/irrlamb/Makefile
==============================================================================
--- branches/2014Q1/games/irrlamb/Makefile	Sat Dec 21 10:28:34 2013	(r337129)
+++ branches/2014Q1/games/irrlamb/Makefile	Sat Dec 21 10:29:32 2013	(r337130)
@@ -17,21 +17,20 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libIrrlich
 
 USE_LUA=	5.1+
 USE_SCONS=	yes
-USE_DOS2UNIX=	src/engine/save.h
+USES=		scons dos2unix
+DOS2UNIX_FILES=	src/engine/save.h src/objects/orb.cpp src/objects/player.cpp
 
 CPPPATH=	${LOCALBASE}/include ${LUA_INCDIR}
 LIBPATH=	${LOCALBASE}/lib ${LUA_LIBDIR}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-PORTDOCS=	readme.txt changelog.txt
-PORTDATA=	*
-
 PLIST_FILES=	bin/${PORTNAME}
+PORTDOCS=	*
+PORTDATA=	*
 
 DATA_DIRS=	art campaigns collision fonts levels meshes scenes scripts textures
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -44,14 +43,9 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/irrlamb ${PREFIX}/bin
-.if !defined(NOPORTDATA)
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "${DATA_DIRS}" ${DATADIR}
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/irrlamb ${STAGEDIR}${PREFIX}/bin/
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "${DATA_DIRS}" ${STAGEDIR}${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} readme.txt changelog.txt ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>

Copied: branches/2014Q1/games/irrlamb/files/patch-src-objects-orb.cpp (from r337111, head/games/irrlamb/files/patch-src-objects-orb.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/irrlamb/files/patch-src-objects-orb.cpp	Sat Dec 21 10:29:32 2013	(r337130, copy of r337111, head/games/irrlamb/files/patch-src-objects-orb.cpp)
@@ -0,0 +1,20 @@
+--- src/objects/orb.cpp.orig	2013-12-19 22:19:20.406056087 +0400
++++ src/objects/orb.cpp	2013-12-19 22:19:55.234053221 +0400
+@@ -40,7 +40,7 @@
+ 	else
+ 		Node->setMaterialTexture(0, irrDriver->getTexture("/home/amdmi3/projects/freebsd/ports/games/irrlamb/prefix/share/irrlamb/textures/orb_outer0.png"));
+ 	Node->setMaterialType(EMT_ONETEXTURE_BLEND);
+-	Node->getMaterial(0).MaterialTypeParam = pack_texureBlendFunc(EBF_ONE, EBF_ONE);
++	Node->getMaterial(0).MaterialTypeParam = pack_textureBlendFunc(EBF_ONE, EBF_ONE);
+ 	
+ 	// Create glow
+ 	//GlowColor = SColor(255, 255, 240, 130);
+@@ -50,7 +50,7 @@
+ 	InnerNode->setMaterialFlag(EMF_LIGHTING, false);
+ 	InnerNode->setMaterialFlag(EMF_ZBUFFER, false);
+ 	InnerNode->setMaterialType(EMT_ONETEXTURE_BLEND);
+-	InnerNode->getMaterial(0).MaterialTypeParam = pack_texureBlendFunc(EBF_ONE, EBF_ONE);
++	InnerNode->getMaterial(0).MaterialTypeParam = pack_textureBlendFunc(EBF_ONE, EBF_ONE);
+ 	if(Template->Textures[1] != "")
+ 		InnerNode->setMaterialTexture(0, irrDriver->getTexture(Template->Textures[1].c_str()));
+ 	else

Copied: branches/2014Q1/games/irrlamb/files/patch-src-objects-player.cpp (from r337111, head/games/irrlamb/files/patch-src-objects-player.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/irrlamb/files/patch-src-objects-player.cpp	Sat Dec 21 10:29:32 2013	(r337130, copy of r337111, head/games/irrlamb/files/patch-src-objects-player.cpp)
@@ -0,0 +1,20 @@
+--- src/objects/player.cpp.orig	2013-12-19 22:20:16.890052259 +0400
++++ src/objects/player.cpp	2013-12-19 22:20:57.089132087 +0400
+@@ -45,7 +45,7 @@
+ 	Node->setMaterialType(EMT_TRANSPARENT_ADD_COLOR);
+ 	Node->setMaterialFlag(EMF_LIGHTING, false);
+ 	Node->setMaterialType(EMT_ONETEXTURE_BLEND);
+-	Node->getMaterial(0).MaterialTypeParam = pack_texureBlendFunc(EBF_ONE, EBF_ONE);
++	Node->getMaterial(0).MaterialTypeParam = pack_textureBlendFunc(EBF_ONE, EBF_ONE);
+ 
+ 	// Light
+ 	//Light = irrScene->addLightSceneNode(0, core::vector3df(0.0f, 0.0f, 0.0f), video::SColorf(0.2f, 0.2f, 1.0f), 20.0f);
+@@ -57,7 +57,7 @@
+ 	InnerNode->setMaterialFlag(EMF_ZBUFFER, false);
+ 	InnerNode->setMaterialTexture(0, irrDriver->getTexture("/home/amdmi3/projects/freebsd/ports/games/irrlamb/prefix/share/irrlamb/textures/player_glow0.png"));
+ 	InnerNode->setMaterialType(EMT_ONETEXTURE_BLEND);
+-	InnerNode->getMaterial(0).MaterialTypeParam = pack_texureBlendFunc(EBF_ONE, EBF_ONE);
++	InnerNode->getMaterial(0).MaterialTypeParam = pack_textureBlendFunc(EBF_ONE, EBF_ONE);
+ 
+ 	// Particle system
+ 	IParticleSystemSceneNode *ParticleSystem = irrScene->addParticleSystemSceneNode(false, Node);