Update to 0.25.12

PR:		ports/58713
Submitted by:	mezz (maintainer)

4 files changed, 19 insertions, 58 deletions

diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index 0d262bbf1547..538621e2c62f 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -6,17 +6,20 @@
 #
 
 PORTNAME=	neverball
-PORTVERSION=	0.25.11
+PORTVERSION=	0.25.12
 CATEGORIES=	games
 MASTER_SITES=	http://icculus.org/neverball/
 
 MAINTAINER=	mezz7@cox.net
 COMMENT=	Tilt the floor to guide a ball through an obstacle course
 
+BUILD_DEPENDS=	${FREETYPE_CONFIG}:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf \
 		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image
 
+FREETYPE_CONFIG?=	${LOCALBASE}/bin/freetype-config
+
 USE_BZIP2=	yes
 USE_SDL=	yes
 USE_GMAKE=	yes
@@ -28,6 +31,8 @@ DIRS=		back bgm map mtrl png shot snd sol ttf
 post-patch:
 	@${REINPLACE_CMD} -e 's|./data|${DATADIR}/data|g' \
 		${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e 's|%%FREETYPE_CONFIG%%|${FREETYPE_CONFIG}|g' \
+		${WRKSRC}/Makefile
 
 do-install:
 .for ii in ${DIRS}
diff --git a/games/neverball/distinfo b/games/neverball/distinfo
index d6fbf09becf9..afb8065f4c86 100644
--- a/games/neverball/distinfo
+++ b/games/neverball/distinfo
@@ -1 +1 @@
-MD5 (neverball-0.25.11.tar.bz2) = 96ace59deb3ed29efe744b7d45b3e7d8
+MD5 (neverball-0.25.12.tar.bz2) = 7d9c3b3bea5f2a65ea583de5061d403e
diff --git a/games/neverball/files/patch-Makefile b/games/neverball/files/patch-Makefile
index e2fd1aea5a8a..2f50a1e7e9a7 100644
--- a/games/neverball/files/patch-Makefile
+++ b/games/neverball/files/patch-Makefile
@@ -1,27 +1,30 @@
---- Makefile.orig	Mon Oct 27 21:35:19 2003
-+++ Makefile	Mon Oct 27 21:37:26 2003
-@@ -3,15 +3,15 @@
+--- Makefile.orig	Thu Oct 30 01:24:20 2003
++++ Makefile	Thu Oct 30 01:25:30 2003
+@@ -3,18 +3,18 @@
  
  # Maybe you need one of these.  Maybe you don't.
  
 -#X11_PATH= -L/usr/X11/lib
 -#X11_PATH= -L/usr/X11R6/lib
-+X11_PATHL= -L${X11BASE}/lib
++X11_PATH= -L${X11BASE}/lib
 +X11_PATHI= -I${X11BASE}/include
  
+ OGL_LIBS= -lGLU -lGL -lm
+ #OGL_LIBS= -lm                                                # Think Different
+ 
  #------------------------------------------------------------------------------
  
 -CFLAGS= -Wall -g -ansi $(shell sdl-config --cflags)
 +CFLAGS+= -Wall -g -ansi $(shell ${SDL_CONFIG} --cflags) ${X11_PATHI}
  
--X11_LIBS= $(X11_PATH) -lGLU -lGL -lm
 -SDL_LIBS= $(shell sdl-config --libs)
-+X11_LIBS= $(X11_PATHL) -lGLU -lGL -lm
+-FT2_LIBS= $(shell freetype-config --libs)
 +SDL_LIBS= $(shell ${SDL_CONFIG} --libs)
++FT2_LIBS= $(shell %%FREETYPE_CONFIG%% --libs)
  
  MAPC_TARG= mapc
  GAME_TARG= neverball
-@@ -39,8 +39,8 @@
+@@ -42,8 +42,8 @@
  	glext.o  \
  	main.o
  
@@ -30,5 +33,5 @@
 +MAPC_DEPS= $(GAME_SRCS:.c)
 +GAME_DEPS= $(GAME_OBJS:.o)
  
- MAPC_LIBS= $(SDL_LIBS) -lSDL_image $(X11_LIBS)
- GAME_LIBS= $(SDL_LIBS) -lSDL_image -lSDL_ttf -lSDL_mixer -lfreetype $(X11_LIBS)
+ 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/files/patch-config.c b/games/neverball/files/patch-config.c
deleted file mode 100644
index 8fec347f6386..000000000000
--- a/games/neverball/files/patch-config.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- config.c.orig	Mon Oct 27 01:11:10 2003
-+++ config.c	Mon Oct 27 01:13:25 2003
-@@ -48,7 +48,7 @@
- static int mouse_sense  = CONFIG_DEF_MOUSE_SENSE;
- static int high_level   = CONFIG_DEF_HIGH_LEVEL;
- static int done         = CONFIG_DEF_DONE;
--static int nice         = CONFIG_DEF_NICE;
-+static int nice1        = CONFIG_DEF_NICE;
- static int fps          = CONFIG_DEF_FPS;
- static int joy          = CONFIG_DEF_JOY;
- static int sound_vol    = CONFIG_DEF_SOUND_VOL;
-@@ -166,7 +166,7 @@
-                 if (strcmp(key, "audio_buff")   == 0) audio_buff   = val;
-                 if (strcmp(key, "mouse_sense")  == 0) mouse_sense  = val;
-                 if (strcmp(key, "high_level")   == 0) high_level   = val;
--                if (strcmp(key, "nice")         == 0) nice         = val;
-+                if (strcmp(key, "nice")         == 0) nice1        = val;
-                 if (strcmp(key, "done")         == 0) done         = val;
-                 if (strcmp(key, "fps")          == 0) fps          = val;
-                 if (strcmp(key, "joy")          == 0) joy          = val;
-@@ -210,7 +210,7 @@
-         fprintf(fp, "mouse_sense %d\n",  mouse_sense);
-         fprintf(fp, "high_level %d\n",   high_level);
-         fprintf(fp, "player %s\n",       player);
--        fprintf(fp, "nice %d\n",         nice);
-+        fprintf(fp, "nice %d\n",         nice1);
-         fprintf(fp, "done %d\n",         done);
-         fprintf(fp, "fps %d\n",          fps);
-         fprintf(fp, "joy %d\n",          joy);
-@@ -242,7 +242,7 @@
- int config_sens(void) { return mouse_sense; }
- int config_high(void) { return high_level; }
- int config_done(void) { return done; }
--int config_nice(void) { return nice; }
-+int config_nice(void) { return nice1; }
- int config_fps (void) { return fps; }
- int config_sound(void) { return sound_vol; }
- int config_music(void) { return music_vol; }
-@@ -368,7 +368,7 @@
- 
- void config_tog_nice(void)
- {
--    nice = nice ? 0 : 1;
-+    nice1 = nice1 ? 0 : 1;
- }
- 
- void config_tog_fps(void)