Changeset 82452

Timestamp:

08/13/11 22:28:41 (4 years ago)

Author:

ryandesign@…

Message:

atanks: update to 5.1 (#22475), indicate license, rewrite master_sites to avoid redirects

Location:

trunk/dports/games/atanks

Files:

• Portfile (modified) (3 diffs)
• files/patch-Makefile.diff (moved) (moved from trunk/dports/games/atanks/files/patch-Makefile) (1 diff)
• files/patch-src-Makefile.bsd.diff (moved) (moved from trunk/dports/games/atanks/files/patch-src-Makefile) (1 diff)
• files/patch-src-files.cc (deleted)

trunk/dports/games/atanks/Portfile

@@ -4 +4 @@
 
 name                    atanks
-version                 3.1
+version                 5.1
 categories              games
 platforms               darwin
@@ -10 +10 @@
 supported_archs         i386 ppc
 maintainers             nomaintainer
+license                 GPL-2+
 
 description             atanks is a multi-platform Scorched Earth clone
@@ -15 +16 @@
 
 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

trunk/dports/games/atanks/files/patch-Makefile.diff

@@ -1 @@
---- 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
+--- 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
  
-+PREFIX=@PREFIX@
-+DESTROOT=@DESTROOT@
-+
- all:
-        $(MAKE) -C src
+-osxuser:
+-       INSTALLDIR=./ FLAGS="-DMACOSX" $(MAKE) -C src -f Makefile.bsd
++osx:
++       FLAGS="-DMACOSX" $(MAKE) -C src -f Makefile.bsd
  
- 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
+ ubuntu:
+        FLAGS="-DLINUX -DUBUNTU" $(MAKE) -C src

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

@@ -1 @@
---- 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 
+--- 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
  
- CC  = g++
--FLAGS = -DLINUX -DDATA_DIR=\".\"
-+FLAGS = -DLINUX -DDATA_DIR=\"$(PREFIX)/share/atanks\"
+-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 = 
++OFLAGS = @OPTFLAGS@
  LFLAGS +=
 -LDFLAGS =  `allegro-config --libs`
-+LDFLAGS +=  `allegro-config --libs`
++LDFLAGS =  `allegro-config --libs` @LDFLAGS@ @ARCHFLAGS@
  
- CFLAGS += -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
- CFLAGS += -g   # debug vs optimize flags
+-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