Date: Sun, 16 Feb 2003 16:22:25 +0100 (CET) From: Stefan Farfeleder <stefan@fafoe.dyndns.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: stefan@fafoe.dyndns.org Subject: ports/48331: Update port: foobillard -> 2.4 Message-ID: <20030216152225.C3690264@frog.fafoe>
next in thread | raw e-mail | index | archive | help
>Number: 48331 >Category: ports >Synopsis: Update port: foobillard -> 2.4 >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: Sun Feb 16 07:30:04 PST 2003 >Closed-Date: >Last-Modified: >Originator: Stefan Farfeleder >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD frog.fafoe 5.0-CURRENT FreeBSD 5.0-CURRENT #16: Thu Feb 13 22:23:09 CET 2003 freebsd@frog.fafoe:/freebsd/current/obj/freebsd/current/src/sys/FROG i386 >Description: - Update to foobillard 2.4 - Install the new man page - Add gnugetopt as dependency (noticed on bento: http://bento.freebsd.org/errorlogs/i386-5-latest/foobillard-1.8.log) - Disable bump reflections per default, add a WITH_NVIDIA_BUMPREF knob to enable them (they depend on NVidia extensions, due to lack of such a device not tested) >How-To-Repeat: n/a >Fix: --- foobillard.diff begins here --- 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> --- foobillard.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030216152225.C3690264>