- Update to 2.1.4

PR:		124211
Submitted by:	Dmitry Marakasov <amdmi3@amdmi3.ru> (maintainer)

4 files changed, 24 insertions, 118 deletions

diff --git a/games/stormbaancoureur/Makefile b/games/stormbaancoureur/Makefile
index 4b5e9bdcaa82..07cde113e04a 100644
--- a/games/stormbaancoureur/Makefile
+++ b/games/stormbaancoureur/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	stormbaancoureur
-PORTVERSION=	2.1.3
+PORTVERSION=	2.1.4
 CATEGORIES=	games
-MASTER_SITES=	http://bram.creative4vision.nl/sturmbahnfahrer/download/ \
+MASTER_SITES=	http://bram.creative4vision.nl/stormbaancoureur/download/ \
 		http://www.amdmi3.ru/distfiles/
 
 MAINTAINER=	amdmi3@amdmi3.ru
diff --git a/games/stormbaancoureur/distinfo b/games/stormbaancoureur/distinfo
index 60c7f30c954a..b34caab74d4b 100644
--- a/games/stormbaancoureur/distinfo
+++ b/games/stormbaancoureur/distinfo
@@ -1,3 +1,3 @@
-MD5 (stormbaancoureur-2.1.3.tar.gz) = 5475c64d85d0921f446cf9fbb3b73c35
-SHA256 (stormbaancoureur-2.1.3.tar.gz) = 55e6f47fd41387eb8f7b8ef66c1c6783ba7d9bf849dabbd94f9d7a93465e6376
-SIZE (stormbaancoureur-2.1.3.tar.gz) = 4015265
+MD5 (stormbaancoureur-2.1.4.tar.gz) = 67c363ebe0c6e7d36dc4ac338225fcff
+SHA256 (stormbaancoureur-2.1.4.tar.gz) = d265b56adf0575b55a16afa5908cccf9b2826f5f67d9870e5eeabd3842675c76
+SIZE (stormbaancoureur-2.1.4.tar.gz) = 3973561
diff --git a/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile b/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile
index 575691d663ae..8a418eece23f 100644
--- a/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile
+++ b/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile
@@ -1,6 +1,6 @@
---- src-stormbaancoureur/Makefile.orig	2008-02-08 21:00:29.000000000 +0300
-+++ src-stormbaancoureur/Makefile	2008-02-09 01:02:10.000000000 +0300
-@@ -5,7 +5,7 @@
+--- src-stormbaancoureur/Makefile.orig	2008-04-20 19:57:43.000000000 +0400
++++ src-stormbaancoureur/Makefile	2008-06-02 16:17:12.000000000 +0400
+@@ -5,23 +5,20 @@
  GLPREFIX=/usr
  PLIBPREFIX=/usr
  ODEPREFIX=/usr
@@ -8,9 +8,6 @@
 +CXX?=g++
  LIBDIRNAME=lib
  
- #PLIBPREFIX=$(HOME)
-@@ -14,17 +14,14 @@
- 
  # END OF CUSTOM SETTINGS
  
 -CXXFLAGS=\
@@ -20,6 +17,7 @@
 +CXXFLAGS+=\
 +  -I$(LOCALBASE)/include \
    -I../src-common \
+   -I. \
    -DGAMEVERSION=$(VERSION) \
 -  -O2 -g -Wall
 +  -g -Wall
@@ -31,7 +29,7 @@
  
  
  OBJS=\
-@@ -43,15 +40,15 @@
+@@ -39,15 +36,15 @@
  
  
  LIBS=\
@@ -50,114 +48,22 @@
  	$(CXX) -o stormbaancoureur $(OBJS) $(LFLAGS) $(LIBS)
  
  staticworldobject.o: ../src-common/staticworldobject.cxx ../src-common/staticworldobject.h ../src-common/worldobject.h
-@@ -102,64 +99,63 @@
- GAMEDIR=$(DESTDIR)/usr/share/games/stormbaancoureur
+@@ -92,16 +89,15 @@
+ clean:
+ 	rm -f *.o stormbaancoureur
+ 
+-GAMEDIR=$(DESTDIR)/usr/share/games/stormbaancoureur
++GAMEDIR=$(PREFIX)/share/stormbaancoureur
  install: stormbaancoureur
  	# Directories
 -	mkdir -p $(DESTDIR)/usr/games/
--	mkdir -p $(GAMEDIR)/images/
--	mkdir -p $(GAMEDIR)/sounds/
--	mkdir -p $(GAMEDIR)/shaders/
--	mkdir -p $(GAMEDIR)/models/
-+	mkdir -p $(DATADIR)/images/
-+	mkdir -p $(DATADIR)/sounds/
-+	mkdir -p $(DATADIR)/shaders/
-+	mkdir -p $(DATADIR)/models/
+ 	mkdir -p $(GAMEDIR)/images/
+ 	mkdir -p $(GAMEDIR)/sounds/
+ 	mkdir -p $(GAMEDIR)/shaders/
+ 	mkdir -p $(GAMEDIR)/models/
  	# Binary
 -	install stormbaancoureur $(DESTDIR)/usr/games/stormbaancoureur
-+	${BSD_INSTALL_PROGRAM} stormbaancoureur $(PREFIX)/bin/stormbaancoureur
++	install stormbaancoureur $(PREFIX)/bin/stormbaancoureur
  	# Images
--	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
--	install -m 644 images/spot.tga $(GAMEDIR)/images/spot.tga
-+	${BSD_INSTALL_DATA} images/info_carpet_smooth.rgb $(DATADIR)/images/info_carpet_smooth.rgb
-+	${BSD_INSTALL_DATA} images/info_door_smooth.rgb $(DATADIR)/images/info_door_smooth.rgb
-+	${BSD_INSTALL_DATA} images/info_jump_smooth.rgb $(DATADIR)/images/info_jump_smooth.rgb
-+	${BSD_INSTALL_DATA} images/spot.tga $(DATADIR)/images/spot.tga
- 	# 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 $(DATADIR)/sounds/rpm_graph.txt
-+	${BSD_INSTALL_DATA} sounds/camaro_s16_le.wav $(DATADIR)/sounds/camaro_s16_le.wav
-+	${BSD_INSTALL_DATA} sounds/detonationnorm_s16_le.wav $(DATADIR)/sounds/detonationnorm_s16_le.wav
-         # Shaders
--	install -m 644 shaders/bramlight.fp $(GAMEDIR)/shaders/bramlight.fp
--	install -m 644 shaders/bramlight.vp $(GAMEDIR)/shaders/bramlight.vp
-+	${BSD_INSTALL_DATA} shaders/bramlight.fp $(DATADIR)/shaders/bramlight.fp
-+	${BSD_INSTALL_DATA} shaders/bramlight.vp $(DATADIR)/shaders/bramlight.vp
- 	# Models (car parts)
--	install -m 644 models/coilspring.3ds $(GAMEDIR)/models/coilspring.3ds
--	install -m 644 models/fivespoke.3ds $(GAMEDIR)/models/fivespoke.3ds
--	install -m 644 models/frame.3ds $(GAMEDIR)/models/frame.3ds
--	install -m 644 models/leafspring.3ds $(GAMEDIR)/models/leafspring.3ds
--	install -m 644 models/rearaxle.3ds $(GAMEDIR)/models/rearaxle.3ds
--	install -m 644 models/spindle.3ds $(GAMEDIR)/models/spindle.3ds
--	install -m 644 models/wishbone.3ds $(GAMEDIR)/models/wishbone.3ds
-+	${BSD_INSTALL_DATA} models/coilspring.3ds $(DATADIR)/models/coilspring.3ds
-+	${BSD_INSTALL_DATA} models/fivespoke.3ds $(DATADIR)/models/fivespoke.3ds
-+	${BSD_INSTALL_DATA} models/frame.3ds $(DATADIR)/models/frame.3ds
-+	${BSD_INSTALL_DATA} models/leafspring.3ds $(DATADIR)/models/leafspring.3ds
-+	${BSD_INSTALL_DATA} models/rearaxle.3ds $(DATADIR)/models/rearaxle.3ds
-+	${BSD_INSTALL_DATA} models/spindle.3ds $(DATADIR)/models/spindle.3ds
-+	${BSD_INSTALL_DATA} models/wishbone.3ds $(DATADIR)/models/wishbone.3ds
- 	#install -m 644 models/car.3ds $(GAMEDIR)/models/car.3ds
- 	#install -m 644 models/wheel.3ds $(GAMEDIR)/models/wheel.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/truck.3ds $(GAMEDIR)/models/truck.3ds
- 	# Models (other)
--	install -m 644 models/baseplate.3ds $(GAMEDIR)/models/baseplate.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/floppy.3ds $(GAMEDIR)/models/floppy.3ds
--	install -m 644 models/grid.3ds $(GAMEDIR)/models/grid.3ds
--	install -m 644 models/highjump.3ds $(GAMEDIR)/models/highjump.3ds
--	install -m 644 models/jumpboard.3ds $(GAMEDIR)/models/jumpboard.3ds
--	install -m 644 models/monoramp.3ds $(GAMEDIR)/models/monoramp.3ds
--	install -m 644 models/piston.3ds $(GAMEDIR)/models/piston.3ds
--	install -m 644 models/ramp.3ds $(GAMEDIR)/models/ramp.3ds
--	install -m 644 models/rod.3ds $(GAMEDIR)/models/rod.3ds
--	install -m 644 models/spikegate.3ds $(GAMEDIR)/models/spikegate.3ds
--	install -m 644 models/terrain3.3ds $(GAMEDIR)/models/terrain3.3ds
--	install -m 644 models/track.3ds $(GAMEDIR)/models/track.3ds
--	install -m 644 models/turntable_ramp.3ds $(GAMEDIR)/models/turntable_ramp.3ds
--	install -m 644 models/turntable_wheel.3ds $(GAMEDIR)/models/turntable_wheel.3ds
-+	${BSD_INSTALL_DATA} models/baseplate.3ds $(DATADIR)/models/baseplate.3ds
-+	${BSD_INSTALL_DATA} models/carpet.3ds $(DATADIR)/models/carpet.3ds
-+	${BSD_INSTALL_DATA} models/crate.3ds $(DATADIR)/models/crate.3ds
-+	${BSD_INSTALL_DATA} models/cratejump.3ds $(DATADIR)/models/cratejump.3ds
-+	${BSD_INSTALL_DATA} models/crate_low.3ds $(DATADIR)/models/crate_low.3ds
-+	${BSD_INSTALL_DATA} models/door.3ds $(DATADIR)/models/door.3ds
-+	${BSD_INSTALL_DATA} models/doorstand.3ds $(DATADIR)/models/doorstand.3ds
-+	${BSD_INSTALL_DATA} models/ferriswheelcart.3ds $(DATADIR)/models/ferriswheelcart.3ds
-+	${BSD_INSTALL_DATA} models/ferriswheelstand.3ds $(DATADIR)/models/ferriswheelstand.3ds
-+	${BSD_INSTALL_DATA} models/ferriswheelwheel.3ds $(DATADIR)/models/ferriswheelwheel.3ds
-+	${BSD_INSTALL_DATA} models/finishdoor.3ds $(DATADIR)/models/finishdoor.3ds
-+	${BSD_INSTALL_DATA} models/finishplank.3ds $(DATADIR)/models/finishplank.3ds
-+	${BSD_INSTALL_DATA} models/floppy.3ds $(DATADIR)/models/floppy.3ds
-+	${BSD_INSTALL_DATA} models/grid.3ds $(DATADIR)/models/grid.3ds
-+	${BSD_INSTALL_DATA} models/highjump.3ds $(DATADIR)/models/highjump.3ds
-+	${BSD_INSTALL_DATA} models/jumpboard.3ds $(DATADIR)/models/jumpboard.3ds
-+	${BSD_INSTALL_DATA} models/monoramp.3ds $(DATADIR)/models/monoramp.3ds
-+	${BSD_INSTALL_DATA} models/piston.3ds $(DATADIR)/models/piston.3ds
-+	${BSD_INSTALL_DATA} models/ramp.3ds $(DATADIR)/models/ramp.3ds
-+	${BSD_INSTALL_DATA} models/rod.3ds $(DATADIR)/models/rod.3ds
-+	${BSD_INSTALL_DATA} models/spikegate.3ds $(DATADIR)/models/spikegate.3ds
-+	${BSD_INSTALL_DATA} models/terrain3.3ds $(DATADIR)/models/terrain3.3ds
-+	${BSD_INSTALL_DATA} models/track.3ds $(DATADIR)/models/track.3ds
-+	${BSD_INSTALL_DATA} models/turntable_ramp.3ds $(DATADIR)/models/turntable_ramp.3ds
-+	${BSD_INSTALL_DATA} models/turntable_wheel.3ds $(DATADIR)/models/turntable_wheel.3ds
- 
- deb:
- 	strip stormbaancoureur
+ 	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
diff --git a/games/stormbaancoureur/pkg-descr b/games/stormbaancoureur/pkg-descr
index 05584548c836..68b361cc732f 100644
--- a/games/stormbaancoureur/pkg-descr
+++ b/games/stormbaancoureur/pkg-descr
@@ -6,4 +6,4 @@ try to have the laws of physics work with you, not against you.
 
 Stormbaan Coureur is a game by Bram Stolk.
 
-WWW: http://www.sturmbahnfahrer.com/
+WWW: http://bram.creative4vision.nl/stormbaancoureur/