[101335] trunk/dports/graphics/MyPaint
ryandesign at macports.org
ryandesign at macports.org
Tue Jan 8 15:41:12 PST 2013
Revision: 101335
https://trac.macports.org/changeset/101335
Author: ryandesign at macports.org
Date: 2013-01-08 15:41:12 -0800 (Tue, 08 Jan 2013)
Log Message:
-----------
MyPaint: update to 1.1.0
Modified Paths:
--------------
trunk/dports/graphics/MyPaint/Portfile
trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff
Added Paths:
-----------
trunk/dports/graphics/MyPaint/files/patch-malloc.diff
Modified: trunk/dports/graphics/MyPaint/Portfile
===================================================================
--- trunk/dports/graphics/MyPaint/Portfile 2013-01-08 23:34:25 UTC (rev 101334)
+++ trunk/dports/graphics/MyPaint/Portfile 2013-01-08 23:41:12 UTC (rev 101335)
@@ -6,8 +6,7 @@
name MyPaint
set my_name mypaint
-version 1.0.0
-revision 4
+version 1.1.0
homepage http://mypaint.info/
categories graphics
maintainers ryandesign
@@ -26,8 +25,8 @@
master_sites http://download.gna.org/mypaint/
-checksums rmd160 ca53e03adb1ec3a37e8c8528a03698f892584625 \
- sha256 1cf196c0f8a528325b19dc1908bb057d299020c10ac32f407e27b0de8b0a5e9c
+checksums rmd160 a102688793e2392f70bd625d65cd5b4ea763adec \
+ sha256 58fd90b08fa3142b6dddc2a656c0e406fc3ebcf9086b84e83815780ab7698036
depends_build port:pkgconfig \
port:scons \
@@ -41,24 +40,40 @@
depends_run port:hicolor-icon-theme
patchfiles patch-SConstruct.diff
+patchfiles-append patch-malloc.diff
-post-patch {
- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/SConstruct
-}
-
use_configure no
variant universal {}
-build.cmd scons
+build.cmd ${prefix}/bin/scons
build.target
-build.args prefix=${prefix}
-build.env CXX="${configure.cxx} [get_canonical_archflags]"
+build.args python_binary=${prefix}/bin/python2.7 \
+ python_config=${prefix}/bin/python2.7-config
+build.env CC="${configure.cc} [get_canonical_archflags cc]" \
+ CXX="${configure.cxx} [get_canonical_archflags cxx]"
-destroot.destdir prefix=${destroot}${prefix}
-destroot.env CXX="${configure.cxx} [get_canonical_archflags]"
+eval destroot.args ${build.args} \
+ prefix=${prefix}
+eval destroot.env ${build.env}
+# Setting --install-sandbox to an absolute path to a subdirectory of ${worksrcpath}
+# is supposed to work, but doesn't; see https://gna.org/bugs/?20399
+#destroot.destdir --install-sandbox=${worksrcpath}/destroot
+destroot.destdir --install-sandbox=pre-destroot
+# prefix must apparently be a nonexistent directory that MacPorts nevertheless has
+# permission to create during the build phase; see https://gna.org/bugs/?20399
+build.args-append prefix=${workpath}/nonexistent
+
post-destroot {
+ # Because we must set --install-sandbox to a relative path for now, multiple pre-destroot
+ # directories get created, which must now be combined; see https://gna.org/bugs/?20399
+ fs-traverse d ${worksrcpath} {
+ if {[file tail ${d}] == "pre-destroot"} {
+ ui_debug "merging ${d} with destroot"
+ system -W ${destroot} "tar -C ${d} -c -f - .${prefix} | tar -x -p -v -f -"
+ }
+ }
set docdir ${destroot}${prefix}/share/doc/${name}
xinstall -d ${docdir}
xinstall -m 644 -W ${worksrcpath} \
Modified: trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff 2013-01-08 23:34:25 UTC (rev 101334)
+++ trunk/dports/graphics/MyPaint/files/patch-SConstruct.diff 2013-01-08 23:41:12 UTC (rev 101335)
@@ -1,49 +1,11 @@
---- SConstruct.orig 2011-11-22 14:27:03.000000000 -0600
-+++ SConstruct 2012-01-10 14:31:34.000000000 -0600
-@@ -21,10 +21,7 @@
+--- SConstruct.orig 2012-12-31 11:03:38.000000000 -0600
++++ SConstruct 2013-01-02 11:20:08.000000000 -0600
+@@ -116,6 +113,8 @@
- SConsignFile() # no .scsonsign into $PREFIX please
+ return install_targs
--if sys.platform == "darwin":
-- default_prefix = '/opt/local/'
--else:
-- default_prefix = '/usr/local/'
-+default_prefix = '@PREFIX@/'
-
- opts = Variables()
- opts.Add(PathVariable('prefix', 'autotools-style installation prefix', default_prefix, validator=PathVariable.PathIsDirCreate))
-@@ -45,6 +42,7 @@
- numpy_path = numpy.get_include()
- env.Append(CPPPATH=numpy_path)
-
++env['CC'] = os.environ.get('CC', 'gcc')
+env['CXX'] = os.environ.get('CXX', 'g++')
- if sys.platform == "win32":
- # official python shipped with no pc file on windows so get from current python
-@@ -52,8 +50,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":
-- 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 +86,7 @@
-
- def burn_python_version(target, source, env):
- # make sure we run the python version that we built the extension modules for
-- s = '#!/usr/bin/env ' + python + '\n'
-+ s = '#!@PREFIX@/bin/' + python + '\n'
- s += 5*'#\n'
- s += '# DO NOT EDIT - edit %s instead\n' % source[0]
- s += 5*'#\n'
+ def install_tree(env, dest, path, perms=0644, dirperms=0755):
+ assert os.path.isdir(path)
Added: trunk/dports/graphics/MyPaint/files/patch-malloc.diff
===================================================================
--- trunk/dports/graphics/MyPaint/files/patch-malloc.diff (rev 0)
+++ trunk/dports/graphics/MyPaint/files/patch-malloc.diff 2013-01-08 23:41:12 UTC (rev 101335)
@@ -0,0 +1,23 @@
+https://gna.org/bugs/?20398
+--- brushlib/fifo.c.orig 2012-12-31 11:03:38.000000000 -0600
++++ brushlib/fifo.c 2013-01-02 11:28:48.000000000 -0600
+@@ -15,7 +15,7 @@
+ *
+ */
+
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "fifo.h"
+
+ struct fifo_item
+--- brushlib/operationqueue.c.orig 2012-12-31 11:03:38.000000000 -0600
++++ brushlib/operationqueue.c 2013-01-02 11:29:53.000000000 -0600
+@@ -15,7 +15,7 @@
+ */
+
+
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <assert.h>
+
+ #include <mypaint-glib-compat.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130108/8bcba1b2/attachment.html>
More information about the macports-changes
mailing list