[88756] trunk/dports/graphics/MyPaint

[ryandesign at macports.org]

Revision: 88756
          http://trac.macports.org/changeset/88756
Author:   ryandesign at macports.org
Date:     2012-01-10 12:20:56 -0800 (Tue, 10 Jan 2012)
Log Message:
-----------
MyPaint: use python 2.7; see #32251

Modified Paths:
--------------
    trunk/dports/graphics/MyPaint/Portfile
    trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff

Modified: trunk/dports/graphics/MyPaint/Portfile
===================================================================
--- trunk/dports/graphics/MyPaint/Portfile	2012-01-10 20:06:31 UTC (rev 88755)
+++ trunk/dports/graphics/MyPaint/Portfile	2012-01-10 20:20:56 UTC (rev 88756)
@@ -7,6 +7,7 @@
 name                        MyPaint
 set my_name                 mypaint
 version                     1.0.0
+revision                    1
 homepage                    http://mypaint.info/
 categories                  graphics
 maintainers                 ryandesign
@@ -29,14 +30,13 @@
                             sha256  1cf196c0f8a528325b19dc1908bb057d299020c10ac32f407e27b0de8b0a5e9c
 
 depends_build               port:pkgconfig \
-                            port:py27-numpy \
                             port:scons \
                             port:swig-python
 
-depends_lib                 port:protobuf-python26 \
-                            port:libpng \
-                            port:py26-numpy \
-                            port:py26-gtk
+depends_lib                 port:libpng \
+                            port:protobuf-python27 \
+                            port:py27-gtk \
+                            port:py27-numpy
 
 depends_run                 port:hicolor-icon-theme
 

Modified: trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff	2012-01-10 20:06:31 UTC (rev 88755)
+++ trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff	2012-01-10 20:20:56 UTC (rev 88756)
@@ -1,14 +1,5 @@
 --- SConstruct.orig	2011-11-22 14:27:03.000000000 -0600
-+++ SConstruct	2011-11-24 21:28:56.000000000 -0600
-@@ -6,7 +6,7 @@
- 
- # FIXME: sometimes it would be good to build for a different python
- # version than the one running scons. (But how to find all paths then?)
--python = 'python%d.%d' % (sys.version_info[0], sys.version_info[1])
-+python = 'python2.6'
- print 'Building for', python
- 
- if sys.platform == "win32":
++++ SConstruct	2012-01-10 14:07:43.000000000 -0600
 @@ -21,10 +21,7 @@
  
  SConsignFile() # no .scsonsign into $PREFIX please
@@ -21,17 +12,25 @@
  
  opts = Variables()
  opts.Add(PathVariable('prefix', 'autotools-style installation prefix', default_prefix, validator=PathVariable.PathIsDirCreate))
-@@ -51,9 +48,6 @@
-     from distutils import sysconfig
+@@ -52,8 +49,15 @@
      pre,inc = sysconfig.get_config_vars('exec_prefix', 'INCLUDEPY')
      env.Append(CPPPATH=inc, LIBPATH=pre+'\libs', LIBS='python'+sys.version[0]+sys.version[2])
--elif sys.platform == "darwin":
+ elif sys.platform == "darwin":
 -    env.ParseConfig('python-config --cflags')
 -    env.ParseConfig('python-config --ldflags')
++    env.ParseConfig(python + '-config --cflags')
++    ldflags = env.backtick(python + '-config --ldflags').split()
++    # scons does not seem to parse '-u' correctly
++    # put all options after -u in LINKFLAGS
++    if '-u' in ldflags:
++        idx = ldflags.index('-u')
++        env.Append(LINKFLAGS=ldflags[idx:])
++        del ldflags[idx:]
++    env.MergeFlags(' '.join(ldflags))
  else:
      # some distros use python2.5-config, others python-config2.5
      try:
-@@ -81,7 +75,7 @@
+@@ -81,7 +85,7 @@
  
  def burn_python_version(target, source, env):
      # make sure we run the python version that we built the extension modules for
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120110/172826a0/attachment.html>