December 2012 - macports-changes - lists.macosforge.org

[100272] trunk/dports/python/py27-hgsubversion/Portfile
by easieste＠macports.org 06 Dec '12

06 Dec '12

Revision: 100272 https://trac.macports.org/changeset/100272 Author: easieste(a)macports.org Date: 2012-12-06 09:34:47 -0800 (Thu, 06 Dec 2012) Log Message: ----------- py27-hgsubversion: track source that works with mercurial-2.4.1. Modified Paths: -------------- trunk/dports/python/py27-hgsubversion/Portfile Modified: trunk/dports/python/py27-hgsubversion/Portfile =================================================================== --- trunk/dports/python/py27-hgsubversion/Portfile 2012-12-06 11:39:19 UTC (rev 100271) +++ trunk/dports/python/py27-hgsubversion/Portfile 2012-12-06 17:34:47 UTC (rev 100272) @@ -5,7 +5,7 @@ PortGroup python27 1.0 name py27-hgsubversion -version 1.4.20120801 +version 1.5.20121205 revision 0 categories-append devel platforms darwin @@ -25,7 +25,7 @@ fetch.type hg hg.url http://bitbucket.org/durin42/hgsubversion -hg.tag 8faa91951bb1 +hg.tag 68191be64af8 checksums sha1 037625745a982592cc24281afe08ddaeef9691b7 \ rmd160 9566f9af2a33aa51b2791e998f18fbe15ad50431

1 0

[100271] trunk/dports/python/py-cairo/Portfile
by g5pw＠macports.org 06 Dec '12

06 Dec '12

Revision: 100271 https://trac.macports.org/changeset/100271 Author: g5pw(a)macports.org Date: 2012-12-06 03:39:19 -0800 (Thu, 06 Dec 2012) Log Message: ----------- python/py-cairo: move variant out of stub port Modified Paths: -------------- trunk/dports/python/py-cairo/Portfile Modified: trunk/dports/python/py-cairo/Portfile =================================================================== --- trunk/dports/python/py-cairo/Portfile 2012-12-06 11:37:50 UTC (rev 100270) +++ trunk/dports/python/py-cairo/Portfile 2012-12-06 11:39:19 UTC (rev 100271) @@ -65,16 +65,16 @@ } } + variant x11 { + pre-configure { + require_active_variants cairo x11 + } + } + + default_variants +x11 + livecheck.type none } else { livecheck.type regex livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" } - -variant x11 { - pre-configure { - require_active_variants cairo x11 - } -} - -default_variants +x11

1 0

[100270] trunk/dports/python/py-cairo/Portfile
by g5pw＠macports.org 06 Dec '12

06 Dec '12

Revision: 100270 https://trac.macports.org/changeset/100270 Author: g5pw(a)macports.org Date: 2012-12-06 03:37:50 -0800 (Thu, 06 Dec 2012) Log Message: ----------- python/py-cairo: fix whitespace Modified Paths: -------------- trunk/dports/python/py-cairo/Portfile Modified: trunk/dports/python/py-cairo/Portfile =================================================================== --- trunk/dports/python/py-cairo/Portfile 2012-12-06 10:55:01 UTC (rev 100269) +++ trunk/dports/python/py-cairo/Portfile 2012-12-06 11:37:50 UTC (rev 100270) @@ -1,9 +1,9 @@ -# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8::et:sw=4:ts=4:sts=4 +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:et:fenc=utf-8::et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 PortGroup python 1.0 -PortGroup active_variants 1.0 +PortGroup active_variants 1.0 name py-cairo set my_name pycairo @@ -50,19 +50,19 @@ distname ${my_name}-${version} platform darwin 9 { - post-patch { + post-patch { reinplace "s| -export-symbols-regex.*||g" ${worksrcpath}/cairo/Makefile.in - } + } } post-extract { - fs-traverse item ${worksrcpath} { + fs-traverse item ${worksrcpath} { if {[file isdirectory ${item}]} { - file attributes ${item} -permissions a+rx + file attributes ${item} -permissions a+rx } elseif {[file isfile ${item}]} { - file attributes ${item} -permissions a+r + file attributes ${item} -permissions a+r } - } + } } livecheck.type none @@ -73,7 +73,7 @@ variant x11 { pre-configure { - require_active_variants cairo x11 + require_active_variants cairo x11 } }

1 0

propchange - r100203 svn:log
by ryandesign＠macports.org 06 Dec '12

06 Dec '12

Author: ryandesign(a)macports.org (original author: michaelld(a)macports.org) Revision: 100203 Property Name: svn:log --- /var/tmp/revprops/pre-100203-ryandesign(a)macports.org 2012-12-06 03:00:19.000265803 -0800 +++ /var/tmp/revprops/post-100203-ryandesign(a)macports.org 2012-12-06 03:00:19.053387231 -0800 @@ -2,4 +2,4 @@ * remove building of the remaining sqlite plugin; it will be moved to a plugin port. -* add variant suypporting OpenVG. +* add variant supporting OpenVG.

1 0

[100269] trunk/dports/python/py-cairo/Portfile
by g5pw＠macports.org 06 Dec '12

06 Dec '12

Revision: 100269 https://trac.macports.org/changeset/100269 Author: g5pw(a)macports.org Date: 2012-12-06 02:55:01 -0800 (Thu, 06 Dec 2012) Log Message: ----------- python/py-cairo: fix install of py-cairo (thanks again, Ryan) Modified Paths: -------------- trunk/dports/python/py-cairo/Portfile Modified: trunk/dports/python/py-cairo/Portfile =================================================================== --- trunk/dports/python/py-cairo/Portfile 2012-12-06 10:30:34 UTC (rev 100268) +++ trunk/dports/python/py-cairo/Portfile 2012-12-06 10:55:01 UTC (rev 100269) @@ -49,28 +49,28 @@ distname ${my_name}-${version} + platform darwin 9 { + post-patch { + reinplace "s| -export-symbols-regex.*||g" ${worksrcpath}/cairo/Makefile.in + } + } + + post-extract { + fs-traverse item ${worksrcpath} { + if {[file isdirectory ${item}]} { + file attributes ${item} -permissions a+rx + } elseif {[file isfile ${item}]} { + file attributes ${item} -permissions a+r + } + } + } + livecheck.type none } else { livecheck.type regex livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" } -platform darwin 9 { - post-patch { - reinplace "s| -export-symbols-regex.*||g" ${worksrcpath}/cairo/Makefile.in - } -} - -post-extract { - fs-traverse item ${worksrcpath} { - if {[file isdirectory ${item}]} { - file attributes ${item} -permissions a+rx - } elseif {[file isfile ${item}]} { - file attributes ${item} -permissions a+r - } - } -} - variant x11 { pre-configure { require_active_variants cairo x11

1 0

[100268] trunk/dports/lang/abcl/Portfile
by easieste＠macports.org 06 Dec '12

06 Dec '12

Revision: 100268 https://trac.macports.org/changeset/100268 Author: easieste(a)macports.org Date: 2012-12-06 02:30:34 -0800 (Thu, 06 Dec 2012) Log Message: ----------- abcl-1.1.0_2: use upstream RC2 source. Modified Paths: -------------- trunk/dports/lang/abcl/Portfile Modified: trunk/dports/lang/abcl/Portfile =================================================================== --- trunk/dports/lang/abcl/Portfile 2012-12-06 10:30:01 UTC (rev 100267) +++ trunk/dports/lang/abcl/Portfile 2012-12-06 10:30:34 UTC (rev 100268) @@ -5,8 +5,8 @@ name abcl version 1.1.0 -# revision 1: use upstream RC1 artifacts -revision 1 +# revision 2: use upstream RC2 artifacts +revision 2 categories lang java license GPL-2 maintainers easieste @@ -25,10 +25,10 @@ homepage http://common-lisp.net/project/armedbear platforms darwin master_sites googlecode:abcl-dynamic-install -distname abcl-src-${version}-rc-1 -checksums md5 97cee2bb0a9adcea9061ced127fae0e4 \ - sha1 bde7cac2cfba6b707d88a823696824e1ea5bc108 \ - rmd160 54eef32ba5bd71180cfebb1f1ff73768fbf6c1e5 +distname abcl-src-${version}-rc-2 +checksums md5 bb172fc144536ee29c22ab30896b33f8 \ + sha1 718a63ea8259242352aed5a7459d382b32b183cd \ + rmd160 16a31b692c9e04ae22e8fd220b277f37ca810405 depends_build port:apache-ant

1 0

[100267] trunk/dports/python/py-cairo/Portfile
by g5pw＠macports.org 06 Dec '12

06 Dec '12

Revision: 100267 https://trac.macports.org/changeset/100267 Author: g5pw(a)macports.org Date: 2012-12-06 02:30:01 -0800 (Thu, 06 Dec 2012) Log Message: ----------- python/py-cairo: moved post-configure block into x11 variant change post-configure to pre-configure (thanks, Ryan) disable py33-cairo because the dependency py33-numpy does not exist Modified Paths: -------------- trunk/dports/python/py-cairo/Portfile Modified: trunk/dports/python/py-cairo/Portfile =================================================================== --- trunk/dports/python/py-cairo/Portfile 2012-12-06 06:53:08 UTC (rev 100266) +++ trunk/dports/python/py-cairo/Portfile 2012-12-06 10:30:01 UTC (rev 100267) @@ -24,7 +24,7 @@ checksums rmd160 7d1c1c05113e5bbad32dbe96c65c918b170cac33 \ sha256 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be -python.versions 26 27 31 32 33 +python.versions 26 27 31 32 python.default_version 27 depends_build port:pkgconfig @@ -55,12 +55,6 @@ livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" } -post-configure { - if {[variant_isset x11]} { - require_active_variants cairo x11 - } -} - platform darwin 9 { post-patch { reinplace "s| -export-symbols-regex.*||g" ${worksrcpath}/cairo/Makefile.in @@ -77,6 +71,10 @@ } } -variant x11 {} +variant x11 { + pre-configure { + require_active_variants cairo x11 + } +} default_variants +x11

1 0

[100266] trunk/dports/multimedia/ffmpeg-devel/Portfile
by devans＠macports.org 06 Dec '12

06 Dec '12

Revision: 100266 https://trac.macports.org/changeset/100266 Author: devans(a)macports.org Date: 2012-12-05 22:53:08 -0800 (Wed, 05 Dec 2012) Log Message: ----------- ffmpeg-devel: update to latest git master. Modified Paths: -------------- trunk/dports/multimedia/ffmpeg-devel/Portfile Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile =================================================================== --- trunk/dports/multimedia/ffmpeg-devel/Portfile 2012-12-06 06:45:07 UTC (rev 100265) +++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2012-12-06 06:53:08 UTC (rev 100266) @@ -7,8 +7,8 @@ name ffmpeg-devel conflicts ffmpeg -version 20121031 -set git_branch 0e4d34e087e708a0211671b56418440de7847be6 +version 20121205 +set git_branch 3ab5f7dc137438e281af19218871da71a52e21be license LGPL-2.1+ categories multimedia maintainers devans jeremyhu openmaintainer @@ -77,9 +77,9 @@ error "git branch hash must be at least 7 characters long." } -checksums sha1 da315e4822eb0cdc959113d99ad66e64fb6a994c \ - rmd160 3647904ec372f2cc8f1efe56869643da770d81ab \ - sha256 94b8570d30d790d01cbaf32a70709cf3df3a0c66d62de6380855f84b9aabf020 +checksums sha1 fef02e4aaf95d4dbf945594049f3207c65b32923 \ + rmd160 001358b74ab40739e7099b8a59c4c3d4a285c585 \ + sha256 8517a731d6cc6104fe52105fdc8e66bac72952bc051323aeba13ec05b52dfe6a build.cmd ${prefix}/bin/gmake build.env-append V=1

1 0

propchange - r100265 svn:log
by g5pw＠macports.org 06 Dec '12

06 Dec '12

Author: g5pw(a)macports.org (original author: g5pw(a)macports.org) Revision: 100265 Property Name: svn:log --- /var/tmp/revprops/pre-100265-g5pw(a)macports.org 2012-12-05 22:48:44.661266839 -0800 +++ /var/tmp/revprops/post-100265-g5pw(a)macports.org 2012-12-05 22:48:44.723138470 -0800 @@ -3,3 +3,4 @@ - check for cairo variant using active_variants - use setup.py install method - new maintainer +- fixes #34889

1 0

[100265] trunk/dports/python
by g5pw＠macports.org 06 Dec '12

06 Dec '12

Revision: 100265 https://trac.macports.org/changeset/100265 Author: g5pw(a)macports.org Date: 2012-12-05 22:45:07 -0800 (Wed, 05 Dec 2012) Log Message: ----------- python/py-cairo: - unified using python portgroup - check for cairo variant using active_variants - use setup.py install method - new maintainer Modified Paths: -------------- trunk/dports/python/py-cairo/Portfile Added Paths: ----------- trunk/dports/python/py-cairo/files/ trunk/dports/python/py-cairo/files/setup.py.patch Removed Paths: ------------- trunk/dports/python/py25-cairo/ trunk/dports/python/py26-cairo/ trunk/dports/python/py27-cairo/ Modified: trunk/dports/python/py-cairo/Portfile =================================================================== --- trunk/dports/python/py-cairo/Portfile 2012-12-06 05:40:57 UTC (rev 100264) +++ trunk/dports/python/py-cairo/Portfile 2012-12-06 06:45:07 UTC (rev 100265) @@ -1,65 +1,82 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8::et:sw=4:ts=4:sts=4 # $Id$ -PortSystem 1.0 +PortSystem 1.0 +PortGroup python 1.0 +PortGroup active_variants 1.0 -name py-cairo -set my_name pycairo -# pycairo 1.6.4 does not support Python 2.4 -version 1.4.12 -revision 5 -categories python x11 -license {LGPL-2.1 MPL-1.1} -platforms darwin -maintainers nomaintainer -description Pycairo is set of Python bindings for the cairo graphics library +name py-cairo +set my_name pycairo +version 1.10.0 +categories python x11 +license {LGPL-2.1 MPL-1.1} +platforms darwin +maintainers gmail.com:sean.michael.farley openmaintainer +description Pycairo is set of Python bindings for the cairo graphics library -long_description \ - ${description} +long_description ${description} -homepage http://cairographics.org/pycairo/ -master_sites http://cairographics.org/releases/ -distname ${my_name}-${version} +homepage http://cairographics.org/pycairo/ +master_sites http://cairographics.org/releases/ -checksums md5 c63199d35b1e1d3c5133509f315f70d7 \ - sha1 580255db6f3ab4c44ac44dfe0a9f7d1f598c2ab3 \ - rmd160 f44bb6bcc6b366568e0297689164537dc891b278 +use_bzip2 yes -depends_build port:pkgconfig -depends_lib port:python24 \ - path:lib/pkgconfig/cairo.pc:cairo \ - port:libpng +checksums rmd160 7d1c1c05113e5bbad32dbe96c65c918b170cac33 \ + sha256 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be -# depends_test -depends_build-append port:py24-numpy +python.versions 26 27 31 32 33 +python.default_version 27 -configure.python ${prefix}/bin/python2.4 +depends_build port:pkgconfig +depends_lib path:lib/pkgconfig/cairo.pc:cairo -set python_prefix ${frameworks_dir}/Python.framework/Versions/2.4 -# change default includedir to avoid conflict with other python pycairo packages -configure.args-append --includedir=${prefix}/include/python2.4 +patchfiles-append setup.py.patch -platform darwin 9 { - post-patch { - reinplace "s| -export-symbols-regex.*||g" ${worksrcpath}/cairo/Makefile.in - } -} +if {${name} != ${subport}} { + depends_build-append port:py${python.version}-numpy -post-destroot { - set docdir ${prefix}/share/doc/${name}-${version} - xinstall -d ${destroot}${docdir} - xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING NEWS doc/NOTES doc/FAQ README \ - ${destroot}${docdir} + # pycairo distributes python 2.x versions as py2cairo + if {${python.version} < 31} { + set my_name py2cairo - # avoid conflict with other python pycairo packages - # pkg-config based ports will have to set configure.pkg_config_path to find this package - xinstall -d -m 0755 ${destroot}${python_prefix}/lib - move ${destroot}${prefix}/lib/pkgconfig ${destroot}${python_prefix}/lib + checksums rmd160 ce75db9af32ef1a3e90f6aaa649cbb2493a941a4 \ + sha256 d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431 + + post-patch { + reinplace "s|py3cairo|pycairo|g" ${worksrcpath}/setup.py + } + } + + distname ${my_name}-${version} + + livecheck.type none +} else { + livecheck.type regex + livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" } -post-patch { reinplace "s/python /python2.4 /" ${worksrcpath}/test/test.test } -test.run yes -test.cmd "cd test && python2.4" -test.target test.py +post-configure { + if {[variant_isset x11]} { + require_active_variants cairo x11 + } +} -livecheck.type regex -livecheck.regex ${my_name}-(1\\.4\\.\\d+) +platform darwin 9 { + post-patch { + reinplace "s| -export-symbols-regex.*||g" ${worksrcpath}/cairo/Makefile.in + } +} + +post-extract { + fs-traverse item ${worksrcpath} { + if {[file isdirectory ${item}]} { + file attributes ${item} -permissions a+rx + } elseif {[file isfile ${item}]} { + file attributes ${item} -permissions a+r + } + } +} + +variant x11 {} + +default_variants +x11 Added: trunk/dports/python/py-cairo/files/setup.py.patch =================================================================== --- trunk/dports/python/py-cairo/files/setup.py.patch (rev 0) +++ trunk/dports/python/py-cairo/files/setup.py.patch 2012-12-06 06:45:07 UTC (rev 100265) @@ -0,0 +1,127 @@ +--- setup.py 2012-09-02 21:20:12.000000000 -0500 ++++ setup.py.new 2012-09-02 21:19:23.000000000 -0500 +@@ -0,0 +1,124 @@ ++#!/usr/bin/env python ++ ++import distutils.core as dic ++import distutils.dir_util as dut ++import distutils.file_util as fut ++import distutils.sysconfig as dsy ++import io ++import os ++import subprocess ++import sys ++ ++pycairo_version = '1.10.0' ++cairo_version_required = '1.10.2' ++python_version_required = (2,6) ++pkgconfig_file = 'py3cairo.pc' ++config_file = 'src/config.h' ++ ++ ++def call(command): ++ pipe = subprocess.Popen(command, shell=True, ++ stdout=subprocess.PIPE, ++ stderr=subprocess.PIPE) ++ pipe.wait() ++ return pipe ++ ++def pkg_config_version_check(pkg, version): ++ check = '%s >= %s' % (pkg, version) ++ pipe = call("pkg-config --print-errors --exists '%s'" % (check,)) ++ if pipe.returncode == 0: ++ print(check, ' Successful') ++ else: ++ print(check, ' Failed') ++ raise SystemExit(pipe.stderr.read().decode()) ++ ++def pkg_config_parse(opt, pkg): ++ check = "pkg-config %s %s" % (opt, pkg) ++ pipe = call("pkg-config %s %s" % (opt, pkg)) ++ if pipe.returncode != 0: ++ print(check, ' Failed') ++ raise SystemExit(pipe.stderr.read().decode()) ++ ++ output = pipe.stdout.read() ++ output = output.decode() # get the str ++ opt = opt[-2:] ++ return [x.lstrip(opt) for x in output.split()] ++ ++ ++def createPcFile(PcFile): ++ print('creating %s' % PcFile) ++ with open(PcFile, 'w') as fo: ++ fo.write ("""\ ++prefix=%s ++ ++Name: Pycairo ++Description: Python 3 bindings for cairo ++Version: %s ++Requires: cairo ++Cflags: -I${prefix}/include/pycairo ++Libs: ++""" % (sys.prefix, pycairo_version) ++ ) ++ ++def createConfigFile(ConfigFile): ++ print('creating %s' % ConfigFile) ++ v = pycairo_version.split('.') ++ ++ with open(ConfigFile, 'w') as fo: ++ fo.write ("""\ ++// Configuration header created by setup.py - do not edit ++#ifndef _CONFIG_H ++#define _CONFIG_H 1 ++ ++#define PYCAIRO_VERSION_MAJOR %s ++#define PYCAIRO_VERSION_MICRO %s ++#define PYCAIRO_VERSION_MINOR %s ++#define VERSION "%s" ++ ++#endif // _CONFIG_H ++""" % (v[0], v[1], v[2], pycairo_version) ++ ) ++ ++ ++if sys.version_info < python_version_required: ++ raise SystemExit('Error: Python >= %s is required' % ++ (python_version_required,)) ++ ++pkg_config_version_check ('cairo', cairo_version_required) ++if sys.platform == 'win32': ++ runtime_library_dirs = [] ++else: ++ runtime_library_dirs = pkg_config_parse('--libs-only-L', 'cairo') ++ ++createPcFile(pkgconfig_file) ++createConfigFile(config_file) ++ ++ ++cairo = dic.Extension( ++ name = 'cairo._cairo', ++ sources = ['src/cairomodule.c', ++ 'src/context.c', ++ 'src/font.c', ++ 'src/matrix.c', ++ 'src/path.c', ++ 'src/pattern.c', ++ 'src/surface.c', ++ ], ++ include_dirs = pkg_config_parse('--cflags-only-I', 'cairo'), ++ library_dirs = pkg_config_parse('--libs-only-L', 'cairo'), ++ libraries = pkg_config_parse('--libs-only-l', 'cairo'), ++ runtime_library_dirs = runtime_library_dirs, ++ ) ++ ++dic.setup( ++ name = "pycairo", ++ version = pycairo_version, ++ description = "python interface for cairo", ++ ext_modules = [cairo], ++ data_files = [ ++ ('include/pycairo', ['src/py3cairo.h']), ++ ('lib/pkgconfig', [pkgconfig_file]), ++ (os.path.join(dsy.get_python_lib(), 'cairo'), ++ ['src/__init__.py']), ++ ], ++ )

1 0