Attachment #28837 for bug #48331

View | Details | Raw Unified | Return to bug 48331
Collapse All | Expand All




#

PORTNAME=	foobillard
PORTVERSION=	2.4
CATEGORIES=	games
MASTER_SITES=	http://foobillard.sunsite.dk/dnl/



LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
		png.5:${PORTSDIR}/graphics/png \
		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
GNU_CONFIGURE=	yes
HAS_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>

Line 1 Link Here

(-)distinfo (-1 / +1 lines)
1	MD5 (foobillard-1.8.tar.gz) = 14038a77187316f378e95ab6ef9ce6fc	1	MD5 (foobillard-2.4.tar.gz) = 9f1adabaf9b62ed1ab7e050d43519f73

Lines 1-6 Link Here

(-)pkg-plist (+8 lines)
1	bin/foobillard	1	bin/foobillard
		2	share/foobillard/ball_ball.raw
2	share/foobillard/blende.png	3	share/foobillard/blende.png
3	share/foobillard/bluebold.ttf	4	share/foobillard/bluebold.ttf
		5	share/foobillard/bumpref.png
4	share/foobillard/cue_shadow.png	6	share/foobillard/cue_shadow.png
5	share/foobillard/foobillard.gif	7	share/foobillard/foobillard.gif
6	share/foobillard/foobillard.png	8	share/foobillard/foobillard.png
Lines 9-15 Link Here
9	share/foobillard/half_symbol.png	11	share/foobillard/half_symbol.png
10	share/foobillard/iomanoid.ttf	12	share/foobillard/iomanoid.ttf
11	share/foobillard/lightflare.png	13	share/foobillard/lightflare.png
		14	share/foobillard/negx.png
		15	share/foobillard/negy.png
		16	share/foobillard/negz.png
12	share/foobillard/place_cue_ball.png	17	share/foobillard/place_cue_ball.png
		18	share/foobillard/posx.png
		19	share/foobillard/posy.png
		20	share/foobillard/posz.png
13	share/foobillard/queue.png	21	share/foobillard/queue.png
14	share/foobillard/queue_shadow.png	22	share/foobillard/queue_shadow.png
15	share/foobillard/shadow2.png	23	share/foobillard/shadow2.png




--- 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 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # 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
 
 INCLUDES = -DNDEBUG -DDATA_DIRECTORY='"${pkgdatadir}/"'
+CC ?= gcc
-@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 = 

 @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} ${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

Added Link Here

(-)files/patch-billard3d.c (+10 lines)
1	--- src/billard3d.c.orig Sun Feb 16 14:50:06 2003
2	+++ src/billard3d.c Sun Feb 16 14:50:12 2003
3	@@ -24,7 +24,6 @@
4	#include <string.h>
5	#include <math.h>
6	#include <unistd.h>
7	-#include <endian.h>
8
9	#ifndef USE_SDL
10	#include <GL/glut.h>

Return to bug 48331

Lines 6-12 Link Here

(-)Makefile (-4 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= foobillard	8	PORTNAME= foobillard
9	PORTVERSION= 1.8	9	PORTVERSION= 2.4
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= http://foobillard.sunsite.dk/dnl/	11	MASTER_SITES= http://foobillard.sunsite.dk/dnl/
12		12
Lines 14-36 Link Here
14		14
15	LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \	15	LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
16	png.5:${PORTSDIR}/graphics/png \	16	png.5:${PORTSDIR}/graphics/png \
17	freetype.9:${PORTSDIR}/print/freetype2	17	freetype.9:${PORTSDIR}/print/freetype2 \
		18	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
18		19
19	SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config	20	SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config
20	USE_MESA= yes	21	USE_MESA= yes
21	USE_GMAKE= yes	22	USE_GMAKE= yes
22	MAKE_ENV= SDL_CONFIG="${SDL_CONFIG}"	23	MAKE_ENV= SDL_CONFIG="${SDL_CONFIG}"
23	USE_REINPLACE= yes	24	USE_REINPLACE= yes
24		25	GNU_CONFIGURE= yes
25	HAS_CONFIGURE= yes
26		26
27	CONFIGURE_ARGS= --enable-SDL --prefix=${PREFIX} \	27	CONFIGURE_ARGS= --enable-SDL --prefix=${PREFIX} \
28	--includedir="${X11BASE}/include"	28	--includedir="${X11BASE}/include"
29		29
		30	.if !defined(WITH_NVIDIA_BUMPREF)
		31	CONFIGURE_ARGS+= --disable-bumpref
		32	.endif
		33
		34	MAN6= foobillard.6
		35	MANCOMPRESSED= no
		36
30	post-patch:	37	post-patch:
31	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \	38	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \
32	${WRKSRC}/src/Makefile.in	39	${WRKSRC}/src/Makefile.in
33	@${REINPLACE_CMD} -e 's\|%%X11BASE%%\|${X11BASE}\|g' \	40	@${REINPLACE_CMD} -e 's\|%%X11BASE%%\|${X11BASE}\|g' \
34	${WRKSRC}/src/Makefile.in	41	${WRKSRC}/src/Makefile.in
		42
		43	post-install:
		44	@${INSTALL_MAN} ${WRKSRC}/foobillard.6 ${PREFIX}/man/man6/foobillard.6
35		45
36	.include <bsd.port.mk>	46	.include <bsd.port.mk>

Lines 1-16 Link Here

(-)files/patch-Makefile.in (-13 / +8 lines)
1	--- src/Makefile.in.orig Sat Oct 26 22:01:08 2002	1	--- src/Makefile.in.orig Sun Feb 16 13:48:17 2003
2	+++ src/Makefile.in Sat Oct 26 22:01:40 2002	2	+++ src/Makefile.in Sun Feb 16 13:52:33 2003
3	@@ -1,4 +1,4 @@	3	@@ -69,16 +69,16 @@
4	-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
5	+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
6		4
7	# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
8	# This Makefile.in is free software; the Free Software Foundation
9	@@ -72,14 +72,14 @@
10	#INCDIR = /usr/X11R6/include
11		5
12	-CC = gcc	6	INCLUDES = -DNDEBUG -DDATA_DIRECTORY='"${pkgdatadir}/"'
13	+CC ?= gcc
14	-@USE_SDL_TRUE@SDL_CFLAGS = `sdl-config --cflags` -DUSE_SDL	7	-@USE_SDL_TRUE@SDL_CFLAGS = `sdl-config --cflags` -DUSE_SDL
15	+@USE_SDL_TRUE@SDL_CFLAGS = `$(SDL_CONFIG) --cflags` -DUSE_SDL	8	+@USE_SDL_TRUE@SDL_CFLAGS = `$(SDL_CONFIG) --cflags` -DUSE_SDL
16	@USE_SDL_FALSE@SDL_CFLAGS =	9	@USE_SDL_FALSE@SDL_CFLAGS =
Lines 19-27 Link Here
19	@USE_SDL_FALSE@SDL_LIBS =	12	@USE_SDL_FALSE@SDL_LIBS =
20	@USE_SDL_TRUE@GLUT_LIBS =	13	@USE_SDL_TRUE@GLUT_LIBS =
21	@USE_SDL_FALSE@GLUT_LIBS = -lglut	14	@USE_SDL_FALSE@GLUT_LIBS = -lglut
		15	@USE_BUMPREF_TRUE@BUMPREF_CFLAGS =
		16	@USE_BUMPREF_FALSE@BUMPREF_CFLAGS = -DNO_NV_BUMPREF
22		17
23	-CFLAGS = -Wall -O3 `freetype-config --cflags` ${SDL_CFLAGS}	18	-CFLAGS = -Wall -O3 `freetype-config --cflags` ${SDL_CFLAGS} ${BUMPREF_CFLAGS}
24	+CFLAGS += -Wall `freetype-config --cflags` ${SDL_CFLAGS} -I%%X11BASE%%/include -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/SDL11	19	+CFLAGS += -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${BUMPREF_CFLAGS} -I%%X11BASE%%/include
25		20
26	#LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz	21	#LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
27	#LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz	22	#LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz