4 files changed, 40 insertions, 23 deletions

diff --git a/games/gnurobbo/Makefile b/games/gnurobbo/Makefile
index da545b742ce7..727737a386f2 100644
--- a/games/gnurobbo/Makefile
+++ b/games/gnurobbo/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	gnurobbo
-PORTVERSION=	0.64
-PORTREVISION=	3
+PORTVERSION=	0.65.6
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION:C/\.[0-9]$//}
 EXTRACT_SUFX=	-source.tar.gz
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -18,7 +17,9 @@ COMMENT=	Reimplementation of LK Avalon's Robbo for the Atari XE/XL
 USE_GMAKE=	yes
 USE_SDL=	sdl ttf mixer image
 
-MAKE_ENV=	DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}"
+MAKE_ENV=	PACKAGE_DATA_DIR="${DATADIR}" \
+		BINDIR="${PREFIX}/bin" \
+		DOCDIR="${DOCSDIR}"
 
 PORTDOCS=	*
 
diff --git a/games/gnurobbo/distinfo b/games/gnurobbo/distinfo
index dc07c9cc4e1d..69ca5981f90f 100644
--- a/games/gnurobbo/distinfo
+++ b/games/gnurobbo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnurobbo-0.64-source.tar.gz) = 0adb4741716d4e96b74db90494632240
-SHA256 (gnurobbo-0.64-source.tar.gz) = 0f95f9b0ba1e48d414c0cd89542a1c68be17c3aad706fd5d13eb9d8e247b6404
-SIZE (gnurobbo-0.64-source.tar.gz) = 1232463
+MD5 (gnurobbo-0.65.6-source.tar.gz) = bb7d2bc1282429ac5c0b89966b07e0cc
+SHA256 (gnurobbo-0.65.6-source.tar.gz) = fa473591f4347c203e4ee57c1f226f0bd312964bbb970483ef2c854e4240d2c9
+SIZE (gnurobbo-0.65.6-source.tar.gz) = 1483435
diff --git a/games/gnurobbo/files/patch-Makefile b/games/gnurobbo/files/patch-Makefile
index 124ed0815482..2048e1e8f36d 100644
--- a/games/gnurobbo/files/patch-Makefile
+++ b/games/gnurobbo/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2009-12-07 19:17:37.000000000 +0300
-+++ Makefile	2009-12-28 23:14:47.000000000 +0300
+--- Makefile.orig	2010-01-17 01:33:19.000000000 +0300
++++ Makefile	2010-05-24 18:32:35.000000000 +0400
 @@ -8,9 +8,9 @@
  #BINDIR=$(HOME)/Games/$(TARGET)/
  #DOCDIR=$(HOME)/Games/$(TARGET)/
@@ -7,31 +7,30 @@
 -PACKAGE_DATA_DIR=./data/
 -BINDIR=./
 -DOCDIR=./
-+PACKAGE_DATA_DIR=${DATADIR}
-+BINDIR=${PREFIX}/bin
-+DOCDIR=${DOCSDIR}
++PACKAGE_DATA_DIR?=./data/
++BINDIR?=./
++DOCDIR?=./
  
  # Uncomment the line below if you want to have music support
- #MUSIC=-DHAVE_MUSIC="yes"
-@@ -26,8 +26,8 @@
+ #MUSIC=-DHAVE_MUSIC
+@@ -28,8 +28,9 @@
  VERSION=$(shell cat VERSION)
  
  # These should be ok for most
 -SDL_CONFIG=sdl-config
--CFLAGS=-O3 -pipe -Wall -fomit-frame-pointer `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)/\" $(FONT_USE_PIXMAP) $(MUSIC)
+-CFLAGS=-O3 -pipe -Wall -fomit-frame-pointer `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)/\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER) 
 +SDL_CONFIG?=sdl-config
-+CFLAGS+=-Wall -fomit-frame-pointer `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)/\" $(FONT_USE_PIXMAP) $(MUSIC)
++CFLAGS?=-O3 -pipe
++CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)/\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER) 
  LINK=$(CC)
  LDFLAGS=
  LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF)
-@@ -47,10 +47,6 @@
+@@ -49,7 +50,7 @@
  	rm $(OBJECTS)
  
  install:
 -	@if [[ "$(PACKAGE_DATA_DIR)" == ./* ]] ; then \
--	echo "Installing into the current folder is not allowed."; \
--	exit 2; \
--	fi			
- 	mkdir -p $(PACKAGE_DATA_DIR)/levels
- 	mkdir -p $(PACKAGE_DATA_DIR)/sounds/default
- 	mkdir -p $(PACKAGE_DATA_DIR)/sounds/oily
++	@if [ "$(PACKAGE_DATA_DIR)" = ./data/ ] ; then \
+ 	echo "Installing into the current folder is not allowed."; \
+ 	exit 2; \
+ 	fi			
diff --git a/games/gnurobbo/pkg-plist b/games/gnurobbo/pkg-plist
index a8dd38734be9..96e5478c2885 100644
--- a/games/gnurobbo/pkg-plist
+++ b/games/gnurobbo/pkg-plist
@@ -1,6 +1,8 @@
 bin/gnurobbo
 %%DATADIR%%/levels/boss.dat
+%%DATADIR%%/levels/demo.dat
 %%DATADIR%%/levels/designer.dat
+%%DATADIR%%/levels/forever.dat
 %%DATADIR%%/levels/k-robbo.dat
 %%DATADIR%%/levels/millenium_demo.dat
 %%DATADIR%%/levels/original.dat
@@ -19,6 +21,7 @@ bin/gnurobbo
 %%DATADIR%%/levels/robbo13.dat
 %%DATADIR%%/levels/robbo2001.dat
 %%DATADIR%%/levels/robbo2009.dat
+%%DATADIR%%/levels/robbo3cs.dat
 %%DATADIR%%/levels/robbo97.dat
 %%DATADIR%%/levels/robbo98.dat
 %%DATADIR%%/levels/robbo_b.dat
@@ -27,6 +30,8 @@ bin/gnurobbo
 %%DATADIR%%/locales/de_DE/text
 %%DATADIR%%/locales/en_GB/localerc
 %%DATADIR%%/locales/en_GB/text
+%%DATADIR%%/locales/id_ID/localerc
+%%DATADIR%%/locales/id_ID/text
 %%DATADIR%%/locales/pl_PL/localerc
 %%DATADIR%%/locales/pl_PL/text
 %%DATADIR%%/locales/ru_RU/localerc
@@ -46,8 +51,11 @@ bin/gnurobbo
 %%DATADIR%%/skins/oily/font24x32.bmp
 %%DATADIR%%/skins/oily/icons16.png
 %%DATADIR%%/skins/oily/icons32.png
+%%DATADIR%%/skins/oily/k_icons16.png
+%%DATADIR%%/skins/oily/k_icons32.png
 %%DATADIR%%/skins/oily/robbo.ttf
 %%DATADIR%%/skins/oily/skinrc
+%%DATADIR%%/skins/oily/wm_icon.bmp
 %%DATADIR%%/skins/original/alpha16.bmp
 %%DATADIR%%/skins/original/alpha32.bmp
 %%DATADIR%%/skins/original/ciphers16.bmp
@@ -56,18 +64,26 @@ bin/gnurobbo
 %%DATADIR%%/skins/original/font24x32.bmp
 %%DATADIR%%/skins/original/icons16.png
 %%DATADIR%%/skins/original/icons32.png
+%%DATADIR%%/skins/original/k_icons16.png
+%%DATADIR%%/skins/original/k_icons32.png
 %%DATADIR%%/skins/original/robbo.ttf
 %%DATADIR%%/skins/original/skinrc
+%%DATADIR%%/skins/original/wm_icon.bmp
 %%DATADIR%%/skins/tronic/alpha16.bmp
 %%DATADIR%%/skins/tronic/alpha32.bmp
+%%DATADIR%%/skins/tronic/background16.png
+%%DATADIR%%/skins/tronic/background32.png
 %%DATADIR%%/skins/tronic/ciphers16.bmp
 %%DATADIR%%/skins/tronic/ciphers32.bmp
 %%DATADIR%%/skins/tronic/font12x16.bmp
 %%DATADIR%%/skins/tronic/font24x32.bmp
 %%DATADIR%%/skins/tronic/icons16.png
 %%DATADIR%%/skins/tronic/icons32.png
+%%DATADIR%%/skins/tronic/k_icons16.png
+%%DATADIR%%/skins/tronic/k_icons32.png
 %%DATADIR%%/skins/tronic/robbo.ttf
 %%DATADIR%%/skins/tronic/skinrc
+%%DATADIR%%/skins/tronic/wm_icon.bmp
 %%DATADIR%%/sounds/default/ammo.ogg
 %%DATADIR%%/sounds/default/bird.ogg
 %%DATADIR%%/sounds/default/bomb.ogg
@@ -103,6 +119,7 @@ bin/gnurobbo
 @dirrm %%DATADIR%%/locales/sk_SK
 @dirrm %%DATADIR%%/locales/ru_RU
 @dirrm %%DATADIR%%/locales/pl_PL
+@dirrm %%DATADIR%%/locales/id_ID
 @dirrm %%DATADIR%%/locales/en_GB
 @dirrm %%DATADIR%%/locales/de_DE
 @dirrm %%DATADIR%%/locales