August 2008 - macports-changes - lists.macosforge.org

[38828] trunk/dports/python
by landonf＠macports.org 01 Aug '08

01 Aug '08

Revision: 38828 http://trac.macosforge.org/projects/macports/changeset/38828 Author: landonf(a)macports.org Date: 2008-07-31 23:09:21 -0700 (Thu, 31 Jul 2008) Log Message: ----------- Bump revisions -- if GEOS is updated to 3.0.0, these ports must link against the new GEOS 2.x port. Modified Paths: -------------- trunk/dports/python/py-matplotlib-basemap/Portfile trunk/dports/python/py25-matplotlib-basemap/Portfile Modified: trunk/dports/python/py-matplotlib-basemap/Portfile =================================================================== --- trunk/dports/python/py-matplotlib-basemap/Portfile 2008-08-01 06:07:12 UTC (rev 38827) +++ trunk/dports/python/py-matplotlib-basemap/Portfile 2008-08-01 06:09:21 UTC (rev 38828) @@ -5,6 +5,7 @@ name py-matplotlib-basemap version 0.99 +revision 1 categories python graphics math platforms darwin maintainers ram openmaintainer Modified: trunk/dports/python/py25-matplotlib-basemap/Portfile =================================================================== --- trunk/dports/python/py25-matplotlib-basemap/Portfile 2008-08-01 06:07:12 UTC (rev 38827) +++ trunk/dports/python/py25-matplotlib-basemap/Portfile 2008-08-01 06:09:21 UTC (rev 38828) @@ -5,6 +5,7 @@ name py25-matplotlib-basemap version 0.99 +revision 1 categories python graphics math platforms darwin maintainers ram openmaintainer

1 0

[38827] trunk/dports/science/geos
by landonf＠macports.org 01 Aug '08

01 Aug '08

Revision: 38827 http://trac.macosforge.org/projects/macports/changeset/38827 Author: landonf(a)macports.org Date: 2008-07-31 23:07:12 -0700 (Thu, 31 Jul 2008) Log Message: ----------- Now that py-matplotlib-basemap and py25-matplotlib-basemap are using geos2, re-introduce the GEOS 3.0.0 update, as per trac ticket #13699 Modified Paths: -------------- trunk/dports/science/geos/Portfile Removed Paths: ------------- trunk/dports/science/geos/files/ Modified: trunk/dports/science/geos/Portfile =================================================================== --- trunk/dports/science/geos/Portfile 2008-08-01 06:05:30 UTC (rev 38826) +++ trunk/dports/science/geos/Portfile 2008-08-01 06:07:12 UTC (rev 38827) @@ -3,7 +3,7 @@ PortSystem 1.0 name geos -version 2.2.3 +version 3.0.0 categories science platforms darwin maintainers opendarwin(a)gaige.net ram @@ -18,12 +18,8 @@ master_sites ${homepage}downloads/ use_bzip2 yes -checksums md5 440be2b11fd3d711e950a47ea6f1b424 \ - sha1 c5da21829255e3625f7c2482c9220234cc5d9f90 \ - rmd160 968de157f96f41aa71d5ef7c28c7186e8db0939e +checksums md5 3f7940abee9fec69a9787878cd3ae771 \ + sha1 71090220351c8ae7bb147d74145fa5daf83e3c26 \ + rmd160 195fb24de2f67d515f629f1dcb3dccec7711bdac use_parallel_build yes - -platform darwin 9 { - patchfiles patch-test_XMLTester.cpp.diff -}

1 0

[38826] trunk/dports/python/py-matplotlib-basemap
by landonf＠macports.org 01 Aug '08

01 Aug '08

Revision: 38826 http://trac.macosforge.org/projects/macports/changeset/38826 Author: landonf(a)macports.org Date: 2008-07-31 23:05:30 -0700 (Thu, 31 Jul 2008) Log Message: ----------- Update to lock to GEOS 2 -- requires fairly small changes. Test procedure: - Verified that the py-matplotlib-basemap _geoslib.so linked against the geos2 port geos dylib. - Ran test.py and sanity-checked the output. Please let me know if there are any issues and I'll do my best to fix them rapidly. Modified Paths: -------------- trunk/dports/python/py-matplotlib-basemap/Portfile Added Paths: ----------- trunk/dports/python/py-matplotlib-basemap/files/ trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c Modified: trunk/dports/python/py-matplotlib-basemap/Portfile =================================================================== --- trunk/dports/python/py-matplotlib-basemap/Portfile 2008-08-01 05:54:23 UTC (rev 38825) +++ trunk/dports/python/py-matplotlib-basemap/Portfile 2008-08-01 06:05:30 UTC (rev 38826) @@ -22,10 +22,13 @@ rmd160 18d5cc303efef8b7d9d20b5c4c3ceba26778a791 depends_lib-append port:py-matplotlib \ - port:geos + port:geos2 universal_variant no +patchfiles patch-setup.py \ + patch-src_geoslib.c + post-destroot { delete ${destroot}${python.pkgd}/mpl_toolkits/__init__.py delete ${destroot}${python.pkgd}/mpl_toolkits/__init__.pyc Added: trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py =================================================================== --- trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py (rev 0) +++ trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py 2008-08-01 06:05:30 UTC (rev 38826) @@ -0,0 +1,20 @@ +--- setup.py.orig 2008-07-31 22:20:38.000000000 -0700 ++++ setup.py 2008-07-31 22:41:58.000000000 -0700 +@@ -37,7 +37,7 @@ + def checkversion(GEOS_dir): + """check geos C-API header file (geos_c.h)""" + try: +- f = open(os.path.join(GEOS_dir,'include/geos_c.h')) ++ f = open(os.path.join(GEOS_dir,'include/geos2_c.h')) + except IOError: + return None + geos_version = None +@@ -96,7 +96,7 @@ + library_dirs=geos_library_dirs, + runtime_library_dirs=geos_library_dirs, + include_dirs=geos_include_dirs, +- libraries=['geos_c','geos'])) ++ libraries=['geos2_c','geos2'])) + + # install shapelib and dbflib. + packages = packages + ['shapelib','dbflib'] Added: trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c =================================================================== --- trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c (rev 0) +++ trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c 2008-08-01 06:05:30 UTC (rev 38826) @@ -0,0 +1,11 @@ +--- src/_geoslib.c.orig 2008-07-31 22:26:20.000000000 -0700 ++++ src/_geoslib.c 2008-07-31 22:26:30.000000000 -0700 +@@ -31,7 +31,7 @@ + #endif + #include <math.h> + #include "numpy/arrayobject.h" +-#include "geos_c.h" ++#include "geos2_c.h" + + + #ifdef __GNUC__

1 0

[38825] trunk/dports/python/py25-matplotlib-basemap
by landonf＠macports.org 01 Aug '08

01 Aug '08

Revision: 38825 http://trac.macosforge.org/projects/macports/changeset/38825 Author: landonf(a)macports.org Date: 2008-07-31 22:54:23 -0700 (Thu, 31 Jul 2008) Log Message: ----------- Update to lock to GEOS 2 -- requires fairly small changes. Test procedure: - Verified that the py25-matplotlib-basemap _geoslib.so linked against the geos2 port geos dylib. - Ran test.py and sanity-checked the output. Please let me know if there are any issues and I'll do my best to fix them rapidly. Modified Paths: -------------- trunk/dports/python/py25-matplotlib-basemap/Portfile Added Paths: ----------- trunk/dports/python/py25-matplotlib-basemap/files/ trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c Modified: trunk/dports/python/py25-matplotlib-basemap/Portfile =================================================================== --- trunk/dports/python/py25-matplotlib-basemap/Portfile 2008-08-01 05:49:34 UTC (rev 38824) +++ trunk/dports/python/py25-matplotlib-basemap/Portfile 2008-08-01 05:54:23 UTC (rev 38825) @@ -21,11 +21,14 @@ sha1 1eb8cdeb605c59e2a7510ac4fae77633f15f0e1d \ rmd160 18d5cc303efef8b7d9d20b5c4c3ceba26778a791 -depends_lib-append port:py25-matplotlib \ - port:geos +depends_lib-append port:py25-matplotlib + port:geos2 universal_variant no +patchfiles patch-setup.py \ + patch-src_geoslib.c + post-destroot { delete ${destroot}${python.pkgd}/mpl_toolkits/__init__.py delete ${destroot}${python.pkgd}/mpl_toolkits/__init__.pyc Added: trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py =================================================================== --- trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py (rev 0) +++ trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py 2008-08-01 05:54:23 UTC (rev 38825) @@ -0,0 +1,20 @@ +--- setup.py.orig 2008-07-31 22:20:38.000000000 -0700 ++++ setup.py 2008-07-31 22:41:58.000000000 -0700 +@@ -37,7 +37,7 @@ + def checkversion(GEOS_dir): + """check geos C-API header file (geos_c.h)""" + try: +- f = open(os.path.join(GEOS_dir,'include/geos_c.h')) ++ f = open(os.path.join(GEOS_dir,'include/geos2_c.h')) + except IOError: + return None + geos_version = None +@@ -96,7 +96,7 @@ + library_dirs=geos_library_dirs, + runtime_library_dirs=geos_library_dirs, + include_dirs=geos_include_dirs, +- libraries=['geos_c','geos'])) ++ libraries=['geos2_c','geos2'])) + + # install shapelib and dbflib. + packages = packages + ['shapelib','dbflib'] Added: trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c =================================================================== --- trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c (rev 0) +++ trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c 2008-08-01 05:54:23 UTC (rev 38825) @@ -0,0 +1,11 @@ +--- src/_geoslib.c.orig 2008-07-31 22:26:20.000000000 -0700 ++++ src/_geoslib.c 2008-07-31 22:26:30.000000000 -0700 +@@ -31,7 +31,7 @@ + #endif + #include <math.h> + #include "numpy/arrayobject.h" +-#include "geos_c.h" ++#include "geos2_c.h" + + + #ifdef __GNUC__

1 0

[38824] trunk/dports/science
by landonf＠macports.org 01 Aug '08

01 Aug '08

Revision: 38824 http://trac.macosforge.org/projects/macports/changeset/38824 Author: landonf(a)macports.org Date: 2008-07-31 22:49:34 -0700 (Thu, 31 Jul 2008) Log Message: ----------- A geos2 port for the python matplotlib basemap toolkit. Modified Paths: -------------- trunk/dports/science/geos2/Portfile Added Paths: ----------- trunk/dports/science/geos2/ Copied: trunk/dports/science/geos2 (from rev 38822, trunk/dports/science/geos) Property changes on: trunk/dports/science/geos2 ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/dports/science/geos2/Portfile =================================================================== --- trunk/dports/science/geos/Portfile 2008-08-01 04:20:40 UTC (rev 38822) +++ trunk/dports/science/geos2/Portfile 2008-08-01 05:49:34 UTC (rev 38824) @@ -2,7 +2,7 @@ PortSystem 1.0 -name geos +name geos2 version 2.2.3 categories science platforms darwin @@ -17,6 +17,7 @@ homepage http://geos.refractions.net/ master_sites ${homepage}downloads/ use_bzip2 yes +distname geos-${version} checksums md5 440be2b11fd3d711e950a47ea6f1b424 \ sha1 c5da21829255e3625f7c2482c9220234cc5d9f90 \ @@ -27,3 +28,16 @@ platform darwin 9 { patchfiles patch-test_XMLTester.cpp.diff } + +configure.args --includedir=\\\${prefix}/include/geos2 \ + --libdir=\\\${prefix}/lib/geos2 \ + --program-suffix=2 + +post-destroot { + # Compatibility links + system "cd ${destroot}/${prefix}/lib && ln -s geos2/libgeos.dylib libgeos2.dylib" + system "cd ${destroot}/${prefix}/lib && ln -s geos2/libgeos_c.dylib libgeos2_c.dylib" + + system "cd ${destroot}/${prefix}/include && ln -s geos2/geos.h geos2.h" + system "cd ${destroot}/${prefix}/include && ln -s geos2/geos_c.h geos2_c.h" +}

1 0

[38823] trunk/dports/graphics/gd2/Portfile
by ryandesign＠macports.org 01 Aug '08

01 Aug '08

Revision: 38823 http://trac.macosforge.org/projects/macports/changeset/38823 Author: ryandesign(a)macports.org Date: 2008-07-31 22:20:35 -0700 (Thu, 31 Jul 2008) Log Message: ----------- gd2: add build dependencies on automake and libtool ports to fix #16148 Modified Paths: -------------- trunk/dports/graphics/gd2/Portfile Modified: trunk/dports/graphics/gd2/Portfile =================================================================== --- trunk/dports/graphics/gd2/Portfile 2008-08-01 04:20:40 UTC (rev 38822) +++ trunk/dports/graphics/gd2/Portfile 2008-08-01 05:20:35 UTC (rev 38823) @@ -39,6 +39,8 @@ depends_build \ port:autoconf \ + port:automake \ + port:libtool \ port:gettext depends_lib \

1 0

[38822] trunk/dports/science/geos
by ram＠macports.org 01 Aug '08

01 Aug '08

Revision: 38822 http://trac.macosforge.org/projects/macports/changeset/38822 Author: ram(a)macports.org Date: 2008-07-31 21:20:40 -0700 (Thu, 31 Jul 2008) Log Message: ----------- revert r38815, as this breaks the matplotlib-basemap which is why the geos port was not updated to 3.0.0 see ticket #13699 Modified Paths: -------------- trunk/dports/science/geos/Portfile Added Paths: ----------- trunk/dports/science/geos/files/ trunk/dports/science/geos/files/patch-test_XMLTester.cpp.diff Modified: trunk/dports/science/geos/Portfile =================================================================== --- trunk/dports/science/geos/Portfile 2008-08-01 01:18:12 UTC (rev 38821) +++ trunk/dports/science/geos/Portfile 2008-08-01 04:20:40 UTC (rev 38822) @@ -3,7 +3,7 @@ PortSystem 1.0 name geos -version 3.0.0 +version 2.2.3 categories science platforms darwin maintainers opendarwin(a)gaige.net ram @@ -18,8 +18,12 @@ master_sites ${homepage}downloads/ use_bzip2 yes -checksums md5 3f7940abee9fec69a9787878cd3ae771 \ - sha1 71090220351c8ae7bb147d74145fa5daf83e3c26 \ - rmd160 195fb24de2f67d515f629f1dcb3dccec7711bdac +checksums md5 440be2b11fd3d711e950a47ea6f1b424 \ + sha1 c5da21829255e3625f7c2482c9220234cc5d9f90 \ + rmd160 968de157f96f41aa71d5ef7c28c7186e8db0939e use_parallel_build yes + +platform darwin 9 { + patchfiles patch-test_XMLTester.cpp.diff +} Added: trunk/dports/science/geos/files/patch-test_XMLTester.cpp.diff =================================================================== --- trunk/dports/science/geos/files/patch-test_XMLTester.cpp.diff (rev 0) +++ trunk/dports/science/geos/files/patch-test_XMLTester.cpp.diff 2008-08-01 04:20:40 UTC (rev 38822) @@ -0,0 +1,11 @@ +--- source/test/XMLTester.cpp 2007-11-24 13:52:10.000000000 -0500 ++++ source/test/XMLTester.cpp 2007-11-24 13:54:58.000000000 -0500 +@@ -63,7 +63,7 @@ + void + tolower(std::string& str) + { +- std::transform(str.begin(), str.end(), str.begin(), safe_ctype<std::tolower>); ++ std::transform(str.begin(), str.end(), str.begin(), (int(*)(int))std::tolower); + } + + XMLTester::XMLTester()

1 0

[38821] trunk/dports/devel/poedit/Portfile
by raimue＠macports.org 01 Aug '08

01 Aug '08

Revision: 38821 http://trac.macosforge.org/projects/macports/changeset/38821 Author: raimue(a)macports.org Date: 2008-07-31 18:18:12 -0700 (Thu, 31 Jul 2008) Log Message: ----------- devel/poedit: Use ${applications_dir} if available Modified Paths: -------------- trunk/dports/devel/poedit/Portfile Modified: trunk/dports/devel/poedit/Portfile =================================================================== --- trunk/dports/devel/poedit/Portfile 2008-08-01 01:10:13 UTC (rev 38820) +++ trunk/dports/devel/poedit/Portfile 2008-08-01 01:18:12 UTC (rev 38821) @@ -45,6 +45,15 @@ configure.args-append --enable-spellchecking } +# Can be removed once MacPorts 1.7.0 is released +if {![info exists applications_dir]} { + set applications_dir /Applications/MacPorts +} + +pre-destroot { + xinstall -d ${destroot}${applications_dir} +} + destroot { # the gettext binaries are copied into poedit.app during build, # but we rather delete and symlink them to get updates to gettext automatically { @@ -55,8 +64,6 @@ file delete ${worksrcpath}/src/poedit.app/Contents/MacOS/gnu_gettext.COPYING # } - set appPath "/Applications/MacPorts/" - xinstall -d -m 755 ${destroot}${appPath} - file copy ${worksrcpath}/src/poedit.app ${destroot}${appPath}poEdit.app + file copy ${worksrcpath}/src/poedit.app ${destroot}${applications_dir}/poEdit.app }

1 0

[38820] trunk/dports/graphics/lcms/Portfile
by ryandesign＠macports.org 01 Aug '08

01 Aug '08

Revision: 38820 http://trac.macosforge.org/projects/macports/changeset/38820 Author: ryandesign(a)macports.org Date: 2008-07-31 18:10:13 -0700 (Thu, 31 Jul 2008) Log Message: ----------- lcms: enable parallel build Modified Paths: -------------- trunk/dports/graphics/lcms/Portfile Modified: trunk/dports/graphics/lcms/Portfile =================================================================== --- trunk/dports/graphics/lcms/Portfile 2008-08-01 01:07:59 UTC (rev 38819) +++ trunk/dports/graphics/lcms/Portfile 2008-08-01 01:10:13 UTC (rev 38820) @@ -7,6 +7,7 @@ categories graphics platforms darwin maintainers nomaintainer +use_parallel_build yes description Little Color Management System, a color matching \ method library

1 0

[38819] trunk/dports/graphics/lcms/Portfile
by ryandesign＠macports.org 01 Aug '08

01 Aug '08

Revision: 38819 http://trac.macosforge.org/projects/macports/changeset/38819 Author: ryandesign(a)macports.org Date: 2008-07-31 18:07:59 -0700 (Thu, 31 Jul 2008) Log Message: ----------- lcms: whitespace changes only Modified Paths: -------------- trunk/dports/graphics/lcms/Portfile Modified: trunk/dports/graphics/lcms/Portfile =================================================================== --- trunk/dports/graphics/lcms/Portfile 2008-08-01 00:41:56 UTC (rev 38818) +++ trunk/dports/graphics/lcms/Portfile 2008-08-01 01:07:59 UTC (rev 38819) @@ -1,33 +1,36 @@ # $Id$ -PortSystem 1.0 +PortSystem 1.0 -name lcms -version 1.17 -categories graphics -maintainers nomaintainer -description Little Color Management System, a color matching method library -long_description \ - LCMS is the Little Color Management System, a Color Matching Method \ - (CMM) library which implements fast transforms between ICC profiles. \ - It is released under LGPL with source code and meant to be portable. \ - Color management refers to techniques that ensure consistent color \ - as images are transferred from scanners or cameras to monitors and \ - printers. -homepage http://www.littlecms.com/ -platforms darwin -master_sites sourceforge:lcms \ - ${homepage} -checksums md5 07bdbb4cfb05d21caa58fe3d1c84ddc1 \ - sha1 083eb02890048f843803a5974914e54b5e034493 \ - rmd160 1ad67295b53a82e4813294cbcdfccf8a5bdb1bbd +name lcms +version 1.17 +categories graphics +platforms darwin +maintainers nomaintainer -depends_lib port:jpeg \ - port:tiff \ - port:zlib +description Little Color Management System, a color matching \ + method library +long_description LCMS is the Little Color Management System, a Color \ + Matching Method (CMM) library which implements fast \ + transforms between ICC profiles. It is released under \ + LGPL with source code and meant to be portable. \ + Color management refers to techniques that ensure \ + consistent color as images are transferred from \ + scanners or cameras to monitors and printers. -configure.args --mandir=${prefix}/share/man +homepage http://www.littlecms.com/ +master_sites sourceforge:lcms \ + ${homepage} -test.run yes -test.target check +checksums md5 07bdbb4cfb05d21caa58fe3d1c84ddc1 \ + sha1 083eb02890048f843803a5974914e54b5e034493 \ + rmd160 1ad67295b53a82e4813294cbcdfccf8a5bdb1bbd +depends_lib port:jpeg \ + port:tiff \ + port:zlib + +configure.args --mandir=${prefix}/share/man + +test.run yes +test.target check

1 0