Attachment #37197 for bug #59319

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




#

PORTNAME=	foobillard
PORTVERSION=	2.9
PORTREVISION=	1
CATEGORIES=	games
MASTER_SITES=	http://foobillard.sunsite.dk/dnl/

MAINTAINER=	thomas.vogt@bsdunix.ch
COMMENT=	A free OpenGL-billard game

LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
		png.5:${PORTSDIR}/graphics/png \
		freetype.9:${PORTSDIR}/print/freetype2

FREETYPE_CONFIG?=	${LOCALBASE}/bin/freetype-config

USE_GETOPT_LONG=yes
USE_SDL=	yes
USE_MESA=	yes
USE_GMAKE=	yes
USE_REINPLACE=	yes
GNU_CONFIGURE=	yes

CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"

.if defined(WITH_SDL)
CONFIGURE_ARGS+=	--enable-SDL
.endif

.if !defined(WITH_NVIDIA_BUMPREF)
CONFIGURE_ARGS+=	--disable-bumpref
.endif

MAN6=		foobillard.6

pre-everything::
.if !defined(WITH_SDL) || !defined(WITH_NVIDIA_BUMPREF)
	@${ECHO_MSG} "You may specify the following on the command line:"
	@${ECHO_MSG} ""
.endif

.if !defined(WITH_SDL)
	@${ECHO_MSG} "WITH_SDL=yes to use SDL-lib instead of glut"
.endif

.if !defined(WITH_NVIDIA_BUMPREF)
	@${ECHO_MSG} "WITH_NVIDIA_BUMPREF=yes to enable NV-extensions"
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|%%FREETYPE_CONFIG%%|${FREETYPE_CONFIG}|g' \
		${WRKSRC}/src/Makefile.in

post-install:
	@${INSTALL_MAN} ${WRKSRC}/foobillard.6 ${PREFIX}/man/man6/foobillard.6

Line 1 Link Here

(-)foobillard/distinfo (-1 / +1 lines)
1	MD5 (foobillard-2.6.tar.gz) = 988dde14ecb7765bc28e365295ec082d	1	MD5 (foobillard-2.9.tar.gz) = b8b10d7d3ade07a9e0c497165beadbca




--- src/Makefile.in.orig	Sat Nov 15 21:06:49 2003
+++ src/Makefile.in	Sat Nov 15 21:09:47 2003
@@ -171,9 +171,9 @@
 #CXXFLAGS = -O6 -s
 #CFLAGS = -DXMESA -Wall -O3 -I$(INCDIR)
 #CFLAGS = -Wall -O3 -I$(INCDIR) `freetype-config --cflags`
-@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
@@ -187,11 +187,11 @@
 @USE_SOUND_TRUE@SOUND_CFLAGS = -DUSE_SOUND
 @USE_SOUND_FALSE@SOUND_CFLAGS = 
 
-AM_CFLAGS = -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS}
+AM_CFLAGS = -Wall `%%FREETYPE_CONFIG%% --cflags` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_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
-AM_LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS}
+AM_LDFLAGS = ${all_libraries} `%%FREETYPE_CONFIG%% --libs` ${SDL_LIBS} ${GLUT_LIBS}
 #LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -L/home/floh/nvsdk/OpenGL/lib/ -lnvparse
 LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz
 subdir = src




--- src/billard3d.c.orig	Sat Nov 15 21:10:47 2003
+++ src/billard3d.c	Sat Nov 15 21:12:13 2003
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>

 
 #ifndef USE_SDL
 #include <GL/glut.h>
@@ -4960,7 +4960,7 @@
 
    /* config file */
    load_config( &confv, &confc, argv, argc );
-   while( ( act_option = getopt_long_only(confc, confv, "+", long_options, &option_index) ) >= 0){
+   while( ( act_option = getopt_long(confc, confv, "+", long_options, &option_index) ) >= 0){
        DPRINTF("processing option %d=%s\n",act_option,optarg);
        process_option(act_option);
    }
@@ -5058,7 +5058,7 @@
@@ -4359,7 +4359,7 @@
        fread( &ball_ball_snd.data[SOUND_NULLOFFS*2], 1, ball_ball_snd.len-SOUND_NULLOFFS*2*2 , f );
        fclose(f);
 

Lines 1-11 Link Here

(-)foobillard/files/patch-sys_stuff.c (-3 / +3 lines)
1	--- src/sys_stuff.c.orig Sat Oct 26 20:47:23 2002	1	--- src/sys_stuff.c.orig Sat Nov 15 21:24:23 2003
2	+++ src/sys_stuff.c Sat Oct 26 20:47:32 2002	2	+++ src/sys_stuff.c Sat Nov 15 21:25:20 2003
3	@@ -5,7 +5,7 @@	3	@@ -5,7 +5,7 @@
4	#ifndef USE_SDL	4	#ifndef USE_SDL
5	#include <GL/glut.h>	5	#include <GL/glut.h>
6	#else	6	#else
7	-#include <SDL/SDL.h>	7	-#include <SDL/SDL.h>
8	+#include <SDL11/SDL.h>	8	+#include <SDL.h>
9	#include <GL/gl.h>	9	#include <GL/gl.h>
10	#include <GL/glu.h>	10	#include <GL/glu.h>
11	#endif	11	#endif

Lines 3-8 Link Here

(-)foobillard/pkg-plist (+1 lines)
3	share/foobillard/blende.png	3	share/foobillard/blende.png
4	share/foobillard/bluebold.ttf	4	share/foobillard/bluebold.ttf
5	share/foobillard/bumpref.png	5	share/foobillard/bumpref.png
		6	share/foobillard/cloth.png
6	share/foobillard/cue_shadow.png	7	share/foobillard/cue_shadow.png
7	share/foobillard/foobillard.gif	8	share/foobillard/foobillard.gif
8	share/foobillard/foobillard.png	9	share/foobillard/foobillard.png

Return to bug 59319

Lines 6-39 Link Here

(-)foobillard/Makefile (-9 / +30 lines)
6	#	6	#
7		7
8	PORTNAME= foobillard	8	PORTNAME= foobillard
9	PORTVERSION= 2.6	9	PORTVERSION= 2.9
10	PORTREVISION= 1
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= http://foobillard.sunsite.dk/dnl/	11	MASTER_SITES= http://foobillard.sunsite.dk/dnl/
13		12
14	MAINTAINER= thomas.vogt@bsdunix.ch	13	MAINTAINER= thomas.vogt@bsdunix.ch
15	COMMENT= A free OpenGL-billard game	14	COMMENT= A free OpenGL-billard game
16		15
17	LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \	16	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
18	png.5:${PORTSDIR}/graphics/png \
19	freetype.9:${PORTSDIR}/print/freetype2	17	freetype.9:${PORTSDIR}/print/freetype2
20		18
21	SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config	19	FREETYPE_CONFIG?= ${LOCALBASE}/bin/freetype-config
		20
22	USE_GETOPT_LONG=yes	21	USE_GETOPT_LONG=yes
		22	USE_SDL= yes
23	USE_MESA= yes	23	USE_MESA= yes
24	USE_GMAKE= yes	24	USE_GMAKE= yes
25	MAKE_ENV= SDL_CONFIG="${SDL_CONFIG}"	25	USE_REINPLACE= yes
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
27		27
28	CPPFLAGS= -I${X11BASE}/include	28	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
29	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="-L${LOCALBASE}/lib"	29	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
		30
		31	.if defined(WITH_SDL)
		32	CONFIGURE_ARGS+= --enable-SDL
		33	.endif
30		34
31	.if !defined(WITH_NVIDIA_BUMPREF)	35	.if !defined(WITH_NVIDIA_BUMPREF)
32	CONFIGURE_ARGS+= --disable-bumpref	36	CONFIGURE_ARGS+= --disable-bumpref
33	.endif	37	.endif
34		38
35	MAN6= foobillard.6	39	MAN6= foobillard.6
36	MANCOMPRESSED= no	40
		41	pre-everything::
		42	.if !defined(WITH_SDL) \|\| !defined(WITH_NVIDIA_BUMPREF)
		43	@${ECHO_MSG} "You may specify the following on the command line:"
		44	@${ECHO_MSG} ""
		45	.endif
		46
		47	.if !defined(WITH_SDL)
		48	@${ECHO_MSG} "WITH_SDL=yes to use SDL-lib instead of glut"
		49	.endif
		50
		51	.if !defined(WITH_NVIDIA_BUMPREF)
		52	@${ECHO_MSG} "WITH_NVIDIA_BUMPREF=yes to enable NV-extensions"
		53	.endif
		54
		55	post-patch:
		56	@${REINPLACE_CMD} -e 's\|%%FREETYPE_CONFIG%%\|${FREETYPE_CONFIG}\|g' \
		57	${WRKSRC}/src/Makefile.in
37		58
38	post-install:	59	post-install:
39	@${INSTALL_MAN} ${WRKSRC}/foobillard.6 ${PREFIX}/man/man6/foobillard.6	60	@${INSTALL_MAN} ${WRKSRC}/foobillard.6 ${PREFIX}/man/man6/foobillard.6

Lines 1-9 Link Here

(-)foobillard/files/patch-Makefile.in (-14 / +14 lines)
1	--- src/Makefile.in.orig Thu May 1 08:44:52 2003	1	--- src/Makefile.in.orig Sat Nov 15 21:06:49 2003
2	+++ src/Makefile.in Fri Jul 25 13:44:28 2003	2	+++ src/Makefile.in Sat Nov 15 21:09:47 2003
3	@@ -69,9 +69,9 @@	3	@@ -171,9 +171,9 @@
4		4	#CXXFLAGS = -O6 -s
5		5	#CFLAGS = -DXMESA -Wall -O3 -I$(INCDIR)
6	INCLUDES = -DNDEBUG -DDATA_DIRECTORY='"${pkgdatadir}/"'	6	#CFLAGS = -Wall -O3 -I$(INCDIR) `freetype-config --cflags`
7	-@USE_SDL_TRUE@SDL_CFLAGS = `sdl-config --cflags` -DUSE_SDL	7	-@USE_SDL_TRUE@SDL_CFLAGS = `sdl-config --cflags` -DUSE_SDL
8	+@USE_SDL_TRUE@SDL_CFLAGS = `$(SDL_CONFIG) --cflags` -DUSE_SDL	8	+@USE_SDL_TRUE@SDL_CFLAGS = `$(SDL_CONFIG) --cflags` -DUSE_SDL
9	@USE_SDL_FALSE@SDL_CFLAGS =	9	@USE_SDL_FALSE@SDL_CFLAGS =
Lines 12-28 Link Here
12	@USE_SDL_FALSE@SDL_LIBS =	12	@USE_SDL_FALSE@SDL_LIBS =
13	@USE_SDL_TRUE@GLUT_LIBS =	13	@USE_SDL_TRUE@GLUT_LIBS =
14	@USE_SDL_FALSE@GLUT_LIBS = -lglut	14	@USE_SDL_FALSE@GLUT_LIBS = -lglut
15	@@ -80,11 +80,11 @@	15	@@ -187,11 +187,11 @@
16	@USE_BUMPREF_TRUE@BUMPREF_CFLAGS =	16	@USE_SOUND_TRUE@SOUND_CFLAGS = -DUSE_SOUND
17	@USE_BUMPREF_FALSE@BUMPREF_CFLAGS = -DNO_NV_BUMPREF	17	@USE_SOUND_FALSE@SOUND_CFLAGS =
18		18
19	-CFLAGS = -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${BUMPREF_CFLAGS} ${DEBUG_CFLAGS}	19	-AM_CFLAGS = -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS}
20	+CFLAGS += -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${BUMPREF_CFLAGS} ${DEBUG_CFLAGS}	20	+AM_CFLAGS = -Wall `%%FREETYPE_CONFIG%% --cflags` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS}
21		21
22	#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
23	#LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz	23	#LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
24	-LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS}	24	-AM_LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS}
25	+LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS} @LDFLAGS@	25	+AM_LDFLAGS = ${all_libraries} `%%FREETYPE_CONFIG%% --libs` ${SDL_LIBS} ${GLUT_LIBS}
26	#LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -L/home/floh/nvsdk/OpenGL/lib/ -lnvparse	26	#LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -L/home/floh/nvsdk/OpenGL/lib/ -lnvparse
27	LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz	27	LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz
28	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs	28	subdir = src

Lines 1-5 Link Here

(-)foobillard/files/patch-billard3d.c (-5 / +5 lines)
1	--- src/billard3d.c.orig Thu May 1 08:32:10 2003	1	--- src/billard3d.c.orig Sat Nov 15 21:10:47 2003
2	+++ src/billard3d.c Mon Jul 7 04:29:04 2003	2	+++ src/billard3d.c Sat Nov 15 21:12:13 2003
3	@@ -24,7 +24,7 @@	3	@@ -24,7 +24,7 @@
4	#include <string.h>	4	#include <string.h>
5	#include <math.h>	5	#include <math.h>
Lines 9-24 Link Here
9		9
10	#ifndef USE_SDL	10	#ifndef USE_SDL
11	#include <GL/glut.h>	11	#include <GL/glut.h>
12	@@ -4270,7 +4270,7 @@	12	@@ -4960,7 +4960,7 @@
13		13
14	/* config file */	14	/* config file */
15	load_config( &confv, &confc, argv, argc );	15	load_config( &confv, &confc, argv, argc );
16	- while( ( act_option = getopt_long_only(confc, confv, "+", long_options, &option_index) ) >= 0){	16	- while( ( act_option = getopt_long_only(confc, confv, "+", long_options, &option_index) ) >= 0){
17	+ while( ( act_option = getopt_long(confc, confv, "+", long_options, &option_index) ) >= 0){	17	+ while( ( act_option = getopt_long(confc, confv, "+", long_options, &option_index) ) >= 0){
		18	DPRINTF("processing option %d=%s\n",act_option,optarg);
18	process_option(act_option);	19	process_option(act_option);
19	}	20	}
20	DPRINTF("main:rgstereo=%d",options_rgstereo_on);	21	@@ -5058,7 +5058,7 @@
21	@@ -4359,7 +4359,7 @@
22	fread( &ball_ball_snd.data[SOUND_NULLOFFS2], 1, ball_ball_snd.len-SOUND_NULLOFFS2*2 , f );	22	fread( &ball_ball_snd.data[SOUND_NULLOFFS2], 1, ball_ball_snd.len-SOUND_NULLOFFS2*2 , f );
23	fclose(f);	23	fclose(f);
24		24