Attachment 28837 Details for Bug 48331 – foobillard.diff

[patch] foobillard.diff

foobillard.diff (text/plain), 5.03 KB, created by Stefan Farfeleder on 2003-02-16 15:30:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Farfeleder

Created: 2003-02-16 15:30:04 UTC

Size: 5.03 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /usr/home/ncvs/ports/games/foobillard/Makefile,v
>retrieving revision 1.2
>diff -c -u -r1.2 Makefile
>--- Makefile	2 Jan 2003 15:06:04 -0000	1.2
>+++ Makefile	16 Feb 2003 14:51:05 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	foobillard
>-PORTVERSION=	1.8
>+PORTVERSION=	2.4
> CATEGORIES=	games
> MASTER_SITES=	http://foobillard.sunsite.dk/dnl/
> 
>@@ -14,23 +14,33 @@
> 
> LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
> 		png.5:${PORTSDIR}/graphics/png \
>-		freetype.9:${PORTSDIR}/print/freetype2
>+		freetype.9:${PORTSDIR}/print/freetype2 \
>+		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
> 
> SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
> USE_MESA=	yes
> USE_GMAKE=	yes
> MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
> USE_REINPLACE=	yes
>-
>-HAS_CONFIGURE=	yes
>+GNU_CONFIGURE=	yes
> 
> CONFIGURE_ARGS=	--enable-SDL --prefix=${PREFIX} \
> 		--includedir="${X11BASE}/include"
> 
>+.if !defined(WITH_NVIDIA_BUMPREF)
>+CONFIGURE_ARGS+=	--disable-bumpref
>+.endif
>+
>+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
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /usr/home/ncvs/ports/games/foobillard/distinfo,v
>retrieving revision 1.1
>diff -c -u -r1.1 distinfo
>--- distinfo	1 Nov 2002 20:41:26 -0000	1.1
>+++ distinfo	16 Feb 2003 14:15:13 -0000
>@@ -1 +1 @@
>-MD5 (foobillard-1.8.tar.gz) = 14038a77187316f378e95ab6ef9ce6fc
>+MD5 (foobillard-2.4.tar.gz) = 9f1adabaf9b62ed1ab7e050d43519f73
>Index: pkg-plist
>===================================================================
>RCS file: /usr/home/ncvs/ports/games/foobillard/pkg-plist,v
>retrieving revision 1.1
>diff -c -u -r1.1 pkg-plist
>--- pkg-plist	1 Nov 2002 20:41:26 -0000	1.1
>+++ pkg-plist	16 Feb 2003 14:15:13 -0000
>@@ -1,6 +1,8 @@
> bin/foobillard
>+share/foobillard/ball_ball.raw
> share/foobillard/blende.png
> share/foobillard/bluebold.ttf
>+share/foobillard/bumpref.png
> share/foobillard/cue_shadow.png
> share/foobillard/foobillard.gif
> share/foobillard/foobillard.png
>@@ -9,7 +11,13 @@
> share/foobillard/half_symbol.png
> share/foobillard/iomanoid.ttf
> share/foobillard/lightflare.png
>+share/foobillard/negx.png
>+share/foobillard/negy.png
>+share/foobillard/negz.png
> share/foobillard/place_cue_ball.png
>+share/foobillard/posx.png
>+share/foobillard/posy.png
>+share/foobillard/posz.png
> share/foobillard/queue.png
> share/foobillard/queue_shadow.png
> share/foobillard/shadow2.png
>Index: files/patch-Makefile.in
>===================================================================
>RCS file: /usr/home/ncvs/ports/games/foobillard/files/patch-Makefile.in,v
>retrieving revision 1.1
>diff -c -u -r1.1 patch-Makefile.in
>--- files/patch-Makefile.in	1 Nov 2002 20:41:26 -0000	1.1
>+++ files/patch-Makefile.in	16 Feb 2003 14:15:13 -0000
>@@ -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
>Index: files/patch-billard3d.c
>===================================================================
>RCS file: files/patch-billard3d.c
>diff -N files/patch-billard3d.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-billard3d.c	16 Feb 2003 14:15:13 -0000
>@@ -0,0 +1,10 @@
>+--- src/billard3d.c.orig	Sun Feb 16 14:50:06 2003
>++++ src/billard3d.c	Sun Feb 16 14:50:12 2003
>+@@ -24,7 +24,6 @@
>+ #include <string.h>
>+ #include <math.h>
>+ #include <unistd.h>
>+-#include <endian.h>
>+ 
>+ #ifndef USE_SDL
>+ #include <GL/glut.h>

Actions: View | Diff

Attachments on bug 48331: 28837 | 28838