[36389] trunk/dports/games/glob2
simon at macports.org
simon at macports.org
Tue Apr 29 09:35:23 PDT 2008
Revision: 36389
http://trac.macosforge.org/projects/macports/changeset/36389
Author: simon at macports.org
Date: 2008-04-29 09:35:22 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
games/glob2: Updated to version 0.9.3.
Modified Paths:
--------------
trunk/dports/games/glob2/Portfile
trunk/dports/games/glob2/files/patch-SConstruct.diff
Removed Paths:
-------------
trunk/dports/games/glob2/files/patch-data_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-04-29 16:34:03 UTC (rev 36388)
+++ trunk/dports/games/glob2/Portfile 2008-04-29 16:35:22 UTC (rev 36389)
@@ -3,7 +3,7 @@
PortSystem 1.0
name glob2
-version 0.9.2
+version 0.9.3
categories games
platforms darwin
maintainers simon
@@ -22,9 +22,9 @@
homepage http://globulation2.org/
master_sites http://dl.sv.nongnu.org/releases/glob2/${version}/
-checksums md5 5ca119d2b9a103073465bc356815eecf \
- sha1 c514c8f2d741a3c18038191c1ab2ef37686424b3 \
- rmd160 61638692208026423bec3efa180624963349c772
+checksums md5 e0483d5864cff4ace5ac8e39eae27429 \
+ sha1 669a43707cf03e4e810e77ef8bef2f46f1116090 \
+ rmd160 266edd6a57f1e8ea8e1effac3871f3c0083fc05f
depends_lib port:boost \
port:freetype \
@@ -41,25 +41,25 @@
port:tiff \
port:zlib
-patchfiles patch-SConstruct.diff \
- patch-data_SConstruct.diff \
- patch-libgag_src_FileManager.cpp.diff
+patchfiles patch-SConstruct.diff
-post-patch {
- reinplace "s|__PREFIX__|${prefix}|g" \
- ${worksrcpath}/libgag/src/FileManager.cpp
+use_configure no
+
+set buildoptions "BINDIR=\"${destroot}${prefix}/bin\" \
+ INSTALLDIR=\"${destroot}${prefix}/share\" \
+ DATADIR=\"${prefix}/share/glob2\" \
+ CXXFLAGS=\"-I${prefix}/include\" \
+ LINKFLAGS=\"-L${prefix}/lib\""
+
+pre-build {
+ # The destroot directories must be created here so scons can find them
+ # during the build.
+ xinstall -d ${destroot}${prefix}/bin
+ xinstall -d ${destroot}${prefix}/share
}
-use_configure no
-
build.cmd scons
-build.target {}
+build.target $buildoptions
-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\""
-}
+destroot.cmd scons
+destroot.target "install $buildoptions"
Modified: trunk/dports/games/glob2/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/games/glob2/files/patch-SConstruct.diff 2008-04-29 16:34:03 UTC (rev 36388)
+++ trunk/dports/games/glob2/files/patch-SConstruct.diff 2008-04-29 16:35:22 UTC (rev 36389)
@@ -1,20 +1,37 @@
---- SConstruct 2008-02-22 21:58:18.000000000 +0100
-+++ SConstruct 2008-02-22 21:58:59.000000000 +0100
-@@ -159,6 +159,8 @@
- if env['mingw'] or isWindowsPlatform:
- 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']:
-@@ -176,8 +178,6 @@
+Index: SConstruct
+===================================================================
+--- SConstruct.orig 2008-04-29 18:25:10.000000000 +0200
++++ SConstruct 2008-04-29 18:25:53.000000000 +0200
+@@ -48,7 +48,7 @@
+ configfile.add("PACKAGE", "Name of package", "\"glob2\"")
+ configfile.add("PACKAGE_BUGREPORT", "Define to the address where bug reports for this package should be sent.", "\"glob2-devel at nongnu.org\"")
+ if isDarwinPlatform:
+- configfile.add("PACKAGE_DATA_DIR", "data directory", "\"" + env["DATADIR"] + "../Resources/\"")
++ configfile.add("PACKAGE_DATA_DIR", "data directory", "\"" + env["DATADIR"] + "\"")
else:
- env.ParseConfig("sdl-config --cflags")
- env.ParseConfig("sdl-config --libs")
-- if isDarwinPlatform:
-- env.Append(CXXFLAGS=" -framework OpenGL ")
- env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex'])
-
- env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz"
+ configfile.add("PACKAGE_DATA_DIR", "data directory", "\"" + env["DATADIR"] + "\"")
+ configfile.add("PACKAGE_SOURCE_DIR", "source directory", "\"" +env.Dir("#").abspath.replace("\\", "\\\\") + "\"")
+@@ -235,23 +235,6 @@
+ env.Tar(target, f)
+
+ PackTar(env["TARFILE"], Split("AUTHORS COPYING gen_inst_uninst_list.py INSTALL mkdist mkinstall mkuninstall README README.hg SConstruct"))
+- #packaging for apple
+- if isDarwinPlatform and env["release"]:
+- bundle.generate(env)
+- dmg.generate(env)
+- env.Replace(
+- BUNDLE_NAME="Glob2",
+- BUNDLE_BINARIES=["src/glob2"],
+- BUNDLE_RESOURCEDIRS=["data","maps", "campaigns"],
+- BUNDLE_PLIST="darwin/Info.plist",
+- BUNDLE_ICON="darwin/Glob2.icns" )
+- bundle.createBundle(os.getcwd(), os.getcwd(), env)
+- dmg.create_dmg("Glob2-%s"%env["VERSION"],"%s.app"%env["BUNDLE_NAME"],env)
+-
+- #TODO mac_bundle should be dependency of Dmg:
+- arch = os.popen("uname -p").read().strip()
+-# mac_packages = env.Dmg('Glob2-%s-%s.dmg'% (fullVersion, arch), env.Dir('Glob2.app/') )
+-# env.Alias("package", mac_packages)
+
+ Export('env')
+ Export('PackTar')
Deleted: trunk/dports/games/glob2/files/patch-data_SConstruct.diff
===================================================================
--- trunk/dports/games/glob2/files/patch-data_SConstruct.diff 2008-04-29 16:34:03 UTC (rev 36388)
+++ trunk/dports/games/glob2/files/patch-data_SConstruct.diff 2008-04-29 16:35:22 UTC (rev 36389)
@@ -1,8 +0,0 @@
---- data/SConscript 2008-02-23 10:35:07.000000000 +0100
-+++ data/SConscript 2008-02-28 15:27:50.000000000 +0100
-@@ -20,5 +20,4 @@
- SConscript("gfx/SConscript")
- SConscript("gui/SConscript")
- SConscript("icons/SConscript")
--SConscript("zik/SConscript")
-
Deleted: trunk/dports/games/glob2/files/patch-libgag_src_FileManager.cpp.diff
===================================================================
--- trunk/dports/games/glob2/files/patch-libgag_src_FileManager.cpp.diff 2008-04-29 16:34:03 UTC (rev 36388)
+++ trunk/dports/games/glob2/files/patch-libgag_src_FileManager.cpp.diff 2008-04-29 16:35:22 UTC (rev 36389)
@@ -1,11 +0,0 @@
---- 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;
- }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080429/319bc7ed/attachment.html
More information about the macports-changes
mailing list