Update to 1.0r1

6 files changed, 25 insertions, 22 deletions

diff --git a/games/blobby/Makefile b/games/blobby/Makefile
index bb383385ab53..36a7279c85b2 100644
--- a/games/blobby/Makefile
+++ b/games/blobby/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	blobby
-PORTVERSION=	0.9c
-PORTREVISION=	2
+PORTVERSION=	1.0r1
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/Blobby%20Volley%202%20%28Linux%29/Beta%20${PORTVERSION}
-DISTNAME=	blobby2-linux-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/Blobby%20Volley%202%20%28Linux%29/1.0RC1/
+DISTNAME=	blobby2-linux-1.0rc1
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Official continuation of the famous Blobby Volley 1.x game
@@ -27,7 +26,7 @@ USE_SDL=	sdl
 USE_GL=		glu
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DDATADIR:PATH="${DATADIR}"
-WRKSRC=		${WRKDIR}/blobby-beta-${PORTVERSION}
+WRKSRC=		${WRKDIR}/blobby-1.0rc1
 
 USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*\.(c|h|cpp)
diff --git a/games/blobby/distinfo b/games/blobby/distinfo
index 726b8c7d1047..49a454e3eb9f 100644
--- a/games/blobby/distinfo
+++ b/games/blobby/distinfo
@@ -1,2 +1,2 @@
-SHA256 (blobby2-linux-0.9c.tar.gz) = e3ed8f92c70e16d24f109b6f0f4dccc25656a88780eb1a348d1223edcb7fc937
-SIZE (blobby2-linux-0.9c.tar.gz) = 2290384
+SHA256 (blobby2-linux-1.0rc1.tar.gz) = de113d71fb195c59528c55601d0b282945a5041ee4feca446013ef30da3265b1
+SIZE (blobby2-linux-1.0rc1.tar.gz) = 2215914
diff --git a/games/blobby/files/patch-data-CMakeLists.txt b/games/blobby/files/patch-data-CMakeLists.txt
index 8828dddbaef0..11bffefcfb45 100644
--- a/games/blobby/files/patch-data-CMakeLists.txt
+++ b/games/blobby/files/patch-data-CMakeLists.txt
@@ -1,6 +1,6 @@
---- data/CMakeLists.txt.orig	2010-03-10 06:56:11.633734175 +0000
-+++ data/CMakeLists.txt	2010-03-10 06:59:30.458786242 +0000
-@@ -29,5 +29,5 @@
+--- data/CMakeLists.txt.orig	2012-08-07 18:08:04.000000000 +0200
++++ data/CMakeLists.txt	2012-08-07 18:08:28.000000000 +0200
+@@ -33,5 +33,5 @@
  if (WIN32)
  	install(FILES ${install_files} DESTINATION data)
  elseif (UNIX)
diff --git a/games/blobby/files/patch-src-InputManager.cpp b/games/blobby/files/patch-src-InputManager.cpp
new file mode 100644
index 000000000000..3536ab13e962
--- /dev/null
+++ b/games/blobby/files/patch-src-InputManager.cpp
@@ -0,0 +1,8 @@
+--- src/InputManager.cpp.orig	2012-08-07 18:12:49.000000000 +0200
++++ src/InputManager.cpp	2012-08-07 18:17:04.000000000 +0200
+@@ -1,4 +1,4 @@
+-/*=============================================================================
++/*=============================================================================
+ Blobby Volley 2
+ Copyright (C) 2006 Jonathan Sieber (jonathan_sieber@yahoo.de)
+ 
diff --git a/games/blobby/files/patch-src-RenderManager.cpp b/games/blobby/files/patch-src-RenderManager.cpp
new file mode 100644
index 000000000000..a8a8f0798b65
--- /dev/null
+++ b/games/blobby/files/patch-src-RenderManager.cpp
@@ -0,0 +1,8 @@
+--- src/RenderManager.cpp.orig	2012-08-07 18:22:07.000000000 +0200
++++ src/RenderManager.cpp	2012-08-07 18:22:19.000000000 +0200
+@@ -1,4 +1,4 @@
+-/*=============================================================================
++/*=============================================================================
+ Blobby Volley 2
+ Copyright (C) 2006 Jonathan Sieber (jonathan_sieber@yahoo.de)
+ Copyright (C) 2006 Daniel Knobe (daniel-knobe@web.de)
diff --git a/games/blobby/files/patch-src-RenderManagerGL2D.cpp b/games/blobby/files/patch-src-RenderManagerGL2D.cpp
deleted file mode 100644
index a75986589660..000000000000
--- a/games/blobby/files/patch-src-RenderManagerGL2D.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/RenderManagerGL2D.cpp.orig	2011-11-10 17:25:30.977965807 +0100
-+++ src/RenderManagerGL2D.cpp	2011-11-10 17:25:31.029970322 +0100
-@@ -284,7 +284,8 @@
- 		SDL_Rect r = {x, 0, fontSurface->w, fontSurface->h};
- 		SDL_BlitSurface(fontSurface, 0, textbase, &r);
- 		SDL_BlitSurface(highlight, 0, hltextbase, &r);
--		r = {sx, 0, fontSurface2->w, fontSurface2->h};
-+		r.x = sx; r.y = 0;
-+		r.w = fontSurface2->w; r.h = fontSurface2->h;
- 		SDL_BlitSurface(fontSurface2, 0, smalltextbase, &r);
- 		SDL_BlitSurface(highlight2, 0, hlsmalltextbase, &r);
- 		//GLuint ballImage = loadTexture(sf, false);