Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6333
Modified Files:
glob2.info glob2.patch
Log Message:
handed-off to me by former maintainer
upstream update to 0.9.4.4, bumped deps to boost1.35-nopython
validated on powerpc-darwin8
Index: glob2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/glob2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glob2.patch 11 Oct 2007 00:40:56 -0000 1.1
+++ glob2.patch 10 Oct 2010 19:58:01 -0000 1.2
@@ -1,53 +1,31 @@
---- glob2-0.9.1/SConstruct~ 2007-09-10 00:17:39.000000000 +0200
-+++ glob2-0.9.1/SConstruct 2007-09-14 03:23:22.000000000 +0200
-@@ -4,12 +4,19 @@
- opts.Add("LINKFLAGS", "Manually add to the LINKFLAGS", "")
- opts.Add("INSTALLDIR", "Installation Directory", "/usr/local/share")
+--- glob2-0.9.4.4-orig/SConstruct 2007-09-10 00:17:39.000000000 +0200
++++ glob2-0.9.4.4/SConstruct 2007-09-14 03:23:22.000000000 +0200
+@@ -5,4 +5,5 @@
opts.Add("BINDIR", "Binary Installation Directory", "/usr/local/bin")
-+ opts.Add("DATADIR", "Final destination of data files", "/usr/local/share")
+ opts.Add("DATADIR", "Directory where data will be put, set to the same as
INSTALLDIR", "/usr/local/share")
+ opts.Add("FINKPREFIX", "Fink directory", "/sw")
opts.Add(BoolOption("release", "Build for release", 0))
- opts.Add(BoolOption("mingw", "Build with mingw enabled if not
auto-detected", 0))
- opts.Add(BoolOption("osx", "Build for OSX", 0))
+ opts.Add(BoolOption("profile", "Build with profiling on", 0))
+@@ -25,6 +26,11 @@
Help(opts.GenerateHelpText(env))
opts.Update(env)
- opts.Save('options_cache.py', env)
+ opts.Save("options_cache.py", env)
+
+ env.Append(CPPPATH = [ env["FINKPREFIX"] + "/include" ])
+ env.Append(CPPPATH = [ "/usr/X11R6/include" ])
+ env.Append(LIBPATH = [ env["FINKPREFIX"] + "/lib"])
+ env.Append(LIBPATH = [ "/usr/X11R6/lib" ])
-
-
+
+
class Configuration:
-@@ -29,7 +36,7 @@
- configfile = Configuration()
- 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-de...@nongnu.org\"")
-- configfile.add("PACKAGE_DATA_DIR", "data directory", "\"" +
env["INSTALLDIR"] + "\"")
-+ configfile.add("PACKAGE_DATA_DIR", "data directory", "\"" +
env["DATADIR"] + "\"")
- configfile.add("PACKAGE_SOURCE_DIR", "source directory", "\""
+env.Dir("#").abspath.replace("\\", "\\\\") + "\"")
- configfile.add("PACKAGE_NAME", "Define to the full name of this
package.", "\"Globulation 2\"")
- configfile.add("PACKAGE_TARNAME", "Define to the one symbol short name of
this package.", "\"glob2\"")
-@@ -94,10 +101,8 @@
- elif conf.CheckLib('opengl32') and conf.CheckCHeader('GL/gl.h'):
- gl_libraries.append("opengl32")
- else:
-- #Quick fix for OSX, ignore libraries not found
-- if not env['osx']:
-- print "Could not find libGL or opengl32, or could not find
GL/gl.h or OpenGL/gl.h"
-- Exit(1)
-+ print "Could not find libGL or opengl32, or could not find GL/gl.h or
OpenGL/gl.h"
-+ Exit(1)
-
- #Do checks for GLU, which is different on every system
- if conf.CheckLib('GLU') and conf.CheckCHeader("GL/glu.h"):
-@@ -147,8 +152,6 @@
- else:
- env.ParseConfig("sdl-config --cflags")
- 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["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] +
".tar.gz"
+--- glob2-0.9.4.4-orig/scons/dmg.py 2007-09-10 00:17:39.000000000 +0200
++++ glob2-0.9.4.4/scons/dmg.py 2007-09-14 03:23:22.000000000 +0200
+@@ -2,7 +2,7 @@
+ def create_dmg( target, source, env) :
+ volume = str(target[0]).replace('.dmg', '')
+ #really need to rewrite this later to use the variables and not be hardcoded
+- os.system( "rm Glob2-0.9.3.dmg" )
++ os.system( "rm -f Glob2-*.dmg" )
+ os.system( "rm -rf DMG" )
+ os.system( "mkdir DMG" )
+ os.system( "cp -r %s DMG"%source )
Index: glob2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/glob2.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- glob2.info 12 Jan 2009 03:31:33 -0000 1.4
+++ glob2.info 10 Oct 2010 19:58:01 -0000 1.5
@@ -1,24 +1,57 @@
Package: glob2
-Version: 0.9.1
-Revision: 2
+Version: 0.9.4.4
+Revision: 1
GCC: 4.0
Architecture: powerpc, i386
-Maintainer: Alexandre Vial <av...@altern.org>
-Depends: libvorbis0-shlibs, sdl-image-shlibs, sdl-ttf-shlibs, sdl-net-shlibs,
speex3-shlibs, boost1.34.nopython-shlibs, fribidi-shlibs, x11-shlibs
-BuildDepends: scons, vorbis-tools, libvorbis0, libogg, sdl, sdl-image,
sdl-ttf, sdl-net, speex3, boost1.34.nopython, fribidi, fribidi-dev, x11-dev,
fink (>= 0.24.12-1)
+Maintainer: David Fang <fang...@users.sourceforge.net>
+Depends: <<
+ libvorbis0-shlibs,
+ sdl-image-shlibs,
+ sdl-ttf-shlibs,
+ sdl-net-shlibs,
+ speex3-shlibs,
+ boost1.35.nopython-shlibs,
+ fribidi-shlibs,
+ x11-shlibs
+<<
+BuildDepends: <<
+ scons,
+ vorbis-tools,
+ libvorbis0,
+ libogg,
+ sdl,
+ sdl-image,
+ sdl-ttf,
+ sdl-net,
+ speex3,
+ boost1.35.nopython,
+ fribidi,
+ fribidi-dev,
+ x11-dev,
+ fink (>= 0.24.12-1)
Conflicts:
-Source: http://dl.sv.nongnu.org/releases/%n/%v/%n-%v.tar.gz
-Source-MD5: 507da29c310f199f9b1a9a5f335b7a7a
-SourceDirectory: glob2-%v
+Source: http://dl.sv.nongnu.org/releases/%n/0.9.4/%n-%v.tar.gz
+Source-MD5: 94c527325f355a29a2807f8f18a6e6a8
+# SourceDirectory: glob2-%v
PatchFile: %n.patch
-PatchFile-MD5: a8f1c1d60cd59392b68d38e2cb16c307
+PatchFile-MD5: 7e9c61de304de03eccb08b07d4f7dac9
CompileScript: <<
- scons osx=1 release=1 INSTALLDIR=%i/share BINDIR=%i/bin
DATADIR=%p/share/glob2 FINKPREFIX=%p
+ #!/bin/sh -ev
+ # c="release=1 INSTALLDIR=%p/share BINDIR=%p/bin DATADIR=%p/share/glob2
FINKPREFIX=%p"
+ # c="release=1 INSTALLDIR=%i/share BINDIR=%i/bin DATADIR=%p/share/glob2
FINKPREFIX=%p"
+ # scons $c
+ echo "Since we need the %i dir. at *compile* time, we compile at "
+ echo "*install* time, when the dir. exists with the correct permissions."
<<
InstallScript: <<
- scons install
+ #!/bin/sh -ev
+ # INSTALLDIR needs to exist first
+ mkdir -p %i/share
+ c="release=1 INSTALLDIR=%i/share BINDIR=%i/bin DATADIR=%p/share/glob2
FINKPREFIX=%p"
+ scons $c
+ scons install $c
<<
-DocFiles: AUTHORS COPYING README README.hg TODO INSTALL
+DocFiles: data/authors.txt COPYING README README.hg INSTALL
InfoDocs:
Description: Innovative Real-Time Strategy (RTS) game
DescDetail: <<
@@ -31,10 +64,16 @@
tutorials and an integrated map editor. Globulation2 can be played in single
player mode, through your local network, or over the Internet with
Ysagoon Online Gaming (or YOG for short).
+<<
+DescUsage: <<
To play, type glob2 in Terminal.app.
<<
DescPort: <<
Scons does not find some files when checking, but compiling is ok, so exit
lines are commented.
<<
+DescPackaging: <<
+The SCons build creates an AppBundle and disc image (.dmg).
+Former maintainer (pre-0.9.4): Alexandre Vial <av...@altern.org>
+<<
Homepage: http://www.globulation2.org/
License: GPL
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
