From 7194cbda4845a2e0fcc93933d7b12150c9363fad Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@FreeBSD.org>
Date: Thu, 15 May 2003 20:04:35 +0000
Subject: [PATCH] Update to 2.6.

PR:		ports/52126
Submitted by:	Stefan Farfeleder <stefan@fafoe.dyndns.org>
Approved by:	thomas.vogt@bsdunix.ch (maintainer)
---
 games/foobillard/Makefile                | 14 +++-----------
 games/foobillard/distinfo                |  2 +-
 games/foobillard/files/patch-Makefile.in | 11 ++++++-----
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index b2efffb6027c..7b64e6d3e553 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	foobillard
-PORTVERSION=	2.4
+PORTVERSION=	2.6
 CATEGORIES=	games
 MASTER_SITES=	http://foobillard.sunsite.dk/dnl/
 
@@ -22,12 +22,10 @@ SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 USE_MESA=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--enable-SDL --prefix=${PREFIX} \
-		--includedir="${X11BASE}/include"
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lgnugetopt"
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lgnugetopt"
 
 .if !defined(WITH_NVIDIA_BUMPREF)
 CONFIGURE_ARGS+=	--disable-bumpref
@@ -36,12 +34,6 @@ CONFIGURE_ARGS+=	--disable-bumpref
 MAN6=		foobillard.6
 MANCOMPRESSED=	no
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/src/Makefile.in
-
 post-install:
 	@${INSTALL_MAN} ${WRKSRC}/foobillard.6 ${PREFIX}/man/man6/foobillard.6
 
diff --git a/games/foobillard/distinfo b/games/foobillard/distinfo
index 62bf9a3bf6dd..969cd789e5eb 100644
--- a/games/foobillard/distinfo
+++ b/games/foobillard/distinfo
@@ -1 +1 @@
-MD5 (foobillard-2.4.tar.gz) = 9f1adabaf9b62ed1ab7e050d43519f73
+MD5 (foobillard-2.6.tar.gz) = 988dde14ecb7765bc28e365295ec082d
diff --git a/games/foobillard/files/patch-Makefile.in b/games/foobillard/files/patch-Makefile.in
index 40b9f6d70e0e..ef17fd808442 100644
--- a/games/foobillard/files/patch-Makefile.in
+++ b/games/foobillard/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	Sun Feb 16 13:48:17 2003
-+++ src/Makefile.in	Sun Feb 16 13:52:33 2003
-@@ -69,16 +69,16 @@
+--- src/Makefile.in.orig	Wed Apr 30 16:44:52 2003
++++ src/Makefile.in	Thu May 15 13:01:03 2003
+@@ -69,9 +69,9 @@
  
  
  INCLUDES = -DNDEBUG -DDATA_DIRECTORY='"${pkgdatadir}/"'
@@ -12,11 +12,12 @@
  @USE_SDL_FALSE@SDL_LIBS = 
  @USE_SDL_TRUE@GLUT_LIBS = 
  @USE_SDL_FALSE@GLUT_LIBS = -lglut
+@@ -80,7 +80,7 @@
  @USE_BUMPREF_TRUE@BUMPREF_CFLAGS = 
  @USE_BUMPREF_FALSE@BUMPREF_CFLAGS = -DNO_NV_BUMPREF
  
--CFLAGS = -Wall -O3 `freetype-config --cflags` ${SDL_CFLAGS} ${BUMPREF_CFLAGS}
-+CFLAGS += -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${BUMPREF_CFLAGS}  -I%%X11BASE%%/include
+-CFLAGS = -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${BUMPREF_CFLAGS} ${DEBUG_CFLAGS}
++CFLAGS += -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${BUMPREF_CFLAGS} ${DEBUG_CFLAGS}
  
  #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
  #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz