- Update to 1.1.0

PR:		ports/62418
Submitted by:	maintainer

4 files changed, 208 insertions, 122 deletions

diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index 826d9698fbdd..93eb64ee487c 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	neverball
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 CATEGORIES=	games
 MASTER_SITES=	http://icculus.org/neverball/
 
@@ -24,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_SDL=	image mixer ttf sdl
 
-DIRS=		back bgm map mtrl png shot snd sol ttf
+DIRS=		bgm map-rlk mtrl png shot-rlk snd sol-rlk ttf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|./data|${DATADIR}/data|g' \
diff --git a/games/neverball/distinfo b/games/neverball/distinfo
index 34d5fc206f9e..cfdd58788085 100644
--- a/games/neverball/distinfo
+++ b/games/neverball/distinfo
@@ -1,2 +1,2 @@
-MD5 (neverball-1.0.0.tar.bz2) = deeae79ed77594b79f7cc65d2ba97926
-SIZE (neverball-1.0.0.tar.bz2) = 6458816
+MD5 (neverball-1.1.0.tar.bz2) = 5d1b71a3779ab0072e87671f59fa8ea8
+SIZE (neverball-1.1.0.tar.bz2) = 6311768
diff --git a/games/neverball/files/patch-Makefile b/games/neverball/files/patch-Makefile
index 2f50a1e7e9a7..5019866e53b9 100644
--- a/games/neverball/files/patch-Makefile
+++ b/games/neverball/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Thu Oct 30 01:24:20 2003
-+++ Makefile	Thu Oct 30 01:25:30 2003
-@@ -3,18 +3,18 @@
+--- Makefile.orig	Tue Feb  3 16:40:40 2004
++++ Makefile	Fri Feb  6 02:45:24 2004
+@@ -3,8 +3,8 @@
  
  # Maybe you need one of these.  Maybe you don't.
  
@@ -11,11 +11,13 @@
  
  OGL_LIBS= -lGLU -lGL -lm
  #OGL_LIBS= -lm                                                # Think Different
- 
+@@ -12,11 +12,11 @@
  #------------------------------------------------------------------------------
  
--CFLAGS= -Wall -g -ansi $(shell sdl-config --cflags)
-+CFLAGS+= -Wall -g -ansi $(shell ${SDL_CONFIG} --cflags) ${X11_PATHI}
+ #CFLAGS= -Wall -pg -ansi $(shell sdl-config --cflags)
+-CFLAGS= -Wall -O3 -ansi $(shell sdl-config --cflags)
++CFLAGS+= -Wall -ansi $(shell ${SDL_CONFIG} --cflags) ${X11_PATHI}
+ #CFLAGS= -Wall -g -ansi $(shell sdl-config --cflags)
  
 -SDL_LIBS= $(shell sdl-config --libs)
 -FT2_LIBS= $(shell freetype-config --libs)
@@ -24,14 +26,14 @@
  
  MAPC_TARG= mapc
  GAME_TARG= neverball
-@@ -42,8 +42,8 @@
+@@ -45,8 +45,8 @@
  	glext.o  \
  	main.o
  
--MAPC_DEPS= $(GAME_SRCS:.c=.d)
 -GAME_DEPS= $(GAME_OBJS:.o=.d)
-+MAPC_DEPS= $(GAME_SRCS:.c)
+-MAPC_DEPS= $(MAPC_OBJS:.o=.d)
 +GAME_DEPS= $(GAME_OBJS:.o)
++MAPC_DEPS= $(MAPC_OBJS:.o)
  
  MAPC_LIBS= $(X11_PATH) $(SDL_LIBS) -lSDL_image $(OGL_LIBS)
  GAME_LIBS= $(X11_PATH) $(SDL_LIBS) -lSDL_image -lSDL_ttf -lSDL_mixer $(FT2_LIBS) $(OGL_LIBS)
diff --git a/games/neverball/pkg-plist b/games/neverball/pkg-plist
index 433a96e5525e..6e131cb2f335 100644
--- a/games/neverball/pkg-plist
+++ b/games/neverball/pkg-plist
@@ -1,92 +1,110 @@
 bin/neverball
-share/neverball/data/back/flood_d.jpg
-share/neverball/data/back/flood_e.jpg
-share/neverball/data/back/flood_n.jpg
-share/neverball/data/back/flood_s.jpg
-share/neverball/data/back/flood_u.jpg
-share/neverball/data/back/flood_w.jpg
-share/neverball/data/back/haze_d.jpg
-share/neverball/data/back/haze_e.jpg
-share/neverball/data/back/haze_n.jpg
-share/neverball/data/back/haze_s.jpg
-share/neverball/data/back/haze_u.jpg
-share/neverball/data/back/haze_w.jpg
-share/neverball/data/back/snow_d.jpg
-share/neverball/data/back/snow_e.jpg
-share/neverball/data/back/snow_n.jpg
-share/neverball/data/back/snow_s.jpg
-share/neverball/data/back/snow_u.jpg
-share/neverball/data/back/snow_w.jpg
 share/neverball/data/bgm/flood.ogg
 share/neverball/data/bgm/haze.ogg
 share/neverball/data/bgm/inter.ogg
 share/neverball/data/bgm/snow.ogg
 share/neverball/data/bgm/title.ogg
-share/neverball/data/levels.txt
-share/neverball/data/map/00_title.map
-share/neverball/data/map/01_easy.map
-share/neverball/data/map/02_coin.map
-share/neverball/data/map/03_slow.map
-share/neverball/data/map/04_fence.map
-share/neverball/data/map/05_fall.map
-share/neverball/data/map/06_move.map
-share/neverball/data/map/07_waka.map
-share/neverball/data/map/08_curve.map
-share/neverball/data/map/09_maze.map
-share/neverball/data/map/10_spiral.map
-share/neverball/data/map/11_ramp.map
-share/neverball/data/map/12_goal.map
-share/neverball/data/map/13_pyramid.map
-share/neverball/data/map/14_quads.map
-share/neverball/data/map/15_frog.map
-share/neverball/data/map/16_angle.map
-share/neverball/data/map/17_spread.map
-share/neverball/data/map/18_four.map
-share/neverball/data/map/19_hump.map
-share/neverball/data/map/20_movers.map
-share/neverball/data/map/21_poke.map
-share/neverball/data/map/22_ring.map
-share/neverball/data/map/23_tele.map
-share/neverball/data/map/24_marble.map
+share/neverball/data/levels-easy.txt
+share/neverball/data/levels-hard.txt
+share/neverball/data/map-rlk/angle.map
+share/neverball/data/map-rlk/bumper.map
+share/neverball/data/map-rlk/bumps.map
+share/neverball/data/map-rlk/check.map
+share/neverball/data/map-rlk/coins.map
+share/neverball/data/map-rlk/corners.map
+share/neverball/data/map-rlk/curbs.map
+share/neverball/data/map-rlk/curved.map
+share/neverball/data/map-rlk/drops.map
+share/neverball/data/map-rlk/easy.map
+share/neverball/data/map-rlk/easytele.map
+share/neverball/data/map-rlk/fence.map
+share/neverball/data/map-rlk/four.map
+share/neverball/data/map-rlk/frogger.map
+share/neverball/data/map-rlk/gaps.map
+share/neverball/data/map-rlk/goals.map
+share/neverball/data/map-rlk/goslow.map
+share/neverball/data/map-rlk/greed.map
+share/neverball/data/map-rlk/grid.map
+share/neverball/data/map-rlk/hole.map
+share/neverball/data/map-rlk/hump.map
+share/neverball/data/map-rlk/invis.map
+share/neverball/data/map-rlk/islands.map
+share/neverball/data/map-rlk/locks.map
+share/neverball/data/map-rlk/maze.map
+share/neverball/data/map-rlk/mover.map
+share/neverball/data/map-rlk/movers.map
+share/neverball/data/map-rlk/peasy.map
+share/neverball/data/map-rlk/pipe.map
+share/neverball/data/map-rlk/plinko.map
+share/neverball/data/map-rlk/poker.map
+share/neverball/data/map-rlk/pyramid.map
+share/neverball/data/map-rlk/quads.map
+share/neverball/data/map-rlk/rampdn.map
+share/neverball/data/map-rlk/rampup.map
+share/neverball/data/map-rlk/ring.map
+share/neverball/data/map-rlk/risers.map
+share/neverball/data/map-rlk/spiraldn.map
+share/neverball/data/map-rlk/spiralin.map
+share/neverball/data/map-rlk/spiralup.map
+share/neverball/data/map-rlk/spread.map
+share/neverball/data/map-rlk/stairs.map
+share/neverball/data/map-rlk/sync.map
+share/neverball/data/map-rlk/telemaze.map
+share/neverball/data/map-rlk/teleport.map
+share/neverball/data/map-rlk/tilt.map
+share/neverball/data/map-rlk/timer.map
+share/neverball/data/map-rlk/title.map
+share/neverball/data/map-rlk/wakka.map
+share/neverball/data/map-rlk/zigzag.map
+share/neverball/data/mtrl/arrow
 share/neverball/data/mtrl/arrow-green
 share/neverball/data/mtrl/arrow-green.jpg
+share/neverball/data/mtrl/arrow.tga
 share/neverball/data/mtrl/back-red
 share/neverball/data/mtrl/back-red.jpg
 share/neverball/data/mtrl/blue
 share/neverball/data/mtrl/blue.jpg
 share/neverball/data/mtrl/caution
 share/neverball/data/mtrl/caution.jpg
+share/neverball/data/mtrl/coin-blue
+share/neverball/data/mtrl/coin-blue.jpg
+share/neverball/data/mtrl/coin-red
+share/neverball/data/mtrl/coin-red.jpg
 share/neverball/data/mtrl/coin-small-green
 share/neverball/data/mtrl/coin-small-green.jpg
 share/neverball/data/mtrl/dark-glass
 share/neverball/data/mtrl/dark-glass.jpg
 share/neverball/data/mtrl/edge
+share/neverball/data/mtrl/edge-blue
+share/neverball/data/mtrl/edge-blue.jpg
 share/neverball/data/mtrl/edge-brown-grey
 share/neverball/data/mtrl/edge-brown-grey.jpg
 share/neverball/data/mtrl/edge-green-grey
 share/neverball/data/mtrl/edge-green-grey-offset
 share/neverball/data/mtrl/edge-green-grey-offset.jpg
 share/neverball/data/mtrl/edge-green-grey.jpg
+share/neverball/data/mtrl/edge-red
+share/neverball/data/mtrl/edge-red.jpg
 share/neverball/data/mtrl/edge.jpg
 share/neverball/data/mtrl/glass
 share/neverball/data/mtrl/glass.jpg
 share/neverball/data/mtrl/goal
-share/neverball/data/mtrl/goal-green
-share/neverball/data/mtrl/goal-green.jpg
 share/neverball/data/mtrl/goal.tga
 share/neverball/data/mtrl/invisible
 share/neverball/data/mtrl/invisible.tga
 share/neverball/data/mtrl/jump
 share/neverball/data/mtrl/jump.tga
-share/neverball/data/mtrl/mm-grid
-share/neverball/data/mtrl/mm-grid.jpg
-share/neverball/data/mtrl/mm-rail
-share/neverball/data/mtrl/mm-rail.jpg
-share/neverball/data/mtrl/mm-wall
-share/neverball/data/mtrl/mm-wall.jpg
 share/neverball/data/mtrl/mtrl.shader
 share/neverball/data/mtrl/rail
 share/neverball/data/mtrl/rail.jpg
+share/neverball/data/mtrl/red
+share/neverball/data/mtrl/red.jpg
+share/neverball/data/mtrl/switch
+share/neverball/data/mtrl/switch.tga
+share/neverball/data/mtrl/timer
+share/neverball/data/mtrl/timer.tga
+share/neverball/data/mtrl/turf-blue
+share/neverball/data/mtrl/turf-blue.jpg
 share/neverball/data/mtrl/turf-brown
 share/neverball/data/mtrl/turf-brown.jpg
 share/neverball/data/mtrl/turf-green
@@ -95,6 +113,8 @@ share/neverball/data/mtrl/turf-green-offset.jpg
 share/neverball/data/mtrl/turf-green.jpg
 share/neverball/data/mtrl/turf-grey
 share/neverball/data/mtrl/turf-grey.jpg
+share/neverball/data/mtrl/turf-red
+share/neverball/data/mtrl/turf-red.jpg
 share/neverball/data/mtrl/turf-small-green
 share/neverball/data/mtrl/turf-small-green.jpg
 share/neverball/data/mtrl/wood
@@ -102,42 +122,82 @@ share/neverball/data/mtrl/wood-check
 share/neverball/data/mtrl/wood-check.jpg
 share/neverball/data/mtrl/wood.jpg
 share/neverball/data/png/ball.png
+share/neverball/data/png/blues.png
 share/neverball/data/png/coin.png
+share/neverball/data/png/colorful.png
+share/neverball/data/png/deep_blue.png
 share/neverball/data/png/eyeball.png
+share/neverball/data/png/fire.png
+share/neverball/data/png/fire_white.png
+share/neverball/data/png/france.png
+share/neverball/data/png/green_blue.png
+share/neverball/data/png/greys_blues.png
+share/neverball/data/png/horiz_one.png
+share/neverball/data/png/horiz_two.png
 share/neverball/data/png/part.png
+share/neverball/data/png/pastel.png
 share/neverball/data/png/shadow.png
-share/neverball/data/scores.txt
-share/neverball/data/shot/00_title.jpg
-share/neverball/data/shot/01_easy.jpg
-share/neverball/data/shot/02_coin.jpg
-share/neverball/data/shot/03_slow.jpg
-share/neverball/data/shot/04_fence.jpg
-share/neverball/data/shot/05_fall.jpg
-share/neverball/data/shot/06_move.jpg
-share/neverball/data/shot/07_waka.jpg
-share/neverball/data/shot/08_curve.jpg
-share/neverball/data/shot/09_maze.jpg
-share/neverball/data/shot/10_spiral.jpg
-share/neverball/data/shot/11_ramp.jpg
-share/neverball/data/shot/12_goal.jpg
-share/neverball/data/shot/13_pyramid.jpg
-share/neverball/data/shot/14_quads.jpg
-share/neverball/data/shot/15_frog.jpg
-share/neverball/data/shot/16_angle.jpg
-share/neverball/data/shot/17_spread.jpg
-share/neverball/data/shot/18_four.jpg
-share/neverball/data/shot/19_hump.jpg
-share/neverball/data/shot/20_movers.jpg
-share/neverball/data/shot/21_poke.jpg
-share/neverball/data/shot/22_ring.jpg
-share/neverball/data/shot/23_tele.jpg
-share/neverball/data/shot/24_marble.jpg
+share/neverball/data/png/skyline.png
+share/neverball/data/png/tropic.png
+share/neverball/data/scores-easy.txt
+share/neverball/data/scores-hard.txt
+share/neverball/data/sets.txt
+share/neverball/data/shot-rlk/angle.jpg
+share/neverball/data/shot-rlk/bumper.jpg
+share/neverball/data/shot-rlk/bumps.jpg
+share/neverball/data/shot-rlk/check.jpg
+share/neverball/data/shot-rlk/coins.jpg
+share/neverball/data/shot-rlk/corners.jpg
+share/neverball/data/shot-rlk/curbs.jpg
+share/neverball/data/shot-rlk/curved.jpg
+share/neverball/data/shot-rlk/drops.jpg
+share/neverball/data/shot-rlk/easy.jpg
+share/neverball/data/shot-rlk/easytele.jpg
+share/neverball/data/shot-rlk/fence.jpg
+share/neverball/data/shot-rlk/four.jpg
+share/neverball/data/shot-rlk/frogger.jpg
+share/neverball/data/shot-rlk/gaps.jpg
+share/neverball/data/shot-rlk/goals.jpg
+share/neverball/data/shot-rlk/goslow.jpg
+share/neverball/data/shot-rlk/greed.jpg
+share/neverball/data/shot-rlk/grid.jpg
+share/neverball/data/shot-rlk/hole.jpg
+share/neverball/data/shot-rlk/hump.jpg
+share/neverball/data/shot-rlk/invis.jpg
+share/neverball/data/shot-rlk/islands.jpg
+share/neverball/data/shot-rlk/locks.jpg
+share/neverball/data/shot-rlk/maze.jpg
+share/neverball/data/shot-rlk/mover.jpg
+share/neverball/data/shot-rlk/movers.jpg
+share/neverball/data/shot-rlk/peasy.jpg
+share/neverball/data/shot-rlk/pipe.jpg
+share/neverball/data/shot-rlk/plinko.jpg
+share/neverball/data/shot-rlk/poker.jpg
+share/neverball/data/shot-rlk/pyramid.jpg
+share/neverball/data/shot-rlk/quads.jpg
+share/neverball/data/shot-rlk/rampdn.jpg
+share/neverball/data/shot-rlk/rampup.jpg
+share/neverball/data/shot-rlk/ring.jpg
+share/neverball/data/shot-rlk/risers.jpg
+share/neverball/data/shot-rlk/spiraldn.jpg
+share/neverball/data/shot-rlk/spiralin.jpg
+share/neverball/data/shot-rlk/spiralup.jpg
+share/neverball/data/shot-rlk/spread.jpg
+share/neverball/data/shot-rlk/stairs.jpg
+share/neverball/data/shot-rlk/sync.jpg
+share/neverball/data/shot-rlk/telemaze.jpg
+share/neverball/data/shot-rlk/teleport.jpg
+share/neverball/data/shot-rlk/tilt.jpg
+share/neverball/data/shot-rlk/timer.jpg
+share/neverball/data/shot-rlk/title.jpg
+share/neverball/data/shot-rlk/wakka.jpg
+share/neverball/data/shot-rlk/zigzag.jpg
 share/neverball/data/snd/ball.ogg
 share/neverball/data/snd/bump.ogg
 share/neverball/data/snd/coin.wav
 share/neverball/data/snd/fall.ogg
 share/neverball/data/snd/go.ogg
-share/neverball/data/snd/goal.ogg
+share/neverball/data/snd/goal.wav
 share/neverball/data/snd/jump.ogg
 share/neverball/data/snd/menu.wav
 share/neverball/data/snd/over.ogg
@@ -145,43 +205,68 @@ share/neverball/data/snd/ready.ogg
 share/neverball/data/snd/record.ogg
 share/neverball/data/snd/select.ogg
 share/neverball/data/snd/set.ogg
+share/neverball/data/snd/switch.wav
 share/neverball/data/snd/tick.ogg
 share/neverball/data/snd/time.ogg
 share/neverball/data/snd/tock.ogg
-share/neverball/data/sol/00_title.sol
-share/neverball/data/sol/01_easy.sol
-share/neverball/data/sol/02_coin.sol
-share/neverball/data/sol/03_slow.sol
-share/neverball/data/sol/04_fence.sol
-share/neverball/data/sol/05_fall.sol
-share/neverball/data/sol/06_move.sol
-share/neverball/data/sol/07_waka.sol
-share/neverball/data/sol/08_curve.sol
-share/neverball/data/sol/09_maze.sol
-share/neverball/data/sol/10_spiral.sol
-share/neverball/data/sol/11_ramp.sol
-share/neverball/data/sol/12_goal.sol
-share/neverball/data/sol/13_pyramid.sol
-share/neverball/data/sol/14_quads.sol
-share/neverball/data/sol/15_frog.sol
-share/neverball/data/sol/16_angle.sol
-share/neverball/data/sol/17_spread.sol
-share/neverball/data/sol/18_four.sol
-share/neverball/data/sol/19_hump.sol
-share/neverball/data/sol/20_movers.sol
-share/neverball/data/sol/21_poke.sol
-share/neverball/data/sol/22_ring.sol
-share/neverball/data/sol/23_tele.sol
-share/neverball/data/sol/24_marble.sol
+share/neverball/data/sol-rlk/angle.sol
+share/neverball/data/sol-rlk/bumper.sol
+share/neverball/data/sol-rlk/bumps.sol
+share/neverball/data/sol-rlk/check.sol
+share/neverball/data/sol-rlk/coins.sol
+share/neverball/data/sol-rlk/corners.sol
+share/neverball/data/sol-rlk/curbs.sol
+share/neverball/data/sol-rlk/curved.sol
+share/neverball/data/sol-rlk/drops.sol
+share/neverball/data/sol-rlk/easy.sol
+share/neverball/data/sol-rlk/easytele.sol
+share/neverball/data/sol-rlk/fence.sol
+share/neverball/data/sol-rlk/four.sol
+share/neverball/data/sol-rlk/frogger.sol
+share/neverball/data/sol-rlk/gaps.sol
+share/neverball/data/sol-rlk/goals.sol
+share/neverball/data/sol-rlk/goslow.sol
+share/neverball/data/sol-rlk/greed.sol
+share/neverball/data/sol-rlk/grid.sol
+share/neverball/data/sol-rlk/hole.sol
+share/neverball/data/sol-rlk/hump.sol
+share/neverball/data/sol-rlk/invis.sol
+share/neverball/data/sol-rlk/islands.sol
+share/neverball/data/sol-rlk/locks.sol
+share/neverball/data/sol-rlk/maze.sol
+share/neverball/data/sol-rlk/mover.sol
+share/neverball/data/sol-rlk/movers.sol
+share/neverball/data/sol-rlk/peasy.sol
+share/neverball/data/sol-rlk/pipe.sol
+share/neverball/data/sol-rlk/plinko.sol
+share/neverball/data/sol-rlk/poker.sol
+share/neverball/data/sol-rlk/pyramid.sol
+share/neverball/data/sol-rlk/quads.sol
+share/neverball/data/sol-rlk/rampdn.sol
+share/neverball/data/sol-rlk/rampup.sol
+share/neverball/data/sol-rlk/ring.sol
+share/neverball/data/sol-rlk/risers.sol
+share/neverball/data/sol-rlk/spiraldn.sol
+share/neverball/data/sol-rlk/spiralin.sol
+share/neverball/data/sol-rlk/spiralup.sol
+share/neverball/data/sol-rlk/spread.sol
+share/neverball/data/sol-rlk/stairs.sol
+share/neverball/data/sol-rlk/sync.sol
+share/neverball/data/sol-rlk/telemaze.sol
+share/neverball/data/sol-rlk/teleport.sol
+share/neverball/data/sol-rlk/tilt.sol
+share/neverball/data/sol-rlk/timer.sol
+share/neverball/data/sol-rlk/title.sol
+share/neverball/data/sol-rlk/wakka.sol
+share/neverball/data/sol-rlk/zigzag.sol
 share/neverball/data/ttf/VeraBd.ttf
 @dirrm share/neverball/data/ttf
-@dirrm share/neverball/data/sol
+@dirrm share/neverball/data/sol-rlk
 @dirrm share/neverball/data/snd
-@dirrm share/neverball/data/shot
+@dirrm share/neverball/data/shot-rlk
 @dirrm share/neverball/data/png
 @dirrm share/neverball/data/mtrl
-@dirrm share/neverball/data/map
+@dirrm share/neverball/data/map-rlk
 @dirrm share/neverball/data/bgm
-@dirrm share/neverball/data/back
 @dirrm share/neverball/data
 @dirrm share/neverball