5 files changed, 215 insertions, 21 deletions

diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index ddc06727a3d1..56e8201fedf1 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	neverball
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	games
 MASTER_SITES=	http://icculus.org/neverball/
 
@@ -23,11 +22,14 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_SDL=	image mixer ttf sdl
 
-DIRS=		bgm map-rlk mtrl png shot-rlk snd sol-rlk ttf
+TXT=		levels-easy levels-hard levels-misc levels-mym scores-easy \
+		scores-hard scores-mym sets
+DIRS=		bgm map-mym map-rlk mtrl png shot-mym shot-rlk snd sol-mym \
+		sol-rlk ttf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|./data|${DATADIR}/data|g' \
-		${WRKSRC}/config.h
+		${WRKSRC}/share/config.h
 	@${REINPLACE_CMD} -e 's|%%FREETYPE_CONFIG%%|${FREETYPE_CONFIG}|g' \
 		${WRKSRC}/Makefile
 
@@ -36,7 +38,9 @@ do-install:
 	@${MKDIR} ${DATADIR}/data/${ii}
 	@${INSTALL_DATA} ${WRKSRC}/data/${ii}/* ${DATADIR}/data/${ii}/
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/data/*.txt ${DATADIR}/data/
+.for tt in ${TXT}
+	@${INSTALL_DATA} ${WRKSRC}/data/${tt}.txt ${DATADIR}/data/
+.endfor
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/games/neverball/distinfo b/games/neverball/distinfo
index 15ce5f6953eb..11ea5b56e999 100644
--- a/games/neverball/distinfo
+++ b/games/neverball/distinfo
@@ -1,2 +1,2 @@
-MD5 (neverball-1.1.0.tar.gz) = 82093401c5eb33126c7a3bc11d4ce095
-SIZE (neverball-1.1.0.tar.gz) = 6398239
+MD5 (neverball-1.2.1.tar.gz) = 43f415d2451cb819e5b7a4d0158f6d11
+SIZE (neverball-1.2.1.tar.gz) = 7625007
diff --git a/games/neverball/files/patch-Makefile b/games/neverball/files/patch-Makefile
index 5019866e53b9..b1d5645f08fd 100644
--- a/games/neverball/files/patch-Makefile
+++ b/games/neverball/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Tue Feb  3 16:40:40 2004
-+++ Makefile	Fri Feb  6 02:45:24 2004
-@@ -3,8 +3,8 @@
+--- Makefile.orig	Thu Apr 15 21:15:33 2004
++++ Makefile	Thu Apr 15 21:15:44 2004
+@@ -3,24 +3,23 @@
  
  # Maybe you need one of these.  Maybe you don't.
  
@@ -11,13 +11,13 @@
  
  OGL_LIBS= -lGLU -lGL -lm
  #OGL_LIBS= -lm                                                # Think Different
-@@ -12,11 +12,11 @@
+ 
  #------------------------------------------------------------------------------
  
- #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)
+ #CFLAGS= -Wall -pg -ansi $(shell sdl-config --cflags)
  
 -SDL_LIBS= $(shell sdl-config --libs)
 -FT2_LIBS= $(shell freetype-config --libs)
@@ -25,15 +25,98 @@
 +FT2_LIBS= $(shell %%FREETYPE_CONFIG%% --libs)
  
  MAPC_TARG= mapc
- GAME_TARG= neverball
-@@ -45,8 +45,8 @@
- 	glext.o  \
- 	main.o
+ BALL_TARG= neverball
+-PUTT_TARG= neverputt
+ 
+ MAPC_OBJS= \
+ 	share/vec3.o   \
+@@ -45,31 +44,12 @@
+ 	ball/set.o     \
+ 	ball/state.o   \
+ 	ball/main.o
+-PUTT_OBJS= \
+-	share/vec3.o   \
+-	share/text.o   \
+-	share/image.o  \
+-	share/solid.o  \
+-	share/part.o   \
+-	share/geom.o   \
+-	share/back.o   \
+-	share/menu.o   \
+-	share/glext.o  \
+-	share/config.o \
+-	putt/audio.o   \
+-	putt/hud.o     \
+-	putt/game.o    \
+-	putt/hole.o    \
+-	putt/state.o   \
+-	putt/main.o
  
--GAME_DEPS= $(GAME_OBJS:.o=.d)
--MAPC_DEPS= $(MAPC_OBJS:.o=.d)
-+GAME_DEPS= $(GAME_OBJS:.o)
-+MAPC_DEPS= $(MAPC_OBJS:.o)
+ BALL_DEPS= $(BALL_OBJS:.o=.d)
+-PUTT_DEPS= $(PUTT_OBJS:.o=.d)
+ MAPC_DEPS= $(MAPC_OBJS:.o=.d)
  
  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)
+ BALL_LIBS= $(X11_PATH) $(SDL_LIBS) -lSDL_image -lSDL_ttf -lSDL_mixer $(FT2_LIBS) $(OGL_LIBS)
+-PUTT_LIBS= $(X11_PATH) $(SDL_LIBS) -lSDL_image -lSDL_ttf -lSDL_mixer $(FT2_LIBS) $(OGL_LIBS)
+ 
+ SOLS= \
+ 	data/sol-rlk/easy.sol     \
+@@ -146,26 +126,7 @@
+ 	data/sol-mym/bombman.sol        \
+ 	data/sol-mym/climb.sol          \
+ 	data/sol-mym/dance.sol          \
+-	data/sol-mym/hard.sol           \
+-	data/sol-putt/01_easy.sol    \
+-	data/sol-putt/02_uturn.sol   \
+-	data/sol-putt/03_kink.sol    \
+-	data/sol-putt/04_aych.sol    \
+-	data/sol-putt/05_ramp.sol    \
+-	data/sol-putt/06_cone.sol    \
+-	data/sol-putt/07_tele.sol    \
+-	data/sol-putt/08_zig.sol     \
+-	data/sol-putt/09_vturn.sol   \
+-	data/sol-putt/10_diamond.sol \
+-	data/sol-putt/11_mover.sol   \
+-	data/sol-putt/12_bumpy.sol   \
+-	data/sol-putt/13_choose.sol  \
+-	data/sol-putt/14_walls.sol   \
+-	data/sol-putt/15_hole.sol    \
+-	data/sol-putt/16_pipe.sol    \
+-	data/sol-putt/17_timing.sol  \
+-	data/sol-putt/18_hill.sol
+-
++	data/sol-mym/hard.sol
+ 
+ #------------------------------------------------------------------------------
+ 
+@@ -181,28 +142,21 @@
+ data/sol-mym/%.sol : data/map-mym/%.map $(MAPC_TARG)
+ 	./$(MAPC_TARG) $< $@ data
+ 
+-data/sol-putt/%.sol : data/map-putt/%.map $(MAPC_TARG)
+-	./$(MAPC_TARG) $< $@ data
+-
+ data/sol-misc/%.sol : data/map-misc/%.map $(MAPC_TARG)
+ 	./$(MAPC_TARG) $< $@ data
+ 
+ #------------------------------------------------------------------------------
+ 
+-all : $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) $(SOLS)
++all : $(BALL_TARG) $(MAPC_TARG) $(SOLS)
+ 
+ $(BALL_TARG) : $(BALL_OBJS)
+ 	$(CC) $(CFLAGS) -o $(BALL_TARG) $(BALL_OBJS) $(BALL_LIBS)
+ 
+-$(PUTT_TARG) : $(PUTT_OBJS)
+-	$(CC) $(CFLAGS) -o $(PUTT_TARG) $(PUTT_OBJS) $(PUTT_LIBS)
+-
+ $(MAPC_TARG) : $(MAPC_OBJS)
+ 	$(CC) $(CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(MAPC_LIBS)
+ 
+ clean :
+ 	rm -f $(BALL_TARG) $(BALL_OBJS) $(BALL_DEPS)
+-	rm -f $(PUTT_TARG) $(PUTT_OBJS) $(PUTT_DEPS)
+ 	rm -f $(MAPC_TARG) $(MAPC_OBJS) $(MAPC_DEPS)
+ 	rm -f $(SOLS)
+ 
diff --git a/games/neverball/files/patch-data::sets.txt b/games/neverball/files/patch-data::sets.txt
new file mode 100644
index 000000000000..60d0ef436a1e
--- /dev/null
+++ b/games/neverball/files/patch-data::sets.txt
@@ -0,0 +1,9 @@
+--- data/sets.txt.orig	Thu Apr 15 21:16:44 2004
++++ data/sets.txt	Thu Apr 15 21:17:18 2004
+@@ -7,6 +7,3 @@
+ levels-mym.txt scores-mym.txt .neverballhs-mym shot-mym/descent.jpg
+ Mehdi's Levels
+ Difficulty: Expert through Insane\\25 levels with even greater challenge.\Author: Mehdi Yousfi Monod\ \
+-levels-putt.txt scores-putt.txt .neverballhs-putt shot-putt/01_easy.jpg
+-Neverputt Holes
+-Difficulty: Trivial\Golf becomes pretty easy when you get to\tilt the entire course.  There are no coins here\or records to be broken.  Just take a leisurely\roll through Neverputt's 18-holes.\
diff --git a/games/neverball/pkg-plist b/games/neverball/pkg-plist
index 6e131cb2f335..d838cc8c5eea 100644
--- a/games/neverball/pkg-plist
+++ b/games/neverball/pkg-plist
@@ -6,6 +6,33 @@ share/neverball/data/bgm/snow.ogg
 share/neverball/data/bgm/title.ogg
 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/map-mym/assault_course.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/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/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/turn.map
+share/neverball/data/map-mym/up.map
 share/neverball/data/map-rlk/angle.map
 share/neverball/data/map-rlk/bumper.map
 share/neverball/data/map-rlk/bumps.map
@@ -101,6 +128,8 @@ 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/thwomp
+share/neverball/data/mtrl/thwomp.tga
 share/neverball/data/mtrl/timer
 share/neverball/data/mtrl/timer.tga
 share/neverball/data/mtrl/turf-blue
@@ -117,6 +146,8 @@ 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/white
+share/neverball/data/mtrl/white.jpg
 share/neverball/data/mtrl/wood
 share/neverball/data/mtrl/wood-check
 share/neverball/data/mtrl/wood-check.jpg
@@ -141,7 +172,33 @@ 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/scores-mym.txt
 share/neverball/data/sets.txt
+share/neverball/data/shot-mym/assault_course.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/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/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/turn.jpg
+share/neverball/data/shot-mym/up.jpg
 share/neverball/data/shot-rlk/angle.jpg
 share/neverball/data/shot-rlk/bumper.jpg
 share/neverball/data/shot-rlk/bumps.jpg
@@ -193,22 +250,60 @@ 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-rlk/angle.sol
 share/neverball/data/sol-rlk/bumper.sol
 share/neverball/data/sol-rlk/bumps.sol
@@ -262,11 +357,14 @@ share/neverball/data/sol-rlk/zigzag.sol
 share/neverball/data/ttf/VeraBd.ttf
 @dirrm share/neverball/data/ttf
 @dirrm share/neverball/data/sol-rlk
+@dirrm share/neverball/data/sol-mym
 @dirrm share/neverball/data/snd
 @dirrm share/neverball/data/shot-rlk
+@dirrm share/neverball/data/shot-mym
 @dirrm share/neverball/data/png
 @dirrm share/neverball/data/mtrl
 @dirrm share/neverball/data/map-rlk
+@dirrm share/neverball/data/map-mym
 @dirrm share/neverball/data/bgm
 @dirrm share/neverball/data
 @dirrm share/neverball