[36269] trunk/dports/python
jmr at macports.org
jmr at macports.org
Fri Apr 25 03:53:29 PDT 2008
Revision: 36269
http://trac.macosforge.org/projects/macports/changeset/36269
Author: jmr at macports.org
Date: 2008-04-25 03:53:28 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
py[25]-game: use the SDL libs we depend on, rather than the framework versions
Modified Paths:
--------------
trunk/dports/python/py-game/Portfile
trunk/dports/python/py25-game/Portfile
Added Paths:
-----------
trunk/dports/python/py-game/files/
trunk/dports/python/py-game/files/patch-config_darwin.py.diff
trunk/dports/python/py25-game/files/
trunk/dports/python/py25-game/files/patch-config_darwin.py.diff
Modified: trunk/dports/python/py-game/Portfile
===================================================================
--- trunk/dports/python/py-game/Portfile 2008-04-25 10:06:01 UTC (rev 36268)
+++ trunk/dports/python/py-game/Portfile 2008-04-25 10:53:28 UTC (rev 36269)
@@ -22,6 +22,8 @@
sha1 00ef4695efc7a666017862ae4cffc316902dd99b \
rmd160 6df6f88deea5a1ef19933e6a0696e102843b293c
+patchfiles patch-config_darwin.py.diff
+
depends_lib-append port:libsdl \
port:libsdl_mixer \
port:libsdl_image \
@@ -30,6 +32,10 @@
port:py-numeric \
port:py-pyobjc
+use_configure yes
+configure.env-append LOCALBASE=${prefix}
+configure.cmd ${python.bin} config.py
+
platform darwin 9 {
depends_lib-delete port:py-pyobjc
depends_lib-append port:py-pyobjc2 port:py-pyobjc2-cocoa
Added: trunk/dports/python/py-game/files/patch-config_darwin.py.diff
===================================================================
--- trunk/dports/python/py-game/files/patch-config_darwin.py.diff (rev 0)
+++ trunk/dports/python/py-game/files/patch-config_darwin.py.diff 2008-04-25 10:53:28 UTC (rev 36269)
@@ -0,0 +1,39 @@
+--- config_darwin.py.orig 2008-03-29 08:45:44.000000000 +1100
++++ config_darwin.py 2008-04-25 20:50:36.000000000 +1000
+@@ -4,6 +4,8 @@
+ from glob import glob
+ from distutils.sysconfig import get_python_inc
+
++localbase = os.environ.get('LOCALBASE', '')
++
+ class Dependency:
+ libext = '.a'
+ def __init__(self, name, checkhead, checklib, libs):
+@@ -86,11 +88,11 @@
+ print self.name + ' '[len(self.name):] + ': not found'
+
+ DEPS = [
+- FrameworkDependency('SDL', 'SDL.h', 'libSDL', 'SDL'),
+- FrameworkDependency('FONT', 'SDL_ttf.h', 'libSDL_ttf', 'SDL_ttf'),
+- FrameworkDependency('IMAGE', 'SDL_image.h', 'libSDL_image', 'SDL_image'),
+- FrameworkDependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer', 'SDL_mixer'),
+- FrameworkDependency('SMPEG', 'smpeg.h', 'libsmpeg', 'smpeg'),
++ Dependency('SDL', 'SDL.h', 'libSDL', ['SDL']),
++ Dependency('FONT', 'SDL_ttf.h', 'libSDL_ttf', ['SDL_ttf']),
++ Dependency('IMAGE', 'SDL_image.h', 'libSDL_image', ['SDL_image']),
++ Dependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer', ['SDL_mixer']),
++ Dependency('SMPEG', 'smpeg.h', 'libsmpeg', ['smpeg']),
+ Dependency('PNG', 'png.h', 'libpng', ['png']),
+ Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
+ Dependency('SCRAP', '','',[])
+@@ -101,8 +103,8 @@
+ global DEPS
+
+ print 'Hunting dependencies...'
+- incdirs = ['/usr/local/include','/opt/local/include']
+- libdirs = ['/usr/local/lib','/opt/local/lib']
++ incdirs = [localbase+'/include', localbase+'/include/SDL', localbase+'/include/smpeg']
++ libdirs = ['/opt/local/lib']
+ newconfig = []
+ for d in DEPS:
+ d.configure(incdirs, libdirs)
Modified: trunk/dports/python/py25-game/Portfile
===================================================================
--- trunk/dports/python/py25-game/Portfile 2008-04-25 10:06:01 UTC (rev 36268)
+++ trunk/dports/python/py25-game/Portfile 2008-04-25 10:53:28 UTC (rev 36269)
@@ -24,6 +24,8 @@
sha1 00ef4695efc7a666017862ae4cffc316902dd99b \
rmd160 6df6f88deea5a1ef19933e6a0696e102843b293c
+patchfiles patch-config_darwin.py.diff
+
depends_lib-append port:libsdl \
port:libsdl_mixer \
port:libsdl_image \
@@ -31,7 +33,11 @@
port:smpeg \
port:py25-numeric \
port:py25-pyobjc
-
+
+use_configure yes
+configure.env-append LOCALBASE=${prefix}
+configure.cmd ${python.bin} config.py
+
platform darwin 9 {
depends_lib-delete port:py25-pyobjc
depends_lib-append port:py25-pyobjc2 port:py25-pyobjc2-cocoa
Added: trunk/dports/python/py25-game/files/patch-config_darwin.py.diff
===================================================================
--- trunk/dports/python/py25-game/files/patch-config_darwin.py.diff (rev 0)
+++ trunk/dports/python/py25-game/files/patch-config_darwin.py.diff 2008-04-25 10:53:28 UTC (rev 36269)
@@ -0,0 +1,39 @@
+--- config_darwin.py.orig 2008-03-29 08:45:44.000000000 +1100
++++ config_darwin.py 2008-04-25 20:50:36.000000000 +1000
+@@ -4,6 +4,8 @@
+ from glob import glob
+ from distutils.sysconfig import get_python_inc
+
++localbase = os.environ.get('LOCALBASE', '')
++
+ class Dependency:
+ libext = '.a'
+ def __init__(self, name, checkhead, checklib, libs):
+@@ -86,11 +88,11 @@
+ print self.name + ' '[len(self.name):] + ': not found'
+
+ DEPS = [
+- FrameworkDependency('SDL', 'SDL.h', 'libSDL', 'SDL'),
+- FrameworkDependency('FONT', 'SDL_ttf.h', 'libSDL_ttf', 'SDL_ttf'),
+- FrameworkDependency('IMAGE', 'SDL_image.h', 'libSDL_image', 'SDL_image'),
+- FrameworkDependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer', 'SDL_mixer'),
+- FrameworkDependency('SMPEG', 'smpeg.h', 'libsmpeg', 'smpeg'),
++ Dependency('SDL', 'SDL.h', 'libSDL', ['SDL']),
++ Dependency('FONT', 'SDL_ttf.h', 'libSDL_ttf', ['SDL_ttf']),
++ Dependency('IMAGE', 'SDL_image.h', 'libSDL_image', ['SDL_image']),
++ Dependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer', ['SDL_mixer']),
++ Dependency('SMPEG', 'smpeg.h', 'libsmpeg', ['smpeg']),
+ Dependency('PNG', 'png.h', 'libpng', ['png']),
+ Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
+ Dependency('SCRAP', '','',[])
+@@ -101,8 +103,8 @@
+ global DEPS
+
+ print 'Hunting dependencies...'
+- incdirs = ['/usr/local/include','/opt/local/include']
+- libdirs = ['/usr/local/lib','/opt/local/lib']
++ incdirs = [localbase+'/include', localbase+'/include/SDL', localbase+'/include/smpeg']
++ libdirs = ['/opt/local/lib']
+ newconfig = []
+ for d in DEPS:
+ d.configure(incdirs, libdirs)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080425/b7330035/attachment.html
More information about the macports-changes
mailing list