From 78472fd2bda442d65a5a1ec9a0e2f9674c004f47 Mon Sep 17 00:00:00 2001 From: Tilman Keskinoz Date: Wed, 19 Feb 2003 17:12:33 +0000 Subject: Update to 2.4 Install manpage Add gnugetopt as dependency (noticed by bento). PR: 48331 Submitted by: Stefan Farfeleder --- games/foobillard/files/patch-Makefile.in | 21 ++++++++------------- games/foobillard/files/patch-billard3d.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 games/foobillard/files/patch-billard3d.c (limited to 'games/foobillard/files') diff --git a/games/foobillard/files/patch-Makefile.in b/games/foobillard/files/patch-Makefile.in index b88793647eaa..40b9f6d70e0e 100644 --- a/games/foobillard/files/patch-Makefile.in +++ b/games/foobillard/files/patch-Makefile.in @@ -1,16 +1,9 @@ ---- src/Makefile.in.orig Sat Oct 26 22:01:08 2002 -+++ src/Makefile.in Sat Oct 26 22:01:40 2002 -@@ -1,4 +1,4 @@ --# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +--- 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 @@ - # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation -@@ -72,14 +72,14 @@ - #INCDIR = /usr/X11R6/include --CC = gcc -+CC ?= gcc + INCLUDES = -DNDEBUG -DDATA_DIRECTORY='"${pkgdatadir}/"' -@USE_SDL_TRUE@SDL_CFLAGS = `sdl-config --cflags` -DUSE_SDL +@USE_SDL_TRUE@SDL_CFLAGS = `$(SDL_CONFIG) --cflags` -DUSE_SDL @USE_SDL_FALSE@SDL_CFLAGS = @@ -19,9 +12,11 @@ @USE_SDL_FALSE@SDL_LIBS = @USE_SDL_TRUE@GLUT_LIBS = @USE_SDL_FALSE@GLUT_LIBS = -lglut + @USE_BUMPREF_TRUE@BUMPREF_CFLAGS = + @USE_BUMPREF_FALSE@BUMPREF_CFLAGS = -DNO_NV_BUMPREF --CFLAGS = -Wall -O3 `freetype-config --cflags` ${SDL_CFLAGS} -+CFLAGS += -Wall `freetype-config --cflags` ${SDL_CFLAGS} -I%%X11BASE%%/include -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/SDL11 +-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 diff --git a/games/foobillard/files/patch-billard3d.c b/games/foobillard/files/patch-billard3d.c new file mode 100644 index 000000000000..3c8a29ec1965 --- /dev/null +++ b/games/foobillard/files/patch-billard3d.c @@ -0,0 +1,20 @@ +--- src/billard3d.c.orig Sat Jan 11 02:04:01 2003 ++++ src/billard3d.c Sun Feb 16 16:39:59 2003 +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + + #ifndef USE_SDL + #include +@@ -4094,7 +4094,7 @@ + fread( &ball_ball_snd.data[SOUND_NULLOFFS*2], 1, ball_ball_snd.len-SOUND_NULLOFFS*2*2 , f ); + fclose(f); + +-#if __BYTE_ORDER == __BIG_ENDIAN ++#if _BYTE_ORDER == _BIG_ENDIAN + { + char *snd=ball_ball_snd.data; + for(i=0;i