From mezz@ns1.mezzweb.com  Thu Oct 30 01:09:19 2003
Return-Path: <mezz@ns1.mezzweb.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 489EA16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 30 Oct 2003 01:09:19 -0800 (PST)
Received: from ns1.mezzweb.com (ip68-103-32-11.ks.ok.cox.net [68.103.32.11])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3D46E43FE3
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 30 Oct 2003 01:09:17 -0800 (PST)
	(envelope-from mezz@ns1.mezzweb.com)
Received: from ns1.mezzweb.com (localhost [127.0.0.1])
	by ns1.mezzweb.com (8.12.9/8.12.9) with ESMTP id h9U8kEF6025752
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 30 Oct 2003 02:46:15 -0600 (CST)
	(envelope-from mezz@ns1.mezzweb.com)
Received: (from mezz@localhost)
	by ns1.mezzweb.com (8.12.9/8.12.9/Submit) id h9U8kEcV025751;
	Thu, 30 Oct 2003 02:46:14 -0600 (CST)
Message-Id: <200310300846.h9U8kEcV025751@ns1.mezzweb.com>
Date: Thu, 30 Oct 2003 02:46:14 -0600 (CST)
From: Jeremy Messenger <mezz7@cox.net>
Reply-To: Jeremy Messenger <mezz7@cox.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Maintainer update: games/neverball 0.25.11 -> 0.25.12
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         58713
>Category:       ports
>Synopsis:       Maintainer update: games/neverball 0.25.11 -> 0.25.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 30 01:10:10 PST 2003
>Closed-Date:    Thu Nov 06 22:40:26 PST 2003
>Last-Modified:  Thu Nov 06 22:40:26 PST 2003
>Originator:     Mezz
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD ns1.mezzweb.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 13
22:39:47 CDT 2003 mezz@mezz.mezzweb.com:/usr/obj/usr/src/sys/BSDROCKS i386

>Description:
Update to 0.25.12.

>How-To-Repeat:
n/a

>Fix:
Remove the patch-config.c, since the author has fixed it.

--- neverball.diff begins here ---
diff -urN neverball.orig/Makefile neverball/Makefile
--- neverball.orig/Makefile	Mon Oct 27 21:02:53 2003
+++ neverball/Makefile	Thu Oct 30 01:41:30 2003
@@ -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 @@
 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 -urN neverball.orig/distinfo neverball/distinfo
--- neverball.orig/distinfo	Mon Oct 27 21:02:53 2003
+++ neverball/distinfo	Thu Oct 30 00:53:28 2003
@@ -1 +1 @@
-MD5 (neverball-0.25.11.tar.bz2) = 96ace59deb3ed29efe744b7d45b3e7d8
+MD5 (neverball-0.25.12.tar.bz2) = 7d9c3b3bea5f2a65ea583de5061d403e
diff -urN neverball.orig/files/patch-Makefile neverball/files/patch-Makefile
--- neverball.orig/files/patch-Makefile	Mon Oct 27 21:02:53 2003
+++ neverball/files/patch-Makefile	Thu Oct 30 01:41:34 2003
@@ -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 -urN neverball.orig/files/patch-config.c neverball/files/patch-config.c
--- neverball.orig/files/patch-config.c	Mon Oct 27 21:02:53 2003
+++ neverball/files/patch-config.c	Wed Dec 31 18:00:00 1969
@@ -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)
--- neverball.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: adamw 
State-Changed-When: Thu Nov 6 22:40:01 PST 2003 
State-Changed-Why:  
Committed. Thanks, mezz! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=58713 
>Unformatted:
