- Update to 0.2.1

8 files changed, 23 insertions, 135 deletions

diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile
index f19e62127843..81cc8b8aef1f 100644
--- a/games/irrlamb/Makefile
+++ b/games/irrlamb/Makefile
@@ -2,48 +2,39 @@
 # $FreeBSD$
 
 PORTNAME=	irrlamb
-PORTVERSION=	0.1.0
-PORTREVISION=	5
+PORTVERSION=	0.2.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	games
-MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	3D physics-based puzzle game
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
-BUILD_DEPENDS=	${LOCALBASE}/lib/libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
-RUN_DEPENDS=	${LOCALBASE}/lib/libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
+LICENSE=	GPLv3 # or later
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		scons dos2unix lua:51
-DOS2UNIX_FILES=	src/engine/save.h src/objects/orb.cpp src/objects/player.cpp \
-		src/engine/state.h
+LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
+		libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libogg.so:${PORTSDIR}/audio/libogg \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libBulletCollision.so:${PORTSDIR}/devel/bullet
 
-CPPPATH=	${LOCALBASE}/include ${LUA_INCDIR}
-LIBPATH=	${LOCALBASE}/lib ${LUA_LIBDIR}
+USE_GITHUB=	yes
+GH_ACCOUNT=	jazztickets
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USES=		cmake compiler:c++11-lib lua:53 openal
 
-PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
 PORTDATA=	*
 
-DATA_DIRS=	art campaigns collision fonts levels meshes scenes scripts textures
+PLIST_FILES=	bin/irrlamb \
+		share/applications/irrlamb.desktop \
+		share/pixmaps/irrlamb.png
+
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
-.for dir in ${DATA_DIRS}
-	@${REINPLACE_CMD} -e 's|"\(${dir}/\)|"${DATADIR}/\1|' \
-		${WRKSRC}/src/*.cpp ${WRKSRC}/src/engine/*.cpp \
-		${WRKSRC}/src/objects/*.cpp ${WRKSRC}/meshes/*.irrmesh \
-		${WRKSRC}/scenes/*.irr
-.endfor
-	@${REINPLACE_CMD} -e "s/lua/lua-${LUA_VER}/g" ${WRKSRC}/SConstruct
-	@${FIND} ${WRKSRC} -name "*.bak" -delete
-
-do-install:
-	${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}/
+	@${REINPLACE_CMD} -e 's|share/games|share|g' ${WRKSRC}/CMakeLists.txt \
+		${WRKSRC}/deployment/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/games/irrlamb/distinfo b/games/irrlamb/distinfo
index 0e8351dcb79e..bbfd47df7643 100644
--- a/games/irrlamb/distinfo
+++ b/games/irrlamb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (irrlamb-0.1.0-src.tar.gz) = 2e700ab1ecd701bdc535361ab4dd620a345cda64671795a316e01a63b563edf1
-SIZE (irrlamb-0.1.0-src.tar.gz) = 1650269
+SHA256 (jazztickets-irrlamb-v0.2.1_GH0.tar.gz) = 17b402e3a5cd203fa88c22c9d266ec7fe4f147781b0fc35470c859d945e323e3
+SIZE (jazztickets-irrlamb-v0.2.1_GH0.tar.gz) = 13500336
diff --git a/games/irrlamb/files/patch-SConstruct b/games/irrlamb/files/patch-SConstruct
deleted file mode 100644
index 1ce9678ea173..000000000000
--- a/games/irrlamb/files/patch-SConstruct
+++ /dev/null
@@ -1,43 +0,0 @@
---- SConstruct.orig	2010-01-07 06:01:43.000000000 +0300
-+++ SConstruct	2010-01-15 22:36:00.000000000 +0300
-@@ -6,36 +6,19 @@
- import os
- 
- # Create the environment
--env = Environment()
--
--# For multiprocessors
--SetOption("num_jobs", 4)
-+env = Environment(ENV=os.environ, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
- 
- # Get the source files
- SOURCES = glob.glob("src/*.cpp") + glob.glob("src/tinyxml/*.cpp") + glob.glob("src/objects/*.cpp") + glob.glob("src/engine/*.cpp") + glob.glob("src/bullet/BulletCollision/BroadphaseCollision/*.cpp") + glob.glob("src/bullet/BulletCollision/CollisionDispatch/*.cpp") + glob.glob("src/bullet/BulletCollision/CollisionShapes/*.cpp") + glob.glob("src/bullet/BulletCollision/NarrowPhaseCollision/*.cpp") + glob.glob("src/bullet/BulletDynamics/ConstraintSolver/*.cpp") + glob.glob("src/bullet/BulletDynamics/Dynamics/*.cpp") + glob.glob("src/bullet/LinearMath/*.cpp") 
- 
- # Compiler flags
--#env.Append(CCFLAGS=Split("-O0 -g3 -Wall"))
--if os.environ.has_key("CXXFLAGS"):
--	env.Append(CCFLAGS=Split((os.environ["CXXFLAGS"]) + " -O2 -DNDEBUG"))
--else:
--	env.Append(CCFLAGS=Split(" -O2 -DNDEBUG"))
--
--# Detect lua-5.1 name
--lua_name = "lua"
--lua_cpppath = "/usr/include"
--for path in ["/usr/include","/usr/local/include"]:
--	if os.path.isdir(os.path.join(path,'lua5.1')):
--		lua_name = "lua5.1"
--		lua_cpppath = lua_cpppath + "/lua5.1"
--		break
-+env.Append(CCFLAGS=Split(" -DNDEBUG"))
- 
- # Paths
--env.Append(CPPPATH=Split("./src/bullet " + lua_cpppath ))
--env.Append(LIBPATH="/usr/local/lib")
-+env.Append(CPPPATH=Split("./src/bullet"))
- 
- # Libraries
--env.Append(LIBS=Split("Irrlicht sqlite3 " + lua_name))
-+env.Append(LIBS=Split("Irrlicht sqlite3 lua"))
- 
- # Build the program
- irrlamb = env.Program("irrlamb", SOURCES)
diff --git a/games/irrlamb/files/patch-src-engine-save.h b/games/irrlamb/files/patch-src-engine-save.h
deleted file mode 100644
index a213ae4ae55f..000000000000
--- a/games/irrlamb/files/patch-src-engine-save.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/engine/save.h.orig	2009-12-29 03:43:28.000000000 +0300
-+++ src/engine/save.h	2013-09-14 07:46:32.762415408 +0400
-@@ -22,6 +22,7 @@
- #include "singleton.h"
- #include <irrlicht/irrlicht.h>
- #include <map>
-+#include <ctime>
- 
- // Namespaces
- using namespace irr;
diff --git a/games/irrlamb/files/patch-src-objects-orb.cpp b/games/irrlamb/files/patch-src-objects-orb.cpp
deleted file mode 100644
index 656c75935884..000000000000
--- a/games/irrlamb/files/patch-src-objects-orb.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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("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
diff --git a/games/irrlamb/files/patch-src-objects-player.cpp b/games/irrlamb/files/patch-src-objects-player.cpp
deleted file mode 100644
index 14ed4f42fd3d..000000000000
--- a/games/irrlamb/files/patch-src-objects-player.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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("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);
diff --git a/games/irrlamb/files/patch-src_engine_state.h b/games/irrlamb/files/patch-src_engine_state.h
deleted file mode 100644
index 6bff5cb92a45..000000000000
--- a/games/irrlamb/files/patch-src_engine_state.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/engine/state.h.orig	2009-12-24 05:02:41 UTC
-+++ src/engine/state.h
-@@ -23,6 +23,7 @@
- // Namespaces
- using namespace irr;
- using namespace core;
-+using namespace irr::core;
- using namespace scene;
- using namespace video;
- using namespace io;
diff --git a/games/irrlamb/pkg-descr b/games/irrlamb/pkg-descr
index bed7dc75d7c0..47a4fb45f148 100644
--- a/games/irrlamb/pkg-descr
+++ b/games/irrlamb/pkg-descr
@@ -1,4 +1,4 @@
 irrlamb is a 3D game that probably involves a lot of physics and
 frustrating gameplay
 
-WWW: http://code.google.com/p/irrlamb/
+WWW: https://github.com/jazztickets/irrlamb