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

[73984] trunk/dports/python
by ryandesign＠macports.org 01 Dec '10

01 Dec '10

Revision: 73984 http://trac.macports.org/changeset/73984 Author: ryandesign(a)macports.org Date: 2010-11-30 23:39:00 -0800 (Tue, 30 Nov 2010) Log Message: ----------- py27-h5py: new port, version 1.3.0, based on py26-h5py; see #26795 Modified Paths: -------------- trunk/dports/python/py27-h5py/Portfile Added Paths: ----------- trunk/dports/python/py27-h5py/ trunk/dports/python/py27-h5py/files/ trunk/dports/python/py27-h5py/files/patch-detect.py.diff Modified: trunk/dports/python/py27-h5py/Portfile =================================================================== --- trunk/dports/python/py26-h5py/Portfile 2010-11-30 01:24:17 UTC (rev 73934) +++ trunk/dports/python/py27-h5py/Portfile 2010-12-01 07:39:00 UTC (rev 73984) @@ -2,9 +2,9 @@ # $Id$ PortSystem 1.0 -PortGroup python26 1.0 +PortGroup python27 1.0 -name py26-h5py +name py27-h5py version 1.3.0 revision 2 platforms darwin @@ -28,6 +28,8 @@ sha1 9398cb3a11ea7f6b62738330206c7dce7c7c2132 \ rmd160 49e475ca6bf2de375eb98b5c8cca78b534d1ef6f +patchfiles patch-detect.py.diff + use_configure yes configure.universal_args @@ -36,7 +38,7 @@ configure.args --api=18 --hdf5=${prefix} build.cmd-delete --no-user-cfg -depends_lib-append port:py26-numpy port:hdf5-18 +depends_lib-append port:py27-numpy port:hdf5-18 post-destroot { system "chmod -R a+r ${destroot}${prefix}" Added: trunk/dports/python/py27-h5py/files/patch-detect.py.diff =================================================================== --- trunk/dports/python/py27-h5py/files/patch-detect.py.diff (rev 0) +++ trunk/dports/python/py27-h5py/files/patch-detect.py.diff 2010-12-01 07:39:00 UTC (rev 73984) @@ -0,0 +1,11 @@ +--- detect.py.orig 2010-10-10 15:53:12.000000000 +0200 ++++ detect.py 2010-10-10 15:55:05.000000000 +0200 +@@ -9,7 +9,7 @@ + """ + + from distutils import ccompiler +- from distutils.core import CompileError, LinkError ++ from distutils.errors import CompileError, LinkError + import subprocess + + cc = ccompiler.new_compiler()

1 0

[73983] trunk/dports/lang/swi-prolog-devel/Portfile
by ryandesign＠macports.org 01 Dec '10

01 Dec '10

Revision: 73983 http://trac.macports.org/changeset/73983 Author: ryandesign(a)macports.org Date: 2010-11-30 23:10:54 -0800 (Tue, 30 Nov 2010) Log Message: ----------- swi-prolog-devel: maintainer update to 5.11.9; see #27522 Modified Paths: -------------- trunk/dports/lang/swi-prolog-devel/Portfile Modified: trunk/dports/lang/swi-prolog-devel/Portfile =================================================================== --- trunk/dports/lang/swi-prolog-devel/Portfile 2010-12-01 06:18:08 UTC (rev 73982) +++ trunk/dports/lang/swi-prolog-devel/Portfile 2010-12-01 07:10:54 UTC (rev 73983) @@ -6,7 +6,7 @@ name swi-prolog-devel conflicts swi-prolog swi-prolog-lite epoch 20051223 -version 5.11.8 +version 5.11.9 categories lang maintainers uva.nl:J.Wielemaker logtalk.org:pmoura @@ -30,9 +30,9 @@ dist_subdir swi-prolog checksums \ - md5 e1e5ca2b5bd740398dd9321db7b8b8dd \ - sha1 4d3b1f8b587acc9aa26fde7542ef392de5a4d3c7 \ - rmd160 c4f476520e8a587052e78bc48889dabba62791ab + md5 639e80365c5235d8579cc9c7294dce47 \ + sha1 61c439c150716e587a22773c45e53b88e83d6134 \ + rmd160 c39ea6bd70fd12e3db26e03f1f914db687606c80 depends_build \ port:gawk \

1 0

[73982] trunk/dports/graphics/leptonica/Portfile
by ryandesign＠macports.org 01 Dec '10

01 Dec '10

Revision: 73982 http://trac.macports.org/changeset/73982 Author: ryandesign(a)macports.org Date: 2010-11-30 22:18:08 -0800 (Tue, 30 Nov 2010) Log Message: ----------- liptonica: update to 1.67; see #27511 Modified Paths: -------------- trunk/dports/graphics/leptonica/Portfile Modified: trunk/dports/graphics/leptonica/Portfile =================================================================== --- trunk/dports/graphics/leptonica/Portfile 2010-12-01 02:18:29 UTC (rev 73981) +++ trunk/dports/graphics/leptonica/Portfile 2010-12-01 06:18:08 UTC (rev 73982) @@ -4,8 +4,7 @@ PortSystem 1.0 name leptonica -version 1.66 -revision 0 +version 1.67 categories graphics science devel platforms darwin maintainers stromnov openmaintainer @@ -18,9 +17,8 @@ distname leptonlib-${version} -checksums md5 5390c7ac76a8d3d9584a3fc86202ee72 \ - sha1 515eac71f157c1a5877b3b0edaaf4fb0fca1bcb2 \ - rmd160 b27954c573b11a6b86210b7eb515c48ebb9a70ab +checksums sha1 3240ae930784b79eb75058cf8cd0d02baa9627e8 \ + rmd160 0b0d9e9055400376239e74b9b13036857bc90ab4 depends_lib port:tiff \ port:zlib \

1 0

[73981] trunk/dports/devel/icu
by takanori＠macports.org 01 Dec '10

01 Dec '10

Revision: 73981 http://trac.macports.org/changeset/73981 Author: takanori(a)macports.org Date: 2010-11-30 18:18:29 -0800 (Tue, 30 Nov 2010) Log Message: ----------- icu: fixed #23773 (fails to install universal ICU library which contains ppc binary on Intel based Macs) Modified Paths: -------------- trunk/dports/devel/icu/Portfile Added Paths: ----------- trunk/dports/devel/icu/files/patch-universal.diff Modified: trunk/dports/devel/icu/Portfile =================================================================== --- trunk/dports/devel/icu/Portfile 2010-11-30 22:17:16 UTC (rev 73980) +++ trunk/dports/devel/icu/Portfile 2010-12-01 02:18:29 UTC (rev 73981) @@ -7,7 +7,7 @@ name icu set my_name icu4c version 4.4.2 -revision 1 +revision 2 categories devel textproc platforms darwin freebsd maintainers nox openmaintainer @@ -38,6 +38,7 @@ set docdir ${prefix}/share/doc/${name} if {[variant_isset universal]} { + patchfiles-append patch-universal.diff set merger_must_run_binaries yes } @@ -61,6 +62,15 @@ configure.cppflags configure.ldflags +post-configure { + if {[variant_isset universal]} { + # Ticket #23773 + foreach arch ${universal_archs_to_use} { + reinplace "s|__ARCH__|${arch}|g" ${worksrcpath}-${arch}/Makefile + } + } +} + build.type gnu use_parallel_build yes @@ -68,26 +78,60 @@ test.run yes test.target check -post-build { +post-destroot { + xinstall -d ${destroot}${docdir} + eval xinstall -m 0644 [glob ${worksrcpath}/../*.{css,html,txt}] ${destroot}${docdir} + if {[variant_isset universal]} { - set dirs {} + # Ticket #23773 foreach arch ${universal_archs_to_use} { - lappend dirs ${worksrcpath}-${arch} + reinplace "s|/Makefile.inc|/Makefile-${arch}.inc|g" ${destroot}${prefix}/bin/icu-config-${arch} + reinplace "s|/pkgdata.inc|/pkgdata-${arch}.inc|g" ${destroot}${prefix}/bin/icu-config-${arch} } - } else { - set dirs ${worksrcpath} + ln -s current/Makefile.inc ${destroot}${prefix}/lib/icu/Makefile.inc + ln -s current/pkgdata.inc ${destroot}${prefix}/lib/icu/pkgdata.inc } - foreach dir ${dirs} { - reinplace -E {s|-arch [a-z0-9_]+||g} \ - ${dir}/config/icu-config \ - ${dir}/config/Makefile.inc \ - ${dir}/config/pkgdata.inc +} + +post-activate { + if {[variant_isset universal]} { + # Ticket #23773 + set a ${configure.build_arch} + if {$a == "ppc64"} { + if {![file exists ${prefix}/bin/icu-config-${a}]} { + set a "ppc" + } + } elseif {$a == "x86_64"} { + if {![file exists ${prefix}/bin/icu-config-${a}]} { + set a "i386" + if {![file exists ${prefix}/bin/icu-config-${a}]} { + set a "ppc" + } + } + } elseif {$a == "i386"} { + if {![file exists ${prefix}/bin/icu-config-${a}]} { + set a "ppc" + } + } + foreach {p q} [list "${prefix}/bin/icu-config-${a}" "${prefix}/bin/icu-config" \ + "${prefix}/lib/icu/${version}/Makefile-${a}.inc" "${prefix}/lib/icu/${version}/Makefile.inc" \ + "${prefix}/lib/icu/${version}/pkgdata-${a}.inc" "${prefix}/lib/icu/${version}/pkgdata.inc"] { + if {[file exists ${p}]} { + ln -s ${p} ${q} + } + } } } -post-destroot { - xinstall -d ${destroot}${docdir} - eval xinstall -m 0644 [glob ${worksrcpath}/../*.{css,html,txt}] ${destroot}${docdir} +post-deactivate { + if {[variant_isset universal]} { + # Ticket #23773 + foreach f [list "${prefix}/bin/icu-config" \ + "${prefix}/lib/icu/${version}/Makefile.inc" \ + "${prefix}/lib/icu/${version}/pkgdata.inc"] { + delete ${f} + } + } } # The official doc archive seems to be a bit incomplete. Added: trunk/dports/devel/icu/files/patch-universal.diff =================================================================== --- trunk/dports/devel/icu/files/patch-universal.diff (rev 0) +++ trunk/dports/devel/icu/files/patch-universal.diff 2010-12-01 02:18:29 UTC (rev 73981) @@ -0,0 +1,21 @@ +--- Makefile.in.orig 2010-09-30 03:38:38.000000000 +0900 ++++ Makefile.in 2010-12-01 06:16:12.000000000 +0900 +@@ -137,13 +137,13 @@ + $(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs + $(INSTALL_SCRIPT) $(top_srcdir)/install-sh $(DESTDIR)$(pkgdatadir)/install-sh + $(INSTALL_DATA) $(top_srcdir)/../license.html $(DESTDIR)$(pkgdatadir)/license.html +- $(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config +- $(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/Makefile.inc +- $(INSTALL_DATA) $(top_builddir)/config/pkgdata.inc $(DESTDIR)$(pkglibdir)/pkgdata.inc ++ $(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config-__ARCH__ ++ $(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/Makefile-__ARCH__.inc ++ $(INSTALL_DATA) $(top_builddir)/config/pkgdata.inc $(DESTDIR)$(pkglibdir)/pkgdata-__ARCH__.inc + cd $(DESTDIR)$(pkglibdir)/..; \ + $(RM) current && ln -s $(VERSION) current; \ +- $(RM) Makefile.inc && ln -s current/Makefile.inc Makefile.inc; \ +- $(RM) pkgdata.inc && ln -s current/pkgdata.inc pkgdata.inc ++# $(RM) Makefile.inc && ln -s current/Makefile.inc Makefile.inc; \ ++# $(RM) pkgdata.inc && ln -s current/pkgdata.inc pkgdata.inc + + ifeq ($(DOXYGEN),) + install-doc:

1 0