[82452] trunk/dports/games/atanks

ryandesign at macports.org ryandesign at macports.org
Sat Aug 13 22:28:43 PDT 2011


Revision: 82452
          http://trac.macports.org/changeset/82452
Author:   ryandesign at macports.org
Date:     2011-08-13 22:28:41 -0700 (Sat, 13 Aug 2011)
Log Message:
-----------
atanks: update to 5.1 (#22475), indicate license, rewrite master_sites to avoid redirects

Modified Paths:
--------------
    trunk/dports/games/atanks/Portfile

Added Paths:
-----------
    trunk/dports/games/atanks/files/patch-Makefile.diff
    trunk/dports/games/atanks/files/patch-src-Makefile.bsd.diff

Removed Paths:
-------------
    trunk/dports/games/atanks/files/patch-Makefile
    trunk/dports/games/atanks/files/patch-src-Makefile
    trunk/dports/games/atanks/files/patch-src-files.cc

Modified: trunk/dports/games/atanks/Portfile
===================================================================
--- trunk/dports/games/atanks/Portfile	2011-08-14 00:25:02 UTC (rev 82451)
+++ trunk/dports/games/atanks/Portfile	2011-08-14 05:28:41 UTC (rev 82452)
@@ -3,42 +3,46 @@
 PortSystem              1.0
 
 name                    atanks
-version                 3.1
+version                 5.1
 categories              games
 platforms               darwin
 # allegro is 32-bit only
 supported_archs         i386 ppc
 maintainers             nomaintainer
+license                 GPL-2+
 
 description             atanks is a multi-platform Scorched Earth clone
 long_description        ${description}
 
 homepage                http://atanks.sourceforge.net/
-master_sites            sourceforge
-checksums               md5     16c46685a089e40f1dc69010b4d839a8 \
-                        sha1    3937a1dab9001c60be659bb913d95b9c57817d2c \
-                        rmd160  e51624da4563b9cdc3e77275d6212895cded537f
-worksrcdir              ${name}
+master_sites            sourceforge:project/${name}/${name}/${name}-${version}
 
+checksums               sha1    b5c692839015992e55bb9c9eb94d75739dcb4081 \
+                        rmd160  542cc069a850eb2a28cc6df320da62c9d6461f94
+
 depends_lib             port:allegro
 
-patchfiles              patch-Makefile \
-                        patch-src-Makefile \
-                        patch-src-files.cc
+patchfiles              patch-Makefile.diff \
+                        patch-src-Makefile.bsd.diff
 
 post-patch {
-    reinplace s|@PREFIX@|${prefix}|g        ${worksrcpath}/Makefile
-    reinplace s|@DESTROOT@|${destroot}|g    ${worksrcpath}/Makefile
+    reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/src/Makefile.bsd
+    reinplace "s|@CXX@|${configure.cxx}|g" ${worksrcpath}/src/Makefile.bsd
+    reinplace "s|@CPPFLAGS@|${configure.cppflags}|g" ${worksrcpath}/src/Makefile.bsd
+    reinplace "s|@LDFLAGS@|${configure.ldflags}|g" ${worksrcpath}/src/Makefile.bsd
+    reinplace "s|@OPTFLAGS@|${configure.optflags}|g" ${worksrcpath}/src/Makefile.bsd
+    reinplace "s|@ARCHFLAGS@|[get_canonical_archflags]|g" ${worksrcpath}/src/Makefile.bsd
 }
 
 use_configure           no
 
-build.env               CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
-                        LDFLAGS="${configure.ld_archflags}" \
-                        CC=${configure.cc}
-build.args              PREFIX=${prefix}
+build.args              PREFIX=${prefix}/
 
+destroot.destdir        PREFIX=${destroot}${prefix}/
+destroot.args           INSTALL=/usr/bin/install
+
 platform darwin {
+    build.target        osx
     post-destroot {
         xinstall -d ${destroot}${applications_dir}/ATanks.app/Contents/MacOS
         ln -s ${prefix}/bin/atanks \

Deleted: trunk/dports/games/atanks/files/patch-Makefile
===================================================================
--- trunk/dports/games/atanks/files/patch-Makefile	2011-08-14 00:25:02 UTC (rev 82451)
+++ trunk/dports/games/atanks/files/patch-Makefile	2011-08-14 05:28:41 UTC (rev 82452)
@@ -1,22 +0,0 @@
---- Makefile	2007-11-08 19:27:29.000000000 -0600
-+++ Makefile	2008-08-01 23:50:24.000000000 -0500
-@@ -5,13 +5,16 @@
- DISTCOMMON=atanks/*.dat atanks/COPYING atanks/README atanks/TODO atanks/Changelog atanks/BUGS atanks/Help.txt atanks/credits.txt atanks/gloat.txt atanks/instr.txt atanks/revenge.txt atanks/suicide.txt gloat.pt_BR.txt Help.pt_BR.txt revenge.pt_BR.txt suicide.pt_BR.txt
- INCOMMON=*.dat COPYING README TODO Changelog *.txt
- 
-+PREFIX=@PREFIX@
-+DESTROOT=@DESTROOT@
-+
- all:
- 	$(MAKE) -C src
- 
- install: all
--	$(INSTALL) -g 0 -m 755 -o 0 atanks /usr/bin
--	mkdir -p /usr/share/games/atanks
--	$(INSTALL) -g 0 -m 644 -o 0 $(INCOMMON) /usr/share/games/atanks
-+	$(INSTALL) -m 755 atanks $(DESTROOT)$(PREFIX)/bin
-+	mkdir -p $(DESTROOT)$(PREFIX)/share/atanks
-+	$(INSTALL) -m 644 $(INCOMMON) $(DESTROOT)$(PREFIX)/share/atanks
- clean:
- 	rm -f atanks
- 	$(MAKE) -C src clean

Copied: trunk/dports/games/atanks/files/patch-Makefile.diff (from rev 82430, trunk/dports/games/atanks/files/patch-Makefile)
===================================================================
--- trunk/dports/games/atanks/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/games/atanks/files/patch-Makefile.diff	2011-08-14 05:28:41 UTC (rev 82452)
@@ -0,0 +1,13 @@
+--- Makefile.orig	2011-06-30 18:35:07.000000000 -0500
++++ Makefile	2011-08-13 23:15:56.000000000 -0500
+@@ -48,8 +48,8 @@
+ winuser:
+ 	INSTALLDIR=./ FLAGS=-DWIN32 $(MAKE) -C src -f Makefile.windows
+ 
+-osxuser:
+-	INSTALLDIR=./ FLAGS="-DMACOSX" $(MAKE) -C src -f Makefile.bsd
++osx:
++	FLAGS="-DMACOSX" $(MAKE) -C src -f Makefile.bsd
+ 
+ ubuntu:
+ 	FLAGS="-DLINUX -DUBUNTU" $(MAKE) -C src

Deleted: trunk/dports/games/atanks/files/patch-src-Makefile
===================================================================
--- trunk/dports/games/atanks/files/patch-src-Makefile	2011-08-14 00:25:02 UTC (rev 82451)
+++ trunk/dports/games/atanks/files/patch-src-Makefile	2011-08-14 05:28:41 UTC (rev 82452)
@@ -1,17 +0,0 @@
---- src/Makefile	2007-10-13 13:37:07.000000000 -0500
-+++ src/Makefile	2008-08-01 23:48:42.000000000 -0500
-@@ -4,12 +4,12 @@
- 	globaldata.o environment.o player.o virtobj.o floattext.o teleport.o physobj.o decor.o explosion.o missile.o beam.o tank.o atanks.o fade.o perlin.o sky.o button.o files.o team.o 
- 
- CC  = g++
--FLAGS = -DLINUX -DDATA_DIR=\".\"
-+FLAGS = -DLINUX -DDATA_DIR=\"$(PREFIX)/share/atanks\"
- OUTPUT = ../atanks
- WFLAGS = 
- OFLAGS = 
- LFLAGS +=
--LDFLAGS =  `allegro-config --libs`
-+LDFLAGS +=  `allegro-config --libs`
- 
- CFLAGS += -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
- CFLAGS += -g	# debug vs optimize flags

Copied: trunk/dports/games/atanks/files/patch-src-Makefile.bsd.diff (from rev 82430, trunk/dports/games/atanks/files/patch-src-Makefile)
===================================================================
--- trunk/dports/games/atanks/files/patch-src-Makefile.bsd.diff	                        (rev 0)
+++ trunk/dports/games/atanks/files/patch-src-Makefile.bsd.diff	2011-08-14 05:28:41 UTC (rev 82452)
@@ -0,0 +1,29 @@
+--- src/Makefile.bsd.orig	2011-08-13 23:11:43.000000000 -0500
++++ src/Makefile.bsd	2011-08-13 23:12:20.000000000 -0500
+@@ -4,20 +4,20 @@
+           missile.o perlin.o physobj.o player.o satellite.o sky.o tank.o team.o teleport.o virtobj.o \
+           update.o network.o floattext.o land.o text.o client.o gameloop.o
+ 
+-CPP=g++
+-CC=gcc
+-LD=g++
++CPP=@CXX@
++CC=@CC@
++LD=@CXX@
+ LIB=ar
+ WINDRES=
+ # FLAGS += -DDATA_DIR=\".\" -Wno-write-strings -DNETWORK -DTHREADS
+ FLAGS += -DDATA_DIR=\"${INSTALLDIR}\" -DNEW_GAMELOOP -Wno-write-strings -DTHREADS
+ OUTPUT = ../atanks
+ WFLAGS = 
+-OFLAGS = 
++OFLAGS = @OPTFLAGS@
+ LFLAGS +=
+-LDFLAGS =  `allegro-config --libs`
++LDFLAGS =  `allegro-config --libs` @LDFLAGS@ @ARCHFLAGS@
+ 
+-CFLAGS += -g -Wall -Iinclude -I/usr/local/include 
++CFLAGS += -g -Wall -Iinclude @CPPFLAGS@ @ARCHFLAGS@
+ 
+ SRCS  = $(MODULES:.o=.cpp)
+ GLOBALS	= main.h imagedefs.h externs.h

Deleted: trunk/dports/games/atanks/files/patch-src-files.cc
===================================================================
--- trunk/dports/games/atanks/files/patch-src-files.cc	2011-08-14 00:25:02 UTC (rev 82451)
+++ trunk/dports/games/atanks/files/patch-src-files.cc	2011-08-14 05:28:41 UTC (rev 82452)
@@ -1,19 +0,0 @@
---- src/files.cc.orig	2008-07-26 12:05:50.000000000 -0600
-+++ src/files.cc	2008-08-10 18:47:46.000000000 -0600
-@@ -2,6 +2,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <dirent.h>
-+#include <sys/stat.h>
- 
- #include "player.h"
- #include "files.h"
-@@ -698,7 +699,7 @@
- /*
- Filter out files that do not have .sav in the name.
- */
--int Filter_File( const struct dirent *my_file )
-+int Filter_File( struct dirent *my_file )
- {
-     if ( strstr(my_file->d_name, ".sav") )
-        return TRUE;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110813/1e1cade7/attachment.html>


More information about the macports-changes mailing list