Attachment #138720 for bug #184800

View | Details | Raw Unified | Return to bug 184800
Collapse All | Expand All




# $FreeBSD: games/armagetron/Makefile 327730 2013-09-20 17:36:33Z bapt $

PORTNAME=	armagetron
PORTVERSION=	0.2.8.3.2
PORTREVISION=	7
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}ad/stable/${PORTVERSION}/
DISTNAME=	armagetronad-${PORTVERSION}
EXTRACT_SUFX=	.src.tar.bz2

MAINTAINER=	ianthetechie@gmail.com
COMMENT=	A multiplayer networked Tron clone in 3D

Lines 1-2 Link Here

(-)armagetron-2.8.3.2/distinfo (-2 / +2 lines)
1	SHA256 (armagetronad-0.2.8.2.1.src.tar.gz) = ef6ce4d913079cb7d26647c42107a165a87e96041b311b8d5059ac04ece1d859	1	SHA256 (armagetronad-0.2.8.3.2.src.tar.bz2) = f444e481de94e6c0e3933c709d46effd2adfe823f5ef44768adcc8003b8ba7c5
2	SIZE (armagetronad-0.2.8.2.1.src.tar.gz) = 1874858	2	SIZE (armagetronad-0.2.8.3.2.src.tar.bz2) = 1841407




#!/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"

Lines 1-11 Link Here

(-)armagetron-2.8.3.2/files/patch-Makefile.in (-11 lines)
1	--- Makefile.in.orig 2008-06-08 21:26:57.000000000 +0800
2	+++ Makefile.in 2008-06-08 21:27:08.000000000 +0800
3	@@ -1130,7 +1130,7 @@
4
5	install-first:
6	# uninstall previous version (if it exists), ignoring errors
7	- test -x $(uninstall_location) && $(uninstall_location) \|\| true
8	+@USE_UNINSTALL_TRUE@ test -x $(uninstall_location) && $(uninstall_location) \|\| true
9
10	distclean-local:
11	rm -f uninstall.sh batch/relocate.in universal_variable* extrapaths src/tUniversalVariables.h*




--- 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 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

Lines 1-10 Link Here

(-)armagetron-2.8.3.2/files/patch-src-engine_eGrid.h (-10 lines)
1	--- src/engine/eGrid.h.orig 2007-10-02 18:09:58.000000000 +0200
2	+++ src/engine/eGrid.h 2007-10-02 18:10:10.000000000 +0200
3	@@ -39,6 +39,7 @@
4	class ePoint;
5	class eFace;
6	class eHalfEdge;
7	+class eGameObject;
8	class eWall;
9	class eGrid;
10	class eWallView;

Lines 1-11 Link Here

(-)armagetron-2.8.3.2/files/patch-src-engine_eVoter.cpp (-11 lines)
1	--- src/engine/eVoter.cpp.orig 2006-05-13 22:17:31.000000000 +0800
2	+++ src/engine/eVoter.cpp 2008-06-08 14:34:16.000000000 +0800
3	@@ -41,6 +41,8 @@
4	#include "ePlayer.h"
5	#include "eGrid.h"
6
7	+class eMenuItemVote;
8	+
9	// use server controlled votes
10	static bool se_useServerControlledKick = false;
11	static nSettingItemWatched< bool > se_usc( "VOTE_USE_SERVER_CONTROLLED_KICK", se_useServerControlledKick, nConfItemVersionWatcher::Group_Annoying, 10 );

Lines 1-10 Link Here

(-)armagetron-2.8.3.2/files/patch-src-engine_eWall.h (-10 lines)
1	--- src/engine/eWall.h.orig 2005-11-18 07:38:17.000000000 +0800
2	+++ src/engine/eWall.h 2008-06-08 14:35:22.000000000 +0800
3	@@ -53,6 +53,7 @@
4
5
6	class eWall;
7	+class eWallView;
8	class eWallHolder;
9	class eGameObject;
10	class eCamera;




--- 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;

Return to bug 184800

Lines 2-13 Link Here

(-)armagetron-2.8.3.2/Makefile (-3 / +3 lines)
2	# $FreeBSD: games/armagetron/Makefile 327730 2013-09-20 17:36:33Z bapt $	2	# $FreeBSD: games/armagetron/Makefile 327730 2013-09-20 17:36:33Z bapt $
3		3
4	PORTNAME= armagetron	4	PORTNAME= armagetron
5	PORTVERSION= 0.2.8.2.1	5	PORTVERSION= 0.2.8.3.2
6	PORTREVISION= 7	6	PORTREVISION= 7
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}ad/${PORTNAME}ad-src/${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}ad/stable/${PORTVERSION}/
9	DISTNAME= armagetronad-${PORTVERSION}	9	DISTNAME= armagetronad-${PORTVERSION}
10	EXTRACT_SUFX= .src.tar.gz	10	EXTRACT_SUFX= .src.tar.bz2
11		11
12	MAINTAINER= ianthetechie@gmail.com	12	MAINTAINER= ianthetechie@gmail.com
13	COMMENT= A multiplayer networked Tron clone in 3D	13	COMMENT= A multiplayer networked Tron clone in 3D

Lines 1-34 Link Here

(-)armagetron-2.8.3.2/files/armagetronad_dedicated.in (-34 lines)
1	#!/bin/sh
2
3	# $FreeBSD: games/armagetron/files/armagetronad_dedicated.in 300896 2012-07-14 13:54:48Z beat $
4	#
5	# PROVIDE: armagetronad_dedicated
6	# REQUIRE: LOGIN
7	# KEYWORD: shutdown
8	#
9	# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
10	# to enable this service:
11	#
12	# armagetronad_dedicated_enable (bool): Set to NO by default.
13	# Set it to YES to enable armagetron server.
14	# armagetronad_dedicated_flags (str): Set to "-d" by default.
15	# Extra flags passed to start command
16	#
17
18	. /etc/rc.subr
19
20	name="armagetronad_dedicated"
21	rcvar=armagetronad_dedicated_enable
22
23	command=%%PREFIX%%/bin/${name}
24	pidfile=/var/run/${name}.pid
25
26	load_rc_config $name
27
28	: ${armagetronad_dedicated_enable="NO"}
29	: ${armagetronad_dedicated_flags="-d"}
30
31	command="%%PREFIX%%/bin/armagetronad-dedicated"
32	command_args="${armagetronad_dedicated_flags} &"
33
34	run_rc_command "$1"

Lines 1-36 Link Here

(-)armagetron-2.8.3.2/files/patch-batch-install.in (-36 lines)
1	--- batch/install.in.orig Sat Feb 19 17:54:22 2005
2	+++ batch/install.in Sun Nov 13 01:26:26 2005
3	@@ -8,7 +8,7 @@
4
5	#find old configuration
6	if test @enable_etc@ = yes ; then
7	- CONFIG=@rpmroot@/etc/@prognamebase@
8	+ CONFIG=@rpmroot@@prefix@/etc/@prognamebase@
9	else
10	CONFIG=$INSTALL/config
11	fi
12	@@ -114,10 +114,6 @@
13	cp $INSTALL/config/* $CONFIG
14	fi
15
16	-rm -rf $CONFIG_NEW
17	-mkdir $CONFIG_NEW
18	-cp $CONFIG/* $CONFIG_NEW
19	-
20	if test "$UPDATE" = "yes" && test -d $CONFIG_ORIG; then
21	echo "Integrating user changes..." #"from $CONFIG_USER to $CONFIG_ORIG and $CONFIG..."
22	test -r $CONFIG_USER \|\| mkdir $CONFIG_USER
23	@@ -140,13 +136,6 @@
24	done
25	cd $PWD_OLD
26	fi
27	-
28	-rm -rf $CONFIG_ORIG
29	-rm -rf $NEW_CONFIG_ORIG
30	-mv $CONFIG_NEW $NEW_CONFIG_ORIG
31	-chmod 755 $NEW_CONFIG_ORIG
32	-chmod 400 $NEW_CONFIG_ORIG/*
33	-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
34
35	#delete obsolete configuration
36	if test @enable_etc@ = yes ; then

Lines 1-11 Link Here

(-)armagetron-2.8.3.2/files/patch-configure (-11 / +21 lines)
1	--- configure.orig 2006-08-05 03:15:57.000000000 +0800	1	diff -Nur configure.orig configure
2	+++ configure 2008-06-08 14:32:47.000000000 +0800	2	--- configure.orig 2013-12-16 15:45:20.000000000 +0400
3	@@ -17362,7 +17362,7 @@	3	+++ configure 2013-12-16 15:46:48.000000000 +0400
4	echo " Static data will be installed in : `eval echo ${aa_datadir}`"	4	@@ -10629,12 +10629,12 @@
5	echo " Configuration will be installed in : `eval echo ${aa_sysconfdir}`"	5	CPPFLAGS="$CPPFLAGS `libpng-config --cflags`"
6	echo " Documentation will be installed in : `eval echo ${aa_docdir}`"	6	LIBS="$LIBS $PNGLIBS"
7	-test "x$enable_etc" = "xyes" && echo " Link to configuration will go to : /etc/${progname}"	7
8	+test "x$enable_etc" = "xyes" && echo " Link to configuration will go to : $prefix/etc/${progname}"	8	-ac_fn_c_check_func "$LINENO" "png_check_sig" "ac_cv_func_png_check_sig"
9	echo " Music support: $enable_music"	9	-if test "x$ac_cv_func_png_check_sig" = x""yes; then :
10	echo " Build with Krawall authentication support: $enable_krawall"	10	+# ac_fn_c_check_func "$LINENO" "png_check_sig" "ac_cv_func_png_check_sig"
11	echo " Use dirty SDL initialization: $enable_dirty"	11	+# if test "x$ac_cv_func_png_check_sig" = x""yes; then :
		12
		13	-else
		14	- as_fn_error "You need libpng to compile Armagetron." "$LINENO" 5
		15	-fi
		16	+# else
		17	+# as_fn_error "You need libpng to compile Armagetron." "$LINENO" 5
		18	+# fi
		19
		20
		21	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5

Lines 1-14 Link Here

(-)armagetron-2.8.3.2/files/patch-src-tron_gCycle.h (-14 lines)
1	--- src/tron/gCycle.h.orig 2006-05-13 22:17:31.000000000 +0800
2	+++ src/tron/gCycle.h 2008-06-08 14:37:33.000000000 +0800
3	@@ -41,8 +41,10 @@
4	#include "gCycleMovement.h"
5
6	class rModel;
7	-class gTextureCycle;
8	+class gCycle;
9	+class gDestination;
10	class eSoundPlayer;
11	+class gTextureCycle;
12	class gSensor;
13	class gNetPlayerWall;
14	class gPlayerWall;