- Fix the build with recent GCC [1]

- Utilize DATADIR macro in pkg-plist
- Canonicalize and reindent Makefile header
- Improve on port description

Reported by:	pointyhat (logs) [1]

4 files changed, 67 insertions, 50 deletions

diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile
index 27016517ddac..84f96256a749 100644
--- a/games/rockdodger/Makefile
+++ b/games/rockdodger/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for: rockdodger
-# Date created:		02 Dec 2002
-# Whom:			nbm
+# New ports collection makefile for:	Rock Dodger
+# Date created:				02 Dec 2002
+# Whom:					Neil Blakey-Milner <nbm@FreeBSD.org>
 #
 # $FreeBSD$
 #
diff --git a/games/rockdodger/files/patch-main.c b/games/rockdodger/files/patch-main.c
index edeaa6c35930..add96bff8433 100644
--- a/games/rockdodger/files/patch-main.c
+++ b/games/rockdodger/files/patch-main.c
@@ -3,6 +3,23 @@ $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];
diff --git a/games/rockdodger/pkg-descr b/games/rockdodger/pkg-descr
index afb5ffabcc78..c34565718b0d 100644
--- a/games/rockdodger/pkg-descr
+++ b/games/rockdodger/pkg-descr
@@ -1,6 +1,6 @@
-Addictive rock-dodging greeblie-killing platform game
+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: http://spacerocks.sourceforge.net/
diff --git a/games/rockdodger/pkg-plist b/games/rockdodger/pkg-plist
index 8768edbf1cef..4d5f2fa1c635 100644
--- a/games/rockdodger/pkg-plist
+++ b/games/rockdodger/pkg-plist
@@ -1,45 +1,45 @@
 bin/rockdodger
-share/rockdodger/data/20P_Betadance.png
-share/rockdodger/data/4est_fulla3s.mod
-share/rockdodger/data/boom.wav
-share/rockdodger/data/booom.wav
-share/rockdodger/data/bzboom.wav
-share/rockdodger/data/cboom.wav
-share/rockdodger/data/deadrock0.bmp
-share/rockdodger/data/deadrock1.bmp
-share/rockdodger/data/deadrock2.bmp
-share/rockdodger/data/deadrock3.bmp
-share/rockdodger/data/deadrock4.bmp
-share/rockdodger/data/deadrock5.bmp
-share/rockdodger/data/dodgers.png
-share/rockdodger/data/game.png
-share/rockdodger/data/gameover.png
-share/rockdodger/data/gameover2.png
-share/rockdodger/data/gauge.png
-share/rockdodger/data/getzznew.mod
-share/rockdodger/data/greeblie0.bmp
-share/rockdodger/data/laser.png
-share/rockdodger/data/laser0.png
-share/rockdodger/data/laser1.png
-share/rockdodger/data/laserpowerup.png
-share/rockdodger/data/magic.mod
-share/rockdodger/data/over.png
-share/rockdodger/data/paused.png
-share/rockdodger/data/rock.png
-share/rockdodger/data/rock0.bmp
-share/rockdodger/data/rock1.bmp
-share/rockdodger/data/rock2.bmp
-share/rockdodger/data/rock3.bmp
-share/rockdodger/data/rock4.bmp
-share/rockdodger/data/rock5.bmp
-share/rockdodger/data/shield.png
-share/rockdodger/data/shield0.png
-share/rockdodger/data/shield1.png
-share/rockdodger/data/shieldpowerup.png
-share/rockdodger/data/ship.bmp
-share/rockdodger/data/ship2.bmp
-share/rockdodger/data/ship_small.bmp
-share/rockdodger/data/speedup.wav
-share/rockdodger/data/url.png
-@dirrm share/rockdodger/data
-@dirrm share/rockdodger
+%%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
+@dirrm %%DATADIR%%