rocksndiamonds: 3.3.1.2 -> 4.1.4.1

3 files changed, 51 insertions, 30 deletions

diff --git a/rocksndiamonds/.footprint b/rocksndiamonds/.footprint
index 27c390898..2987d2d06 100644
--- a/rocksndiamonds/.footprint
+++ b/rocksndiamonds/.footprint
@@ -5,28 +5,37 @@ drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/rocksndiamonds/
 drwxr-xr-x	root/root	usr/share/rocksndiamonds/graphics/
 drwxr-xr-x	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksBusy.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksCE.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksDC.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksDC2.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksDoor.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksEMC.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksElements.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksFontBig.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksFontDC.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksFontEM.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksFontMedium.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksFontSmall.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksHeroes.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksMore.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksSP.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksScreen.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksToons.pcx
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksBusy.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksCE.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksDC.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksDC2.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksDF.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksDoor.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksDoor2.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksDoorMM.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksEMC.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksElements.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksFontBig.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksFontDC.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksFontEM.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksFontMedium.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksFontSmall.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksHeroes.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksIcon32x32.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksMM.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksMore.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksSP.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksScreen.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksToons.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/RocksTouch.png
 -rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/graphicsinfo.conf
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/mouse.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/rocks_icon.xbm
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/rocks_icon_32x32.pcx
--rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/rocks_iconmask.xbm
+drwxr-xr-x	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/joystick/
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/joystick/axis_x.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/joystick/axis_y.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/joystick/button.png
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/joystick/controller.png
+drwxr-xr-x	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/overlay/
+-rw-r--r--	root/root	usr/share/rocksndiamonds/graphics/gfx_classic/overlay/VirtualButtons.png
 drwxr-xr-x	root/root	usr/share/rocksndiamonds/levels/
 drwxr-xr-x	root/root	usr/share/rocksndiamonds/levels/Classic_Games/
 drwxr-xr-x	root/root	usr/share/rocksndiamonds/levels/Classic_Games/classic_boulderdash/
@@ -348,6 +357,7 @@ drwxr-xr-x	root/root	usr/share/rocksndiamonds/levels/Tutorials/
 -rw-r--r--	root/root	usr/share/rocksndiamonds/levels/Tutorials/levelinfo.conf
 drwxr-xr-x	root/root	usr/share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/
 -rw-r--r--	root/root	usr/share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/001.level
+-rw-r--r--	root/root	usr/share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/001.level.orig
 -rw-r--r--	root/root	usr/share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/002.level
 -rw-r--r--	root/root	usr/share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/003.level
 -rw-r--r--	root/root	usr/share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/004.level
@@ -507,35 +517,47 @@ drwxr-xr-x	root/root	usr/share/rocksndiamonds/sounds/snd_classic/
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/autsch.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/base.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/blurb.wav
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/bong.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/booom.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/bug.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/buing.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/deng.wav
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/door.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/empty.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/exit.wav
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/fuel.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/gate.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/gong.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/halloffame.wav
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/holz.wav
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/hui.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/infotron.wav
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/kabumm.wav
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/kink.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/klapper.wav
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/kling.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/klopf.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/klumpf.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/knack.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/knurk.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/lachen.wav
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/laser.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/miep.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/njam.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/oeffnen.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/pling.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/pong.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/pusch.wav
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/quiek.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/quirk.wav
--rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/rhythmloop.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/roaaar.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/roehr.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/schlurf.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/sirr.wav
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/slurp.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/soundsinfo.conf
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/warnton.wav
+-rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/whoosh.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/zisch.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/zonkdown.wav
 -rw-r--r--	root/root	usr/share/rocksndiamonds/sounds/snd_classic/zonkpush.wav
@@ -543,4 +565,3 @@ drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
 drwxr-xr-x	root/root	var/lib/games/
 drwxr-xr-x	root/root	var/lib/games/rocksndiamonds/
-drwxr-xr-x	root/root	var/lib/games/rocksndiamonds/scores/
diff --git a/rocksndiamonds/.signature b/rocksndiamonds/.signature
index 938da347a..9faf22b82 100644
--- a/rocksndiamonds/.signature
+++ b/rocksndiamonds/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF36eObSjKwLoeuBTqsLYGz3WDT/z+ZSmSxxV6Jx7mQaUl9Ml6izrZ0ff+ktPcEbHBzVeja2CtuEy5qjXdt90ZagU=
-SHA256 (Pkgfile) = f3535410d67d871d0448596e2c361309ac43d22f79c5499185fc3966a47e2f9b
-SHA256 (.footprint) = 1c6cfee7de71fff7825d23e5351d68356afb3a644767adc2b58eaa1371c23527
-SHA256 (rocksndiamonds-3.3.1.2.tar.gz) = c117c20026299c6c935bd531ef9b0dc767731f600881d12ceb80c831483755f3
+RWSagIOpLGJF3z8gXfkutz2b7uhhcG2L47LGQ6okJZWy/MuINSYrodT4dO5T+oDZLc9k763hbfRWYf/9d8RyBloZDTGE6cEZJgE=
+SHA256 (Pkgfile) = e45fc120def28fa0f0508e772df5a54c6147071533f53889cdb398d8202d9337
+SHA256 (.footprint) = 035603d9a464cf8ae453bc834930231e1a59c64f9ca0fbd6c2cf270d3dbda19f
+SHA256 (rocksndiamonds-4.1.4.1.tar.gz) = 0f65559070b24e8a82c27e7cae40243a8dcdca9028c4c9cc75487112129854ce
diff --git a/rocksndiamonds/Pkgfile b/rocksndiamonds/Pkgfile
index 696a4c14c..cfb357bbc 100644
--- a/rocksndiamonds/Pkgfile
+++ b/rocksndiamonds/Pkgfile
@@ -2,10 +2,10 @@
 # URL: https://www.artsoft.org/rocksndiamonds/
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Packager: James Mills, prologic at shortcircuit dot net dot au
-# Depends on: sdl_image sdl_mixer sdl_net
+# Depends on: sdl2_image sdl2_mixer sdl2_net
 
 name=rocksndiamonds
-version=3.3.1.2
+version=4.1.4.1
 release=1
 source=(http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-$version.tar.gz)
 
@@ -33,7 +33,7 @@ build() {
 	cp -r music $PKG/usr/share/rocksndiamonds
 	cp -r sounds $PKG/usr/share/rocksndiamonds
 
-	cp -r scores $PKG/var/lib/games/rocksndiamonds
+	#cp -r scores $PKG/var/lib/games/rocksndiamonds
 	install -D -m 0755 rocksndiamonds $PKG/usr/bin/rocksndiamonds
 
 	rm $PKG/usr/share/rocksndiamonds/levels/Tutorials/rnd_tutorial_niko_boehm/README