ports/184800: Update to games/armagetron port to 2.8.3.2
Peter Kosyh
p.kosyh at gmail.com
Mon Dec 16 12:00:01 UTC 2013
>Number: 184800
>Category: ports
>Synopsis: Update to games/armagetron port to 2.8.3.2
>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: Mon Dec 16 12:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Peter Kosyh
>Release: 10.0-RC1
>Organization:
>Environment:
FreeBSD peter-bsd 10.0-RC1 FreeBSD 10.0-RC1 #0 r259068: Sat Dec 7 17:45:20 UTC 2013 root at snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
armagetron is cool game, but the port is outdated
>How-To-Repeat:
>Fix:
I have attachhed the patch, compiled on 10.0-RC1 well
Patch attached with submission follows:
diff -Nur armagetron/Makefile armagetron-2.8.3.2/Makefile
--- armagetron/Makefile 2013-09-20 21:36:33.000000000 +0400
+++ armagetron-2.8.3.2/Makefile 2013-12-16 15:42:57.000000000 +0400
@@ -2,12 +2,12 @@
# $FreeBSD: games/armagetron/Makefile 327730 2013-09-20 17:36:33Z bapt $
PORTNAME= armagetron
-PORTVERSION= 0.2.8.2.1
+PORTVERSION= 0.2.8.3.2
PORTREVISION= 7
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 at gmail.com
COMMENT= A multiplayer networked Tron clone in 3D
diff -Nur armagetron/distinfo armagetron-2.8.3.2/distinfo
--- armagetron/distinfo 2012-07-14 17:54:48.000000000 +0400
+++ armagetron-2.8.3.2/distinfo 2013-12-16 15:44:48.000000000 +0400
@@ -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
diff -Nur armagetron/files/armagetronad_dedicated.in armagetron-2.8.3.2/files/armagetronad_dedicated.in
--- armagetron/files/armagetronad_dedicated.in 2012-07-14 17:54:48.000000000 +0400
+++ armagetron-2.8.3.2/files/armagetronad_dedicated.in 1970-01-01 03:00:00.000000000 +0300
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD: games/armagetron/files/armagetronad_dedicated.in 300896 2012-07-14 13:54:48Z beat $
-#
-# 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"
diff -Nur armagetron/files/patch-Makefile.in armagetron-2.8.3.2/files/patch-Makefile.in
--- armagetron/files/patch-Makefile.in 2012-07-14 17:54:48.000000000 +0400
+++ armagetron-2.8.3.2/files/patch-Makefile.in 1970-01-01 03:00:00.000000000 +0300
@@ -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
-+ at 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*
diff -Nur armagetron/files/patch-batch-install.in armagetron-2.8.3.2/files/patch-batch-install.in
--- armagetron/files/patch-batch-install.in 2012-07-14 17:54:48.000000000 +0400
+++ armagetron-2.8.3.2/files/patch-batch-install.in 1970-01-01 03:00:00.000000000 +0300
@@ -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
diff -Nur armagetron/files/patch-configure armagetron-2.8.3.2/files/patch-configure
--- armagetron/files/patch-configure 2012-07-14 17:54:48.000000000 +0400
+++ armagetron-2.8.3.2/files/patch-configure 2013-12-16 15:49:39.000000000 +0400
@@ -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
diff -Nur armagetron/files/patch-src-engine_eGrid.h armagetron-2.8.3.2/files/patch-src-engine_eGrid.h
--- armagetron/files/patch-src-engine_eGrid.h 2012-07-14 17:54:48.000000000 +0400
+++ armagetron-2.8.3.2/files/patch-src-engine_eGrid.h 1970-01-01 03:00:00.000000000 +0300
@@ -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;
diff -Nur armagetron/files/patch-src-engine_eVoter.cpp armagetron-2.8.3.2/files/patch-src-engine_eVoter.cpp
--- armagetron/files/patch-src-engine_eVoter.cpp 2012-07-14 17:54:48.000000000 +0400
+++ armagetron-2.8.3.2/files/patch-src-engine_eVoter.cpp 1970-01-01 03:00:00.000000000 +0300
@@ -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 );
diff -Nur armagetron/files/patch-src-engine_eWall.h armagetron-2.8.3.2/files/patch-src-engine_eWall.h
--- armagetron/files/patch-src-engine_eWall.h 2012-07-14 17:54:48.000000000 +0400
+++ armagetron-2.8.3.2/files/patch-src-engine_eWall.h 1970-01-01 03:00:00.000000000 +0300
@@ -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;
diff -Nur armagetron/files/patch-src-tron_gCycle.h armagetron-2.8.3.2/files/patch-src-tron_gCycle.h
--- armagetron/files/patch-src-tron_gCycle.h 2012-07-14 17:54:48.000000000 +0400
+++ armagetron-2.8.3.2/files/patch-src-tron_gCycle.h 1970-01-01 03:00:00.000000000 +0300
@@ -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;
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list