4 files changed, 114 insertions, 32 deletions

diff --git a/games/gnurobbo/Makefile b/games/gnurobbo/Makefile
index e2e6a0c62640..4a30fecbb8f1 100644
--- a/games/gnurobbo/Makefile
+++ b/games/gnurobbo/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	gnurobbo
-PORTVERSION=	0.61
+PORTVERSION=	0.64
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
+EXTRACT_SUFX=	-source.tar.gz
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Reimplementation of LK Avalon's Robbo for the Atari XE/XL
 
 USE_GMAKE=	yes
-USE_SDL=	sdl ttf
+USE_SDL=	sdl ttf mixer image
 
 MAKE_ENV=	DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}"
 
diff --git a/games/gnurobbo/distinfo b/games/gnurobbo/distinfo
index 831de0d3bf93..dc07c9cc4e1d 100644
--- a/games/gnurobbo/distinfo
+++ b/games/gnurobbo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnurobbo-0.61.tar.gz) = 587534e6d67ed37bac698aabcf8944ff
-SHA256 (gnurobbo-0.61.tar.gz) = 0c8b2052e572551991906b70e9c3e72afa29e2591e750975384278f27e453733
-SIZE (gnurobbo-0.61.tar.gz) = 746351
+MD5 (gnurobbo-0.64-source.tar.gz) = 0adb4741716d4e96b74db90494632240
+SHA256 (gnurobbo-0.64-source.tar.gz) = 0f95f9b0ba1e48d414c0cd89542a1c68be17c3aad706fd5d13eb9d8e247b6404
+SIZE (gnurobbo-0.64-source.tar.gz) = 1232463
diff --git a/games/gnurobbo/files/patch-Makefile b/games/gnurobbo/files/patch-Makefile
index f23c1506b41d..124ed0815482 100644
--- a/games/gnurobbo/files/patch-Makefile
+++ b/games/gnurobbo/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2009-03-02 21:56:14.000000000 +0300
-+++ Makefile	2009-03-05 17:58:17.000000000 +0300
+--- Makefile.orig	2009-12-07 19:17:37.000000000 +0300
++++ Makefile	2009-12-28 23:14:47.000000000 +0300
 @@ -8,9 +8,9 @@
  #BINDIR=$(HOME)/Games/$(TARGET)/
  #DOCDIR=$(HOME)/Games/$(TARGET)/
@@ -11,21 +11,27 @@
 +BINDIR=${PREFIX}/bin
 +DOCDIR=${DOCSDIR}
  
- #You won't need to alter these
- TARGET=gnurobbo
-@@ -19,11 +19,10 @@
- VERSION=`cat VERSION`
+ # Uncomment the line below if you want to have music support
+ #MUSIC=-DHAVE_MUSIC="yes"
+@@ -26,8 +26,8 @@
+ VERSION=$(shell cat VERSION)
  
- #These should be ok for most
--CC=gcc
--CFLAGS=-O3 -pipe -Wall -fomit-frame-pointer -I/usr/include `sdl-config --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)/\" 
--LINK=gcc
--LDFLAGS=-L/usr/lib
--LIBS=`sdl-config --libs` -lSDL_ttf
-+CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)/\" 
-+LINK=$(CC)
-+LDFLAGS=
-+LIBS=`$(SDL_CONFIG) --libs` -lSDL_ttf
+ # 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)
++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)
+ LINK=$(CC)
+ LDFLAGS=
+ LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF)
+@@ -47,10 +47,6 @@
+ 	rm $(OBJECTS)
  
- #You won't need to alter anything below
- all: $(SOURCES) $(TARGET)
+ 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
diff --git a/games/gnurobbo/pkg-plist b/games/gnurobbo/pkg-plist
index efdbc64fd816..a8dd38734be9 100644
--- a/games/gnurobbo/pkg-plist
+++ b/games/gnurobbo/pkg-plist
@@ -1,35 +1,110 @@
 bin/gnurobbo
+%%DATADIR%%/levels/boss.dat
+%%DATADIR%%/levels/designer.dat
+%%DATADIR%%/levels/k-robbo.dat
+%%DATADIR%%/levels/millenium_demo.dat
 %%DATADIR%%/levels/original.dat
-%%DATADIR%%/levels/robboix.dat
-%%DATADIR%%/levels/robbovii.dat
-%%DATADIR%%/levels/robboviii.dat
+%%DATADIR%%/levels/rob653924.dat
+%%DATADIR%%/levels/robbo01.dat
+%%DATADIR%%/levels/robbo02.dat
+%%DATADIR%%/levels/robbo03.dat
+%%DATADIR%%/levels/robbo04.dat
+%%DATADIR%%/levels/robbo05.dat
+%%DATADIR%%/levels/robbo07.dat
+%%DATADIR%%/levels/robbo08.dat
+%%DATADIR%%/levels/robbo09.dat
+%%DATADIR%%/levels/robbo10.dat
+%%DATADIR%%/levels/robbo11.dat
+%%DATADIR%%/levels/robbo12.dat
+%%DATADIR%%/levels/robbo13.dat
+%%DATADIR%%/levels/robbo2001.dat
+%%DATADIR%%/levels/robbo2009.dat
+%%DATADIR%%/levels/robbo97.dat
+%%DATADIR%%/levels/robbo98.dat
+%%DATADIR%%/levels/robbo_b.dat
+%%DATADIR%%/levels/warsaw.dat
+%%DATADIR%%/locales/de_DE/localerc
+%%DATADIR%%/locales/de_DE/text
 %%DATADIR%%/locales/en_GB/localerc
 %%DATADIR%%/locales/en_GB/text
 %%DATADIR%%/locales/pl_PL/localerc
 %%DATADIR%%/locales/pl_PL/text
-%%DATADIR%%/skins/original/LICENSE-font
+%%DATADIR%%/locales/ru_RU/localerc
+%%DATADIR%%/locales/ru_RU/text
+%%DATADIR%%/locales/sk_SK/localerc
+%%DATADIR%%/locales/sk_SK/text
+%%DATADIR%%/locales/sv_SE/localerc
+%%DATADIR%%/locales/sv_SE/text
+%%DATADIR%%/rob/robsprites.bmp
+%%DATADIR%%/skins/oily/alpha16.bmp
+%%DATADIR%%/skins/oily/alpha32.bmp
+%%DATADIR%%/skins/oily/background16.png
+%%DATADIR%%/skins/oily/background32.png
+%%DATADIR%%/skins/oily/ciphers16.bmp
+%%DATADIR%%/skins/oily/ciphers32.bmp
+%%DATADIR%%/skins/oily/font12x16.bmp
+%%DATADIR%%/skins/oily/font24x32.bmp
+%%DATADIR%%/skins/oily/icons16.png
+%%DATADIR%%/skins/oily/icons32.png
+%%DATADIR%%/skins/oily/robbo.ttf
+%%DATADIR%%/skins/oily/skinrc
 %%DATADIR%%/skins/original/alpha16.bmp
 %%DATADIR%%/skins/original/alpha32.bmp
 %%DATADIR%%/skins/original/ciphers16.bmp
 %%DATADIR%%/skins/original/ciphers32.bmp
-%%DATADIR%%/skins/original/icons16.bmp
-%%DATADIR%%/skins/original/icons32.bmp
+%%DATADIR%%/skins/original/font12x16.bmp
+%%DATADIR%%/skins/original/font24x32.bmp
+%%DATADIR%%/skins/original/icons16.png
+%%DATADIR%%/skins/original/icons32.png
 %%DATADIR%%/skins/original/robbo.ttf
 %%DATADIR%%/skins/original/skinrc
-%%DATADIR%%/skins/tronic/LICENSE-font
 %%DATADIR%%/skins/tronic/alpha16.bmp
 %%DATADIR%%/skins/tronic/alpha32.bmp
 %%DATADIR%%/skins/tronic/ciphers16.bmp
 %%DATADIR%%/skins/tronic/ciphers32.bmp
-%%DATADIR%%/skins/tronic/icons16.bmp
-%%DATADIR%%/skins/tronic/icons32.bmp
+%%DATADIR%%/skins/tronic/font12x16.bmp
+%%DATADIR%%/skins/tronic/font24x32.bmp
+%%DATADIR%%/skins/tronic/icons16.png
+%%DATADIR%%/skins/tronic/icons32.png
 %%DATADIR%%/skins/tronic/robbo.ttf
 %%DATADIR%%/skins/tronic/skinrc
+%%DATADIR%%/sounds/default/ammo.ogg
+%%DATADIR%%/sounds/default/bird.ogg
+%%DATADIR%%/sounds/default/bomb.ogg
+%%DATADIR%%/sounds/default/box.ogg
+%%DATADIR%%/sounds/default/capsule.ogg
+%%DATADIR%%/sounds/default/door_default.ogg
+%%DATADIR%%/sounds/default/end_default.ogg
+%%DATADIR%%/sounds/default/gun_default.ogg
+%%DATADIR%%/sounds/default/key.ogg
+%%DATADIR%%/sounds/default/kill.ogg
+%%DATADIR%%/sounds/default/magnet.ogg
+%%DATADIR%%/sounds/default/screw.ogg
+%%DATADIR%%/sounds/default/shoot_default.ogg
+%%DATADIR%%/sounds/default/teleport.ogg
+%%DATADIR%%/sounds/default/walk_default.ogg
+%%DATADIR%%/sounds/oily/door.ogg
+%%DATADIR%%/sounds/oily/end.ogg
+%%DATADIR%%/sounds/oily/gun.ogg
+%%DATADIR%%/sounds/oily/shoot.ogg
+%%DATADIR%%/sounds/oily/walk.ogg
+%%DATADIR%%/sounds/skins/default.dat
+%%DATADIR%%/sounds/skins/sounds_oily.dat
+@dirrm %%DATADIR%%/sounds/skins
+@dirrm %%DATADIR%%/sounds/oily
+@dirrm %%DATADIR%%/sounds/default
+@dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/skins/tronic
 @dirrm %%DATADIR%%/skins/original
+@dirrm %%DATADIR%%/skins/oily
 @dirrm %%DATADIR%%/skins
+@dirrm %%DATADIR%%/rob
+@dirrm %%DATADIR%%/locales/sv_SE
+@dirrm %%DATADIR%%/locales/sk_SK
+@dirrm %%DATADIR%%/locales/ru_RU
 @dirrm %%DATADIR%%/locales/pl_PL
 @dirrm %%DATADIR%%/locales/en_GB
+@dirrm %%DATADIR%%/locales/de_DE
 @dirrm %%DATADIR%%/locales
 @dirrm %%DATADIR%%/levels
 @dirrm %%DATADIR%%