7 files changed, 95 insertions, 124 deletions

diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index 56e8201fedf1..5b75573251d4 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	neverball
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	games
 MASTER_SITES=	http://icculus.org/neverball/
 
@@ -20,12 +20,10 @@ FREETYPE_CONFIG?=	${LOCALBASE}/bin/freetype-config
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_SDL=	image mixer ttf sdl
+USE_SDL=	image mixer 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
+DIRS=		bgm map-mym map-putt map-rlk mtrl png shot-mym shot-putt \
+		shot-rlk snd sol-mym sol-putt sol-rlk ttf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|./data|${DATADIR}/data|g' \
@@ -38,9 +36,8 @@ do-install:
 	@${MKDIR} ${DATADIR}/data/${ii}
 	@${INSTALL_DATA} ${WRKSRC}/data/${ii}/* ${DATADIR}/data/${ii}/
 .endfor
-.for tt in ${TXT}
-	@${INSTALL_DATA} ${WRKSRC}/data/${tt}.txt ${DATADIR}/data/
-.endfor
+	@${INSTALL_DATA} ${WRKSRC}/data/*.txt ${DATADIR}/data/
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+	@${INSTALL_PROGRAM} ${WRKSRC}/neverputt ${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/games/neverball/distinfo b/games/neverball/distinfo
index 11ea5b56e999..af1217836586 100644
--- a/games/neverball/distinfo
+++ b/games/neverball/distinfo
@@ -1,2 +1,2 @@
-MD5 (neverball-1.2.1.tar.gz) = 43f415d2451cb819e5b7a4d0158f6d11
-SIZE (neverball-1.2.1.tar.gz) = 7625007
+MD5 (neverball-1.2.2.tar.gz) = d08817da57078b0fb8e5998fc45fc10a
+SIZE (neverball-1.2.2.tar.gz) = 7624876
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.\
diff --git a/games/neverball/pkg-descr b/games/neverball/pkg-descr
index 52fa5a825215..f205fb5f59e3 100644
--- a/games/neverball/pkg-descr
+++ b/games/neverball/pkg-descr
@@ -1,11 +1,17 @@
-Tilt the floor to roll a ball through an obstacle course within the given time.
-If the ball falls or time expires, a ball is lost. Collect 100 coins to save
-your progress and earn an extra ball. Red coins are worth 5. Blue coins are
-worth 10.
+In 1.1.5 version, the Neverball and Neverputt source trees have been merged
+into one. It includes 75 Neverball levels and 18 Neverputt levels.
+
+Neverball, tilt the floor to roll a ball through an obstacle course within the
+given time. If the ball falls or time expires, a ball is lost. Collect 100
+coins to save your progress and earn an extra ball. Red coins are worth 5.
+Blue coins are worth 10.
+
+Neverputt, a hot-seat multiplayer miniature golf game using the physics and
+graphics of Neverball.
 
 Neverball runs under Linux, Win2K/XP, and hopefully anywhere else SDL is
-supported. Hardware accellerated OpenGL support with multitexture (OpenGL 1.2.1
-or greater) is required. Neverball has been tested on Intel machines as slow as
-1GHz with GeForce2. Minimum system requirements may be lower.
+supported. Hardware accellerated OpenGL support with multitexture (OpenGL
+1.2.1 or greater) is required. Neverball has been tested on Intel machines as
+slow as 1GHz with GeForce2. Minimum system requirements may be lower.
 
 WWW: http://icculus.org/neverball/
diff --git a/games/neverball/pkg-plist b/games/neverball/pkg-plist
index d838cc8c5eea..8ddb292cf8c2 100644
--- a/games/neverball/pkg-plist
+++ b/games/neverball/pkg-plist
@@ -1,13 +1,16 @@
 bin/neverball
+bin/neverputt
 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/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/bombman.map
 share/neverball/data/map-mym/circuit1.map
@@ -33,6 +36,24 @@ 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-putt/01_easy.map
+share/neverball/data/map-putt/02_uturn.map
+share/neverball/data/map-putt/03_kink.map
+share/neverball/data/map-putt/04_aych.map
+share/neverball/data/map-putt/05_ramp.map
+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/11_mover.map
+share/neverball/data/map-putt/12_bumpy.map
+share/neverball/data/map-putt/13_choose.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/18_hill.map
 share/neverball/data/map-rlk/angle.map
 share/neverball/data/map-rlk/bumper.map
 share/neverball/data/map-rlk/bumps.map
@@ -199,6 +220,24 @@ 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-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/shot-rlk/angle.jpg
 share/neverball/data/shot-rlk/bumper.jpg
 share/neverball/data/shot-rlk/bumps.jpg
@@ -304,6 +343,24 @@ 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
@@ -357,13 +414,16 @@ 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-putt
 @dirrm share/neverball/data/sol-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/png
 @dirrm share/neverball/data/mtrl
 @dirrm share/neverball/data/map-rlk
+@dirrm share/neverball/data/map-putt
 @dirrm share/neverball/data/map-mym
 @dirrm share/neverball/data/bgm
 @dirrm share/neverball/data