Date: Sun, 16 Nov 2003 00:22:08 -0600 (CST) From: Jeremy Messenger <mezz7@cox.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: thomas.vogt@bsdunix.ch Subject: ports/59319: Update port: games/foobillard 2.6 -> 2.9 Message-ID: <200311160622.hAG6M8N5088353@ns1.mezzweb.com> Resent-Message-ID: <200311160650.hAG6oKka096972@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59319 >Category: ports >Synopsis: Update port: games/foobillard 2.6 -> 2.9 >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: Sat Nov 15 22:50:20 PST 2003 >Closed-Date: >Last-Modified: >Originator: Mezz >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD ns1.mezzweb.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 13 22:39:47 CDT 2003 mezz@mezz.mezzweb.com:/usr/obj/usr/src/sys/BSDROCKS i386 >Description: - Update to 2.9. - Add an new option/define, WITH_SDL. >How-To-Repeat: n/a >Fix: Here what I have made some change: - Update to 2.9. - Remove SDL from LIB_DEPENDS and use USE_SDL. Also, remove the SDL_CONFIG since the USE_SDL will take care of it. - Add FREETYPE_CONFIG. - Remove MAKE_ENV, since foobillard's src/Makefile should take care. - Add a new define/option, WITH_SDL. - Remove MANCOMPRESSED=no, user will decide if they don't want the compress the manpage and can be done by via the /etc/make.conf. - Add pre-everything to explain that it has two defines/options. I think, it's all. I personal would change the prefix from LOCALBASE to X11BASE, but it doesn't matter to me. It's up to you, so I am leaving the prefix alone. Please do feel free if you dislike my change and modify it. :-) --- foobillard.diff begins here --- diff -ur foobillard.orig/Makefile foobillard/Makefile --- foobillard.orig/Makefile Sun Jul 13 21:36:32 2003 +++ foobillard/Makefile Sun Nov 16 00:12:40 2003 @@ -6,34 +6,55 @@ # PORTNAME= foobillard -PORTVERSION= 2.6 -PORTREVISION= 1 +PORTVERSION= 2.9 CATEGORIES= games MASTER_SITES= http://foobillard.sunsite.dk/dnl/ MAINTAINER= thomas.vogt@bsdunix.ch COMMENT= A free OpenGL-billard game -LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \ - png.5:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 -SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config +FREETYPE_CONFIG?= ${LOCALBASE}/bin/freetype-config + USE_GETOPT_LONG=yes +USE_SDL= yes USE_MESA= yes USE_GMAKE= yes -MAKE_ENV= SDL_CONFIG="${SDL_CONFIG}" +USE_REINPLACE= yes GNU_CONFIGURE= yes -CPPFLAGS= -I${X11BASE}/include -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="-L${LOCALBASE}/lib" +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 -MANCOMPRESSED= no + +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 diff -ur foobillard.orig/distinfo foobillard/distinfo --- foobillard.orig/distinfo Thu May 15 15:04:35 2003 +++ foobillard/distinfo Sat Nov 15 20:55:50 2003 @@ -1 +1 @@ -MD5 (foobillard-2.6.tar.gz) = 988dde14ecb7765bc28e365295ec082d +MD5 (foobillard-2.9.tar.gz) = b8b10d7d3ade07a9e0c497165beadbca diff -ur foobillard.orig/files/patch-Makefile.in foobillard/files/patch-Makefile.in --- foobillard.orig/files/patch-Makefile.in Thu Jul 24 23:57:24 2003 +++ foobillard/files/patch-Makefile.in Sat Nov 15 21:16:37 2003 @@ -1,9 +1,9 @@ ---- src/Makefile.in.orig Thu May 1 08:44:52 2003 -+++ src/Makefile.in Fri Jul 25 13:44:28 2003 -@@ -69,9 +69,9 @@ - - - INCLUDES = -DNDEBUG -DDATA_DIRECTORY='"${pkgdatadir}/"' +--- 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 = @@ -12,17 +12,17 @@ @USE_SDL_FALSE@SDL_LIBS = @USE_SDL_TRUE@GLUT_LIBS = @USE_SDL_FALSE@GLUT_LIBS = -lglut -@@ -80,11 +80,11 @@ - @USE_BUMPREF_TRUE@BUMPREF_CFLAGS = - @USE_BUMPREF_FALSE@BUMPREF_CFLAGS = -DNO_NV_BUMPREF +@@ -187,11 +187,11 @@ + @USE_SOUND_TRUE@SOUND_CFLAGS = -DUSE_SOUND + @USE_SOUND_FALSE@SOUND_CFLAGS = --CFLAGS = -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${BUMPREF_CFLAGS} ${DEBUG_CFLAGS} -+CFLAGS += -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${BUMPREF_CFLAGS} ${DEBUG_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 --LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS} -+LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS} @LDFLAGS@ +-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 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + subdir = src diff -ur foobillard.orig/files/patch-billard3d.c foobillard/files/patch-billard3d.c --- foobillard.orig/files/patch-billard3d.c Sun Jul 13 21:36:32 2003 +++ foobillard/files/patch-billard3d.c Sat Nov 15 21:12:42 2003 @@ -1,5 +1,5 @@ ---- src/billard3d.c.orig Thu May 1 08:32:10 2003 -+++ src/billard3d.c Mon Jul 7 04:29:04 2003 +--- 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> @@ -9,16 +9,16 @@ #ifndef USE_SDL #include <GL/glut.h> -@@ -4270,7 +4270,7 @@ +@@ -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); } - DPRINTF("main:rgstereo=%d",options_rgstereo_on); -@@ -4359,7 +4359,7 @@ +@@ -5058,7 +5058,7 @@ fread( &ball_ball_snd.data[SOUND_NULLOFFS*2], 1, ball_ball_snd.len-SOUND_NULLOFFS*2*2 , f ); fclose(f); diff -ur foobillard.orig/files/patch-sys_stuff.c foobillard/files/patch-sys_stuff.c --- foobillard.orig/files/patch-sys_stuff.c Fri Nov 1 14:41:26 2002 +++ foobillard/files/patch-sys_stuff.c Sat Nov 15 21:25:47 2003 @@ -1,11 +1,11 @@ ---- src/sys_stuff.c.orig Sat Oct 26 20:47:23 2002 -+++ src/sys_stuff.c Sat Oct 26 20:47:32 2002 +--- src/sys_stuff.c.orig Sat Nov 15 21:24:23 2003 ++++ src/sys_stuff.c Sat Nov 15 21:25:20 2003 @@ -5,7 +5,7 @@ #ifndef USE_SDL #include <GL/glut.h> #else -#include <SDL/SDL.h> -+#include <SDL11/SDL.h> ++#include <SDL.h> #include <GL/gl.h> #include <GL/glu.h> #endif diff -ur foobillard.orig/pkg-plist foobillard/pkg-plist --- foobillard.orig/pkg-plist Wed Feb 19 11:12:33 2003 +++ foobillard/pkg-plist Sat Nov 15 23:27:06 2003 @@ -3,6 +3,7 @@ share/foobillard/blende.png share/foobillard/bluebold.ttf share/foobillard/bumpref.png +share/foobillard/cloth.png share/foobillard/cue_shadow.png share/foobillard/foobillard.gif share/foobillard/foobillard.png --- foobillard.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311160622.hAG6M8N5088353>