Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Mar 2010 13:43:46 GMT
From:      Ganael Laplanche <ganael.laplanche@martymac.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/144623: port update: games/blobby - Update to v0.8a
Message-ID:  <201003101343.o2ADhkqk029246@www.freebsd.org>
Resent-Message-ID: <201003101350.o2ADo7N1063293@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         144623
>Category:       ports
>Synopsis:       port update: games/blobby - Update to v0.8a
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 10 13:50:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Ganael Laplanche
>Release:        9.0-CURRENT
>Organization:
http://contribs.martymac.org
>Environment:
FreeBSD laptop.martymac.com 9.0-CURRENT FreeBSD 9.0-CURRENT #6: Thu Jan 21 14:46:32 UTC 2010     martymac@laptop.martymac.com:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
This patch updates games/blobby to v0.8a.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -aurN blobby.orig/Makefile blobby/Makefile
--- blobby.orig/Makefile	2010-03-09 17:18:44.137381076 +0000
+++ blobby/Makefile	2010-03-10 09:04:35.000000000 +0000
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	blobby
-PORTVERSION=	0.6a
-PORTREVISION=	1
+PORTVERSION=	0.8a
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/Blobby%20Volley%202%20%28Linux%29/Alpha%206
+MASTER_SITES=	SF/${PORTNAME}/Blobby%20Volley%202%20%28Linux%29/Alpha%208
 DISTNAME=	blobby2-linux-${PORTVERSION}
 
 MAINTAINER=	ganael.laplanche@martymac.com
@@ -17,14 +16,15 @@
 
 LIB_DEPENDS=	physfs.1:${PORTSDIR}/devel/physfs \
 		drm:${PORTSDIR}/graphics/libdrm
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		${LOCALBASE}/include/boost/crc.hpp:${PORTSDIR}/devel/boost-libs
 
-USE_XORG=	x11 xext xxf86vm xdamage xfixes xau xdmcp xrandr xrender
+USE_XORG=	ice x11 xext xxf86vm xdamage xfixes xau xdmcp xrandr xrender
 USE_SDL=	sdl
 USE_GL=		glu
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-WRKSRC=		${WRKDIR}/blobby-alpha-6
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-DDATADIR:PATH="${DATADIR}"
+WRKSRC=		${WRKDIR}/blobby-alpha-8
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 
diff -aurN blobby.orig/distinfo blobby/distinfo
--- blobby.orig/distinfo	2010-03-09 17:18:44.128386148 +0000
+++ blobby/distinfo	2010-03-10 08:03:25.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (blobby2-linux-0.6a.tar.gz) = fdef3e59f0870d890be8dffaccd773ca
-SHA256 (blobby2-linux-0.6a.tar.gz) = da070839fd2c99269fcb0d4dfc0de10bb9fab980ca28408d2a27490244bce526
-SIZE (blobby2-linux-0.6a.tar.gz) = 2110392
+MD5 (blobby2-linux-0.8a.tar.gz) = 75e7d46039d5e8fe1ed2d174244143a9
+SHA256 (blobby2-linux-0.8a.tar.gz) = ff259e1fb16b6a444c056bcf9971ce85de0e7a16b6bac813d675cdb19365e8f3
+SIZE (blobby2-linux-0.8a.tar.gz) = 1493181
diff -aurN blobby.orig/files/patch-config.h.in blobby/files/patch-config.h.in
--- blobby.orig/files/patch-config.h.in	1970-01-01 00:00:00.000000000 +0000
+++ blobby/files/patch-config.h.in	2010-03-10 08:03:25.000000000 +0000
@@ -0,0 +1,7 @@
+--- config.h.in.orig	2010-03-10 07:19:26.023348777 +0000
++++ config.h.in	2010-03-10 07:20:03.718760903 +0000
+@@ -20,3 +20,4 @@
+ #pragma once
+ 
+ #define BLOBBY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
++#define GAMEDATADIR "${DATADIR}"
diff -aurN blobby.orig/files/patch-data-CMakeLists.txt blobby/files/patch-data-CMakeLists.txt
--- blobby.orig/files/patch-data-CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ blobby/files/patch-data-CMakeLists.txt	2010-03-10 08:03:25.000000000 +0000
@@ -0,0 +1,9 @@
+--- 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 @@
+ if (WIN32)
+ 	install(FILES ${install_files} DESTINATION data)
+ elseif (UNIX)
+-	install(FILES ${install_files} DESTINATION share/blobby)
++	install(FILES ${install_files} DESTINATION ${DATADIR})
+ endif (WIN32)
diff -aurN blobby.orig/pkg-plist blobby/pkg-plist
--- blobby.orig/pkg-plist	2010-03-09 17:18:44.124378865 +0000
+++ blobby/pkg-plist	2010-03-10 08:03:25.000000000 +0000
@@ -1,9 +1,10 @@
 bin/blobby
 bin/blobby-server
 %%DATADIR%%/gfx.zip
-%%DATADIR%%/gf2x.zip
 %%DATADIR%%/sounds.zip
 %%DATADIR%%/scripts.zip
+%%DATADIR%%/backgrounds.zip
 %%DATADIR%%/config.xml
 %%DATADIR%%/inputconfig.xml
+%%DATADIR%%/server.xml
 @dirrm %%DATADIR%%


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003101343.o2ADhkqk029246>