upgrade to 1.4.0

3 files changed, 368 insertions, 221 deletions

diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index cfba2a50b92..1c4c5702338 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/12/11 09:40:42 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/02 14:01:09 christos Exp $
 #
 
-DISTNAME=	neverball-1.2.2
-PKGREVISION=	3
+DISTNAME=	neverball-1.4.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.icculus.org/neverball/
 
@@ -23,7 +22,7 @@ INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_DATA_DIR} ${SHAREDIR}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/MAPPING \
+	${INSTALL_DATA} ${WRKSRC}/README \
 	    ${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_PROGRAM} ${WRKSRC}/neverball ${WRKSRC}/neverputt ${SHAREDIR}
 	cd ${WRKSRC} && ${PAX} -rwppm data ${SHAREDIR}
diff --git a/games/neverball/PLIST b/games/neverball/PLIST
index 7da56f4e0d8..848192e3613 100644
--- a/games/neverball/PLIST
+++ b/games/neverball/PLIST
@@ -1,43 +1,201 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/18 05:02:55 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/01/02 14:01:09 christos Exp $
 bin/neverball
-share/doc/neverball/MAPPING
 share/doc/neverball/README
-share/neverball/data/bgm/flood.ogg
-share/neverball/data/bgm/haze.ogg
+share/neverball/data/back/alien.png
+share/neverball/data/back/blk_org.png
+share/neverball/data/back/blues.png
+share/neverball/data/back/city.png
+share/neverball/data/back/greens.png
+share/neverball/data/back/greys.png
+share/neverball/data/back/gui.png
+share/neverball/data/back/land.png
+share/neverball/data/back/ocean.png
+share/neverball/data/back/org_yel.png
+share/neverball/data/back/pastel.png
+share/neverball/data/back/purples.png
+share/neverball/data/back/red_blu.png
+share/neverball/data/back/red_wht.png
+share/neverball/data/back/space.png
 share/neverball/data/bgm/inter.ogg
-share/neverball/data/bgm/snow.ogg
 share/neverball/data/bgm/title.ogg
+share/neverball/data/bgm/track1.ogg
+share/neverball/data/bgm/track2.ogg
+share/neverball/data/bgm/track3.ogg
+share/neverball/data/bgm/track4.ogg
+share/neverball/data/bgm/track5.ogg
+share/neverball/data/holes-abc.txt
+share/neverball/data/courses.txt
+share/neverball/data/map-back/alien.sol
+share/neverball/data/map-back/alien.map
+share/neverball/data/map-back/blank.map
+share/neverball/data/map-back/city.map
+share/neverball/data/map-back/clouds.map
+share/neverball/data/map-back/jupiter.map
+share/neverball/data/map-back/ocean.map
+share/neverball/data/map-back/blank.sol
+share/neverball/data/map-back/city.sol
+share/neverball/data/map-back/clouds.sol
+share/neverball/data/map-back/ocean.sol
+share/neverball/data/map-back/jupiter.sol
+share/neverball/data/obj/platform.obj
+share/neverball/data/obj/peg.obj
+share/neverball/data/obj/pin.obj
+share/neverball/data/obj/snowman.obj
+share/neverball/data/obj/post.obj
+share/neverball/data/obj/xrail2.obj
+share/neverball/data/obj/xrail3.obj
+share/neverball/data/obj/xrail4.obj
+share/neverball/data/obj/xrail6.obj
+share/neverball/data/obj/xrail8.obj
+share/neverball/data/obj/zrail2.obj
+share/neverball/data/obj/zrail3.obj
+share/neverball/data/obj/zrail4.obj
+share/neverball/data/obj/zrail6.obj
+share/neverball/data/obj/zrail8.obj
+share/neverball/data/holes-paxed.txt
 share/neverball/data/holes-putt.txt
 share/neverball/data/levels-easy.txt
 share/neverball/data/levels-hard.txt
-share/neverball/data/levels-misc.txt
 share/neverball/data/levels-mym.txt
-share/neverball/data/levels-putt.txt
-share/neverball/data/map-mym/assault_course.map
+share/neverball/data/map-mym/earthquake.map
+share/neverball/data/map-mym/assault.map
 share/neverball/data/map-mym/bombman.map
 share/neverball/data/map-mym/circuit1.map
 share/neverball/data/map-mym/circuit2.map
 share/neverball/data/map-mym/climb.map
 share/neverball/data/map-mym/comeback.map
-share/neverball/data/map-mym/dance.map
+share/neverball/data/map-mym/dance1.map
+share/neverball/data/map-mym/dance2.map
 share/neverball/data/map-mym/descent.map
 share/neverball/data/map-mym/drive1.map
 share/neverball/data/map-mym/drive2.map
-share/neverball/data/map-mym/earth_quake.map
-share/neverball/data/map-mym/free_fall.map
-share/neverball/data/map-mym/glass_tower.map
+share/neverball/data/map-mym/trust.map
+share/neverball/data/map-mym/glasstower.map
 share/neverball/data/map-mym/hard.map
 share/neverball/data/map-mym/loop1.map
 share/neverball/data/map-mym/loop2.map
 share/neverball/data/map-mym/maze1.map
 share/neverball/data/map-mym/maze2.map
-share/neverball/data/map-mym/maze3.map
 share/neverball/data/map-mym/narrow.map
 share/neverball/data/map-mym/running.map
 share/neverball/data/map-mym/scrambling.map
-share/neverball/data/map-mym/trust.map
+share/neverball/data/map-mym/snow.map
+share/neverball/data/map-mym/assault.sol
 share/neverball/data/map-mym/turn.map
 share/neverball/data/map-mym/up.map
+share/neverball/data/map-mym/bombman.sol
+share/neverball/data/map-mym/circuit1.sol
+share/neverball/data/map-mym/circuit2.sol
+share/neverball/data/map-mym/climb.sol
+share/neverball/data/map-mym/comeback.sol
+share/neverball/data/map-mym/dance2.sol
+share/neverball/data/map-mym/dance1.sol
+share/neverball/data/map-mym/descent.sol
+share/neverball/data/map-mym/drive1.sol
+share/neverball/data/map-mym/drive2.sol
+share/neverball/data/map-mym/earthquake.sol
+share/neverball/data/map-mym/glasstower.sol
+share/neverball/data/map-mym/hard.sol
+share/neverball/data/map-mym/loop1.sol
+share/neverball/data/map-mym/loop2.sol
+share/neverball/data/map-mym/maze1.sol
+share/neverball/data/map-mym/maze2.sol
+share/neverball/data/map-mym/narrow.sol
+share/neverball/data/map-mym/running.sol
+share/neverball/data/map-mym/scrambling.sol
+share/neverball/data/map-mym/snow.sol
+share/neverball/data/map-mym/trust.sol
+share/neverball/data/map-mym/turn.sol
+share/neverball/data/map-mym/up.sol
+share/neverball/data/map-paxed/02_bumpy_road.map
+share/neverball/data/map-paxed/01_fastpenta.map
+share/neverball/data/map-paxed/06_partitions.map
+share/neverball/data/map-paxed/03_zigzag.map
+share/neverball/data/map-paxed/04_u_twist.map
+share/neverball/data/map-paxed/05_hookey.map
+share/neverball/data/map-paxed/16_pyramidian.map
+share/neverball/data/map-paxed/07_a_danger.map
+share/neverball/data/map-paxed/08_f.map
+share/neverball/data/map-paxed/09_rampedge.map
+share/neverball/data/map-paxed/10_pentomino.map
+share/neverball/data/map-paxed/11_stapler.map
+share/neverball/data/map-paxed/12_helixramp.map
+share/neverball/data/map-paxed/13_loch_ness.map
+share/neverball/data/map-paxed/14_figur8.map
+share/neverball/data/map-paxed/15_upNdown.map
+share/neverball/data/map-paxed/01_fastpenta.sol
+share/neverball/data/map-paxed/17_oopsydaisy.map
+share/neverball/data/map-paxed/04_u_twist.sol
+share/neverball/data/map-paxed/18_3rd_floor.map
+share/neverball/data/map-paxed/a.map
+share/neverball/data/map-paxed/b.map
+share/neverball/data/map-paxed/c.map
+share/neverball/data/map-paxed/d.map
+share/neverball/data/map-paxed/e.map
+share/neverball/data/map-paxed/f.map
+share/neverball/data/map-paxed/g.map
+share/neverball/data/map-paxed/h.map
+share/neverball/data/map-paxed/i.map
+share/neverball/data/map-paxed/j.map
+share/neverball/data/map-paxed/k.map
+share/neverball/data/map-paxed/l.map
+share/neverball/data/map-paxed/m.map
+share/neverball/data/map-paxed/n.map
+share/neverball/data/map-paxed/o.map
+share/neverball/data/map-paxed/p.map
+share/neverball/data/map-paxed/q.map
+share/neverball/data/map-paxed/r.map
+share/neverball/data/map-paxed/s.map
+share/neverball/data/map-paxed/t.map
+share/neverball/data/map-paxed/u.map
+share/neverball/data/map-paxed/v.map
+share/neverball/data/map-paxed/w.map
+share/neverball/data/map-paxed/x.map
+share/neverball/data/map-paxed/y.map
+share/neverball/data/map-paxed/z.map
+share/neverball/data/map-paxed/02_bumpy_road.sol
+share/neverball/data/map-paxed/03_zigzag.sol
+share/neverball/data/map-paxed/a.sol
+share/neverball/data/map-paxed/05_hookey.sol
+share/neverball/data/map-paxed/06_partitions.sol
+share/neverball/data/map-paxed/07_a_danger.sol
+share/neverball/data/map-paxed/08_f.sol
+share/neverball/data/map-paxed/09_rampedge.sol
+share/neverball/data/map-paxed/10_pentomino.sol
+share/neverball/data/map-paxed/11_stapler.sol
+share/neverball/data/map-paxed/12_helixramp.sol
+share/neverball/data/map-paxed/13_loch_ness.sol
+share/neverball/data/map-paxed/14_figur8.sol
+share/neverball/data/map-paxed/15_upNdown.sol
+share/neverball/data/map-paxed/16_pyramidian.sol
+share/neverball/data/map-paxed/17_oopsydaisy.sol
+share/neverball/data/map-paxed/18_3rd_floor.sol
+share/neverball/data/map-paxed/b.sol
+share/neverball/data/map-paxed/c.sol
+share/neverball/data/map-paxed/d.sol
+share/neverball/data/map-paxed/e.sol
+share/neverball/data/map-paxed/f.sol
+share/neverball/data/map-paxed/g.sol
+share/neverball/data/map-paxed/h.sol
+share/neverball/data/map-paxed/i.sol
+share/neverball/data/map-paxed/j.sol
+share/neverball/data/map-paxed/k.sol
+share/neverball/data/map-paxed/l.sol
+share/neverball/data/map-paxed/m.sol
+share/neverball/data/map-paxed/n.sol
+share/neverball/data/map-paxed/o.sol
+share/neverball/data/map-paxed/p.sol
+share/neverball/data/map-paxed/q.sol
+share/neverball/data/map-paxed/r.sol
+share/neverball/data/map-paxed/s.sol
+share/neverball/data/map-paxed/t.sol
+share/neverball/data/map-paxed/u.sol
+share/neverball/data/map-paxed/v.sol
+share/neverball/data/map-paxed/w.sol
+share/neverball/data/map-paxed/x.sol
+share/neverball/data/map-paxed/y.sol
+share/neverball/data/map-paxed/z.sol
+share/neverball/data/map-putt/10_diamond.map
 share/neverball/data/map-putt/01_easy.map
 share/neverball/data/map-putt/02_uturn.map
 share/neverball/data/map-putt/03_kink.map
@@ -47,15 +205,33 @@ share/neverball/data/map-putt/06_cone.map
 share/neverball/data/map-putt/07_tele.map
 share/neverball/data/map-putt/08_zig.map
 share/neverball/data/map-putt/09_vturn.map
-share/neverball/data/map-putt/10_diamond.map
+share/neverball/data/map-putt/13_choose.map
 share/neverball/data/map-putt/11_mover.map
 share/neverball/data/map-putt/12_bumpy.map
-share/neverball/data/map-putt/13_choose.map
+share/neverball/data/map-putt/17_timing.map
 share/neverball/data/map-putt/14_walls.map
 share/neverball/data/map-putt/15_hole.map
 share/neverball/data/map-putt/16_pipe.map
-share/neverball/data/map-putt/17_timing.map
+share/neverball/data/map-putt/01_easy.sol
+share/neverball/data/map-putt/04_aych.sol
 share/neverball/data/map-putt/18_hill.map
+share/neverball/data/map-putt/02_uturn.sol
+share/neverball/data/map-putt/03_kink.sol
+share/neverball/data/map-putt/05_ramp.sol
+share/neverball/data/map-putt/06_cone.sol
+share/neverball/data/map-putt/07_tele.sol
+share/neverball/data/map-putt/08_zig.sol
+share/neverball/data/map-putt/09_vturn.sol
+share/neverball/data/map-putt/10_diamond.sol
+share/neverball/data/map-putt/11_mover.sol
+share/neverball/data/map-putt/12_bumpy.sol
+share/neverball/data/map-putt/13_choose.sol
+share/neverball/data/map-putt/14_walls.sol
+share/neverball/data/map-putt/15_hole.sol
+share/neverball/data/map-putt/16_pipe.sol
+share/neverball/data/map-putt/17_timing.sol
+share/neverball/data/map-putt/18_hill.sol
+share/neverball/data/map-rlk/easy.sol
 share/neverball/data/map-rlk/angle.map
 share/neverball/data/map-rlk/bumper.map
 share/neverball/data/map-rlk/bumps.map
@@ -78,6 +254,7 @@ 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/plinko.sol
 share/neverball/data/map-rlk/islands.map
 share/neverball/data/map-rlk/locks.map
 share/neverball/data/map-rlk/maze.map
@@ -106,44 +283,106 @@ 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/map-rlk/peasy.sol
+share/neverball/data/map-rlk/coins.sol
+share/neverball/data/map-rlk/goslow.sol
+share/neverball/data/map-rlk/fence.sol
+share/neverball/data/map-rlk/bumper.sol
+share/neverball/data/map-rlk/maze.sol
+share/neverball/data/map-rlk/goals.sol
+share/neverball/data/map-rlk/hole.sol
+share/neverball/data/map-rlk/bumps.sol
+share/neverball/data/map-rlk/corners.sol
+share/neverball/data/map-rlk/easytele.sol
+share/neverball/data/map-rlk/zigzag.sol
+share/neverball/data/map-rlk/greed.sol
+share/neverball/data/map-rlk/mover.sol
+share/neverball/data/map-rlk/wakka.sol
+share/neverball/data/map-rlk/curbs.sol
+share/neverball/data/map-rlk/curved.sol
+share/neverball/data/map-rlk/stairs.sol
+share/neverball/data/map-rlk/rampdn.sol
+share/neverball/data/map-rlk/sync.sol
+share/neverball/data/map-rlk/spiralin.sol
+share/neverball/data/map-rlk/drops.sol
+share/neverball/data/map-rlk/locks.sol
+share/neverball/data/map-rlk/grid.sol
+share/neverball/data/map-rlk/four.sol
+share/neverball/data/map-rlk/telemaze.sol
+share/neverball/data/map-rlk/spiraldn.sol
+share/neverball/data/map-rlk/islands.sol
+share/neverball/data/map-rlk/angle.sol
+share/neverball/data/map-rlk/spiralup.sol
+share/neverball/data/map-rlk/rampup.sol
+share/neverball/data/map-rlk/check.sol
+share/neverball/data/map-rlk/risers.sol
+share/neverball/data/map-rlk/tilt.sol
+share/neverball/data/map-rlk/gaps.sol
+share/neverball/data/map-rlk/pyramid.sol
+share/neverball/data/map-rlk/quads.sol
+share/neverball/data/map-rlk/frogger.sol
+share/neverball/data/map-rlk/timer.sol
+share/neverball/data/map-rlk/spread.sol
+share/neverball/data/map-rlk/hump.sol
+share/neverball/data/map-rlk/movers.sol
+share/neverball/data/map-rlk/teleport.sol
+share/neverball/data/map-rlk/poker.sol
+share/neverball/data/map-rlk/invis.sol
+share/neverball/data/map-rlk/ring.sol
+share/neverball/data/map-rlk/pipe.sol
+share/neverball/data/map-rlk/title.sol
 share/neverball/data/mtrl/arrow-green
+share/neverball/data/mtrl/arrow
+share/neverball/data/mtrl/edge-blue
+share/neverball/data/mtrl/edge
 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/black
+share/neverball/data/mtrl/black.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/chrome
+share/neverball/data/mtrl/chrome.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-shiny
+share/neverball/data/mtrl/coin-shiny.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/coin-small-green.jpg
 share/neverball/data/mtrl/dark-glass.jpg
-share/neverball/data/mtrl/edge
-share/neverball/data/mtrl/edge-blue
+share/neverball/data/mtrl/dark-mirror
+share/neverball/data/mtrl/dark-mirror.jpg
+share/neverball/data/mtrl/edge-brown-grey.jpg
 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
+share/neverball/data/mtrl/edge-red.jpg
+share/neverball/data/mtrl/edge-red
 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/glass.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.tga
+share/neverball/data/mtrl/goal
+share/neverball/data/mtrl/jump.tga
+share/neverball/data/mtrl/jump
 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/mirror-check.jpg
+share/neverball/data/mtrl/land1.png
+share/neverball/data/mtrl/mirror
+share/neverball/data/mtrl/mirror-check
+share/neverball/data/mtrl/turf-blue.jpg
+share/neverball/data/mtrl/mirror.jpg
 share/neverball/data/mtrl/mtrl.shader
 share/neverball/data/mtrl/rail
 share/neverball/data/mtrl/rail.jpg
@@ -156,90 +395,123 @@ share/neverball/data/mtrl/thwomp.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
+share/neverball/data/mtrl/turf-brown
 share/neverball/data/mtrl/turf-green-offset
+share/neverball/data/mtrl/turf-green
+share/neverball/data/mtrl/white.jpg
+share/neverball/data/mtrl/white
 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-shiny
+share/neverball/data/mtrl/turf-shiny-bright
+share/neverball/data/mtrl/turf-shiny-bright.jpg
+share/neverball/data/mtrl/turf-shiny.jpg
 share/neverball/data/mtrl/turf-small-green
 share/neverball/data/mtrl/turf-small-green.jpg
-share/neverball/data/mtrl/white
-share/neverball/data/mtrl/white.jpg
-share/neverball/data/mtrl/wood
 share/neverball/data/mtrl/wood-check
+share/neverball/data/mtrl/wood
 share/neverball/data/mtrl/wood-check.jpg
 share/neverball/data/mtrl/wood.jpg
+share/neverball/data/png/buildings1.png
 share/neverball/data/png/ball.png
-share/neverball/data/png/blues.png
+share/neverball/data/png/euro_coin.png
+share/neverball/data/png/city1.png
+share/neverball/data/png/city2.png
+share/neverball/data/png/city4.png
+share/neverball/data/png/clouds1.png
+share/neverball/data/png/clouds2.png
+share/neverball/data/png/clouds3.png
 share/neverball/data/png/coin.png
-share/neverball/data/png/colorful.png
-share/neverball/data/png/deep_blue.png
+share/neverball/data/png/contrail.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/grid.png
+share/neverball/data/png/hills1.png
+share/neverball/data/png/hills2.png
+share/neverball/data/png/hills3.png
+share/neverball/data/png/io.png
+share/neverball/data/png/jupiter.png
+share/neverball/data/png/loops1.png
+share/neverball/data/png/loops2.png
+share/neverball/data/png/loops3.png
+share/neverball/data/png/moon.png
+share/neverball/data/png/mount1.png
+share/neverball/data/png/mount2.png
 share/neverball/data/png/part.png
-share/neverball/data/png/pastel.png
 share/neverball/data/png/shadow.png
-share/neverball/data/png/skyline.png
-share/neverball/data/png/tropic.png
+share/neverball/data/png/space.png
+share/neverball/data/png/stars1.png
+share/neverball/data/png/stars2.png
+share/neverball/data/png/stars3.png
+share/neverball/data/png/stars4.png
+share/neverball/data/png/sun.png
+share/neverball/data/png/wave.png
 share/neverball/data/scores-easy.txt
 share/neverball/data/scores-hard.txt
 share/neverball/data/scores-mym.txt
 share/neverball/data/sets.txt
-share/neverball/data/shot-mym/assault_course.jpg
+share/neverball/data/shot-mym/earthquake.jpg
+share/neverball/data/shot-mym/assault.jpg
 share/neverball/data/shot-mym/bombman.jpg
 share/neverball/data/shot-mym/circuit1.jpg
 share/neverball/data/shot-mym/circuit2.jpg
 share/neverball/data/shot-mym/climb.jpg
 share/neverball/data/shot-mym/comeback.jpg
-share/neverball/data/shot-mym/dance.jpg
+share/neverball/data/shot-mym/dance1.jpg
+share/neverball/data/shot-mym/dance2.jpg
 share/neverball/data/shot-mym/descent.jpg
 share/neverball/data/shot-mym/drive1.jpg
 share/neverball/data/shot-mym/drive2.jpg
-share/neverball/data/shot-mym/earth_quake.jpg
-share/neverball/data/shot-mym/free_fall.jpg
-share/neverball/data/shot-mym/glass_tower.jpg
+share/neverball/data/shot-mym/trust.jpg
+share/neverball/data/shot-mym/glasstower.jpg
 share/neverball/data/shot-mym/hard.jpg
 share/neverball/data/shot-mym/loop1.jpg
 share/neverball/data/shot-mym/loop2.jpg
 share/neverball/data/shot-mym/maze1.jpg
 share/neverball/data/shot-mym/maze2.jpg
-share/neverball/data/shot-mym/maze3.jpg
 share/neverball/data/shot-mym/narrow.jpg
 share/neverball/data/shot-mym/running.jpg
 share/neverball/data/shot-mym/scrambling.jpg
-share/neverball/data/shot-mym/trust.jpg
+share/neverball/data/shot-mym/snow.jpg
 share/neverball/data/shot-mym/turn.jpg
 share/neverball/data/shot-mym/up.jpg
-share/neverball/data/shot-putt/01_easy.jpg
-share/neverball/data/shot-putt/02_uturn.jpg
-share/neverball/data/shot-putt/03_kink.jpg
-share/neverball/data/shot-putt/04_aych.jpg
-share/neverball/data/shot-putt/05_ramp.jpg
-share/neverball/data/shot-putt/06_cone.jpg
-share/neverball/data/shot-putt/07_tele.jpg
-share/neverball/data/shot-putt/08_zig.jpg
-share/neverball/data/shot-putt/09_vturn.jpg
-share/neverball/data/shot-putt/10_diamond.jpg
-share/neverball/data/shot-putt/11_mover.jpg
-share/neverball/data/shot-putt/12_bumpy.jpg
-share/neverball/data/shot-putt/13_choose.jpg
-share/neverball/data/shot-putt/14_walls.jpg
-share/neverball/data/shot-putt/15_hole.jpg
-share/neverball/data/shot-putt/16_pipe.jpg
-share/neverball/data/shot-putt/17_timing.jpg
-share/neverball/data/shot-putt/18_hill.jpg
+share/neverball/data/snd/birdie.ogg
+share/neverball/data/snd/ball.ogg
+share/neverball/data/snd/bink.wav
+share/neverball/data/snd/bogey.ogg
+share/neverball/data/snd/bump.ogg
+share/neverball/data/snd/coin.wav
+share/neverball/data/snd/double.ogg
+share/neverball/data/snd/eagle.ogg
+share/neverball/data/snd/fall.ogg
+share/neverball/data/snd/go.ogg
+share/neverball/data/snd/goal.wav
+share/neverball/data/snd/jump.ogg
+share/neverball/data/snd/menu.wav
+share/neverball/data/snd/one.ogg
+share/neverball/data/snd/over.ogg
+share/neverball/data/snd/par.ogg
+share/neverball/data/snd/penalty.ogg
+share/neverball/data/snd/player1.ogg
+share/neverball/data/snd/player2.ogg
+share/neverball/data/snd/player3.ogg
+share/neverball/data/snd/player4.ogg
+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/success.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/shot-putt/paxed.jpg
+share/neverball/data/shot-putt/abc.jpg
+share/neverball/data/shot-putt/putt.jpg
 share/neverball/data/shot-rlk/angle.jpg
 share/neverball/data/shot-rlk/bumper.jpg
 share/neverball/data/shot-rlk/bumps.jpg
@@ -290,152 +562,28 @@ 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/bink.wav
-share/neverball/data/snd/birdie.ogg
-share/neverball/data/snd/bogey.ogg
-share/neverball/data/snd/bump.ogg
-share/neverball/data/snd/coin.wav
-share/neverball/data/snd/double.ogg
-share/neverball/data/snd/eagle.ogg
-share/neverball/data/snd/fall.ogg
-share/neverball/data/snd/go.ogg
-share/neverball/data/snd/goal.wav
-share/neverball/data/snd/jump.ogg
-share/neverball/data/snd/menu.wav
-share/neverball/data/snd/one.ogg
-share/neverball/data/snd/over.ogg
-share/neverball/data/snd/par.ogg
-share/neverball/data/snd/penalty.ogg
-share/neverball/data/snd/player1.ogg
-share/neverball/data/snd/player2.ogg
-share/neverball/data/snd/player3.ogg
-share/neverball/data/snd/player4.ogg
-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/success.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-mym/assault_course.sol
-share/neverball/data/sol-mym/bombman.sol
-share/neverball/data/sol-mym/circuit1.sol
-share/neverball/data/sol-mym/circuit2.sol
-share/neverball/data/sol-mym/climb.sol
-share/neverball/data/sol-mym/comeback.sol
-share/neverball/data/sol-mym/dance.sol
-share/neverball/data/sol-mym/descent.sol
-share/neverball/data/sol-mym/drive1.sol
-share/neverball/data/sol-mym/drive2.sol
-share/neverball/data/sol-mym/earth_quake.sol
-share/neverball/data/sol-mym/free_fall.sol
-share/neverball/data/sol-mym/glass_tower.sol
-share/neverball/data/sol-mym/hard.sol
-share/neverball/data/sol-mym/loop1.sol
-share/neverball/data/sol-mym/loop2.sol
-share/neverball/data/sol-mym/maze1.sol
-share/neverball/data/sol-mym/maze2.sol
-share/neverball/data/sol-mym/maze3.sol
-share/neverball/data/sol-mym/narrow.sol
-share/neverball/data/sol-mym/running.sol
-share/neverball/data/sol-mym/scrambling.sol
-share/neverball/data/sol-mym/trust.sol
-share/neverball/data/sol-mym/turn.sol
-share/neverball/data/sol-mym/up.sol
-share/neverball/data/sol-putt/01_easy.sol
-share/neverball/data/sol-putt/02_uturn.sol
-share/neverball/data/sol-putt/03_kink.sol
-share/neverball/data/sol-putt/04_aych.sol
-share/neverball/data/sol-putt/05_ramp.sol
-share/neverball/data/sol-putt/06_cone.sol
-share/neverball/data/sol-putt/07_tele.sol
-share/neverball/data/sol-putt/08_zig.sol
-share/neverball/data/sol-putt/09_vturn.sol
-share/neverball/data/sol-putt/10_diamond.sol
-share/neverball/data/sol-putt/11_mover.sol
-share/neverball/data/sol-putt/12_bumpy.sol
-share/neverball/data/sol-putt/13_choose.sol
-share/neverball/data/sol-putt/14_walls.sol
-share/neverball/data/sol-putt/15_hole.sol
-share/neverball/data/sol-putt/16_pipe.sol
-share/neverball/data/sol-putt/17_timing.sol
-share/neverball/data/sol-putt/18_hill.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
 share/neverball/neverball
 share/neverball/neverputt
-@dirrm share/neverball/data/ttf
-@dirrm share/neverball/data/sol-rlk
-@dirrm share/neverball/data/sol-putt
-@dirrm share/neverball/data/sol-mym
-@exec ${MKDIR} %D/share/neverball/data/sol-misc
-@dirrm share/neverball/data/sol-misc
+@dirrm share/neverball/data
+@dirrm share/neverball/data/back
+@dirrm share/neverball/data/bgm
+@dirrm share/neverball/data/map-back
+@dirrm share/neverball/data/obj
+@dirrm share/neverball/data/map-misc
+@dirrm share/neverball/data/map-mym
+@dirrm share/neverball/data/map-paxed
+@dirrm share/neverball/data/map-putt
+@dirrm share/neverball/data/map-rlk
+@dirrm share/neverball/data/mtrl
+@dirrm share/neverball/data/png
+@dirrm share/neverball/data/shot-misc
+@dirrm share/neverball/data/shot-mym
 @dirrm share/neverball/data/snd
-@dirrm share/neverball/data/shot-rlk
 @dirrm share/neverball/data/shot-putt
-@dirrm share/neverball/data/shot-mym
+@dirrm share/neverball/data/shot-rlk
+@dirrm share/neverball/data/ttf
 @exec ${MKDIR} %D/share/neverball/data/shot-misc
-@dirrm share/neverball/data/shot-misc
-@dirrm share/neverball/data/png
-@dirrm share/neverball/data/mtrl
-@dirrm share/neverball/data/map-rlk
-@dirrm share/neverball/data/map-putt
-@dirrm share/neverball/data/map-mym
 @exec ${MKDIR} %D/share/neverball/data/map-misc
-@dirrm share/neverball/data/map-misc
-@dirrm share/neverball/data/bgm
-@dirrm share/neverball/data
 @dirrm share/neverball
 @dirrm share/doc/neverball
diff --git a/games/neverball/distinfo b/games/neverball/distinfo
index ef6257791b8..16967c41016 100644
--- a/games/neverball/distinfo
+++ b/games/neverball/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 23:12:01 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/01/02 14:01:10 christos Exp $
 
-SHA1 (neverball-1.2.2.tar.gz) = 462a01446083aa12993cef8b0cc8d64bdf1d026d
-RMD160 (neverball-1.2.2.tar.gz) = 83f5276f00ba77067a8f68773479172e7c6cca21
-Size (neverball-1.2.2.tar.gz) = 7624876 bytes
+RMD160 (neverball-1.4.0.tar.gz) = 7952f588ead50aec8681802aee53953b29f72383
+SHA1 (neverball-1.4.0.tar.gz) = 630aab5b4149d6ffb781cc38c4ce26dd6b048b40
+Size (neverball-1.2.2.tar.gz) = 11314294