From c9624da733ee2551bbe306a5434dafe5391659ef Mon Sep 17 00:00:00 2001 From: Kirill Ponomarev Date: Mon, 15 Dec 2003 18:12:40 +0000 Subject: - Update to version 0.70 PR: 60266 Submitted by: Ports Fury --- games/gltron/Makefile | 34 ++-- games/gltron/distinfo | 2 +- games/gltron/files/patch-Makefile.in | 11 ++ .../files/patch-nebu::scripting::scritpting.c | 22 +++ games/gltron/pkg-plist | 192 +++++++-------------- 5 files changed, 112 insertions(+), 149 deletions(-) create mode 100644 games/gltron/files/patch-Makefile.in create mode 100644 games/gltron/files/patch-nebu::scripting::scritpting.c (limited to 'games/gltron') diff --git a/games/gltron/Makefile b/games/gltron/Makefile index 2779cd6f4326..f8966073f54b 100644 --- a/games/gltron/Makefile +++ b/games/gltron/Makefile @@ -6,46 +6,48 @@ # PORTNAME= gltron -PORTVERSION= 0.62 -PORTREVISION= 1 +PORTVERSION= 0.70 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - http://gltron.sourceforge.net/download/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} EXTRACT_SUFX= -source.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= A 3D worm game for two players for X Window System -LIB_DEPENDS= mikmod.2:${PORTSDIR}/audio/libmikmod \ - SDL_sound-1.0.1:${PORTSDIR}/audio/sdl_sound \ - SDL_net.0:${PORTSDIR}/net/sdl_net \ +LIB_DEPENDS= SDL_sound-1.0.1:${PORTSDIR}/audio/sdl_sound \ png.5:${PORTSDIR}/graphics/png -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config - USE_X_PREFIX= yes -USE_MESA= yes +USE_GL= yes +USE_SDL= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ - SDL_CONFIG="${SDL_CONFIG}" - -MAN6= gltron.6 +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS= --disable-warn CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +.if defined(WITH_SDL_NET) +LIB_DEPENDS+= SDL_net:${PORTSDIR}/net/sdl_net +CONFIGURE_ARGS+= --enable-network +.endif + post-patch: + @${REINPLACE_CMD} -e 's|CFLAGS="-D|CFLAGS="$$CFLAGS -D|g ; \ + s|-O$$enable_optimize||g' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-O2|@CFLAGS@|g' + 's|^AM_CFLAGS|INCLUDES|g ; \ + s|^AM_CXXFLAGS|INCLUDES|g ; \ + s|-ansi -pedantic||g' post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for file in ChangeLog CREDITS README +.for file in ChangeLog README ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif diff --git a/games/gltron/distinfo b/games/gltron/distinfo index e98543972410..3cc5649f1b1c 100644 --- a/games/gltron/distinfo +++ b/games/gltron/distinfo @@ -1 +1 @@ -MD5 (gltron-0.62-source.tar.gz) = cb62b09c39bd3f246432fa390e5e4881 +MD5 (gltron-0.70-source.tar.gz) = 300e54914844f36c199415d6d8b0372a diff --git a/games/gltron/files/patch-Makefile.in b/games/gltron/files/patch-Makefile.in new file mode 100644 index 000000000000..947191697908 --- /dev/null +++ b/games/gltron/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sun Dec 14 18:00:19 2003 ++++ Makefile.in Tue Dec 16 00:00:11 2003 +@@ -84,7 +84,7 @@ + + gltron_SOURCES = @top_srcdir@/src/gltron.c + +-gltron_LINK = $(CXX) -o $@ ++gltron_LINK = $(CXX) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + gltron_LDADD = \ + src/game/libgame.a \ + src/input/libinput.a \ diff --git a/games/gltron/files/patch-nebu::scripting::scritpting.c b/games/gltron/files/patch-nebu::scripting::scritpting.c new file mode 100644 index 000000000000..b3b9efd10faa --- /dev/null +++ b/games/gltron/files/patch-nebu::scripting::scritpting.c @@ -0,0 +1,22 @@ +--- nebu/scripting/scripting.c.orig Fri Dec 12 18:05:55 2003 ++++ nebu/scripting/scripting.c Mon Dec 15 22:43:04 2003 +@@ -169,16 +169,16 @@ + return status; + } + +-void scripting_RunFile(char *name) { ++void scripting_RunFile(const char *name) { + lua_dofile(L, name); + } + +-void scripting_Run(char *command) { ++void scripting_Run(const char *command) { + /* fprintf(stderr, "[command] %s\n", command); */ + lua_dostring(L, command); + } + +-void scripting_RunFormat(char *format, ... ) { ++void scripting_RunFormat(const char *format, ... ) { + char buf[4096]; + va_list ap; + va_start(ap, format); diff --git a/games/gltron/pkg-plist b/games/gltron/pkg-plist index 84c37bf2d55b..8805d7678c3f 100644 --- a/games/gltron/pkg-plist +++ b/games/gltron/pkg-plist @@ -1,133 +1,61 @@ bin/gltron -%%PORTDOCS%%share/doc/gltron/ChangeLog -%%PORTDOCS%%share/doc/gltron/CREDITS -%%PORTDOCS%%share/doc/gltron/README -share/gltron/art/arcade_spots/artpack.lua -share/gltron/art/arcade_spots/gltron_floor.png -share/gltron/art/arcade_spots/gltron_traildecal.png -share/gltron/art/arcade_spots/gltron_wall_1.png -share/gltron/art/arcade_spots/gltron_wall_2.png -share/gltron/art/arcade_spots/gltron_wall_3.png -share/gltron/art/arcade_spots/gltron_wall_4.png -share/gltron/art/arcade_spots/skybox0.png -share/gltron/art/arcade_spots/skybox1.png -share/gltron/art/arcade_spots/skybox2.png -share/gltron/art/arcade_spots/skybox3.png -share/gltron/art/arcade_spots/skybox4.png -share/gltron/art/arcade_spots/skybox5.png -share/gltron/art/biohazard/artpack.lua -share/gltron/art/biohazard/babbage.0.png -share/gltron/art/biohazard/babbage.1.png -share/gltron/art/biohazard/gltron.png -share/gltron/art/biohazard/gltron_floor.png -share/gltron/art/biohazard/gltron_logo.png -share/gltron/art/biohazard/gltron_trail.png -share/gltron/art/biohazard/gltron_traildecal.png -share/gltron/art/biohazard/gltron_wall_1.png -share/gltron/art/biohazard/gltron_wall_2.png -share/gltron/art/biohazard/gltron_wall_3.png -share/gltron/art/biohazard/gltron_wall_4.png -share/gltron/art/biohazard/skybox0.png -share/gltron/art/biohazard/skybox1.png -share/gltron/art/biohazard/skybox2.png -share/gltron/art/biohazard/skybox3.png -share/gltron/art/biohazard/skybox4.png -share/gltron/art/biohazard/skybox5.png -share/gltron/art/classic/artpack.lua -share/gltron/art/classic/babbage.0.png -share/gltron/art/classic/babbage.1.png -share/gltron/art/classic/gltron_floor.png -share/gltron/art/classic/gltron_trail.png -share/gltron/art/classic/gltron_traildecal.png -share/gltron/art/classic/gltron_wall_1.png -share/gltron/art/classic/gltron_wall_2.png -share/gltron/art/classic/gltron_wall_3.png -share/gltron/art/classic/gltron_wall_4.png -share/gltron/art/classic/skybox0.png -share/gltron/art/classic/skybox1.png -share/gltron/art/classic/skybox2.png -share/gltron/art/classic/skybox3.png -share/gltron/art/classic/skybox4.png -share/gltron/art/classic/skybox5.png -share/gltron/art/classic/xenotron.0.png -share/gltron/art/classic/xenotron.1.png -share/gltron/art/default/artpack.lua -share/gltron/art/default/babbage.0.png -share/gltron/art/default/babbage.1.png -share/gltron/art/default/gltron.png -share/gltron/art/default/gltron_bitmap.png -share/gltron/art/default/gltron_floor.png -share/gltron/art/default/gltron_impact.png -share/gltron/art/default/gltron_logo.png -share/gltron/art/default/gltron_trail.png -share/gltron/art/default/gltron_traildecal.png -share/gltron/art/default/gltron_wall_1.png -share/gltron/art/default/gltron_wall_2.png -share/gltron/art/default/gltron_wall_3.png -share/gltron/art/default/gltron_wall_4.png -share/gltron/art/default/skybox0.png -share/gltron/art/default/skybox1.png -share/gltron/art/default/skybox2.png -share/gltron/art/default/skybox3.png -share/gltron/art/default/skybox4.png -share/gltron/art/default/skybox5.png -share/gltron/art/default/test.bitmap.png -share/gltron/art/default/xenotron.0.png -share/gltron/art/default/xenotron.1.png -share/gltron/art/metalTron/artpack.lua -share/gltron/art/metalTron/gltron_floor.png -share/gltron/art/metalTron/gltron_wall_1.png -share/gltron/art/metalTron/gltron_wall_2.png -share/gltron/art/metalTron/gltron_wall_3.png -share/gltron/art/metalTron/gltron_wall_4.png -share/gltron/art/metalTron/skybox0.png -share/gltron/art/metalTron/skybox1.png -share/gltron/art/metalTron/skybox2.png -share/gltron/art/metalTron/skybox3.png -share/gltron/art/metalTron/skybox4.png -share/gltron/art/metalTron/skybox5.png -share/gltron/data/babbage.ftx -share/gltron/data/fonts.txt -share/gltron/data/game_crash.ogg -share/gltron/data/game_crash.wav -share/gltron/data/game_engine.ogg -share/gltron/data/game_engine.wav -share/gltron/data/game_recognizer.ogg -share/gltron/data/game_recognizer.wav -share/gltron/data/lightcycle-high.obj -share/gltron/data/lightcycle-low.obj -share/gltron/data/lightcycle-med.obj -share/gltron/data/lightcycle.mtl -share/gltron/data/recognizer.mtl -share/gltron/data/recognizer.obj -share/gltron/data/recognizer_quad.obj -share/gltron/data/settings.txt -share/gltron/data/test.fbmp -share/gltron/data/xenotron.ftx -share/gltron/music/song_revenge_of_cats.it -share/gltron/scripts/audio.lua -share/gltron/scripts/basics.lua -share/gltron/scripts/config.lua -share/gltron/scripts/menu.lua -share/gltron/scripts/menu_functions.lua -share/gltron/scripts/save.lua -share/gltron/scripts/video.lua -share/gltron/sounds/game_crash.wav -share/gltron/sounds/game_engine.wav -share/gltron/sounds/game_lose.wav -share/gltron/sounds/game_start.wav -share/gltron/sounds/game_win.wav -share/gltron/sounds/menu_action.wav -share/gltron/sounds/menu_highlight.wav -@dirrm share/gltron/sounds -@dirrm share/gltron/scripts -@dirrm share/gltron/music -@dirrm share/gltron/data -@dirrm share/gltron/art/metalTron -@dirrm share/gltron/art/default -@dirrm share/gltron/art/classic -@dirrm share/gltron/art/biohazard -@dirrm share/gltron/art/arcade_spots -@dirrm share/gltron/art -@dirrm share/gltron -%%PORTDOCS%%@dirrm share/doc/gltron +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%DATADIR%%/art/default/artpack.lua +%%DATADIR%%/art/default/babbage.0.png +%%DATADIR%%/art/default/babbage.1.png +%%DATADIR%%/art/default/gltron.png +%%DATADIR%%/art/default/gltron_bitmap.png +%%DATADIR%%/art/default/gltron_floor.png +%%DATADIR%%/art/default/gltron_impact.png +%%DATADIR%%/art/default/gltron_logo.png +%%DATADIR%%/art/default/gltron_trail.png +%%DATADIR%%/art/default/gltron_traildecal.png +%%DATADIR%%/art/default/gltron_wall_1.png +%%DATADIR%%/art/default/gltron_wall_2.png +%%DATADIR%%/art/default/gltron_wall_3.png +%%DATADIR%%/art/default/gltron_wall_4.png +%%DATADIR%%/art/default/skybox0.png +%%DATADIR%%/art/default/skybox1.png +%%DATADIR%%/art/default/skybox2.png +%%DATADIR%%/art/default/skybox3.png +%%DATADIR%%/art/default/skybox4.png +%%DATADIR%%/art/default/skybox5.png +%%DATADIR%%/art/default/test.bitmap.png +%%DATADIR%%/art/default/xenotron.0.png +%%DATADIR%%/art/default/xenotron.1.png +%%DATADIR%%/data/babbage.ftx +%%DATADIR%%/data/fonts.txt +%%DATADIR%%/data/game_crash.ogg +%%DATADIR%%/data/game_crash.wav +%%DATADIR%%/data/game_engine.ogg +%%DATADIR%%/data/game_engine.wav +%%DATADIR%%/data/game_recognizer.ogg +%%DATADIR%%/data/game_recognizer.wav +%%DATADIR%%/data/lightcycle-high.obj +%%DATADIR%%/data/lightcycle-low.obj +%%DATADIR%%/data/lightcycle-med.obj +%%DATADIR%%/data/lightcycle.mtl +%%DATADIR%%/data/recognizer.mtl +%%DATADIR%%/data/recognizer.obj +%%DATADIR%%/data/recognizer_quad.obj +%%DATADIR%%/data/test.fbmp +%%DATADIR%%/data/xenotron.ftx +%%DATADIR%%/music/song_revenge_of_cats.it +%%DATADIR%%/scripts/artpack.lua +%%DATADIR%%/scripts/audio.lua +%%DATADIR%%/scripts/basics.lua +%%DATADIR%%/scripts/config.lua +%%DATADIR%%/scripts/joystick.lua +%%DATADIR%%/scripts/main.lua +%%DATADIR%%/scripts/menu.lua +%%DATADIR%%/scripts/menu_functions.lua +%%DATADIR%%/scripts/save.lua +%%DATADIR%%/scripts/video.lua +@dirrm %%DATADIR%%/scripts +@dirrm %%DATADIR%%/music +@dirrm %%DATADIR%%/data +@dirrm %%DATADIR%%/art/default +@dirrm %%DATADIR%%/art +@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% -- cgit v1.2.3