ports/52126: Update: games/foobillard to 2.6

[Stefan Farfeleder]

>Number:         52126
>Category:       ports
>Synopsis:       Update: games/foobillard to 2.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 12 09:30:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Farfeleder
>Release:        FreeBSD 5.1-BETA i386
>Organization:
>Environment:
System: FreeBSD frog.fafoe 5.1-BETA FreeBSD 5.1-BETA #14: Tue May 6 23:46:20 CEST 2003 freebsd at frog.fafoe:/freebsd/frog/obj/freebsd/frog/src/sys/FROG i386


	
>Description:
* Update to 2.6
* Remove post-patch target: ${LOCALBASE} isn't used anymore in src/Makefile.in, 
	pass ${X11BASE} via CONFIGURE_ENV, remove %%X11BASE%% patch from
	patch-Makefile.in
* Remove CONFIGURE_ARGS assignment: --enable-SDL is on by default,
	--prefix=${PREFIX} is done by GNU_CONFIGURE and --includedir does not
	work for X11 headers anyway.
	
>How-To-Repeat:
	
>Fix:

	

--- foobillard.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/home/ncvs/ports/games/foobillard/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	27 Feb 2003 10:37:45 -0000	1.4
+++ Makefile	12 May 2003 15:58:29 -0000
@@ -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 @@
 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
@@ -35,12 +33,6 @@
 
 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
Index: distinfo
===================================================================
RCS file: /usr/home/ncvs/ports/games/foobillard/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	19 Feb 2003 17:12:33 -0000	1.2
+++ distinfo	12 May 2003 15:17:38 -0000
@@ -1 +1 @@
-MD5 (foobillard-2.4.tar.gz) = 9f1adabaf9b62ed1ab7e050d43519f73
+MD5 (foobillard-2.6.tar.gz) = 988dde14ecb7765bc28e365295ec082d
Index: files/patch-Makefile.in
===================================================================
RCS file: /usr/home/ncvs/ports/games/foobillard/files/patch-Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile.in
--- files/patch-Makefile.in	19 Feb 2003 17:12:33 -0000	1.2
+++ files/patch-Makefile.in	12 May 2003 16:01:07 -0000
@@ -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	Thu May  1 01:44:52 2003
++++ src/Makefile.in	Mon May 12 17:22:56 2003
+@@ -69,9 +69,9 @@
  
  
  INCLUDES = -DNDEBUG -DDATA_DIRECTORY='"${pkgdatadir}/"'
@@ -12,11 +12,3 @@
  @USE_SDL_FALSE at SDL_LIBS = 
  @USE_SDL_TRUE at GLUT_LIBS = 
  @USE_SDL_FALSE at GLUT_LIBS = -lglut
- @USE_BUMPREF_TRUE at BUMPREF_CFLAGS = 
- @USE_BUMPREF_FALSE at 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
- 
- #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
- #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
--- foobillard.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: