[154186] trunk/dports/games/blobwars

[khindenburg at macports.org]

Revision: 154186
          https://trac.macports.org/changeset/154186
Author:   khindenburg at macports.org
Date:     2016-10-23 19:53:48 +0200 (Sun, 23 Oct 2016)
Log Message:
-----------
blobwars: update to 2.00
 - update depends to sdl2
 - build/install pak file
 - verified plays fine on 10.12

Modified Paths:
--------------
    trunk/dports/games/blobwars/Portfile
    trunk/dports/games/blobwars/files/patch-makefile.diff

Removed Paths:
-------------
    trunk/dports/games/blobwars/files/patch-src_pak.h.diff

Modified: trunk/dports/games/blobwars/Portfile
===================================================================
--- trunk/dports/games/blobwars/Portfile	2016-10-23 16:39:30 UTC (rev 154185)
+++ trunk/dports/games/blobwars/Portfile	2016-10-23 17:53:48 UTC (rev 154186)
@@ -4,7 +4,7 @@
 PortGroup               app 1.0
 
 name                    blobwars
-version                 1.19
+version                 2.00
 categories              games
 platforms               darwin
 maintainers             nomaintainer
@@ -23,22 +23,26 @@
 homepage                http://www.parallelrealities.co.uk/p/blob-wars-metal-blob-solid.html
 master_sites            sourceforge:project/blobwars
 
-checksums               rmd160  39a2bf865e7c2af97dcb2d26e06604e8d1fcc62f \
-                        sha256  f9bafe59ead9e370ceaba4aae3d280241bf05fa06c8ae006eec0322c2fe9e2ed
+checksums               rmd160  c4a54ce0f64db2fc6038590eb22d1b2241b0917f \
+                        sha256  c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99
 
-depends_lib             port:gettext \
-                        port:libsdl \
-                        port:libsdl_image \
-                        port:libsdl_ttf \
-                        port:libsdl_mixer \
-                        port:libsdl_net \
+depends_build-append    path:bin/pkg-config:pkgconfig
+
+depends_lib-append      port:gettext \
+                        port:libsdl2 \
+                        port:libsdl2_image \
+                        port:libsdl2_ttf \
+                        port:libsdl2_mixer \
+                        port:libsdl2_net \
                         port:zlib
 
 post-extract {
     copy ${filespath}/${name}.in ${workpath}/${name}
+    system -W ${worksrcpath} "find . -type d -exec chmod 755 {} \\;"
+    system -W ${worksrcpath} "find . -type f -exec chmod 666 {} \\;"
 }
 
-patchfiles              patch-makefile.diff patch-src_pak.h.diff
+patchfiles              patch-makefile.diff
 
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" ${workpath}/${name}
@@ -51,7 +55,8 @@
 use_parallel_build      yes
 build.args              PREFIX=${prefix}
 build.env               CXX="${configure.cxx} [get_canonical_archflags cxx]" \
-                        CFLAGS="${configure.cppflags}"
+                        CFLAGS="${configure.cppflags}" \
+                        USEPAK=1
 
 destroot.destdir        PREFIX=${destroot}${prefix}
 
@@ -58,6 +63,8 @@
 post-destroot {
     file delete -force ${destroot}${prefix}/share/applications \
         ${destroot}${prefix}/share/icons
+
+    copy ${worksrcpath}/blobwars.pak ${destroot}${prefix}/share/games/${name}
 }
 
 app.name                Blob Wars

Modified: trunk/dports/games/blobwars/files/patch-makefile.diff
===================================================================
--- trunk/dports/games/blobwars/files/patch-makefile.diff	2016-10-23 16:39:30 UTC (rev 154185)
+++ trunk/dports/games/blobwars/files/patch-makefile.diff	2016-10-23 17:53:48 UTC (rev 154186)
@@ -1,31 +1,23 @@
---- makefile.orig	2011-04-17 09:56:56.000000000 -0500
-+++ makefile	2014-10-15 13:57:31.000000000 -0500
-@@ -9,7 +9,7 @@
+--- Makefile	2015-11-21 17:18:19.000000000 -0500
++++ Makefile	2016-10-23 12:44:23.000000000 -0400
+@@ -8,8 +8,7 @@
+ RELEASE ?= 0
  USEPAK ?= 0
  
- PREFIX ?= /usr
+-PREFIX ?= /usr
 -BINDIR ?= $(PREFIX)/games/
 +BINDIR ?= $(PREFIX)/libexec/blobwars/
  DATADIR ?= $(PREFIX)/share/games/blobwars/
  DOCDIR ?= $(PREFIX)/share/doc/$(PROG)/
  ICONDIR ?= $(PREFIX)/share/icons/hicolor/
-@@ -21,8 +21,8 @@
- CXXFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
+@@ -21,8 +20,8 @@
+ CXXFLAGS += `pkg-config --cflags sdl2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
  CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
  CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
 -CXXFLAGS += $(CFLAGS) -Werror
--LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lz
+-LIBS = `pkg-config --libs sdl2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net` -lz
 +CXXFLAGS += $(CFLAGS)
-+LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lz -lintl
++LIBS = `pkg-config --libs sdl2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net` -lz -lintl
+ PAKLIBS = -lz
  
  OBJS += CAudio.o
- OBJS += CBoss.o
-@@ -85,7 +85,7 @@
- 	$(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)
- 	
- pak: $(PAKOBJS)
--	$(CXX) $(LIBS) $(PAKOBJS) -o pak
-+	$(CXX) -lz $(PAKOBJS) -o pak
- 
- %.mo: %.po
- 	msgfmt -c -o $@ $<

Deleted: trunk/dports/games/blobwars/files/patch-src_pak.h.diff
===================================================================
--- trunk/dports/games/blobwars/files/patch-src_pak.h.diff	2016-10-23 16:39:30 UTC (rev 154185)
+++ trunk/dports/games/blobwars/files/patch-src_pak.h.diff	2016-10-23 17:53:48 UTC (rev 154186)
@@ -1,7 +0,0 @@
---- src/pak.h.orig	2009-02-01 22:34:45.000000000 +1100
-+++ src/pak.h	2011-07-30 22:49:14.000000000 +1000
-@@ -21,3 +21,4 @@
- #include <dirent.h>
- 
- #include "headers.h"
-+#undef main
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161023/def18013/attachment-0002.html>