- Update to 0.9.2

- Change master sites, add ogg music
- Add dependency for audio/libogg
- Remove unneeded .mod
- Remove obsolete REINPLACE_CMD, malloc.h is removed
- Add REINPLACE_CMD, fix config.h.in, use ogg music instead of not working mod
- Change patch-Makefile, use new supplied manual pages
- Change pkg-plist, remove .mod, add .ogg

4 files changed, 54 insertions, 31 deletions

diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile
index cc8f59da9ee6..6061ceee836e 100644
--- a/games/rockdodger/Makefile
+++ b/games/rockdodger/Makefile
@@ -2,27 +2,46 @@
 # $FreeBSD$
 
 PORTNAME=	rockdodger
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.2
 CATEGORIES=	games
 MASTER_SITES=	GOOGLE_CODE \
-		SF/nemysisfreebsdp/${CATEGORIES}/:icons
+		SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:addons
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}.png:icons
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
+		${PORTNAME}_music${EXTRACT_SUFX}:addons \
+		${PORTNAME}.png:addons
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}_music${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Addictive rock-dodging greeblie-killing platform game
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+
 USES=		gmake
 USE_SDL=	mixer image sdl
 
 DESKTOP_ENTRIES="Rock Dodger" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
+post-extract:
+	${TAR} xfjp ${_DISTDIR}/${PORTNAME}_music${EXTRACT_SUFX} -C \
+		${WRKSRC}/data/
+	@cd ${WRKSRC}/data ; ${RM} -f *.mod
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|#include <malloc.h>||' ${WRKSRC}/u-iff.c
+	@${REINPLACE_CMD} -e 's|@gamesdir@|${DATADIR}|; \
+		s|@datadir@|${PREFIX}/share|' \
+		${WRKSRC}/config.h.in
+	@${REINPLACE_CMD} -e 's|magic.mod|magic.ogg|; \
+		s|getzznew.mod|getzznew.ogg|; \
+		s|4est_fulla3s.mod|4est_fulla3s.ogg|; \
+		s|ramcharg.mod|ramcharg.ogg|; \
+		s|front_1.mod|front_1.ogg|' \
+		${WRKSRC}/sound.c
+	@${REINPLACE_CMD} -e 's|*.mod|*.ogg|' \
+		${WRKSRC}/data/Makefile
 
 post-install:
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
diff --git a/games/rockdodger/distinfo b/games/rockdodger/distinfo
index fbedf5466b52..af3c1492af5d 100644
--- a/games/rockdodger/distinfo
+++ b/games/rockdodger/distinfo
@@ -1,4 +1,6 @@
-SHA256 (rockdodger-0.9.1.tar.gz) = 84b77375be3b14e12a449b7f77277d178f7ad12c752c558eb39f19ce0e312c7b
-SIZE (rockdodger-0.9.1.tar.gz) = 948425
+SHA256 (rockdodger-0.9.2.tar.gz) = 2b305f78cbdbf1df3954e1db6142d6ccdf742ecec84e8690a6fc56f24e61ade6
+SIZE (rockdodger-0.9.2.tar.gz) = 951997
+SHA256 (rockdodger_music.tar.gz) = c88c92063a99061afea6eefc6b1a7e20723a8c7fc54fa3126aa4130b9722ff03
+SIZE (rockdodger_music.tar.gz) = 7607030
 SHA256 (rockdodger.png) = 3ed4cdd14a583e0b2ec99693459808b241a70b4c5901bfe67e76855d4f7de8a9
 SIZE (rockdodger.png) = 2192
diff --git a/games/rockdodger/files/patch-Makefile b/games/rockdodger/files/patch-Makefile
index 8e5db8db91a1..52cd86fd4a61 100644
--- a/games/rockdodger/files/patch-Makefile
+++ b/games/rockdodger/files/patch-Makefile
@@ -1,5 +1,5 @@
---- ./Makefile.orig	2013-12-23 22:12:37.000000000 +0100
-+++ ./Makefile	2013-12-24 15:01:35.000000000 +0100
+--- ./Makefile.orig	2013-12-28 17:42:18.000000000 +0100
++++ ./Makefile	2014-01-15 20:20:49.000000000 +0100
 @@ -34,9 +34,9 @@
  datadir = $(datarootdir)
  bindir = $(exec_prefix)/bin
@@ -7,35 +7,22 @@
 -mandir = $(datarootdir)/man
 -localstatedir = $(prefix)/var
 -gamesdir = $(localstatedir)/games
-+#mandir = $(datarootdir)/man
++mandir =$(prefix)/man
 +#localstatedir = $(prefix)/var
 +gamesdir = $(datarootdir)/$(PACKAGENAME)
  
  NEWD=$(PACKAGENAME)-$(VERSION)
  COMPILEDATE=$(shell date '+%Y-%m-%d')
-@@ -54,7 +54,7 @@
- 	mood_item.o sparkles.o \
- 	u-iff.o \
- 	rockdodger_globals.o intro.o main.o
--MANPAGE=rockdodger.6
-+#MANPAGE=rockdodger.6
- 
- ifeq ($(profile),1)
- 	OPTIONS+=-pg
-@@ -103,11 +103,11 @@
+@@ -103,9 +103,9 @@
  	-chgrp games $(bindir)/$(EXENAME)
  	chmod g+s $(bindir)/$(EXENAME)
  	$(MAKE) -C data install
 -	touch $(gamesdir)/rockdodger.scores
 -	-chgrp games $(gamesdir)/rockdodger.scores
 -	chmod g+rw $(gamesdir)/rockdodger.scores
--	mkdir -p $(mandir)/man6
--	gzip  < $(MANPAGE) > $(mandir)/man6/$(MANPAGE).gz
 +#	touch $(gamesdir)/rockdodger.scores
 +#	-chgrp games $(gamesdir)/rockdodger.scores
 +#	chmod g+rw $(gamesdir)/rockdodger.scores
-+#	mkdir -p $(mandir)/man6
-+#	gzip  < $(MANPAGE) > $(mandir)/man6/$(MANPAGE).gz
+ 	mkdir -p $(mandir)/man6
+ 	gzip  < $(MANPAGE) > $(mandir)/man6/$(MANPAGE).gz
  
- uninstall:
- 	rm -f $(gamesdir)/rockdodger.scores
diff --git a/games/rockdodger/pkg-plist b/games/rockdodger/pkg-plist
index 003c645c40b0..5d9a8f17c3d0 100644
--- a/games/rockdodger/pkg-plist
+++ b/games/rockdodger/pkg-plist
@@ -1,8 +1,9 @@
 bin/rockdodger
+man/man6/rockdodger.6.gz
 share/pixmaps/rockdodger.png
 %%DATADIR%%/20P_Betadance.png
 %%DATADIR%%/24P_Arial_NeonYellow.png
-%%DATADIR%%/4est_fulla3s.mod
+%%DATADIR%%/4est_fulla3s.ogg
 %%DATADIR%%/SmallNeon.png
 %%DATADIR%%/boom.wav
 %%DATADIR%%/booom.wav
@@ -13,8 +14,8 @@ share/pixmaps/rockdodger.png
 %%DATADIR%%/fart.2.aiff
 %%DATADIR%%/fart.3.aiff
 %%DATADIR%%/fart.4.aiff
-%%DATADIR%%/front_1.mod
-%%DATADIR%%/getzznew.mod
+%%DATADIR%%/front_1.ogg
+%%DATADIR%%/getzznew.ogg
 %%DATADIR%%/iff.configdata.rock
 %%DATADIR%%/images/bb-dropping.00.xpm
 %%DATADIR%%/images/bb-dropping.01.xpm
@@ -33,6 +34,7 @@ share/pixmaps/rockdodger.png
 %%DATADIR%%/images/deadicerock.03.png
 %%DATADIR%%/images/deadlithiumrock.00.ilbm
 %%DATADIR%%/images/deadlithiumrock.01.ilbm
+%%DATADIR%%/images/deadlithiumrock.02.ilbm
 %%DATADIR%%/images/deadrock0.bmp
 %%DATADIR%%/images/deadrock1.bmp
 %%DATADIR%%/images/deadrock2.bmp
@@ -87,8 +89,21 @@ share/pixmaps/rockdodger.png
 %%DATADIR%%/images/laserpowerup.1E.png
 %%DATADIR%%/images/laserpowerup.1F.png
 %%DATADIR%%/images/laserpowerup.png
+%%DATADIR%%/images/lifepowerup.00.ilbm
+%%DATADIR%%/images/lifepowerup.01.ilbm
+%%DATADIR%%/images/lifepowerup.02.ilbm
+%%DATADIR%%/images/lifepowerup.03.ilbm
+%%DATADIR%%/images/lifepowerup.04.ilbm
+%%DATADIR%%/images/lifepowerup.05.ilbm
+%%DATADIR%%/images/lifepowerup.06.ilbm
+%%DATADIR%%/images/lifepowerup.07.ilbm
+%%DATADIR%%/images/lifepowerup.08.ilbm
+%%DATADIR%%/images/lifepowerup.09.ilbm
+%%DATADIR%%/images/lifepowerup.0A.ilbm
+%%DATADIR%%/images/lifepowerup.0B.ilbm
 %%DATADIR%%/images/lithiumrock.00.ilbm
 %%DATADIR%%/images/lithiumrock.01.ilbm
+%%DATADIR%%/images/lithiumrock.02.ilbm
 %%DATADIR%%/images/mood_item.00.png
 %%DATADIR%%/images/mood_item.01.png
 %%DATADIR%%/images/mood_item.02.png
@@ -128,9 +143,9 @@ share/pixmaps/rockdodger.png
 %%DATADIR%%/images/ship_small.png
 %%DATADIR%%/laser0.png
 %%DATADIR%%/laser1.png
-%%DATADIR%%/magic.mod
+%%DATADIR%%/magic.ogg
 %%DATADIR%%/paused.png
-%%DATADIR%%/ramcharg.mod
+%%DATADIR%%/ramcharg.ogg
 %%DATADIR%%/shield0.png
 %%DATADIR%%/shield1.png
 %%DATADIR%%/speedup.wav