[34208] trunk/dports/games/glob2

[simon at macports.org]

Revision: 34208
          http://trac.macosforge.org/projects/macports/changeset/34208
Author:   simon at macports.org
Date:     2008-02-17 09:40:32 -0800 (Sun, 17 Feb 2008)

Log Message:
-----------
games/glob2: Updated to version 0.9.1. Added me as maintainer.

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

Added Paths:
-----------
    trunk/dports/games/glob2/files/
    trunk/dports/games/glob2/files/patch-SConstruct.diff
    trunk/dports/games/glob2/files/patch-libgag_src_FileManager.cpp.diff

Modified: trunk/dports/games/glob2/Portfile
===================================================================
--- trunk/dports/games/glob2/Portfile	2008-02-17 17:39:18 UTC (rev 34207)
+++ trunk/dports/games/glob2/Portfile	2008-02-17 17:40:32 UTC (rev 34208)
@@ -3,10 +3,10 @@
 PortSystem          1.0
 
 name                glob2
-version             0.8.23
+version             0.9.1
 categories          games
 platforms           darwin
-maintainers         nomaintainer
+maintainers         simon
 description         Globulation 2 - a free and innovative strategy game
 long_description    Globulation 2 is an innovative high quality Real-Time \
                     Strategy, which minimizes micro-management by \
@@ -22,8 +22,9 @@
 
 homepage            http://globulation2.org/
 master_sites        http://dl.sv.nongnu.org/releases/glob2/${version}/
-checksums           md5 d8807da21fc32db1727dd62b8d5c786a \
-                    sha1 910a6a4af7ff21e768aa525cda61cbd7ae675a7b
+checksums           md5 507da29c310f199f9b1a9a5f335b7a7a \
+                    sha1 edfc49f3b06933783518afeeb670c5119694267a \
+                    rmd160 1b1ba987c696a857b74f33e8ff9dbbddc71bf9ec
 
 depends_lib         port:boost \
                     port:freetype \
@@ -40,6 +41,24 @@
                     port:tiff \
                     port:zlib
 
-post-configure {
-    reinplace "s|\${datarootdir}|${prefix}/share|" ${worksrcpath}/config.h
+patchfiles          patch-SConstruct.diff \
+                    patch-libgag_src_FileManager.cpp.diff
+
+post-patch {
+    reinplace "s|__PREFIX__|${prefix}|g" \
+        ${worksrcpath}/libgag/src/FileManager.cpp
 }
+
+use_configure       no
+
+build.cmd           scons
+build.target        {}
+
+destroot {
+    # Make sure the files are installed in destroot. As I know no way to
+    # specify a DESTDIR to scons the patch for "FileManager.cpp" is necessary
+    # so the data files are found after the installation.
+    system "cd ${worksrcpath} && scons install \
+        BINDIR=\"${destroot}${prefix}/bin\" \
+        INSTALLDIR=\"${destroot}${prefix}/share\""
+}

Added: trunk/dports/games/glob2/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/games/glob2/files/patch-SConstruct.diff	                        (rev 0)
+++ trunk/dports/games/glob2/files/patch-SConstruct.diff	2008-02-17 17:40:32 UTC (rev 34208)
@@ -0,0 +1,29 @@
+--- SConstruct	2008-02-17 14:36:08.000000000 +0100
++++ SConstruct	2008-02-17 14:36:13.000000000 +0100
+@@ -66,7 +66,7 @@
+         else:
+             print "Coulf not find libz or zlib1.dll"
+             Exit(1)
+-    if not conf.CheckLib('boost_thread') or not conf.CheckCXXHeader('boost/thread/thread.hpp'):
++    if not conf.CheckLib('boost_thread-mt') or not conf.CheckCXXHeader('boost/thread/thread.hpp'):
+         print "Could not find libboost_thread or boost/thread/thread.hpp"
+         Exit(1)
+     if not conf.CheckCXXHeader('boost/shared_ptr.hpp'):
+@@ -134,6 +134,8 @@
+     if env['mingw'] or env['PLATFORM'] == 'win32':
+         env.Append(LIBPATH=["C:/msys/1.0/local/lib", "C:/msys/1.0/lib"])
+         env.Append(CPPPATH=["C:/msys/1.0/local/include/SDL", "C:/msys/1.0/local/include", "C:/msys/1.0/include/SDL", "C:/msys/1.0/include"])
++    env.Append(LIBPATH=["/opt/local/lib", "/System/Library/Frameworks/OpenGL.framework/Libraries"])
++    env.Append(CPPPATH=["/opt/local/include", "/System/Library/Frameworks/OpenGL.framework/Headers"])
+     configure(env)
+     env.Append(CPPPATH=['#libgag/include', '#'])
+     if env['release']:
+@@ -149,7 +151,7 @@
+         env.ParseConfig("sdl-config --libs")
+     if env['osx']:
+         env.Append(CXXFLAGS="-framework OpenGL")
+-    env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex', 'boost_thread'])
++    env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex', 'boost_thread-mt'])
+     
+     env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz"
+     env["TARFLAGS"] = "-c -z"


Property changes on: trunk/dports/games/glob2/files/patch-SConstruct.diff
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/dports/games/glob2/files/patch-libgag_src_FileManager.cpp.diff
===================================================================
--- trunk/dports/games/glob2/files/patch-libgag_src_FileManager.cpp.diff	                        (rev 0)
+++ trunk/dports/games/glob2/files/patch-libgag_src_FileManager.cpp.diff	2008-02-17 17:40:32 UTC (rev 34208)
@@ -0,0 +1,11 @@
+--- libgag/src/FileManager.cpp	2008-02-17 15:09:58.000000000 +0100
++++ libgag/src/FileManager.cpp	2008-02-17 15:10:02.000000000 +0100
+@@ -128,7 +128,7 @@
+ 		#endif
+ 		#endif
+ 
+-		addDir(PACKAGE_DATA_DIR);
++		addDir("__PREFIX__/share/glob2");
+ 		addDir(PACKAGE_SOURCE_DIR);
+ 		fileListIndex = -1;
+ 	}


Property changes on: trunk/dports/games/glob2/files/patch-libgag_src_FileManager.cpp.diff
___________________________________________________________________
Name: svn:eol-style
   + native

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080217/2bba577e/attachment.html