6 files changed, 197 insertions, 115 deletions

diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile
index e0f5788e6d37..d2605fcc098a 100644
--- a/games/rockdodger/Makefile
+++ b/games/rockdodger/Makefile
@@ -2,34 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	rockdodger
-PORTVERSION=	0.6.0a
-PORTREVISION=	6
+PORTVERSION=	0.9.0
 CATEGORIES=	games
-MASTER_SITES=	SF/spacerocks/spacerocks/${PORTVERSION}
+MASTER_SITES=	GOOGLE_CODE \
+		SF/nemysisfreebsdp/${CATEGORIES}/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Addictive rock-dodging greeblie-killing platform game
 
-USE_SDL=	mixer image sdl
-USES=		gmake
+LICENSE=	GPLv2
 
-GAMESDIR?=	/var/games
+USES=		gmake
+USE_SDL=	mixer image sdl
 
-pre-patch:
-	@${REINPLACE_CMD} \
-		-e "s%/usr/share/rockdodger/.highscore%${GAMESDIR}/rockdodger.highscore%" \
-		-e "s%/usr/share/rockdodger%${PREFIX}/share/rockdodger%" \
-		-e "s%/usr/games%${PREFIX}/bin%" \
-		${WRKSRC}/main.c
-	@${REINPLACE_CMD} \
-		-e "s%/usr/share/rockdodger/.highscore%${STAGEDIR}${GAMESDIR}/rockdodger.highscore%" \
-		-e "s%/usr/games%${STAGEDIR}${PREFIX}/bin%" \
-		-e "s%/usr/share/rockdodger%${STAGEDIR}${PREFIX}/share/rockdodger%" \
-		-e "s%data/\*.{bmp,png,wav,mod}%data/*%" \
-		${WRKSRC}/Makefile
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e "s%#include <SDL/%#include <%" SFont.c SFont.h main.c sound.c
+DESKTOP_ENTRIES="Rock Dodger" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" false
 
-pre-install:
-	@${MKDIR} ${STAGEDIR}${GAMESDIR}
+post-install:
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.mk>
diff --git a/games/rockdodger/distinfo b/games/rockdodger/distinfo
index a26e343bbac4..0d29bf523337 100644
--- a/games/rockdodger/distinfo
+++ b/games/rockdodger/distinfo
@@ -1,2 +1,4 @@
-SHA256 (rockdodger-0.6.0a.tar.gz) = 3b6676676d47c1a4d6074c6b811f7a0449f1e4774b2200127c9096c489def17e
-SIZE (rockdodger-0.6.0a.tar.gz) = 410223
+SHA256 (rockdodger-0.9.0.tar.gz) = 7adcb0a4e6e835c7efaecee8cc12546ff4d439e1bfc2ddab8bbd15d4e1cab3b4
+SIZE (rockdodger-0.9.0.tar.gz) = 937247
+SHA256 (rockdodger.png) = 3ed4cdd14a583e0b2ec99693459808b241a70b4c5901bfe67e76855d4f7de8a9
+SIZE (rockdodger.png) = 2192
diff --git a/games/rockdodger/files/patch-Makefile b/games/rockdodger/files/patch-Makefile
new file mode 100644
index 000000000000..8982925bb29d
--- /dev/null
+++ b/games/rockdodger/files/patch-Makefile
@@ -0,0 +1,41 @@
+--- ./Makefile.orig	2013-05-19 00:02:10.000000000 +0200
++++ ./Makefile	2013-11-25 00:26:42.000000000 +0100
+@@ -34,9 +34,9 @@
+ datadir = $(datarootdir)
+ bindir = $(exec_prefix)/bin
+ docdir = $(datarootdir)/doc/$(PACKAGENAME)
+-mandir = $(datarootdir)/man
+-localstatedir = $(prefix)/var
+-gamesdir = $(localstatedir)/games
++#mandir = $(datarootdir)/man
++#localstatedir = $(prefix)/var
++gamesdir = $(prefix)/share/$(PACKAGENAME)
+ 
+ NEWD=$(PACKAGENAME)-$(VERSION)
+ COMPILEDATE=$(shell date '+%Y-%m-%d')
+@@ -53,7 +53,7 @@
+ 	blubats.o greeblies.o powerup.o rocks.o spacedots.o ship.o engine_exhaust.o laser.o \
+ 	mood_item.o sparkles.o \
+ 	rockdodger_globals.o intro.o main.o
+-MANPAGE=rockdodger.6
++#MANPAGE=rockdodger.6
+ 
+ ifeq ($(profile),1)
+ 	OPTIONS+=-pg
+@@ -102,11 +102,11 @@
+ 	-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
+ 
+ uninstall:
+ 	rm -f $(gamesdir)/rockdodger.scores
diff --git a/games/rockdodger/files/patch-main.c b/games/rockdodger/files/patch-main.c
deleted file mode 100644
index add96bff8433..000000000000
--- a/games/rockdodger/files/patch-main.c
+++ /dev/null
@@ -1,40 +0,0 @@
-
-$FreeBSD$
-
---- main.c.orig
-+++ main.c
-@@ -206,7 +206,6 @@
- struct bangdots bdot[MAX_BANG_DOTS], *bdotptr=bdot;
- struct spacedot sdot[MAX_SPACE_DOTS];
- 
--struct greeble greeb[MAX_GREEBLES];
- struct greeble {
-     int active;
-     float x,y; // When landed, these represent an offset from the host rock
-@@ -214,6 +213,8 @@
-     int landed;
-     int boredom; // Goes up while landed
- };
-+
-+struct greeble greeb[MAX_GREEBLES];
- // }}}
- 
- void init_greeblies() {
-@@ -459,7 +459,7 @@
-     else {
- 	char s[1024];
- 	umask(0177);
--	sprintf(s,"%s/.rockdodger_high",getenv("HOME"));
-+	snprintf(s,1024,"%s/.rockdodger_high",getenv("HOME"));
- 	if (f=fopen(s,mode)) {
- 	    umask(mask);
- 	    return f;
-@@ -478,7 +478,7 @@
- 	for (i=0; i<8; i++) {
- 	    char s[1024];
- 	    int highscore;
--	    if (fscanf (f, "%d %[^\n]", &highscore, s)!=2)
-+	    if (fscanf (f, "%d %1023[^\n]", &highscore, s)!=2)
- 		break;
- 	    if (high[i].allocated)
- 		free(high[i].name);
diff --git a/games/rockdodger/pkg-descr b/games/rockdodger/pkg-descr
index c34565718b0d..bb4639c32f46 100644
--- a/games/rockdodger/pkg-descr
+++ b/games/rockdodger/pkg-descr
@@ -1,6 +1,6 @@
 Addictive rock-dodging greeblie-killing platform game.
 
-Dodge the rocks for as long as possible until you die.  Kill greeblies to
+Dodge the rocks for as long as possible until you die. Kill greeblies to
 make the universe safe for non-greeblie life once again.
 
-WWW: http://spacerocks.sourceforge.net/
+WWW: https://code.google.com/p/rockdodger/
diff --git a/games/rockdodger/pkg-plist b/games/rockdodger/pkg-plist
index 51f9143a59ed..da33df085fed 100644
--- a/games/rockdodger/pkg-plist
+++ b/games/rockdodger/pkg-plist
@@ -1,51 +1,137 @@
-@group games
-@mode 2755
 bin/rockdodger
-@mode
-@group
-@exec touch /var/games/rockdodger.highscore ; chmod 664 /var/games/rockdodger.highscore
-@unexec if [ -f /var/games/rockdodger.highscore ] ; then rm /var/games/rockdodger.highscore; fi
-%%DATADIR%%/data/20P_Betadance.png
-%%DATADIR%%/data/4est_fulla3s.mod
-%%DATADIR%%/data/boom.wav
-%%DATADIR%%/data/booom.wav
-%%DATADIR%%/data/bzboom.wav
-%%DATADIR%%/data/cboom.wav
-%%DATADIR%%/data/deadrock0.bmp
-%%DATADIR%%/data/deadrock1.bmp
-%%DATADIR%%/data/deadrock2.bmp
-%%DATADIR%%/data/deadrock3.bmp
-%%DATADIR%%/data/deadrock4.bmp
-%%DATADIR%%/data/deadrock5.bmp
-%%DATADIR%%/data/dodgers.png
-%%DATADIR%%/data/game.png
-%%DATADIR%%/data/gameover.png
-%%DATADIR%%/data/gameover2.png
-%%DATADIR%%/data/gauge.png
-%%DATADIR%%/data/getzznew.mod
-%%DATADIR%%/data/greeblie0.bmp
-%%DATADIR%%/data/laser.png
-%%DATADIR%%/data/laser0.png
-%%DATADIR%%/data/laser1.png
-%%DATADIR%%/data/laserpowerup.png
-%%DATADIR%%/data/magic.mod
-%%DATADIR%%/data/over.png
-%%DATADIR%%/data/paused.png
-%%DATADIR%%/data/rock.png
-%%DATADIR%%/data/rock0.bmp
-%%DATADIR%%/data/rock1.bmp
-%%DATADIR%%/data/rock2.bmp
-%%DATADIR%%/data/rock3.bmp
-%%DATADIR%%/data/rock4.bmp
-%%DATADIR%%/data/rock5.bmp
-%%DATADIR%%/data/shield.png
-%%DATADIR%%/data/shield0.png
-%%DATADIR%%/data/shield1.png
-%%DATADIR%%/data/shieldpowerup.png
-%%DATADIR%%/data/ship.bmp
-%%DATADIR%%/data/ship2.bmp
-%%DATADIR%%/data/ship_small.bmp
-%%DATADIR%%/data/speedup.wav
-%%DATADIR%%/data/url.png
-@dirrm %%DATADIR%%/data
+share/pixmaps/rockdodger.png
+%%DATADIR%%/20P_Betadance.png
+%%DATADIR%%/24P_Arial_NeonYellow.png
+%%DATADIR%%/4est_fulla3s.mod
+%%DATADIR%%/SmallNeon.png
+%%DATADIR%%/boom.wav
+%%DATADIR%%/booom.wav
+%%DATADIR%%/bzboom.wav
+%%DATADIR%%/cboom.wav
+%%DATADIR%%/drip.wav
+%%DATADIR%%/fart.1.aiff
+%%DATADIR%%/fart.2.aiff
+%%DATADIR%%/fart.3.aiff
+%%DATADIR%%/fart.4.aiff
+%%DATADIR%%/front_1.mod
+%%DATADIR%%/getzznew.mod
+%%DATADIR%%/images/bb-dropping.00.xpm
+%%DATADIR%%/images/bb-dropping.01.xpm
+%%DATADIR%%/images/bb-dropping.02.xpm
+%%DATADIR%%/images/bb-dropping.03.xpm
+%%DATADIR%%/images/bb-dropping.04.xpm
+%%DATADIR%%/images/bb-dropping.05.xpm
+%%DATADIR%%/images/blubat.00.xpm
+%%DATADIR%%/images/blubat.01.xpm
+%%DATADIR%%/images/blubat.02.xpm
+%%DATADIR%%/images/blubat.03.xpm
+%%DATADIR%%/images/blubat.04.xpm
+%%DATADIR%%/images/deadicerock.00.png
+%%DATADIR%%/images/deadicerock.01.png
+%%DATADIR%%/images/deadicerock.02.png
+%%DATADIR%%/images/deadicerock.03.png
+%%DATADIR%%/images/deadlithiumrock.00.ilbm
+%%DATADIR%%/images/deadlithiumrock.01.ilbm
+%%DATADIR%%/images/deadrock0.bmp
+%%DATADIR%%/images/deadrock1.bmp
+%%DATADIR%%/images/deadrock2.bmp
+%%DATADIR%%/images/deadrock3.bmp
+%%DATADIR%%/images/deadrock4.bmp
+%%DATADIR%%/images/deadrock5.bmp
+%%DATADIR%%/images/deadrock6.bmp
+%%DATADIR%%/images/deadrock7.bmp
+%%DATADIR%%/images/dodgers.png
+%%DATADIR%%/images/exploding_rock.png
+%%DATADIR%%/images/game.png
+%%DATADIR%%/images/greeblie0.bmp
+%%DATADIR%%/images/greeblie1.bmp
+%%DATADIR%%/images/greeblie2.bmp
+%%DATADIR%%/images/greeblie3.bmp
+%%DATADIR%%/images/greeblie4.bmp
+%%DATADIR%%/images/greeblie5.bmp
+%%DATADIR%%/images/icerock.00.png
+%%DATADIR%%/images/icerock.01.png
+%%DATADIR%%/images/icerock.02.png
+%%DATADIR%%/images/icerock.03.png
+%%DATADIR%%/images/laserpowerup.00.png
+%%DATADIR%%/images/laserpowerup.01.png
+%%DATADIR%%/images/laserpowerup.02.png
+%%DATADIR%%/images/laserpowerup.03.png
+%%DATADIR%%/images/laserpowerup.04.png
+%%DATADIR%%/images/laserpowerup.05.png
+%%DATADIR%%/images/laserpowerup.06.png
+%%DATADIR%%/images/laserpowerup.07.png
+%%DATADIR%%/images/laserpowerup.08.png
+%%DATADIR%%/images/laserpowerup.09.png
+%%DATADIR%%/images/laserpowerup.0A.png
+%%DATADIR%%/images/laserpowerup.0B.png
+%%DATADIR%%/images/laserpowerup.0C.png
+%%DATADIR%%/images/laserpowerup.0D.png
+%%DATADIR%%/images/laserpowerup.0E.png
+%%DATADIR%%/images/laserpowerup.0F.png
+%%DATADIR%%/images/laserpowerup.10.png
+%%DATADIR%%/images/laserpowerup.11.png
+%%DATADIR%%/images/laserpowerup.12.png
+%%DATADIR%%/images/laserpowerup.13.png
+%%DATADIR%%/images/laserpowerup.14.png
+%%DATADIR%%/images/laserpowerup.15.png
+%%DATADIR%%/images/laserpowerup.16.png
+%%DATADIR%%/images/laserpowerup.17.png
+%%DATADIR%%/images/laserpowerup.18.png
+%%DATADIR%%/images/laserpowerup.19.png
+%%DATADIR%%/images/laserpowerup.1A.png
+%%DATADIR%%/images/laserpowerup.1B.png
+%%DATADIR%%/images/laserpowerup.1C.png
+%%DATADIR%%/images/laserpowerup.1D.png
+%%DATADIR%%/images/laserpowerup.1E.png
+%%DATADIR%%/images/laserpowerup.1F.png
+%%DATADIR%%/images/laserpowerup.png
+%%DATADIR%%/images/lithiumrock.00.ilbm
+%%DATADIR%%/images/lithiumrock.01.ilbm
+%%DATADIR%%/images/mood_item.00.png
+%%DATADIR%%/images/mood_item.01.png
+%%DATADIR%%/images/mood_item.02.png
+%%DATADIR%%/images/mood_item.03.png
+%%DATADIR%%/images/mood_item.04.png
+%%DATADIR%%/images/over.png
+%%DATADIR%%/images/rock.png
+%%DATADIR%%/images/rock0.bmp
+%%DATADIR%%/images/rock1.bmp
+%%DATADIR%%/images/rock2.bmp
+%%DATADIR%%/images/rock3.bmp
+%%DATADIR%%/images/rock4.bmp
+%%DATADIR%%/images/rock5.bmp
+%%DATADIR%%/images/rock6.bmp
+%%DATADIR%%/images/rock7.bmp
+%%DATADIR%%/images/shieldpowerup.00.png
+%%DATADIR%%/images/shieldpowerup.01.png
+%%DATADIR%%/images/shieldpowerup.02.png
+%%DATADIR%%/images/shieldpowerup.03.png
+%%DATADIR%%/images/shieldpowerup.04.png
+%%DATADIR%%/images/shieldpowerup.05.png
+%%DATADIR%%/images/shieldpowerup.06.png
+%%DATADIR%%/images/shieldpowerup.07.png
+%%DATADIR%%/images/shieldpowerup.png
+%%DATADIR%%/images/ship.00.png
+%%DATADIR%%/images/ship.01.png
+%%DATADIR%%/images/ship.02.png
+%%DATADIR%%/images/ship.03.png
+%%DATADIR%%/images/ship.04.png
+%%DATADIR%%/images/ship.05.png
+%%DATADIR%%/images/ship.06.png
+%%DATADIR%%/images/ship.07.png
+%%DATADIR%%/images/ship.08.png
+%%DATADIR%%/images/ship.09.png
+%%DATADIR%%/images/ship.0a.png
+%%DATADIR%%/images/ship.0b.png
+%%DATADIR%%/images/ship_small.png
+%%DATADIR%%/laser0.png
+%%DATADIR%%/laser1.png
+%%DATADIR%%/magic.mod
+%%DATADIR%%/paused.png
+%%DATADIR%%/ramcharg.mod
+%%DATADIR%%/shield0.png
+%%DATADIR%%/shield1.png
+%%DATADIR%%/speedup.wav
+@dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%