Revision: 134634 https://trac.macports.org/changeset/134634 Author: khindenburg@macports.org Date: 2015-04-01 07:44:31 -0700 (Wed, 01 Apr 2015) Log Message: ----------- py-enable: update to 4.5.0 maintainer #46584 Modified Paths: -------------- trunk/dports/python/py-enable/Portfile Added Paths: ----------- trunk/dports/python/py-enable/files/patch-swig_fix.diff Modified: trunk/dports/python/py-enable/Portfile =================================================================== --- trunk/dports/python/py-enable/Portfile 2015-04-01 14:25:42 UTC (rev 134633) +++ trunk/dports/python/py-enable/Portfile 2015-04-01 14:44:31 UTC (rev 134634) @@ -3,11 +3,10 @@ PortSystem 1.0 PortGroup python 1.0 - PortGroup github 1.0 -github.setup enthought enable 4.3.0 -revision 1 +github.setup enthought enable 4.5.0 + name py-enable categories-append devel maintainers gmail.com:jjstickel openmaintainer @@ -20,22 +19,24 @@ license BSD platforms darwin -checksums rmd160 73bd0a92c677784ee40432ab65f3ead6ac853b72 \ - sha256 6eac82675cc4c52ddf1bb50c53ec82de92309bf7c2f003bfe4709d106c89693c +checksums rmd160 d2c43d3f488fe81be39f7168b77d9697fdbed9ec \ + sha256 453b1fb373845f703a5cb31c92166925fb74f2285717d04f0e1d0e9705d28496 -python.versions 26 27 +python.versions 27 if {${name} ne ${subport}} { # It seems this is not needed for version >= 4.3.0, but leaving here in # case problems are reported JJS 1/9/13 # patchfiles no-64-bit-quartz.diff -# patch.pre_args -p1 - + patchfiles patch-swig_fix.diff + patch.pre_args -p1 + depends_build-append port:py${python.version}-setuptools \ port:py${python.version}-cython \ port:swig-python - depends_lib-append port:py${python.version}-traitsui\ - port:py${python.version}-reportlab + depends_lib-append port:py${python.version}-traitsui \ + port:py${python.version}-reportlab \ + port:py${python.version}-kiwisolver } # haven't retested if this is still true for version >= 4.0; commenting out but Added: trunk/dports/python/py-enable/files/patch-swig_fix.diff =================================================================== --- trunk/dports/python/py-enable/files/patch-swig_fix.diff (rev 0) +++ trunk/dports/python/py-enable/files/patch-swig_fix.diff 2015-04-01 14:44:31 UTC (rev 134634) @@ -0,0 +1,77 @@ +diff -ur enable-4.5.0/kiva/agg/src/affine_matrix.i enable-4.5.0_swig_fix/kiva/agg/src/affine_matrix.i +--- enable-4.5.0/kiva/agg/src/affine_matrix.i 2015-03-23 11:27:31.000000000 -0600 ++++ enable-4.5.0_swig_fix/kiva/agg/src/affine_matrix.i 2015-03-25 12:00:40.000000000 -0600 +@@ -157,7 +157,7 @@ + }; + }; + +-%pythoncode { ++%pythoncode %{ + def is_sequence(arg): + try: + len(arg) +@@ -184,7 +184,7 @@ + """ + self.multiply(other) + return self +-} ++%} + + %extend agg24::trans_affine + { +diff -ur enable-4.5.0/kiva/agg/src/constants.i enable-4.5.0_swig_fix/kiva/agg/src/constants.i +--- enable-4.5.0/kiva/agg/src/constants.i 2015-03-23 11:27:31.000000000 -0600 ++++ enable-4.5.0_swig_fix/kiva/agg/src/constants.i 2015-03-25 11:58:24.000000000 -0600 +@@ -44,7 +44,7 @@ + unsigned path_cmd(unsigned c); + unsigned path_flags(unsigned c); + +-%pythoncode { ++%pythoncode %{ + + #---------------------------------------------------------------------------- + # +@@ -141,4 +141,4 @@ + for key,value in interp_string_map.items(): + interp_enum_map[value] = key + +-} ++%} +diff -ur enable-4.5.0/kiva/agg/src/hit_test.i enable-4.5.0_swig_fix/kiva/agg/src/hit_test.i +--- enable-4.5.0/kiva/agg/src/hit_test.i 2015-03-23 11:27:31.000000000 -0600 ++++ enable-4.5.0_swig_fix/kiva/agg/src/hit_test.i 2015-03-25 12:01:02.000000000 -0600 +@@ -22,7 +22,7 @@ + } + + %pythoncode +-{ ++%{ + from numpy import shape, transpose, zeros, rank, reshape, int32 + + def points_in_polygon(pts, poly_pts, use_winding=False): +@@ -92,4 +92,4 @@ + else: + _agg.points_in_polygon(pts, poly_pts, results) + return results +-} ++%} +diff -ur enable-4.5.0/kiva/agg/src/rgba.i enable-4.5.0_swig_fix/kiva/agg/src/rgba.i +--- enable-4.5.0/kiva/agg/src/rgba.i 2015-03-23 11:27:31.000000000 -0600 ++++ enable-4.5.0_swig_fix/kiva/agg/src/rgba.i 2015-03-25 11:59:59.000000000 -0600 +@@ -74,7 +74,7 @@ + } + + +-%pythoncode { ++%pythoncode %{ + def is_sequence(arg): + try: + len(arg) +@@ -90,6 +90,6 @@ + if len(args) not in [3,4]: + raise ValueError, "array argument must be 1x3 or 1x4" + _Rgba.__init__(self,*args) +-} ++%} + + %clear double r, double g, double b, double a;