1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-29 01:13:08 +00:00

- Update to 0.2.8.2.1

- Pass maintainership to submitter

PR:		ports/124017 (based on)
Submitted by:	Ian Wagner <ianthetechie at gmail.com>
This commit is contained in:
Rong-En Fan 2008-06-29 15:21:08 +00:00
parent b68102dc04
commit 56ae4435c0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=215949
11 changed files with 187 additions and 169 deletions

View File

@ -7,23 +7,27 @@
#
PORTNAME= armagetron
PORTVERSION= 0.2.7.1
PORTREVISION= 3
PORTVERSION= 0.2.8.2.1
CATEGORIES= games
MASTER_SITES= SF/armagetronad
DISTNAME= armagetronad-${PORTVERSION}
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= ports@FreeBSD.org
MAINTAINER= ianthetechie@gmail.com
COMMENT= A multiplayer networked Tron clone in 3D
USE_GL= gl
USE_SDL= sdl image
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CXXFLAGS="${CFLAGS} -I${LOCALBASE}/include"
CONFIGURE_ENV= CXXFLAGS="${CFLAGS} -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`"
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-etc
BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash
LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
png.5:${PORTSDIR}/graphics/png \
xml2.5:${PORTSDIR}/textproc/libxml2
OPTIONS= MUSIC "Compile in support for background music" on
@ -34,11 +38,14 @@ USE_SDL+= mixer
CONFIGURE_ARGS+=--enable-music
.endif
# This script isn't needed and only causes install problems
CONFIGURE_ARGS+=--disable-uninstall
post-patch:
@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|^#!/bin/bash$$|#!/bin/sh|g' ${WRKSRC}/batch/*
@${FIND} ${WRKSRC}/batch -type f -exec ${REINPLACE_CMD} -e 's|^#!/bin/bash$$|#!/bin/sh|g' {} \+
@${REINPLACE_CMD} -e 's|^INSTALL=.*$$|INSTALL=${DATADIR}|g' \
${WRKSRC}/batch/*.in
@${RM} -f ${WRKSRC}/batch/*.bak ${WRKSRC}/batch/*.orig
@${FIND} ${WRKSRC}/batch -name '*.bak' -o -name '*.orig' -delete
.include <bsd.port.post.mk>

View File

@ -1,3 +1,3 @@
MD5 (armagetronad-0.2.7.1.tar.gz) = 1359977836fd68ba732419649366c3df
SHA256 (armagetronad-0.2.7.1.tar.gz) = 3001fc78409b9e0978b59a0e2be40855444717c40f2cac31214289d71c9e42c9
SIZE (armagetronad-0.2.7.1.tar.gz) = 1344874
MD5 (armagetronad-0.2.8.2.1.src.tar.gz) = be4ee66a499a8fe7122391e8340cb576
SHA256 (armagetronad-0.2.8.2.1.src.tar.gz) = ef6ce4d913079cb7d26647c42107a165a87e96041b311b8d5059ac04ece1d859
SIZE (armagetronad-0.2.8.2.1.src.tar.gz) = 1874858

View File

@ -1,11 +0,0 @@
--- Makefile.global.in.orig Sat Nov 12 16:05:46 2005
+++ Makefile.global.in Sat Nov 12 16:05:55 2005
@@ -116,7 +116,7 @@
for f in ${srcdir}/*.m4 ; do\
echo >> .m4.dep;\
echo -n $$( echo $$f | sed -e "s/.m4$$/.ghost/" -e "s|${srcdir}/||" ) >> .m4.dep;\
- echo -en ":" >> .m4.dep;\
+ echo -n ":" >> .m4.dep;\
{ echo -n "define(include,\$$1\) define(m4,ghost)" ; grep "include(" $$f; }| m4 >> .m4.dep;\
done

View File

@ -0,0 +1,11 @@
--- Makefile.in.orig 2008-06-08 21:26:57.000000000 +0800
+++ Makefile.in 2008-06-08 21:27:08.000000000 +0800
@@ -1130,7 +1130,7 @@
install-first:
# uninstall previous version (if it exists), ignoring errors
- test -x $(uninstall_location) && $(uninstall_location) || true
+@USE_UNINSTALL_TRUE@ test -x $(uninstall_location) && $(uninstall_location) || true
distclean-local:
rm -f uninstall.sh batch/relocate.in universal_variable* extrapaths src/tUniversalVariables.h*

View File

@ -1,31 +1,11 @@
--- configure.orig Sat Nov 12 20:05:56 2005
+++ configure Sat Nov 12 20:08:47 2005
@@ -4455,7 +4455,7 @@
fi
-test x$enable_etc = xyes && configdir="--configdir /etc/$prognamebase"
+test x$enable_etc = xyes && configdir="--configdir $prefix/etc/$prognamebase"
@@ -8878,7 +8878,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL `sdl-config --libs` $LIBS"
+LIBS="`sdl-config --libs` $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8941,9 +8941,7 @@
CPPFLAGS="$CPPFLAGS `sdl-config --cflags`"
export CPPFLAGS
export CXXFLAGS
-for LIBRARY in `sdl-config --libs`; do
- echo "$LIBRARY" | grep "^-l" > /dev/null && LIBS="$LIBRARY $LIBS"
-done
+LIBS="`sdl-config --libs` $LIBS"
export LIBS
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBSDL 1
--- configure.orig 2006-08-05 03:15:57.000000000 +0800
+++ configure 2008-06-08 14:32:47.000000000 +0800
@@ -17362,7 +17362,7 @@
echo " Static data will be installed in : `eval echo ${aa_datadir}`"
echo " Configuration will be installed in : `eval echo ${aa_sysconfdir}`"
echo " Documentation will be installed in : `eval echo ${aa_docdir}`"
-test "x$enable_etc" = "xyes" && echo " Link to configuration will go to : /etc/${progname}"
+test "x$enable_etc" = "xyes" && echo " Link to configuration will go to : $prefix/etc/${progname}"
echo " Music support: $enable_music"
echo " Build with Krawall authentication support: $enable_krawall"
echo " Use dirty SDL initialization: $enable_dirty"

View File

@ -1,11 +1,11 @@
--- src/engine/eVoter.cpp.orig 2007-10-02 18:10:33.000000000 +0200
+++ src/engine/eVoter.cpp 2007-10-02 18:10:58.000000000 +0200
@@ -39,6 +39,8 @@
--- src/engine/eVoter.cpp.orig 2006-05-13 22:17:31.000000000 +0800
+++ src/engine/eVoter.cpp 2008-06-08 14:34:16.000000000 +0800
@@ -41,6 +41,8 @@
#include "ePlayer.h"
#include "eGrid.h"
+class eMenuItemVote;
+
static unsigned short se_votingItemID = 0;
static float se_votingTimeout = 300.0f;
static nSettingItem< float > se_vt( "VOTING_TIMEOUT", se_votingTimeout );
// use server controlled votes
static bool se_useServerControlledKick = false;
static nSettingItemWatched< bool > se_usc( "VOTE_USE_SERVER_CONTROLLED_KICK", se_useServerControlledKick, nConfItemVersionWatcher::Group_Annoying, 10 );

View File

@ -1,11 +1,10 @@
--- src/engine/eWall.h.orig 2007-10-02 18:12:07.000000000 +0200
+++ src/engine/eWall.h 2007-10-02 18:13:02.000000000 +0200
@@ -53,6 +53,8 @@
--- src/engine/eWall.h.orig 2005-11-18 07:38:17.000000000 +0800
+++ src/engine/eWall.h 2008-06-08 14:35:22.000000000 +0800
@@ -53,6 +53,7 @@
class eWall;
+class eWallView;
+class eWallHolder;
class eWallHolder;
class eGameObject;
class eWallView:public tHeapElement{
class eCamera;

View File

@ -1,10 +0,0 @@
--- src/network/nPriorizing.h.orig 2007-10-02 18:17:42.000000000 +0200
+++ src/network/nPriorizing.h 2007-10-02 18:18:00.000000000 +0200
@@ -36,6 +36,7 @@
class nSendBuffer;
class nBandwidthControl;
class nBandwidthTask;
+class nBandwidthTaskPriorizer;
tDECLARE_REFOBJ( nBandwidthTask );
tDECLARE_REFOBJ( nBandwidthArbitrator );

View File

@ -1,13 +1,14 @@
--- src/tron/gCycle.h.orig 2007-10-02 18:18:27.000000000 +0200
+++ src/tron/gCycle.h 2007-10-02 18:18:51.000000000 +0200
@@ -40,6 +40,10 @@
class gTextureCycle;
class eSoundPlayer;
class gSensor;
+class gCycle;
+class gPlayerWall;
+class gNetPlayerWall;
+class gDestination;
--- src/tron/gCycle.h.orig 2006-05-13 22:17:31.000000000 +0800
+++ src/tron/gCycle.h 2008-06-08 14:37:33.000000000 +0800
@@ -41,8 +41,10 @@
#include "gCycleMovement.h"
// minimum time between two cycle turns
extern REAL sg_delayCycle;
class rModel;
-class gTextureCycle;
+class gCycle;
+class gDestination;
class eSoundPlayer;
+class gTextureCycle;
class gSensor;
class gNetPlayerWall;
class gPlayerWall;

View File

@ -5,10 +5,10 @@ arcade game based on the movie of the same name, release by Disney in 1982. The
original game consisted of 4 sub-games, the only one of concern is the 'Light
Cycles' one, in which the player uses a left/right joystick to control a 'Light
Cycle' which leaves a wall behind it wherever the cycle it goes, turning only
at 90 degree angles. The player must then get the AI to crash into their wall
while avoiding hitting the AI's own wall themselves. Those were the humble
beginnings of Armagetron Advanced's game play, which has now blossomed into 16
player mayhem, with highly advanced AI, network game play, and of course all in
a 3D environment.
at 90 degree angles (well, on most servers anyways). The player must then force
his opponents to crash into their wall while avoiding his opponents walls.
Those were the humble beginnings of Armagetron Advanced's game play, which has
now blossomed into 16 player mayhem, with highly advanced AI, network game
play, and of course all in a 3D environment.
WWW: http://armagetronad.net/

View File

@ -1,79 +1,120 @@
bin/armagetronad
bin/armagetronad-stat
etc/armagetronad/aiplayers.cfg
etc/armagetronad/default.cfg
etc/armagetronad/master.srv
etc/armagetronad/rc.config
etc/armagetronad/settings.cfg
etc/armagetronad/settings_dedicated.cfg
@dirrm etc/armagetronad
%%DATADIR%%/COPYING.txt
%%DATADIR%%/arenas/basic.aar
%%DATADIR%%/bin/armagetronad
%%DATADIR%%/bin/armagetronad-stat
%%DATADIR%%/bin/pushscores
%%DATADIR%%/bin/rcd_config
%%DATADIR%%/bin/rcd_master
%%DATADIR%%/bin/rcd_server
%%DATADIR%%/bin/rcd_startstop
%%DATADIR%%/bin/uninstall
%%DATADIR%%/doc/COPYING.txt
%%DATADIR%%/doc/artr.cfg
%%DATADIR%%/doc/bugs.html
%%DATADIR%%/doc/changelog.html
%%DATADIR%%/doc/commands.html
%%DATADIR%%/doc/commands.txt
%%DATADIR%%/doc/compile.html
%%DATADIR%%/doc/config.html
%%DATADIR%%/doc/faq.html
%%DATADIR%%/doc/index.html
%%DATADIR%%/doc/install_linux.html
%%DATADIR%%/doc/install_macosx.html
%%DATADIR%%/doc/install_windows.html
%%DATADIR%%/doc/net/index.html
%%DATADIR%%/doc/net/lower.html
%%DATADIR%%/doc/net/middle.html
%%DATADIR%%/doc/net/upper.html
%%DATADIR%%/doc/network.html
%%DATADIR%%/doc/readme_linux.html
%%DATADIR%%/doc/readme_macosx.html
%%DATADIR%%/doc/readme_windows.html
%%DATADIR%%/doc/todo.html
%%DATADIR%%/doc/versions.html
%%DATADIR%%/language/.tag
%%DATADIR%%/language/deutsch.txt
%%DATADIR%%/language/english.txt
%%DATADIR%%/language/languages.txt
%%DATADIR%%/language/new.txt
%%DATADIR%%/models/cycle_body.mod
%%DATADIR%%/models/cycle_front.mod
%%DATADIR%%/models/cycle_rear.mod
%%DATADIR%%/sound/cyclrun.wav
%%DATADIR%%/sound/expl.wav
%%DATADIR%%/textures/KGN_logo.png
%%DATADIR%%/textures/cycle_body.png
%%DATADIR%%/textures/cycle_wheel.png
%%DATADIR%%/textures/dir_wall.png
%%DATADIR%%/textures/floor.png
%%DATADIR%%/textures/floor_a.png
%%DATADIR%%/textures/floor_b.png
%%DATADIR%%/textures/font.png
%%DATADIR%%/textures/font_extra.png
%%DATADIR%%/textures/font_s.png
%%DATADIR%%/textures/icon.png
%%DATADIR%%/textures/rim_wall.png
%%DATADIR%%/textures/shadow.png
%%DATADIR%%/textures/sky.png
%%DATADIR%%/textures/title.jpg
%%DATADIR%%/textures/wrap.png
@dirrm %%DATADIR%%/arenas
@dirrm %%DATADIR%%/bin
@dirrm %%DATADIR%%/doc/net
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%/language
@dirrm %%DATADIR%%/log
@dirrm %%DATADIR%%/models
@dirrm %%DATADIR%%/music
@dirrm %%DATADIR%%/sound
@dirrm %%DATADIR%%/textures
@dirrm %%DATADIR%%
etc/games/armagetronad/aiplayers.cfg
etc/games/armagetronad/default.cfg
etc/games/armagetronad/examples/breakfast_in_hell.cfg
etc/games/armagetronad/examples/cvs_test/fortress_complete.cfg
etc/games/armagetronad/examples/cvs_test/fortress_physics.cfg
etc/games/armagetronad/examples/cvs_test/fortress_politics.cfg
etc/games/armagetronad/examples/cvs_test/fortress_scoring.cfg
etc/games/armagetronad/examples/cvs_test/sumo_complete.cfg
etc/games/armagetronad/examples/death_zone.cfg
etc/games/armagetronad/examples/fortress_soccer.cfg
etc/games/armagetronad/examples/single_use_turbo.cfg
etc/games/armagetronad/master.srv
etc/games/armagetronad/rc.config
etc/games/armagetronad/settings.cfg
etc/games/armagetronad/settings_dedicated.cfg
etc/games/armagetronad/settings_visual.cfg
share/doc/games/armagetronad/html/bugs.html
share/doc/games/armagetronad/html/changelog.html
share/doc/games/armagetronad/html/commands.html
share/doc/games/armagetronad/html/compile.html
share/doc/games/armagetronad/html/config.html
share/doc/games/armagetronad/html/faq.html
share/doc/games/armagetronad/html/index.html
share/doc/games/armagetronad/html/install_linux.html
share/doc/games/armagetronad/html/install_macosx.html
share/doc/games/armagetronad/html/install_result.html
share/doc/games/armagetronad/html/install_windows.html
share/doc/games/armagetronad/html/net/index.html
share/doc/games/armagetronad/html/net/lower.html
share/doc/games/armagetronad/html/net/middle.html
share/doc/games/armagetronad/html/net/upper.html
share/doc/games/armagetronad/html/network.html
share/doc/games/armagetronad/html/readme_macosx.html
share/doc/games/armagetronad/html/todo.html
share/doc/games/armagetronad/html/versions.html
share/games/armagetronad/desktop/armagetronad.desktop
share/games/armagetronad/desktop/icons/large/armagetronad.png
share/games/armagetronad/desktop/icons/medium/armagetronad.png
share/games/armagetronad/desktop/icons/small/armagetronad.png
share/games/armagetronad/language/american.txt
share/games/armagetronad/language/british.txt
share/games/armagetronad/language/deutsch.txt
share/games/armagetronad/language/english_base.txt
share/games/armagetronad/language/english_base_notranslate.txt
share/games/armagetronad/language/french.txt
share/games/armagetronad/language/languages.txt
share/games/armagetronad/language/languages.txt.in
share/games/armagetronad/language/spanish.txt
share/games/armagetronad/language/update.py
share/games/armagetronad/models/cycle_body.mod
share/games/armagetronad/models/cycle_front.mod
share/games/armagetronad/models/cycle_rear.mod
share/games/armagetronad/resource/included/AATeam/map-0.2.8.0.dtd
share/games/armagetronad/resource/included/AATeam/map-0.2.8.0_rc4.dtd
share/games/armagetronad/resource/included/Anonymous/README
share/games/armagetronad/resource/included/Anonymous/polygon/README
share/games/armagetronad/resource/included/Anonymous/polygon/regular/40-gon-0.2.aamap.xml
share/games/armagetronad/resource/included/Anonymous/polygon/regular/README
share/games/armagetronad/resource/included/Anonymous/polygon/regular/diamond-1.0.2.aamap.xml
share/games/armagetronad/resource/included/Anonymous/polygon/regular/square-1.0.1.aamap.xml
share/games/armagetronad/resource/included/Your_mom/clever/inaktek-0.7.2.aamap.xml
share/games/armagetronad/resource/included/Your_mom/clever/repeat-0.3.2.aamap.xml
share/games/armagetronad/resource/included/Z-Man/fortress/for_old_clients-0.1.0.aamap.xml
share/games/armagetronad/resource/included/Z-Man/fortress/fourfold_for_old_clients-0.1.0.aamap.xml
share/games/armagetronad/resource/included/Z-Man/fortress/sumo_4x4-0.1.1.aamap.xml
share/games/armagetronad/resource/included/Z-Man/fortress/sumo_8x2-0.1.0.aamap.xml
share/games/armagetronad/resource/included/Z-Man/fortress/zonetest-0.1.0.aamap.xml
share/games/armagetronad/resource/included/map-0.1-exp.dtd
share/games/armagetronad/resource/included/map-0.1.dtd
share/games/armagetronad/resource/included/map-0.2.8_beta3.dtd
share/games/armagetronad/scripts/relocate
share/games/armagetronad/scripts/sysinstall
share/games/armagetronad/sound/cyclrun.wav
share/games/armagetronad/sound/expl.wav
share/games/armagetronad/textures/KGN_logo.png
share/games/armagetronad/textures/cycle_body.png
share/games/armagetronad/textures/cycle_wheel.png
share/games/armagetronad/textures/dir_wall.png
share/games/armagetronad/textures/floor.png
share/games/armagetronad/textures/floor_a.png
share/games/armagetronad/textures/floor_b.png
share/games/armagetronad/textures/font.png
share/games/armagetronad/textures/font_extra.png
share/games/armagetronad/textures/font_s.png
share/games/armagetronad/textures/icon.png
share/games/armagetronad/textures/rim_wall.png
share/games/armagetronad/textures/shadow.png
share/games/armagetronad/textures/sky.png
share/games/armagetronad/textures/title.jpg
@dirrm share/games/armagetronad/textures
@dirrm share/games/armagetronad/sound
@dirrm share/games/armagetronad/scripts
@dirrm share/games/armagetronad/resource/included/Z-Man/fortress
@dirrm share/games/armagetronad/resource/included/Z-Man
@dirrm share/games/armagetronad/resource/included/Your_mom/clever
@dirrm share/games/armagetronad/resource/included/Your_mom
@dirrm share/games/armagetronad/resource/included/Anonymous/polygon/regular
@dirrm share/games/armagetronad/resource/included/Anonymous/polygon
@dirrm share/games/armagetronad/resource/included/Anonymous
@dirrm share/games/armagetronad/resource/included/AATeam
@dirrm share/games/armagetronad/resource/included
@dirrm share/games/armagetronad/resource
@dirrm share/games/armagetronad/models
@dirrm share/games/armagetronad/language
@dirrm share/games/armagetronad/desktop/icons/small
@dirrm share/games/armagetronad/desktop/icons/medium
@dirrm share/games/armagetronad/desktop/icons/large
@dirrm share/games/armagetronad/desktop/icons
@dirrm share/games/armagetronad/desktop
@dirrm share/games/armagetronad
@dirrm share/games
@dirrm share/doc/games/armagetronad/html/net
@dirrm share/doc/games/armagetronad/html
@dirrm share/doc/games/armagetronad
@dirrm share/doc/games
@dirrm etc/games/armagetronad/examples/cvs_test
@dirrm etc/games/armagetronad/examples
@dirrm etc/games/armagetronad
@dirrmtry etc/games