aboutsummaryrefslogtreecommitdiffstats
path: root/games/foobillard
diff options
context:
space:
mode:
authorsf <sf@FreeBSD.org>2003-07-14 10:36:32 +0800
committersf <sf@FreeBSD.org>2003-07-14 10:36:32 +0800
commit73e9df16f30aa62cae232c4ea9508d42871288d8 (patch)
treea99fcd5df3baf6551aa4b583e6f0629a9e2011a1 /games/foobillard
parent2ce467befa91d01773724a4c8f31424dc8b043bf (diff)
downloadfreebsd-ports-gnome-73e9df16f30aa62cae232c4ea9508d42871288d8.tar.gz
freebsd-ports-gnome-73e9df16f30aa62cae232c4ea9508d42871288d8.tar.zst
freebsd-ports-gnome-73e9df16f30aa62cae232c4ea9508d42871288d8.zip
get rid of libgnugetopt dependency for -CURRENT,
use USE_GETOPT_LONG instead. convert getopt_long_only() to getopt_long().
Diffstat (limited to 'games/foobillard')
-rw-r--r--games/foobillard/Makefile9
-rw-r--r--games/foobillard/files/patch-billard3d.c17
2 files changed, 18 insertions, 8 deletions
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 7b64e6d3e553..74cc68a68ecb 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -7,6 +7,7 @@
PORTNAME= foobillard
PORTVERSION= 2.6
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://foobillard.sunsite.dk/dnl/
@@ -15,17 +16,17 @@ COMMENT= A free OpenGL-billard game
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
png.5:${PORTSDIR}/graphics/png \
- freetype.9:${PORTSDIR}/print/freetype2 \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+ freetype.9:${PORTSDIR}/print/freetype2
SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config
+USE_GETOPT_LONG=yes
USE_MESA= yes
USE_GMAKE= yes
MAKE_ENV= SDL_CONFIG="${SDL_CONFIG}"
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lgnugetopt"
+CPPFLAGS= -I${X11BASE}/include
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="-L${LOCALBASE}/lib"
.if !defined(WITH_NVIDIA_BUMPREF)
CONFIGURE_ARGS+= --disable-bumpref
diff --git a/games/foobillard/files/patch-billard3d.c b/games/foobillard/files/patch-billard3d.c
index 3c8a29ec1965..ca2ed4776a7a 100644
--- a/games/foobillard/files/patch-billard3d.c
+++ b/games/foobillard/files/patch-billard3d.c
@@ -1,15 +1,24 @@
---- src/billard3d.c.orig Sat Jan 11 02:04:01 2003
-+++ src/billard3d.c Sun Feb 16 16:39:59 2003
+--- src/billard3d.c.orig Thu May 1 08:32:10 2003
++++ src/billard3d.c Mon Jul 7 04:29:04 2003
@@ -24,7 +24,7 @@
#include <string.h>
#include <math.h>
#include <unistd.h>
-#include <endian.h>
-+#include <machine/endian.h>
++#include <sys/endian.h>
#ifndef USE_SDL
#include <GL/glut.h>
-@@ -4094,7 +4094,7 @@
+@@ -4270,7 +4270,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){
+ process_option(act_option);
+ }
+ DPRINTF("main:rgstereo=%d",options_rgstereo_on);
+@@ -4359,7 +4359,7 @@
fread( &ball_ball_snd.data[SOUND_NULLOFFS*2], 1, ball_ball_snd.len-SOUND_NULLOFFS*2*2 , f );
fclose(f);