4 files changed, 178 insertions, 111 deletions

diff --git a/games/sdl-ball/Makefile b/games/sdl-ball/Makefile
index 404d19f5a402..cd3f433df65d 100644
--- a/games/sdl-ball/Makefile
+++ b/games/sdl-ball/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdl-ball
-PORTVERSION=	0.11
+PORTVERSION=	0.13
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -16,16 +16,13 @@ COMMENT=	Arkanoid/Breakout clone with pretty graphics
 USE_BZIP2=	yes
 USE_SDL=	sdl mixer image ttf
 USE_GL=		gl glu
+MAKE_ENV=	DATADIR=${DATADIR}/
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' \
-		${WRKSRC}/main.cpp ${WRKSRC}/menu.cpp
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sdl-ball ${PREFIX}/bin
 	${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR}
+	cd ${WRKSRC}/themes && ${COPYTREE_SHARE} . ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/games/sdl-ball/distinfo b/games/sdl-ball/distinfo
index 271da9f69356..6e3a574ab0b7 100644
--- a/games/sdl-ball/distinfo
+++ b/games/sdl-ball/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdl-ball-0.11.tar.bz2) = 9714039aa313cd67e847dbb1db193a69
-SHA256 (sdl-ball-0.11.tar.bz2) = f44b6d8d87611ba9261eb357e4ca84fb59e26ff3d7b94efd5e7fb3f56d62ab13
-SIZE (sdl-ball-0.11.tar.bz2) = 2314512
+MD5 (sdl-ball-0.13.tar.bz2) = 5ca72d13b6e79f8a4b0fc5b56c8e2899
+SHA256 (sdl-ball-0.13.tar.bz2) = 7558c8a028b9fbe14cfbc1cbc606d3d6d993c2bf1cf6e3890f2a6a11e19d745b
+SIZE (sdl-ball-0.13.tar.bz2) = 3227636
diff --git a/games/sdl-ball/files/patch-Makefile b/games/sdl-ball/files/patch-Makefile
index 78fbdf7b9163..a51dc4d34ffd 100644
--- a/games/sdl-ball/files/patch-Makefile
+++ b/games/sdl-ball/files/patch-Makefile
@@ -1,13 +1,18 @@
---- Makefile.orig	2008-09-16 16:54:41.000000000 +0400
-+++ Makefile	2008-10-09 17:34:32.000000000 +0400
-@@ -1,8 +1,7 @@
--CC=g++
--CFLAGS=-c -Wall
-+CFLAGS+=-c -Wall `${SDL_CONFIG} --cflags`
- #append -lwiiuse if compiling WITH_WIIUSE
- #remove -lSDL_mixer if NOT compiling WITH_SOUND
--LDFLAGS=-lGL -lGLU -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer -lwiiuse
-+LDFLAGS=-lGL -lGLU `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lSDL_mixer
+--- Makefile.orig	2008-11-09 18:39:41.000000000 +0300
++++ Makefile	2008-11-12 21:34:21.000000000 +0300
+@@ -2,13 +2,12 @@
+ 
+ #append -DWITH_WIIUSE to compile with WIIUSE support!
+ #append -DNOSOUND to compile WITHOUT sound support
+-CC=g++ -DDATADIR="\"$(DATADIR)\""
+ 
+-CFLAGS+=-c -Wall
++CFLAGS+=-c -Wall -DDATADIR="\"$(DATADIR)\"" `${SDL_CONFIG} --cflags`
+ 
+ #append -lwiiuse to compile with WIIUSE support
+ #remove -lSDL_mixer if compiling with -DNOSOUND
+-LDFLAGS+=-lGL -lGLU -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer
++LDFLAGS+=-lGL -lGLU `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lSDL_mixer
  
  SOURCES=main.cpp 
  OBJECTS=$(SOURCES:.cpp=.o)
diff --git a/games/sdl-ball/pkg-plist b/games/sdl-ball/pkg-plist
index 48bef1f349e1..9ca4822248dc 100644
--- a/games/sdl-ball/pkg-plist
+++ b/games/sdl-ball/pkg-plist
@@ -1,94 +1,159 @@
 bin/sdl-ball
-%%DATADIR%%/font/acidic.ttf
-%%DATADIR%%/font/ack.ttf
-%%DATADIR%%/gfx/ball/fireball.png
-%%DATADIR%%/gfx/ball/tail.png
-%%DATADIR%%/gfx/ball/test.png
-%%DATADIR%%/gfx/bg/1.jpg
-%%DATADIR%%/gfx/bg/2.jpg
-%%DATADIR%%/gfx/bg/23.jpg
-%%DATADIR%%/gfx/bg/24.jpg
-%%DATADIR%%/gfx/bg/25.jpg
-%%DATADIR%%/gfx/bg/3.jpg
-%%DATADIR%%/gfx/bg/4.jpg
-%%DATADIR%%/gfx/bg/5.jpg
-%%DATADIR%%/gfx/bg/6.jpg
-%%DATADIR%%/gfx/bg/7.jpg
-%%DATADIR%%/gfx/border.png
-%%DATADIR%%/gfx/brick/ani1.png
-%%DATADIR%%/gfx/brick/base.png
-%%DATADIR%%/gfx/brick/cement.png
-%%DATADIR%%/gfx/brick/doom-org.png
-%%DATADIR%%/gfx/brick/doom.png
-%%DATADIR%%/gfx/brick/explosive.png
-%%DATADIR%%/gfx/brick/glass.png
-%%DATADIR%%/gfx/brick/invisible.png
-%%DATADIR%%/gfx/highscore/entername.png
-%%DATADIR%%/gfx/highscore/numbers.png
-%%DATADIR%%/gfx/menu/but0.png
-%%DATADIR%%/gfx/menu/but1.png
-%%DATADIR%%/gfx/menu/but2.png
-%%DATADIR%%/gfx/menu/highscorebg.png
-%%DATADIR%%/gfx/menu/menu0.png
-%%DATADIR%%/gfx/paddle/aim.png
-%%DATADIR%%/gfx/paddle/base.png
-%%DATADIR%%/gfx/paddle/glue.png
-%%DATADIR%%/gfx/paddle/gun.png
-%%DATADIR%%/gfx/particle.png
-%%DATADIR%%/gfx/powerup/aim.png
-%%DATADIR%%/gfx/powerup/aimhelp.png
-%%DATADIR%%/gfx/powerup/bigball.png
-%%DATADIR%%/gfx/powerup/bullet.png
-%%DATADIR%%/gfx/powerup/detonate.png
-%%DATADIR%%/gfx/powerup/die.png
-%%DATADIR%%/gfx/powerup/drop.png
-%%DATADIR%%/gfx/powerup/easybrick.png
-%%DATADIR%%/gfx/powerup/explosive-grow.png
-%%DATADIR%%/gfx/powerup/explosive.png
-%%DATADIR%%/gfx/powerup/glue.png
-%%DATADIR%%/gfx/powerup/go-thru.png
-%%DATADIR%%/gfx/powerup/gravity.png
-%%DATADIR%%/gfx/powerup/growbat.png
-%%DATADIR%%/gfx/powerup/gun.png
-%%DATADIR%%/gfx/powerup/laser.png
-%%DATADIR%%/gfx/powerup/life.png
-%%DATADIR%%/gfx/powerup/multiball.png
-%%DATADIR%%/gfx/powerup/nextlevel.png
-%%DATADIR%%/gfx/powerup/normalball.png
-%%DATADIR%%/gfx/powerup/shrinkbat.png
-%%DATADIR%%/gfx/powerup/smallball.png
-%%DATADIR%%/levels.txt
-%%DATADIR%%/powerups.txt
-%%DATADIR%%/snd/LICENSE.txt
-%%DATADIR%%/snd/ball-drop.ogg
-%%DATADIR%%/snd/ball-hit-border.ogg
-%%DATADIR%%/snd/ball-hit-paddle.ogg
-%%DATADIR%%/snd/cement-brick-hit.ogg
-%%DATADIR%%/snd/die.ogg
-%%DATADIR%%/snd/doom-brick-break.ogg
-%%DATADIR%%/snd/evil-po-hit-paddle.ogg
-%%DATADIR%%/snd/expl-brick-break.ogg
-%%DATADIR%%/snd/gameover.ogg
-%%DATADIR%%/snd/glass-brick-break.ogg
-%%DATADIR%%/snd/glass-brick-hit.ogg
-%%DATADIR%%/snd/glue-ball-hit-paddle.ogg
-%%DATADIR%%/snd/good-po-hit-paddle.ogg
-%%DATADIR%%/snd/highscore.ogg
-%%DATADIR%%/snd/invisible-brick-appear.ogg
-%%DATADIR%%/snd/menuclick.ogg
-%%DATADIR%%/snd/nextlevel.ogg
-%%DATADIR%%/snd/norm-brick-break.ogg
-%%DATADIR%%/snd/po-hit-border.ogg
-%%DATADIR%%/snd/shot.ogg
-%%DATADIR%%/snd/start.ogg
-@dirrm %%DATADIR%%/snd
-@dirrm %%DATADIR%%/gfx/powerup
-@dirrm %%DATADIR%%/gfx/paddle
-@dirrm %%DATADIR%%/gfx/menu
-@dirrm %%DATADIR%%/gfx/highscore
-@dirrm %%DATADIR%%/gfx/brick
-@dirrm %%DATADIR%%/gfx/bg
-@dirrm %%DATADIR%%/gfx/ball
-@dirrm %%DATADIR%%/gfx
-@dirrm %%DATADIR%%/font
+%%DATADIR%%/default/font/Bandal.ttf
+%%DATADIR%%/default/font/COPYING
+%%DATADIR%%/default/font/fonts.txt
+%%DATADIR%%/default/font/subgamefont.ttf
+%%DATADIR%%/default/gfx/ball/fireball.png
+%%DATADIR%%/default/gfx/ball/fireball.txt
+%%DATADIR%%/default/gfx/ball/normal.png
+%%DATADIR%%/default/gfx/ball/normal.txt
+%%DATADIR%%/default/gfx/ball/tail.png
+%%DATADIR%%/default/gfx/ball/tail.txt
+%%DATADIR%%/default/gfx/bg/1.jpg
+%%DATADIR%%/default/gfx/bg/10.jpg
+%%DATADIR%%/default/gfx/bg/11.jpg
+%%DATADIR%%/default/gfx/bg/12.jpg
+%%DATADIR%%/default/gfx/bg/13.jpg
+%%DATADIR%%/default/gfx/bg/14.jpg
+%%DATADIR%%/default/gfx/bg/15.jpg
+%%DATADIR%%/default/gfx/bg/16.jpg
+%%DATADIR%%/default/gfx/bg/17.jpg
+%%DATADIR%%/default/gfx/bg/18.jpg
+%%DATADIR%%/default/gfx/bg/19.jpg
+%%DATADIR%%/default/gfx/bg/2.jpg
+%%DATADIR%%/default/gfx/bg/20.jpg
+%%DATADIR%%/default/gfx/bg/21.jpg
+%%DATADIR%%/default/gfx/bg/22.jpg
+%%DATADIR%%/default/gfx/bg/23.jpg
+%%DATADIR%%/default/gfx/bg/24.jpg
+%%DATADIR%%/default/gfx/bg/25.jpg
+%%DATADIR%%/default/gfx/bg/3.jpg
+%%DATADIR%%/default/gfx/bg/4.jpg
+%%DATADIR%%/default/gfx/bg/5.jpg
+%%DATADIR%%/default/gfx/bg/6.jpg
+%%DATADIR%%/default/gfx/bg/7.jpg
+%%DATADIR%%/default/gfx/bg/8.jpg
+%%DATADIR%%/default/gfx/bg/9.jpg
+%%DATADIR%%/default/gfx/border.png
+%%DATADIR%%/default/gfx/brick/base.png
+%%DATADIR%%/default/gfx/brick/base.txt
+%%DATADIR%%/default/gfx/brick/blue.txt
+%%DATADIR%%/default/gfx/brick/cement.png
+%%DATADIR%%/default/gfx/brick/cement.txt
+%%DATADIR%%/default/gfx/brick/doom-org.png
+%%DATADIR%%/default/gfx/brick/doom.png
+%%DATADIR%%/default/gfx/brick/doom.txt
+%%DATADIR%%/default/gfx/brick/explosive.png
+%%DATADIR%%/default/gfx/brick/explosive.txt
+%%DATADIR%%/default/gfx/brick/glass.png
+%%DATADIR%%/default/gfx/brick/glass.txt
+%%DATADIR%%/default/gfx/brick/green.txt
+%%DATADIR%%/default/gfx/brick/grey.txt
+%%DATADIR%%/default/gfx/brick/invisible.png
+%%DATADIR%%/default/gfx/brick/invisible.txt
+%%DATADIR%%/default/gfx/brick/purple.txt
+%%DATADIR%%/default/gfx/brick/red.txt
+%%DATADIR%%/default/gfx/brick/template.txt
+%%DATADIR%%/default/gfx/brick/white.txt
+%%DATADIR%%/default/gfx/brick/yellow.txt
+%%DATADIR%%/default/gfx/highscore/entername.png
+%%DATADIR%%/default/gfx/menu/but0.png
+%%DATADIR%%/default/gfx/menu/but1.png
+%%DATADIR%%/default/gfx/menu/but2.png
+%%DATADIR%%/default/gfx/menu/highscorebg.png
+%%DATADIR%%/default/gfx/menu/menu0.png
+%%DATADIR%%/default/gfx/paddle/base.png
+%%DATADIR%%/default/gfx/paddle/base.txt
+%%DATADIR%%/default/gfx/paddle/glue.png
+%%DATADIR%%/default/gfx/paddle/glue.txt
+%%DATADIR%%/default/gfx/paddle/gun.png
+%%DATADIR%%/default/gfx/paddle/gun.txt
+%%DATADIR%%/default/gfx/particle.png
+%%DATADIR%%/default/gfx/powerup/aim.png
+%%DATADIR%%/default/gfx/powerup/aim.txt
+%%DATADIR%%/default/gfx/powerup/aimhelp.png
+%%DATADIR%%/default/gfx/powerup/aimhelp.txt
+%%DATADIR%%/default/gfx/powerup/bigball.png
+%%DATADIR%%/default/gfx/powerup/bigball.txt
+%%DATADIR%%/default/gfx/powerup/bullet.png
+%%DATADIR%%/default/gfx/powerup/bullet.txt
+%%DATADIR%%/default/gfx/powerup/coin.png
+%%DATADIR%%/default/gfx/powerup/coin.txt
+%%DATADIR%%/default/gfx/powerup/detonate.png
+%%DATADIR%%/default/gfx/powerup/detonate.txt
+%%DATADIR%%/default/gfx/powerup/die.png
+%%DATADIR%%/default/gfx/powerup/die.txt
+%%DATADIR%%/default/gfx/powerup/drop.png
+%%DATADIR%%/default/gfx/powerup/drop.txt
+%%DATADIR%%/default/gfx/powerup/easybrick.png
+%%DATADIR%%/default/gfx/powerup/easybrick.txt
+%%DATADIR%%/default/gfx/powerup/explosive-grow.png
+%%DATADIR%%/default/gfx/powerup/explosive-grow.txt
+%%DATADIR%%/default/gfx/powerup/explosive.png
+%%DATADIR%%/default/gfx/powerup/explosive.txt
+%%DATADIR%%/default/gfx/powerup/glue.png
+%%DATADIR%%/default/gfx/powerup/glue.txt
+%%DATADIR%%/default/gfx/powerup/go-thru.png
+%%DATADIR%%/default/gfx/powerup/go-thru.txt
+%%DATADIR%%/default/gfx/powerup/growbat.png
+%%DATADIR%%/default/gfx/powerup/growbat.txt
+%%DATADIR%%/default/gfx/powerup/gun.png
+%%DATADIR%%/default/gfx/powerup/gun.txt
+%%DATADIR%%/default/gfx/powerup/laser.png
+%%DATADIR%%/default/gfx/powerup/laser.txt
+%%DATADIR%%/default/gfx/powerup/life.png
+%%DATADIR%%/default/gfx/powerup/life.txt
+%%DATADIR%%/default/gfx/powerup/multiball.png
+%%DATADIR%%/default/gfx/powerup/multiball.txt
+%%DATADIR%%/default/gfx/powerup/nextlevel.png
+%%DATADIR%%/default/gfx/powerup/nextlevel.txt
+%%DATADIR%%/default/gfx/powerup/normalball.png
+%%DATADIR%%/default/gfx/powerup/normalball.txt
+%%DATADIR%%/default/gfx/powerup/shrinkbat.png
+%%DATADIR%%/default/gfx/powerup/shrinkbat.txt
+%%DATADIR%%/default/gfx/powerup/smallball.png
+%%DATADIR%%/default/gfx/powerup/smallball.txt
+%%DATADIR%%/default/gfx/title/title.png
+%%DATADIR%%/default/icon32.png
+%%DATADIR%%/default/levels.txt
+%%DATADIR%%/default/powerupdescriptions.txt
+%%DATADIR%%/default/powerupdescriptions.txt~
+%%DATADIR%%/default/powerups.txt
+%%DATADIR%%/default/snd/ball-hit-border.ogg
+%%DATADIR%%/default/snd/ball-hit-paddle.ogg
+%%DATADIR%%/default/snd/buy-powerup.ogg
+%%DATADIR%%/default/snd/cement-brick-hit.ogg
+%%DATADIR%%/default/snd/die.ogg
+%%DATADIR%%/default/snd/doom-brick-break.ogg
+%%DATADIR%%/default/snd/evil-po-hit-paddle.ogg
+%%DATADIR%%/default/snd/expl-brick-break.ogg
+%%DATADIR%%/default/snd/gameover.ogg
+%%DATADIR%%/default/snd/glass-brick-break.ogg
+%%DATADIR%%/default/snd/glass-brick-hit.ogg
+%%DATADIR%%/default/snd/glue-ball-hit-paddle.ogg
+%%DATADIR%%/default/snd/good-po-hit-paddle.ogg
+%%DATADIR%%/default/snd/highscore.ogg
+%%DATADIR%%/default/snd/invisible-brick-appear.ogg
+%%DATADIR%%/default/snd/menuclick.ogg
+%%DATADIR%%/default/snd/nextlevel.ogg
+%%DATADIR%%/default/snd/norm-brick-breaka.ogg
+%%DATADIR%%/default/snd/norm-brick-breakb.ogg
+%%DATADIR%%/default/snd/norm-brick-breakc.ogg
+%%DATADIR%%/default/snd/norm-brick-breakd.ogg
+%%DATADIR%%/default/snd/norm-brick-breake.ogg
+%%DATADIR%%/default/snd/po-hit-border.ogg
+%%DATADIR%%/default/snd/shot.ogg
+%%DATADIR%%/default/snd/start.ogg
+@dirrm %%DATADIR%%/default/snd
+@dirrm %%DATADIR%%/default/gfx/title
+@dirrm %%DATADIR%%/default/gfx/powerup
+@dirrm %%DATADIR%%/default/gfx/paddle
+@dirrm %%DATADIR%%/default/gfx/menu
+@dirrm %%DATADIR%%/default/gfx/highscore
+@dirrm %%DATADIR%%/default/gfx/brick
+@dirrm %%DATADIR%%/default/gfx/bg
+@dirrm %%DATADIR%%/default/gfx/ball
+@dirrm %%DATADIR%%/default/gfx
+@dirrm %%DATADIR%%/default/font
+@dirrm %%DATADIR%%/default
 @dirrm %%DATADIR%%