1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

- Update to 1.0r3

- Use new header format in Makefile
This commit is contained in:
Ganael LAPLANCHE 2013-03-29 10:22:43 +00:00
parent 1f05ffe74c
commit 77af481c89
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=315536
4 changed files with 17 additions and 77 deletions

View File

@ -1,15 +1,11 @@
# New ports collection makefile for: blobby
# Date created: 01 Apr 2008
# Whom: Ganael Laplanche <ganael.laplanche@martymac.org>
#
# Created by: Ganael Laplanche <ganael.laplanche@martymac.org>
# $FreeBSD$
#
PORTNAME= blobby
PORTVERSION= 1.0r1
PORTVERSION= 1.0r3
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Blobby%20Volley%202%20%28Linux%29/1.0RC1/
DISTNAME= blobby2-linux-1.0rc1
MASTER_SITES= SF/${PORTNAME}/Blobby%20Volley%202%20%28Linux%29/1.0RC3/
DISTNAME= blobby2-linux-1.0rc3
MAINTAINER= martymac@FreeBSD.org
COMMENT= Official continuation of the famous Blobby Volley 1.x game
@ -26,7 +22,7 @@ USE_SDL= sdl
USE_GL= glu
USES= cmake
CMAKE_ARGS+= -DDATADIR:PATH="${DATADIR}"
WRKSRC= ${WRKDIR}/blobby-1.0rc1
WRKSRC= ${WRKDIR}/blobby-1.0rc3
USE_DOS2UNIX= yes
DOS2UNIX_REGEX= .*\.(c|h|cpp)

View File

@ -1,2 +1,2 @@
SHA256 (blobby2-linux-1.0rc1.tar.gz) = de113d71fb195c59528c55601d0b282945a5041ee4feca446013ef30da3265b1
SIZE (blobby2-linux-1.0rc1.tar.gz) = 2215914
SHA256 (blobby2-linux-1.0rc3.tar.gz) = 45bdb2530b7eb1b508693d304e31088c9a9b366f978f716b5a0cf1e7c502c581
SIZE (blobby2-linux-1.0rc3.tar.gz) = 2323776

View File

@ -1,66 +0,0 @@
--- src/raknet/BinarySearchTree.h.orig 2011-11-10 19:09:02.760002087 +0100
+++ src/raknet/BinarySearchTree.h 2011-11-10 19:16:43.285213671 +0100
@@ -338,12 +338,12 @@
if ( current->left == 0 )
left_height = 0;
else
- left_height = height( current->left );
+ left_height = this->height( current->left );
if ( current->right == 0 )
right_height = 0;
else
- right_height = height( current->right );
+ right_height = this->height( current->right );
if ( right_height - left_height == 2 )
{
@@ -371,7 +371,7 @@
if ( current == this->root )
break;
- current = find_parent( *( current->item ) );
+ current = this->find_parent( *( current->item ) );
}
}
@@ -400,7 +400,7 @@
if ( A == 0 )
return false;
- return height( A->right ) > height( A->left );
+ return this->height( A->right ) > this->height( A->left );
}
template <class BinarySearchTreeType>
@@ -409,7 +409,7 @@
if ( A == 0 )
return false;
- return height( A->left ) > height( A->right );
+ return this->height( A->left ) > this->height( A->right );
}
template <class BinarySearchTreeType>
@@ -446,8 +446,8 @@
*/
- B = find_parent( *( C->item ) );
- A = find_parent( *( B->item ) );
+ B = this->find_parent( *( C->item ) );
+ A = this->find_parent( *( B->item ) );
D = C->right;
if ( A )
@@ -510,8 +510,8 @@
*/
- B = find_parent( *( C->item ) );
- A = find_parent( *( B->item ) );
+ B = this->find_parent( *( C->item ) );
+ A = this->find_parent( *( B->item ) );
D = C->left;
if ( A )

View File

@ -0,0 +1,10 @@
--- src/raknet/RakPeer.cpp.orig 2013-03-28 17:46:00.000000000 +0100
+++ src/raknet/RakPeer.cpp 2013-03-28 17:55:11.000000000 +0100
@@ -1060,7 +1060,6 @@
for ( ; index < banList.size(); index++ )
{
- delete [] banList[ index ]->IP;
delete [] banList[ index ];
}