- Update to 1.4

- Remove 4.x support

PR:		ports/115330
Submitted by:	Dmitry Marakasov <amdmi3 at amdmi3.ru> (maintainer)

8 files changed, 194 insertions, 137 deletions

diff --git a/games/stormbaancoureur/Makefile b/games/stormbaancoureur/Makefile
index 01c6a0386396..be2b6732f1b6 100644
--- a/games/stormbaancoureur/Makefile
+++ b/games/stormbaancoureur/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sturmbahnfahrer
-PORTVERSION=	1.3
-PORTREVISION=	2
+PORTVERSION=	1.4
 CATEGORIES=	games
 MASTER_SITES=	http://www.stolk.org/sturmbahnfahrer/download/ \
 		http://www.amdmi3.ru/distfiles/
@@ -20,21 +19,19 @@ BUILD_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode
 
 USE_GL=		yes
-USE_GCC=	3.4+
 
 MAKE_ENV=	DATADIR="${DATADIR}"
 
+BUILD_WRKSRC=	${WRKSRC}/src-sturmbahnfahrer
+INSTALL_WRKSRC=	${WRKSRC}/src-sturmbahnfahrer
+
 PORTDOCS=	README
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile on FreeBSD 4.x
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/games/sturmbahnfahrer|${DATADIR}|' \
-		${WRKSRC}/main.cxx
+		${WRKSRC}/src-sturmbahnfahrer/main.cxx
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/games/stormbaancoureur/distinfo b/games/stormbaancoureur/distinfo
index 5220c7011506..614e65a819b9 100644
--- a/games/stormbaancoureur/distinfo
+++ b/games/stormbaancoureur/distinfo
@@ -1,3 +1,3 @@
-MD5 (sturmbahnfahrer-1.3.tar.gz) = fae14d9e3a503928b4423825a7268cfa
-SHA256 (sturmbahnfahrer-1.3.tar.gz) = 69ffdb02121657983393874480f2106775bd7713cc817f2cee6f4435af9255c6
-SIZE (sturmbahnfahrer-1.3.tar.gz) = 3100944
+MD5 (sturmbahnfahrer-1.4.tar.gz) = a861fffe67c90aa5a0cd114e8e786541
+SHA256 (sturmbahnfahrer-1.4.tar.gz) = 4e324dc080c7c0b302aaf64a9f30640560d08ac73a869bb86a272acee79fe85a
+SIZE (sturmbahnfahrer-1.4.tar.gz) = 3090504
diff --git a/games/stormbaancoureur/files/patch-Makefile b/games/stormbaancoureur/files/patch-Makefile
deleted file mode 100644
index c4feba5a3a64..000000000000
--- a/games/stormbaancoureur/files/patch-Makefile
+++ /dev/null
@@ -1,105 +0,0 @@
---- Makefile.orig	Wed Sep  6 05:32:09 2006
-+++ Makefile	Wed Sep  6 05:32:14 2006
-@@ -1,17 +1,17 @@
- # EDIT THESE SETTINGS
- 
--PLIBPREFIX=/usr
--ODEPREFIX=/usr
--CXX=g++
-+PLIBPREFIX=$(X11BASE)
-+ODEPREFIX=$(X11BASE)
-+CXX?=g++
- 
- # END OF CUSTOM SETTINGS
- 
--CXXFLAGS=-I$(ODEPREFIX)/include -I$(PLIBPREFIX)/include -O2 -g -Wall
--LFLAGS=-L$(PLIBPREFIX)/lib -L/usr/X11R6/lib
-+CXXFLAGS+=-I$(ODEPREFIX)/include -I$(PLIBPREFIX)/include -g -Wall
-+LFLAGS+=-L$(PLIBPREFIX)/lib
- 
- OBJS=staticworldobject.o carobject.o controllerpad.o controllerkey.o main.o dynamicobject.o texture.o tga.o intro.o soundenginealsa.o vectortext.o postscore.o cartobject.o
- 
--LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lglut -lGLU -lGL -lasound
-+LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lglut -lGLU -lGL
- 
- 
- all: sturmbahnfahrer
-@@ -65,47 +65,46 @@
- clean:
- 	rm -f *.o sturmbahnfahrer
- 
--GAMEDIR=$(DESTDIR)/usr/share/games/sturmbahnfahrer
-+GAMEDIR=$(DATADIR)
- install: sturmbahnfahrer
- 	# Directories
--	mkdir -p $(DESTDIR)/usr/games/
- 	mkdir -p $(GAMEDIR)/images/
- 	mkdir -p $(GAMEDIR)/sounds/
- 	mkdir -p $(GAMEDIR)/models/
- 	# Binary
--	install sturmbahnfahrer $(DESTDIR)/usr/games/sturmbahnfahrer
-+	${BSD_INSTALL_PROGRAM} sturmbahnfahrer $(PREFIX)/bin/
- 	# Images
--	install -m 644 images/engine.tga $(GAMEDIR)/images/engine.tga
--	install -m 644 images/info_carpet_smooth.rgb $(GAMEDIR)/images/info_carpet_smooth.rgb
--	install -m 644 images/info_door_smooth.rgb $(GAMEDIR)/images/info_door_smooth.rgb
--	install -m 644 images/info_jump_smooth.rgb $(GAMEDIR)/images/info_jump_smooth.rgb
-+	${BSD_INSTALL_DATA} images/engine.tga $(GAMEDIR)/images/engine.tga
-+	${BSD_INSTALL_DATA} images/info_carpet_smooth.rgb $(GAMEDIR)/images/info_carpet_smooth.rgb
-+	${BSD_INSTALL_DATA} images/info_door_smooth.rgb $(GAMEDIR)/images/info_door_smooth.rgb
-+	${BSD_INSTALL_DATA} images/info_jump_smooth.rgb $(GAMEDIR)/images/info_jump_smooth.rgb
- 	# Sounds
--	install -m 644 sounds/rpm_graph.txt $(GAMEDIR)/sounds/rpm_graph.txt
--	install -m 644 sounds/camaro_s16_le.wav $(GAMEDIR)/sounds/camaro_s16_le.wav
--	install -m 644 sounds/detonationnorm_s16_le.wav $(GAMEDIR)/sounds/detonationnorm_s16_le.wav
-+	${BSD_INSTALL_DATA} sounds/rpm_graph.txt $(GAMEDIR)/sounds/rpm_graph.txt
-+	${BSD_INSTALL_DATA} sounds/camaro_s16_le.wav $(GAMEDIR)/sounds/camaro_s16_le.wav
-+	${BSD_INSTALL_DATA} sounds/detonationnorm_s16_le.wav $(GAMEDIR)/sounds/detonationnorm_s16_le.wav
- 	# Models
--	install -m 644 models/baseplate.3ds $(GAMEDIR)/models/baseplate.3ds
--	install -m 644 models/car.3ds $(GAMEDIR)/models/car.3ds
--	install -m 644 models/carpet.3ds $(GAMEDIR)/models/carpet.3ds
--	install -m 644 models/crate.3ds $(GAMEDIR)/models/crate.3ds
--	install -m 644 models/cratejump.3ds $(GAMEDIR)/models/cratejump.3ds
--	install -m 644 models/crate_low.3ds $(GAMEDIR)/models/crate_low.3ds
--	install -m 644 models/door.3ds $(GAMEDIR)/models/door.3ds
--	install -m 644 models/doorstand.3ds $(GAMEDIR)/models/doorstand.3ds
--	install -m 644 models/ferriswheelcart.3ds $(GAMEDIR)/models/ferriswheelcart.3ds
--	install -m 644 models/ferriswheelstand.3ds $(GAMEDIR)/models/ferriswheelstand.3ds
--	install -m 644 models/ferriswheelwheel.3ds $(GAMEDIR)/models/ferriswheelwheel.3ds
--	install -m 644 models/finishdoor.3ds $(GAMEDIR)/models/finishdoor.3ds
--	install -m 644 models/finishplank.3ds $(GAMEDIR)/models/finishplank.3ds
--	install -m 644 models/grid.3ds $(GAMEDIR)/models/grid.3ds
--	install -m 644 models/jumpboard.3ds $(GAMEDIR)/models/jumpboard.3ds
--	install -m 644 models/licplate.ac $(GAMEDIR)/models/licplate.ac
--	install -m 644 models/licplate.bmp $(GAMEDIR)/models/licplate.bmp
--	install -m 644 models/ramp.3ds $(GAMEDIR)/models/ramp.3ds
--	install -m 644 models/spikegate.3ds $(GAMEDIR)/models/spikegate.3ds
--	install -m 644 models/track.3ds $(GAMEDIR)/models/track.3ds
--	install -m 644 models/truck.3ds $(GAMEDIR)/models/truck.3ds
--	install -m 644 models/wheel.3ds $(GAMEDIR)/models/wheel.3ds
-+	${BSD_INSTALL_DATA} models/baseplate.3ds $(GAMEDIR)/models/baseplate.3ds
-+	${BSD_INSTALL_DATA} models/car.3ds $(GAMEDIR)/models/car.3ds
-+	${BSD_INSTALL_DATA} models/carpet.3ds $(GAMEDIR)/models/carpet.3ds
-+	${BSD_INSTALL_DATA} models/crate.3ds $(GAMEDIR)/models/crate.3ds
-+	${BSD_INSTALL_DATA} models/cratejump.3ds $(GAMEDIR)/models/cratejump.3ds
-+	${BSD_INSTALL_DATA} models/crate_low.3ds $(GAMEDIR)/models/crate_low.3ds
-+	${BSD_INSTALL_DATA} models/door.3ds $(GAMEDIR)/models/door.3ds
-+	${BSD_INSTALL_DATA} models/doorstand.3ds $(GAMEDIR)/models/doorstand.3ds
-+	${BSD_INSTALL_DATA} models/ferriswheelcart.3ds $(GAMEDIR)/models/ferriswheelcart.3ds
-+	${BSD_INSTALL_DATA} models/ferriswheelstand.3ds $(GAMEDIR)/models/ferriswheelstand.3ds
-+	${BSD_INSTALL_DATA} models/ferriswheelwheel.3ds $(GAMEDIR)/models/ferriswheelwheel.3ds
-+	${BSD_INSTALL_DATA} models/finishdoor.3ds $(GAMEDIR)/models/finishdoor.3ds
-+	${BSD_INSTALL_DATA} models/finishplank.3ds $(GAMEDIR)/models/finishplank.3ds
-+	${BSD_INSTALL_DATA} models/grid.3ds $(GAMEDIR)/models/grid.3ds
-+	${BSD_INSTALL_DATA} models/jumpboard.3ds $(GAMEDIR)/models/jumpboard.3ds
-+	${BSD_INSTALL_DATA} models/licplate.ac $(GAMEDIR)/models/licplate.ac
-+	${BSD_INSTALL_DATA} models/licplate.bmp $(GAMEDIR)/models/licplate.bmp
-+	${BSD_INSTALL_DATA} models/ramp.3ds $(GAMEDIR)/models/ramp.3ds
-+	${BSD_INSTALL_DATA} models/spikegate.3ds $(GAMEDIR)/models/spikegate.3ds
-+	${BSD_INSTALL_DATA} models/track.3ds $(GAMEDIR)/models/track.3ds
-+	${BSD_INSTALL_DATA} models/truck.3ds $(GAMEDIR)/models/truck.3ds
-+	${BSD_INSTALL_DATA} models/wheel.3ds $(GAMEDIR)/models/wheel.3ds
- 
- 
- deb:
diff --git a/games/stormbaancoureur/files/patch-soundenginealsa.cxx b/games/stormbaancoureur/files/patch-src-common-soundenginealsa.cxx
index e0891046e7ef..5dc18d152560 100644
--- a/games/stormbaancoureur/files/patch-soundenginealsa.cxx
+++ b/games/stormbaancoureur/files/patch-src-common-soundenginealsa.cxx
@@ -1,6 +1,6 @@
---- soundenginealsa.cxx.orig	Mon Sep  4 19:47:37 2006
-+++ soundenginealsa.cxx	Wed Sep  6 04:43:37 2006
-@@ -38,85 +38,20 @@
+--- src-common/soundenginealsa.cxx.orig	Thu May 17 20:02:03 2007
++++ src-common/soundenginealsa.cxx	Thu Aug  9 02:19:21 2007
+@@ -38,93 +38,20 @@
    complexfeed(0),
    enginefeed(0),
    activefeed(0),
@@ -10,6 +10,14 @@
    framelag(lag),
    lpfilter(0.0)
  {
+-  // test endiness
+-  unsigned int scratch=0;
+-  unsigned char *p = (unsigned char*) &scratch;
+-  *p = 1;
+-  assert(scratch == 1 || scratch == 16777216);
+-  SoundClip::bigendian = (scratch == 16777216);
+-  //fprintf(stderr,"soundenginealsa.cxx: %s endian\n", (SoundClip::bigendian)?"big":"little");
+-
 -  /* Open PCM device for playback. */
 -  int rc = snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, 0);
 -  if (rc < 0)
@@ -27,7 +35,7 @@
 -  /* Interleaved mode */
 -  snd_pcm_hw_params_set_access(handle, params, SND_PCM_ACCESS_RW_INTERLEAVED);
 -  /* Signed 16-bit little-endian format */
--  snd_pcm_hw_params_set_format(handle, params, SND_PCM_FORMAT_S16_LE);
+-  snd_pcm_hw_params_set_format(handle, params, (SoundClip::bigendian)?SND_PCM_FORMAT_S16_BE:SND_PCM_FORMAT_S16_LE);
 -  /* Two channels (stereo) */
 -  snd_pcm_hw_params_set_channels(handle, params, 2);
 -  /* 44100 bits/second sampling rate (CD quality) */
@@ -80,18 +88,59 @@
  }
  
   
- void SoundEngineAlsa::Play(const std::string &fname, int delay)
+ void SoundEngineAlsa::Play(const std::string &fname, int delay, bool looping)
+ {
+-  activefeed->Paste(fname, delay, looping);
+ }
+ 
+ 
+@@ -136,40 +63,11 @@
+ 
+ void SoundEngineAlsa::SetMode(const std::string &modename)
+ {
+-  if (modename=="complex")
+-  {
+-    activefeed = complexfeed;
+-    return;
+-  }
+-  if (modename=="simple")
+-  {
+-    activefeed = simplefeed;
+-    return;
+-  }
+-  if (modename=="modulated")
+-  {
+-    activefeed = modulatedfeed;
+-    return;
+-  }
+-  if (modename=="engine")
+-  {
+-    activefeed = enginefeed;
+-    return;
+-  }
+-  if (modename=="none")
+-  {
+-    activefeed = 0;
+-    return;
+-  }
+-  assert(0);
+ }
+ 
+ 
+ void SoundEngineAlsa::SetModulation(float freq, float ampl)
  {
--  activefeed->Paste(fname, delay);
+-  modulatedfeed->SetModulation(freq, ampl);
+-  complexfeed->SetModulation(freq, ampl);
+-  enginefeed->SetModulation(freq, ampl);
  }
  
  
-@@ -173,58 +108,7 @@
+@@ -182,58 +80,6 @@
  
  float SoundEngineAlsa::Sustain(void)
  {
 -  if (!activefeed)
-     return 0.0;
+-    return 0.0;
 -  snd_pcm_sframes_t delay;
 -  int avail = snd_pcm_avail_update(handle);
 -  int rc = snd_pcm_delay(handle, &delay);
@@ -113,7 +162,7 @@
 -
 -#if 0
 -  if (delay<0)
--    fprintf(stderr,"delay=%d, avail=%d, periodsz=%d\n", delay, avail, periodsz);
+-    fprintf(stderr,"delay=%d, avail=%d, periodsz=%d\n", (int) delay, (int) avail, (int) periodsz);
 -#else
 -  (void) avail;
 -#endif
diff --git a/games/stormbaancoureur/files/patch-soundenginealsa.h b/games/stormbaancoureur/files/patch-src-common-soundenginealsa.h
index c9b1967b194f..d1c186cdff00 100644
--- a/games/stormbaancoureur/files/patch-soundenginealsa.h
+++ b/games/stormbaancoureur/files/patch-src-common-soundenginealsa.h
@@ -1,14 +1,15 @@
---- soundenginealsa.h.orig	Mon Sep  4 19:47:37 2006
-+++ soundenginealsa.h	Wed Sep  6 04:38:00 2006
-@@ -2,7 +2,6 @@
+--- src-common/soundenginealsa.h.orig	Thu May 17 20:02:03 2007
++++ src-common/soundenginealsa.h	Thu Aug  9 02:17:07 2007
+@@ -2,8 +2,6 @@
  #ifndef SOUNDENGINE_ALSA_H
  #define SOUNDENGINE_ALSA_H
  
 -#include <alsa/asoundlib.h>
- 
+-
  class SoundClip;
  class SoundFeed;
-@@ -29,8 +28,6 @@
+ class SoundFeedSimple;
+@@ -29,8 +27,6 @@
      SoundFeedModulated *modulatedfeed;
      SoundFeedEngine    *enginefeed;
      SoundFeed          *activefeed;
diff --git a/games/stormbaancoureur/files/patch-src-sturmbahnfahrer-Makefile b/games/stormbaancoureur/files/patch-src-sturmbahnfahrer-Makefile
new file mode 100644
index 000000000000..8d53dfcee8f9
--- /dev/null
+++ b/games/stormbaancoureur/files/patch-src-sturmbahnfahrer-Makefile
@@ -0,0 +1,116 @@
+--- src-sturmbahnfahrer/Makefile.orig	Thu May 17 20:02:03 2007
++++ src-sturmbahnfahrer/Makefile	Thu Aug  9 02:28:39 2007
+@@ -6,19 +6,17 @@
+ 
+ PLIBPREFIX=$(HOME)
+ ODEPREFIX=$(HOME)
+-CXX=g++
++CXX?=g++
+ 
+ # END OF CUSTOM SETTINGS
+ 
+ CXXFLAGS=\
+-  -I$(ODEPREFIX)/include \
+-  -I$(PLIBPREFIX)/include \
++  -I$(LOCALBASE)/include \
+   -I../src-common \
+-  -O2 -g -Wall
++  -g -Wall
+ 
+ LFLAGS=\
+-  -L$(PLIBPREFIX)/lib \
+-  -L/usr/X11R6/lib
++  -L$(LOCALBASE)/lib
+ 
+ 
+ OBJS=\
+@@ -37,9 +35,9 @@
+ 
+ 
+ LIBS=\
+-  $(ODEPREFIX)/lib/libode.a \
++  $(LOCALBASE)/lib/libode.a \
+   -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul \
+-  -lglut -lGLU -lGL -lasound
++  -lglut -lGLU -lGL
+ 
+ 
+ all: sturmbahnfahrer
+@@ -94,44 +92,43 @@
+ GAMEDIR=$(DESTDIR)/usr/share/games/sturmbahnfahrer
+ install: sturmbahnfahrer
+ 	# Directories
+-	mkdir -p $(DESTDIR)/usr/games/
+-	mkdir -p $(GAMEDIR)/images/
+-	mkdir -p $(GAMEDIR)/sounds/
+-	mkdir -p $(GAMEDIR)/models/
++	mkdir -p $(DATADIR)/images/
++	mkdir -p $(DATADIR)/sounds/
++	mkdir -p $(DATADIR)/models/
+ 	# Binary
+-	install sturmbahnfahrer $(DESTDIR)/usr/games/sturmbahnfahrer
++	${BSD_INSTALL_PROGRAM} sturmbahnfahrer $(PREFIX)/bin/sturmbahnfahrer
+ 	# Images
+-	install -m 644 images/engine.tga $(GAMEDIR)/images/engine.tga
+-	install -m 644 images/info_carpet_smooth.rgb $(GAMEDIR)/images/info_carpet_smooth.rgb
+-	install -m 644 images/info_door_smooth.rgb $(GAMEDIR)/images/info_door_smooth.rgb
+-	install -m 644 images/info_jump_smooth.rgb $(GAMEDIR)/images/info_jump_smooth.rgb
++	${BSD_INSTALL_DATA} -m 644 images/engine.tga $(DATADIR)/images/engine.tga
++	${BSD_INSTALL_DATA} -m 644 images/info_carpet_smooth.rgb $(DATADIR)/images/info_carpet_smooth.rgb
++	${BSD_INSTALL_DATA} -m 644 images/info_door_smooth.rgb $(DATADIR)/images/info_door_smooth.rgb
++	${BSD_INSTALL_DATA} -m 644 images/info_jump_smooth.rgb $(DATADIR)/images/info_jump_smooth.rgb
+ 	# Sounds
+-	install -m 644 sounds/rpm_graph.txt $(GAMEDIR)/sounds/rpm_graph.txt
+-	install -m 644 sounds/camaro_s16_le.wav $(GAMEDIR)/sounds/camaro_s16_le.wav
+-	install -m 644 sounds/detonationnorm_s16_le.wav $(GAMEDIR)/sounds/detonationnorm_s16_le.wav
++	${BSD_INSTALL_DATA} -m 644 sounds/rpm_graph.txt $(DATADIR)/sounds/rpm_graph.txt
++	${BSD_INSTALL_DATA} -m 644 sounds/camaro_s16_le.wav $(DATADIR)/sounds/camaro_s16_le.wav
++	${BSD_INSTALL_DATA} -m 644 sounds/detonationnorm_s16_le.wav $(DATADIR)/sounds/detonationnorm_s16_le.wav
+ 	# Models
+-	install -m 644 models/baseplate.3ds $(GAMEDIR)/models/baseplate.3ds
+-	install -m 644 models/car.3ds $(GAMEDIR)/models/car.3ds
+-	install -m 644 models/carpet.3ds $(GAMEDIR)/models/carpet.3ds
+-	install -m 644 models/crate.3ds $(GAMEDIR)/models/crate.3ds
+-	install -m 644 models/cratejump.3ds $(GAMEDIR)/models/cratejump.3ds
+-	install -m 644 models/crate_low.3ds $(GAMEDIR)/models/crate_low.3ds
+-	install -m 644 models/door.3ds $(GAMEDIR)/models/door.3ds
+-	install -m 644 models/doorstand.3ds $(GAMEDIR)/models/doorstand.3ds
+-	install -m 644 models/ferriswheelcart.3ds $(GAMEDIR)/models/ferriswheelcart.3ds
+-	install -m 644 models/ferriswheelstand.3ds $(GAMEDIR)/models/ferriswheelstand.3ds
+-	install -m 644 models/ferriswheelwheel.3ds $(GAMEDIR)/models/ferriswheelwheel.3ds
+-	install -m 644 models/finishdoor.3ds $(GAMEDIR)/models/finishdoor.3ds
+-	install -m 644 models/finishplank.3ds $(GAMEDIR)/models/finishplank.3ds
+-	install -m 644 models/grid.3ds $(GAMEDIR)/models/grid.3ds
+-	install -m 644 models/jumpboard.3ds $(GAMEDIR)/models/jumpboard.3ds
+-	install -m 644 models/licplate.ac $(GAMEDIR)/models/licplate.ac
+-	install -m 644 models/licplate.bmp $(GAMEDIR)/models/licplate.bmp
+-	install -m 644 models/ramp.3ds $(GAMEDIR)/models/ramp.3ds
+-	install -m 644 models/spikegate.3ds $(GAMEDIR)/models/spikegate.3ds
+-	install -m 644 models/track.3ds $(GAMEDIR)/models/track.3ds
+-	install -m 644 models/truck.3ds $(GAMEDIR)/models/truck.3ds
+-	install -m 644 models/wheel.3ds $(GAMEDIR)/models/wheel.3ds
++	${BSD_INSTALL_DATA} -m 644 models/baseplate.3ds $(DATADIR)/models/baseplate.3ds
++	${BSD_INSTALL_DATA} -m 644 models/car.3ds $(DATADIR)/models/car.3ds
++	${BSD_INSTALL_DATA} -m 644 models/carpet.3ds $(DATADIR)/models/carpet.3ds
++	${BSD_INSTALL_DATA} -m 644 models/crate.3ds $(DATADIR)/models/crate.3ds
++	${BSD_INSTALL_DATA} -m 644 models/cratejump.3ds $(DATADIR)/models/cratejump.3ds
++	${BSD_INSTALL_DATA} -m 644 models/crate_low.3ds $(DATADIR)/models/crate_low.3ds
++	${BSD_INSTALL_DATA} -m 644 models/door.3ds $(DATADIR)/models/door.3ds
++	${BSD_INSTALL_DATA} -m 644 models/doorstand.3ds $(DATADIR)/models/doorstand.3ds
++	${BSD_INSTALL_DATA} -m 644 models/ferriswheelcart.3ds $(DATADIR)/models/ferriswheelcart.3ds
++	${BSD_INSTALL_DATA} -m 644 models/ferriswheelstand.3ds $(DATADIR)/models/ferriswheelstand.3ds
++	${BSD_INSTALL_DATA} -m 644 models/ferriswheelwheel.3ds $(DATADIR)/models/ferriswheelwheel.3ds
++	${BSD_INSTALL_DATA} -m 644 models/finishdoor.3ds $(DATADIR)/models/finishdoor.3ds
++	${BSD_INSTALL_DATA} -m 644 models/finishplank.3ds $(DATADIR)/models/finishplank.3ds
++	${BSD_INSTALL_DATA} -m 644 models/grid.3ds $(DATADIR)/models/grid.3ds
++	${BSD_INSTALL_DATA} -m 644 models/jumpboard.3ds $(DATADIR)/models/jumpboard.3ds
++	${BSD_INSTALL_DATA} -m 644 models/licplate.ac $(DATADIR)/models/licplate.ac
++	${BSD_INSTALL_DATA} -m 644 models/licplate.bmp $(DATADIR)/models/licplate.bmp
++	${BSD_INSTALL_DATA} -m 644 models/ramp.3ds $(DATADIR)/models/ramp.3ds
++	${BSD_INSTALL_DATA} -m 644 models/spikegate.3ds $(DATADIR)/models/spikegate.3ds
++	${BSD_INSTALL_DATA} -m 644 models/track.3ds $(DATADIR)/models/track.3ds
++	${BSD_INSTALL_DATA} -m 644 models/truck.3ds $(DATADIR)/models/truck.3ds
++	${BSD_INSTALL_DATA} -m 644 models/wheel.3ds $(DATADIR)/models/wheel.3ds
+ 
+ 
+ deb:
diff --git a/games/stormbaancoureur/files/patch-controllerpad.cxx b/games/stormbaancoureur/files/patch-src-sturmbahnfahrer-controllerpad.cxx
index 07c8069a2233..057236a9eb65 100644
--- a/games/stormbaancoureur/files/patch-controllerpad.cxx
+++ b/games/stormbaancoureur/files/patch-src-sturmbahnfahrer-controllerpad.cxx
@@ -1,5 +1,5 @@
---- controllerpad.cxx.orig	Mon Jul 17 00:26:08 2006
-+++ controllerpad.cxx	Mon Jul 17 00:28:23 2006
+--- src-sturmbahnfahrer/controllerpad.cxx.orig	Mon Jul 17 00:26:08 2006
++++ src-sturmbahnfahrer/controllerpad.cxx	Mon Jul 17 00:28:23 2006
 @@ -14,7 +14,6 @@
  #include <windows.h>
  #include <mmsystem.h>
diff --git a/games/stormbaancoureur/files/patch-main.cxx b/games/stormbaancoureur/files/patch-src-sturmbahnfahrer-main.cxx
index 04d93b7664db..c2c45b30027d 100644
--- a/games/stormbaancoureur/files/patch-main.cxx
+++ b/games/stormbaancoureur/files/patch-src-sturmbahnfahrer-main.cxx
@@ -1,10 +1,9 @@
---- main.cxx.orig	Mon Sep  4 20:04:09 2006
-+++ main.cxx	Wed Sep  6 05:03:34 2006
-@@ -655,13 +655,7 @@
-   fprintf(stderr,"plib is (c) by Steve Baker\n");
+--- src-sturmbahnfahrer/main.cxx.orig	Thu May 17 20:02:03 2007
++++ src-sturmbahnfahrer/main.cxx	Thu Aug  9 02:21:33 2007
+@@ -656,12 +656,7 @@
    fprintf(stderr,"OpenDE is (c) by Russel L. Smith\n");
  
--  char *bindirname  = dirname(argv[0]);
+   char *bindirname  = dirname(argv[0]);
 -  if (!strcmp(bindirname,"."))
      dirprefix="/usr/share/games/sturmbahnfahrer";
 -  else