Index: head/games/armagetron/Makefile =================================================================== --- head/games/armagetron/Makefile (revision 341167) +++ head/games/armagetron/Makefile (revision 341168) @@ -1,60 +1,57 @@ # Created by: Maxime Henrion # $FreeBSD$ PORTNAME= armagetron -PORTVERSION= 0.2.8.2.1 -PORTREVISION= 7 +PORTVERSION= 0.2.8.3.2 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}ad/${PORTNAME}ad-src/${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}ad/stable/${PORTVERSION}/ DISTNAME= armagetronad-${PORTVERSION} -EXTRACT_SUFX= .src.tar.gz +EXTRACT_SUFX= .src.tar.bz2 MAINTAINER= ianthetechie@gmail.com COMMENT= A multiplayer networked Tron clone in 3D -USE_GMAKE= yes +USES= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-etc --disable-initscripts CXXFLAGS+= ${CFLAGS} -I${LOCALBASE}/include BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - xml2.5:${PORTSDIR}/textproc/libxml2 +LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng.so:${PORTSDIR}/graphics/png \ + libxml2.so:${PORTSDIR}/textproc/libxml2 OPTIONS_DEFINE= MUSIC ARMA_SERVER_ONLY MUSIC_DESC= Compile in support for background music ARMA_SERVER_ONLY_DESC= Build dedicated server only OPTIONS_DEFAULT= MUSIC -NO_STAGE= yes .include .if ${PORT_OPTIONS:MARMA_SERVER_ONLY} CONFIGURE_ARGS+= --disable-glout PLIST_SUB+= CLIENT="@comment " SERVER="" SUFFIX="-dedicated" PKGNAMESUFFX= -dedicated -USE_RC_SUBR= armagetronad_dedicated .else USE_GL= gl USE_SDL= sdl image CXXFLAGS+= `${SDL_CONFIG} --cflags` PLIST_SUB+= CLIENT="" SERVER="@comment " SUFFIX="" .if ${PORT_OPTIONS:MMUSIC} USE_SDL+= mixer CONFIGURE_ARGS+=--enable-music .endif .endif # This script isn't needed and only causes install problems CONFIGURE_ARGS+=--disable-uninstall post-patch: @${REINPLACE_CMD} -e 's|sdl11-config|${SDL_CONFIG}|g' ${WRKSRC}/configure @${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 @${FIND} ${WRKSRC}/batch -name '*.bak' -o -name '*.orig' -delete .include Index: head/games/armagetron/distinfo =================================================================== --- head/games/armagetron/distinfo (revision 341167) +++ head/games/armagetron/distinfo (revision 341168) @@ -1,2 +1,2 @@ -SHA256 (armagetronad-0.2.8.2.1.src.tar.gz) = ef6ce4d913079cb7d26647c42107a165a87e96041b311b8d5059ac04ece1d859 -SIZE (armagetronad-0.2.8.2.1.src.tar.gz) = 1874858 +SHA256 (armagetronad-0.2.8.3.2.src.tar.bz2) = f444e481de94e6c0e3933c709d46effd2adfe823f5ef44768adcc8003b8ba7c5 +SIZE (armagetronad-0.2.8.3.2.src.tar.bz2) = 1841407 Index: head/games/armagetron/files/patch-src-engine_eGrid.h =================================================================== --- head/games/armagetron/files/patch-src-engine_eGrid.h (revision 341167) +++ head/games/armagetron/files/patch-src-engine_eGrid.h (nonexistent) @@ -1,10 +0,0 @@ ---- src/engine/eGrid.h.orig 2007-10-02 18:09:58.000000000 +0200 -+++ src/engine/eGrid.h 2007-10-02 18:10:10.000000000 +0200 -@@ -39,6 +39,7 @@ - class ePoint; - class eFace; - class eHalfEdge; -+class eGameObject; - class eWall; - class eGrid; - class eWallView; Property changes on: head/games/armagetron/files/patch-src-engine_eGrid.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/armagetron/files/patch-src-tron_gCycle.h =================================================================== --- head/games/armagetron/files/patch-src-tron_gCycle.h (revision 341167) +++ head/games/armagetron/files/patch-src-tron_gCycle.h (nonexistent) @@ -1,14 +0,0 @@ ---- 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" - - class rModel; --class gTextureCycle; -+class gCycle; -+class gDestination; - class eSoundPlayer; -+class gTextureCycle; - class gSensor; - class gNetPlayerWall; - class gPlayerWall; Property changes on: head/games/armagetron/files/patch-src-tron_gCycle.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/armagetron/files/patch-Makefile.in =================================================================== --- head/games/armagetron/files/patch-Makefile.in (revision 341167) +++ head/games/armagetron/files/patch-Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- 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* Property changes on: head/games/armagetron/files/patch-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/armagetron/files/patch-src-engine_eVoter.cpp =================================================================== --- head/games/armagetron/files/patch-src-engine_eVoter.cpp (revision 341167) +++ head/games/armagetron/files/patch-src-engine_eVoter.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- 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; -+ - // 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 ); Property changes on: head/games/armagetron/files/patch-src-engine_eVoter.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/armagetron/files/armagetronad_dedicated.in =================================================================== --- head/games/armagetron/files/armagetronad_dedicated.in (revision 341167) +++ head/games/armagetron/files/armagetronad_dedicated.in (nonexistent) @@ -1,34 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ -# -# PROVIDE: armagetronad_dedicated -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# armagetronad_dedicated_enable (bool): Set to NO by default. -# Set it to YES to enable armagetron server. -# armagetronad_dedicated_flags (str): Set to "-d" by default. -# Extra flags passed to start command -# - -. /etc/rc.subr - -name="armagetronad_dedicated" -rcvar=armagetronad_dedicated_enable - -command=%%PREFIX%%/bin/${name} -pidfile=/var/run/${name}.pid - -load_rc_config $name - -: ${armagetronad_dedicated_enable="NO"} -: ${armagetronad_dedicated_flags="-d"} - -command="%%PREFIX%%/bin/armagetronad-dedicated" -command_args="${armagetronad_dedicated_flags} &" - -run_rc_command "$1" Property changes on: head/games/armagetron/files/armagetronad_dedicated.in ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/armagetron/files/patch-batch-install.in =================================================================== --- head/games/armagetron/files/patch-batch-install.in (revision 341167) +++ head/games/armagetron/files/patch-batch-install.in (nonexistent) @@ -1,36 +0,0 @@ ---- batch/install.in.orig Sat Feb 19 17:54:22 2005 -+++ batch/install.in Sun Nov 13 01:26:26 2005 -@@ -8,7 +8,7 @@ - - #find old configuration - if test @enable_etc@ = yes ; then -- CONFIG=@rpmroot@/etc/@prognamebase@ -+ CONFIG=@rpmroot@@prefix@/etc/@prognamebase@ - else - CONFIG=$INSTALL/config - fi -@@ -114,10 +114,6 @@ - cp $INSTALL/config/* $CONFIG - fi - --rm -rf $CONFIG_NEW --mkdir $CONFIG_NEW --cp $CONFIG/* $CONFIG_NEW -- - if test "$UPDATE" = "yes" && test -d $CONFIG_ORIG; then - echo "Integrating user changes..." #"from $CONFIG_USER to $CONFIG_ORIG and $CONFIG..." - test -r $CONFIG_USER || mkdir $CONFIG_USER -@@ -140,13 +136,6 @@ - done - cd $PWD_OLD - fi -- --rm -rf $CONFIG_ORIG --rm -rf $NEW_CONFIG_ORIG --mv $CONFIG_NEW $NEW_CONFIG_ORIG --chmod 755 $NEW_CONFIG_ORIG --chmod 400 $NEW_CONFIG_ORIG/* --echo -e "Don't change anything in this directory; it will be needed exactly as it is now\nwhen you upgrate to a new version." >> $NEW_CONFIG_ORIG/README - - #delete obsolete configuration - if test @enable_etc@ = yes ; then Property changes on: head/games/armagetron/files/patch-batch-install.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/armagetron/files/patch-src-engine_eWall.h =================================================================== --- head/games/armagetron/files/patch-src-engine_eWall.h (revision 341167) +++ head/games/armagetron/files/patch-src-engine_eWall.h (nonexistent) @@ -1,10 +0,0 @@ ---- 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 eGameObject; - class eCamera; Property changes on: head/games/armagetron/files/patch-src-engine_eWall.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/armagetron/files/patch-configure =================================================================== --- head/games/armagetron/files/patch-configure (revision 341167) +++ head/games/armagetron/files/patch-configure (revision 341168) @@ -1,11 +1,21 @@ ---- 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" +diff -Nur configure.orig configure +--- configure.orig 2013-12-16 15:45:20.000000000 +0400 ++++ configure 2013-12-16 15:46:48.000000000 +0400 +@@ -10629,12 +10629,12 @@ + CPPFLAGS="$CPPFLAGS `libpng-config --cflags`" + LIBS="$LIBS $PNGLIBS" + +-ac_fn_c_check_func "$LINENO" "png_check_sig" "ac_cv_func_png_check_sig" +-if test "x$ac_cv_func_png_check_sig" = x""yes; then : ++# ac_fn_c_check_func "$LINENO" "png_check_sig" "ac_cv_func_png_check_sig" ++# if test "x$ac_cv_func_png_check_sig" = x""yes; then : + +-else +- as_fn_error "You need libpng to compile Armagetron." "$LINENO" 5 +-fi ++# else ++# as_fn_error "You need libpng to compile Armagetron." "$LINENO" 5 ++# fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5