- Update to 1.2.2.

- Neverputt is now enabled and fixed.

PR:		ports/65737
Submitted by:	maintainer

3 files changed, 14 insertions, 106 deletions

diff --git a/games/neverball/files/patch-Makefile b/games/neverball/files/patch-Makefile
index b1d5645f08fd..47d7e850d121 100644
--- a/games/neverball/files/patch-Makefile
+++ b/games/neverball/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Thu Apr 15 21:15:33 2004
-+++ Makefile	Thu Apr 15 21:15:44 2004
-@@ -3,24 +3,23 @@
+--- Makefile.orig	Sun Apr 18 13:24:48 2004
++++ Makefile	Sun Apr 18 13:24:54 2004
+@@ -3,20 +3,20 @@
  
  # Maybe you need one of these.  Maybe you don't.
  
@@ -26,97 +26,3 @@
  
  MAPC_TARG= mapc
  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
- 
- 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)
- 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-ball::game.c b/games/neverball/files/patch-ball::game.c
new file mode 100644
index 000000000000..67733d46cd7b
--- /dev/null
+++ b/games/neverball/files/patch-ball::game.c
@@ -0,0 +1,11 @@
+--- ball/game.c.orig	Sun Apr 18 16:18:16 2004
++++ ball/game.c	Sun Apr 18 16:18:31 2004
+@@ -127,7 +127,7 @@
+ 
+ char *curr_intro(void)
+ {
+-    return file.av;
++    return (file.ac > 0) ? file.av : NULL;
+ }
+ 
+ /*---------------------------------------------------------------------------*/
diff --git a/games/neverball/files/patch-data::sets.txt b/games/neverball/files/patch-data::sets.txt
deleted file mode 100644
index 60d0ef436a1e..000000000000
--- a/games/neverball/files/patch-data::sets.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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.\