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

[70282] trunk/dports
by michaelld＠macports.org 04 Aug '10

04 Aug '10

Revision: 70282 http://trac.macports.org/changeset/70282 Author: michaelld(a)macports.org Date: 2010-08-04 11:01:24 -0700 (Wed, 04 Aug 2010) Log Message: ----------- Rev bump ports that depend on the GSS port; fixes ticket #25824. Modified Paths: -------------- trunk/dports/net/jabberd/Portfile trunk/dports/security/libgsasl/Portfile Modified: trunk/dports/net/jabberd/Portfile =================================================================== --- trunk/dports/net/jabberd/Portfile 2010-08-04 17:59:13 UTC (rev 70281) +++ trunk/dports/net/jabberd/Portfile 2010-08-04 18:01:24 UTC (rev 70282) @@ -4,7 +4,7 @@ name jabberd version 2.2.9 -revision 2 +revision 3 categories net platforms darwin maintainers nomaintainer Modified: trunk/dports/security/libgsasl/Portfile =================================================================== --- trunk/dports/security/libgsasl/Portfile 2010-08-04 17:59:13 UTC (rev 70281) +++ trunk/dports/security/libgsasl/Portfile 2010-08-04 18:01:24 UTC (rev 70282) @@ -4,6 +4,7 @@ name libgsasl version 1.4.4 +revision 1 maintainers ryandesign categories security net platforms darwin

1 0

[70281] trunk/dports/aqua/qt4-mac/files
by michaelld＠macports.org 04 Aug '10

04 Aug '10

Revision: 70281 http://trac.macports.org/changeset/70281 Author: michaelld(a)macports.org Date: 2010-08-04 10:59:13 -0700 (Wed, 04 Aug 2010) Log Message: ----------- Patch files for QAudioInput and QAudioOutput, for ticket #25831. Added Paths: ----------- trunk/dports/aqua/qt4-mac/files/patch-qaudio-format-converters.diff trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-conversion.diff trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-readyread.diff trunk/dports/aqua/qt4-mac/files/patch-qaudiooutput-period-size.diff Added: trunk/dports/aqua/qt4-mac/files/patch-qaudio-format-converters.diff =================================================================== --- trunk/dports/aqua/qt4-mac/files/patch-qaudio-format-converters.diff (rev 0) +++ trunk/dports/aqua/qt4-mac/files/patch-qaudio-format-converters.diff 2010-08-04 17:59:13 UTC (rev 70281) @@ -0,0 +1,39 @@ +From b82ed43086aebb4698a8a52965eeb17349ef1d04 Mon Sep 17 00:00:00 2001 +From: Justin McPherson <justin.mcpherson(a)nokia.com> +Date: Mon, 21 Jun 2010 15:11:59 +1000 +Subject: [PATCH] Audio(osx); Fix audio format converters. + +Reviewed-by:Dmytro Poplavskiy +--- + src/multimedia/audio/qaudio_mac.cpp | 9 ++++++--- + 1 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/multimedia/audio/qaudio_mac.cpp b/src/multimedia/audio/qaudio_mac.cpp +index 14fee8b..4e17b52 100644 +--- src/multimedia/audio/qaudio_mac.cpp ++++ src/multimedia/audio/qaudio_mac.cpp +@@ -68,11 +68,11 @@ QAudioFormat toQAudioFormat(AudioStreamBasicDescription const& sf) + audioFormat.setChannels(sf.mChannelsPerFrame); + audioFormat.setSampleSize(sf.mBitsPerChannel); + audioFormat.setCodec(QString::fromLatin1("audio/pcm")); +- audioFormat.setByteOrder(sf.mFormatFlags & kLinearPCMFormatFlagIsBigEndian != 0 ? QAudioFormat::BigEndian : QAudioFormat::LittleEndian); ++ audioFormat.setByteOrder((sf.mFormatFlags & kAudioFormatFlagIsBigEndian) != 0 ? QAudioFormat::BigEndian : QAudioFormat::LittleEndian); + QAudioFormat::SampleType type = QAudioFormat::UnSignedInt; +- if ((sf.mFormatFlags & kLinearPCMFormatFlagIsSignedInteger) != 0) ++ if ((sf.mFormatFlags & kAudioFormatFlagIsSignedInteger) != 0) + type = QAudioFormat::SignedInt; +- else if ((sf.mFormatFlags & kLinearPCMFormatFlagIsFloat) != 0) ++ else if ((sf.mFormatFlags & kAudioFormatFlagIsFloat) != 0) + type = QAudioFormat::Float; + audioFormat.setSampleType(type); + +@@ -99,6 +99,9 @@ AudioStreamBasicDescription toAudioStreamBasicDescription(QAudioFormat const& au + case QAudioFormat::Unknown: default: break; + } + ++ if (audioFormat.byteOrder() == QAudioFormat::BigEndian) ++ sf.mFormatFlags |= kAudioFormatFlagIsBigEndian; ++ + return sf; + } + Added: trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-conversion.diff =================================================================== --- trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-conversion.diff (rev 0) +++ trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-conversion.diff 2010-08-04 17:59:13 UTC (rev 70281) @@ -0,0 +1,86 @@ +From 66d02e4bde0a628978436217032abe555ed77fad Mon Sep 17 00:00:00 2001 +From: Justin McPherson <justin.mcpherson(a)nokia.com> +Date: Mon, 21 Jun 2010 15:18:32 +1000 +Subject: [PATCH] Audio(osx); refactor input period conversion + +Reviewed-by:Dmytro Poplavskiy +--- + src/multimedia/audio/qaudioinput_mac_p.cpp | 51 ++++++++++++++------------- + 1 files changed, 26 insertions(+), 25 deletions(-) + +diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp +index b99fe11..5897e75 100644 +--- src/multimedia/audio/qaudioinput_mac_p.cpp ++++ src/multimedia/audio/qaudioinput_mac_p.cpp +@@ -210,6 +210,11 @@ public: + return true; + } + ++ bool empty() const ++ { ++ return position == totalPackets; ++ } ++ + private: + UInt32 totalPackets; + UInt32 position; +@@ -275,36 +280,32 @@ public: + if (m_audioConverter != 0) { + QAudioPacketFeeder feeder(m_inputBufferList); + +- bool wecan = true; + int copied = 0; +- + const int available = m_buffer->free(); + +- while (err == noErr && wecan) { ++ while (err == noErr && !feeder.empty()) { + QAudioRingBuffer::Region region = m_buffer->acquireWriteRegion(available); + +- if (region.second > 0) { +- AudioBufferList output; +- output.mNumberBuffers = 1; +- output.mBuffers[0].mNumberChannels = 1; +- output.mBuffers[0].mDataByteSize = region.second; +- output.mBuffers[0].mData = region.first; +- +- UInt32 packetSize = region.second / m_outputFormat.mBytesPerPacket; +- err = AudioConverterFillComplexBuffer(m_audioConverter, +- converterCallback, +- &feeder, +- &packetSize, +- &output, +- 0); +- +- region.second = output.mBuffers[0].mDataByteSize; +- copied += region.second; ++ if (region.second == 0) ++ break; ++ ++ AudioBufferList output; ++ output.mNumberBuffers = 1; ++ output.mBuffers[0].mNumberChannels = 1; ++ output.mBuffers[0].mDataByteSize = region.second; ++ output.mBuffers[0].mData = region.first; ++ ++ UInt32 packetSize = region.second / m_outputFormat.mBytesPerPacket; ++ err = AudioConverterFillComplexBuffer(m_audioConverter, ++ converterCallback, ++ &feeder, ++ &packetSize, ++ &output, ++ 0); ++ region.second = output.mBuffers[0].mDataByteSize; ++ copied += region.second; + +- m_buffer->releaseWriteRegion(region); +- } +- else +- wecan = false; ++ m_buffer->releaseWriteRegion(region); + } + + framesRendered += copied / m_outputFormat.mBytesPerFrame; +-- +1.6.1 + Added: trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-readyread.diff =================================================================== --- trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-readyread.diff (rev 0) +++ trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-readyread.diff 2010-08-04 17:59:13 UTC (rev 70281) @@ -0,0 +1,33 @@ +From 4f79cbb2b7923ff7f7cbc77dc6820d12f594311d Mon Sep 17 00:00:00 2001 +From: Justin McPherson <justin.mcpherson(a)nokia.com> +Date: Wed, 16 Jun 2010 16:44:18 +1000 +Subject: [PATCH] Audio (osx); In pull mode emit readyRead() for each period received. + +Task-number: QTBUG-10009 +Reviewed-by:Dmytro Poplavskiy +--- + src/multimedia/audio/qaudioinput_mac_p.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp +index cb65f6e..b99fe11 100644 +--- src/multimedia/audio/qaudioinput_mac_p.cpp ++++ src/multimedia/audio/qaudioinput_mac_p.cpp +@@ -259,7 +259,7 @@ public: + UInt32 inBusNumber, + UInt32 inNumberFrames) + { +- const bool wasEmpty = m_buffer->used() == 0; ++ const bool pullMode = m_device == 0; + + OSStatus err; + qint64 framesRendered = 0; +@@ -330,7 +330,7 @@ public: + framesRendered = copied / m_outputFormat.mBytesPerFrame; + } + +- if (wasEmpty && framesRendered > 0) ++ if (pullMode && framesRendered > 0) + emit readyRead(); + + return framesRendered; Added: trunk/dports/aqua/qt4-mac/files/patch-qaudiooutput-period-size.diff =================================================================== --- trunk/dports/aqua/qt4-mac/files/patch-qaudiooutput-period-size.diff (rev 0) +++ trunk/dports/aqua/qt4-mac/files/patch-qaudiooutput-period-size.diff 2010-08-04 17:59:13 UTC (rev 70281) @@ -0,0 +1,44 @@ +From 76c256bdabcc207a6ed70d5b5b62698495548a25 Mon Sep 17 00:00:00 2001 +From: Justin McPherson <justin.mcpherson(a)nokia.com> +Date: Tue, 22 Jun 2010 12:01:51 +1000 +Subject: [PATCH] Audio(osx); Fix period size calculation. + +Task-number: QTBUG-8878 +Reviewed-by:Dmytro Poplavskiy +--- + src/multimedia/audio/qaudiooutput_mac_p.cpp | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) + +diff --git a/src/multimedia/audio/qaudiooutput_mac_p.cpp b/src/multimedia/audio/qaudiooutput_mac_p.cpp +index 9689101..cc52d90 100644 +--- src/multimedia/audio/qaudiooutput_mac_p.cpp ++++ src/multimedia/audio/qaudiooutput_mac_p.cpp +@@ -358,17 +358,7 @@ bool QAudioOutputPrivate::open() + // Set stream format + streamFormat = toAudioStreamBasicDescription(audioFormat); + +- UInt32 size = sizeof(deviceFormat); +- if (AudioUnitGetProperty(audioUnit, +- kAudioUnitProperty_StreamFormat, +- kAudioUnitScope_Input, +- 0, +- &deviceFormat, +- &size) != noErr) { +- qWarning() << "QAudioOutput: Unable to retrieve device format"; +- return false; +- } +- ++ UInt32 size = sizeof(streamFormat); + if (AudioUnitSetProperty(audioUnit, + kAudioUnitProperty_StreamFormat, + kAudioUnitScope_Input, +@@ -392,8 +382,7 @@ bool QAudioOutputPrivate::open() + return false; + } + +- periodSizeBytes = (numberOfFrames * streamFormat.mSampleRate / deviceFormat.mSampleRate) * +- streamFormat.mBytesPerFrame; ++ periodSizeBytes = numberOfFrames * streamFormat.mBytesPerFrame; + if (internalBufferSize < periodSizeBytes * 2) + internalBufferSize = periodSizeBytes * 2; + else

1 0

[70280] trunk/dports/aqua/qt4-mac/Portfile
by michaelld＠macports.org 04 Aug '10

04 Aug '10

Revision: 70280 http://trac.macports.org/changeset/70280 Author: michaelld(a)macports.org Date: 2010-08-04 10:43:16 -0700 (Wed, 04 Aug 2010) Log Message: ----------- Added patches for QAudioInpout and QAudioOutpout; fixes ticket #25831. Modified Paths: -------------- trunk/dports/aqua/qt4-mac/Portfile Modified: trunk/dports/aqua/qt4-mac/Portfile =================================================================== --- trunk/dports/aqua/qt4-mac/Portfile 2010-08-04 15:01:11 UTC (rev 70279) +++ trunk/dports/aqua/qt4-mac/Portfile 2010-08-04 17:43:16 UTC (rev 70280) @@ -36,9 +36,15 @@ port:tiff port:libpng port:libmng port:jpeg \ port:${select_port} -# Test for Precompiled-headers support requires a C++ compiler, +# (1) Test for Precompiled-headers support requires a C++ compiler, # but configure calls it, by default, with a C compiler. -patchfiles patch-precomp.test.diff +# (rest) Correct QAudioInput and QAudioOutput in QtMultimedia, which +# will be part of a newer 4.6.X series. +patchfiles patch-precomp.test.diff \ + patch-qaudio-format-converters.diff \ + patch-qaudioinput-conversion.diff \ + patch-qaudioinput-readyread.diff \ + patch-qaudiooutput-period-size.diff # The build process uses -fconstant-cfstrings. # configure.compiler should therefore not be one of the MacPorts compilers.

1 0

[70279] trunk/dports/lang/python24/Portfile
by macsforever2000＠macports.org 04 Aug '10

04 Aug '10

Revision: 70279 http://trac.macports.org/changeset/70279 Author: macsforever2000(a)macports.org Date: 2010-08-04 08:01:11 -0700 (Wed, 04 Aug 2010) Log Message: ----------- Rev bump for r70266. (#22278) Revision Links: -------------- http://trac.macports.org/changeset/70266 Modified Paths: -------------- trunk/dports/lang/python24/Portfile Modified: trunk/dports/lang/python24/Portfile =================================================================== --- trunk/dports/lang/python24/Portfile 2010-08-04 13:36:24 UTC (rev 70278) +++ trunk/dports/lang/python24/Portfile 2010-08-04 15:01:11 UTC (rev 70279) @@ -5,7 +5,7 @@ name python24 version 2.4.6 -revision 6 +revision 7 set major [lindex [split $version .] 0] set branch [join [lrange [split ${version} .] 0 1] .] categories lang

1 0

[70278] trunk/dports/office/todotxt/Portfile
by snc＠macports.org 04 Aug '10

04 Aug '10

Revision: 70278 http://trac.macports.org/changeset/70278 Author: snc(a)macports.org Date: 2010-08-04 06:36:24 -0700 (Wed, 04 Aug 2010) Log Message: ----------- update version Modified Paths: -------------- trunk/dports/office/todotxt/Portfile Modified: trunk/dports/office/todotxt/Portfile =================================================================== --- trunk/dports/office/todotxt/Portfile 2010-08-04 13:35:06 UTC (rev 70277) +++ trunk/dports/office/todotxt/Portfile 2010-08-04 13:36:24 UTC (rev 70278) @@ -4,7 +4,7 @@ PortSystem 1.0 name todotxt -version 2.6 +version 2.7 categories office license GPL maintainers snc openmaintainer @@ -19,9 +19,8 @@ master_sites http://github.com/downloads/ginatrapani/todo.txt-cli distname todo.txt_cli-${version} -checksums md5 1395ed8cdce96ef630c25522a7a11998 \ - sha1 ed6491141ac6e55addc06733485f2fe1ff064515 \ - rmd160 f54ce343ad6bcf0a3725e9cea0f2a2b23feda7fb +checksums md5 b4ef313bbb8f185fe4a21ce07ad6933d \ + sha1 f0e45040633a1fb15eae9a47733f8aed03b8f7f9 use_configure no

1 0

[70277] trunk/dports/security/libyubikey/Portfile
by snc＠macports.org 04 Aug '10

04 Aug '10

Revision: 70277 http://trac.macports.org/changeset/70277 Author: snc(a)macports.org Date: 2010-08-04 06:35:06 -0700 (Wed, 04 Aug 2010) Log Message: ----------- update version Modified Paths: -------------- trunk/dports/security/libyubikey/Portfile Modified: trunk/dports/security/libyubikey/Portfile =================================================================== --- trunk/dports/security/libyubikey/Portfile 2010-08-04 13:33:50 UTC (rev 70276) +++ trunk/dports/security/libyubikey/Portfile 2010-08-04 13:35:06 UTC (rev 70277) @@ -4,7 +4,7 @@ PortSystem 1.0 name libyubikey -version 1.5 +version 1.6 categories security maintainers snc openmaintainer description Low-level library for decrypting and parsing Yubikey One-Time Passwords (OTP) in C. @@ -13,8 +13,7 @@ homepage http://code.google.com/p/yubico-c/ platforms darwin master_sites http://yubico-c.googlecode.com/files/ -checksums md5 387518eb89c1a9e44cbff95a32edaada \ - sha1 c43dbb4210b83338ddf0a61a36091115afd950fe \ - rmd160 1ec1c5b68f73d7bb02b34b9a8c86cf510b736836 +checksums md5 0db791eabcf2ea917317f505907838cf \ + sha1 151ea1eba21b9f3137c6d8d7dc30566923c01139 livecheck.regex "files/${name}-(\\d+\\.\\d+)"

1 0

[70276] trunk/dports/devel/depot_tools/Portfile
by snc＠macports.org 04 Aug '10

04 Aug '10

Revision: 70276 http://trac.macports.org/changeset/70276 Author: snc(a)macports.org Date: 2010-08-04 06:33:50 -0700 (Wed, 04 Aug 2010) Log Message: ----------- update version, add conflicts and descriptions to variants Modified Paths: -------------- trunk/dports/devel/depot_tools/Portfile Modified: trunk/dports/devel/depot_tools/Portfile =================================================================== --- trunk/dports/devel/depot_tools/Portfile 2010-08-04 12:44:49 UTC (rev 70275) +++ trunk/dports/devel/depot_tools/Portfile 2010-08-04 13:33:50 UTC (rev 70276) @@ -4,7 +4,7 @@ PortSystem 1.0 name depot_tools -version 54528 +version 54894 categories devel maintainers snc openmaintainer description Manages interaction with the Chromium development process @@ -15,15 +15,15 @@ platforms darwin depends_build port:git-core -variant python25 { +variant python25 conflicts python26 python27 description {Use python 2.5} { depends_run-append port:py25-socket-ssl } -variant python26 { +variant python26 conflicts python25 python27 description {Use python 2.6} { depends_run-append port:python26 } -variant python27 { +variant python27 conflicts python25 python26 description {Use python 2.7} { depends_run-append port:python27 }

1 0

[70275] trunk/dports/net/rabbitmq-server/files/rabbitmq-script-wrapper
by snc＠macports.org 04 Aug '10

04 Aug '10

Revision: 70275 http://trac.macports.org/changeset/70275 Author: snc(a)macports.org Date: 2010-08-04 05:44:49 -0700 (Wed, 04 Aug 2010) Log Message: ----------- update wrapper script (missed in r69911) #25682 Revision Links: -------------- http://trac.macports.org/changeset/69911 Modified Paths: -------------- trunk/dports/net/rabbitmq-server/files/rabbitmq-script-wrapper Modified: trunk/dports/net/rabbitmq-server/files/rabbitmq-script-wrapper =================================================================== --- trunk/dports/net/rabbitmq-server/files/rabbitmq-script-wrapper 2010-08-04 12:11:31 UTC (rev 70274) +++ trunk/dports/net/rabbitmq-server/files/rabbitmq-script-wrapper 2010-08-04 12:44:49 UTC (rev 70275) @@ -45,7 +45,7 @@ SCRIPT=`basename $0` if [ `id -u` = 0 ] ; then - sudo -E -u rabbitmq -H /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}" + SHELL=/bin/sh HOME=/var/lib/rabbitmq USER=rabbitmq LOGNAME=rabbitmq PATH="$(eval `PATH=MACPORTS_PREFIX/bin /usr/libexec/path_helper -s`; echo $PATH)" su -m rabbitmq -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}" elif [ `id -u` = `id -u rabbitmq` ] ; then /usr/lib/rabbitmq/bin/${SCRIPT} "$@" else

1 0

[70274] trunk/base/ChangeLog
by jmr＠macports.org 04 Aug '10

04 Aug '10

Revision: 70274 http://trac.macports.org/changeset/70274 Author: jmr(a)macports.org Date: 2010-08-04 05:11:31 -0700 (Wed, 04 Aug 2010) Log Message: ----------- update changelog Modified Paths: -------------- trunk/base/ChangeLog Modified: trunk/base/ChangeLog =================================================================== --- trunk/base/ChangeLog 2010-08-04 10:22:34 UTC (rev 70273) +++ trunk/base/ChangeLog 2010-08-04 12:11:31 UTC (rev 70274) @@ -2,12 +2,52 @@ # This is a log of major user-visible changes in each MacPorts release. # $Id$ ### + +Unreleased changes: + + - Add SHA256 checksums in addition to MD5, SHA1 and RIPEMD160. + (afb in r57888, r57913; snc in r68955) + Release 1.9.2 (future): - - Fixed sha256 checksum (snc in r68955) - - Fixed premature privilege dropping (jmr in r68952) + - Added more locking to avoid TOCTOU errors when running multiple port(1) + instances (#19935, jmr in r70174) + - Fixed -q not suppressing output from 'port lint' (#25880, jmr in r70163) + - Added a helpful message when there is a checksum mismatch and the + distfile appears to incorrectly be a HTML document (#25128, + ryandesign/jmr in r70143) + + - Now checking early on if there are sufficient privileges to install, + and failing before building anything if not (#25671, jmr in r70135) + + - Avoided possible failure when the -u option is used when upgrading a + port that is marked as being replaced by another (jmr in r69022) + + - Using the platform-specific PortIndex when syncing using a daily tarball + (jmr in r68786) + + - Fixed failures when fetch target is run without root privileges and the + port is then installed with them (#25418, #25937; jmr in r69334, r70271) + + - Fixed upgrading ports where the new version differs from the old version + only in epoch (jmr in r69436) + + - Fixed [un]setrequested when using the flat registry format + (jmr in r69387) + + - Fixed checking for conflicting ports before installation + (#25386, jmr in r69105) + + - Now gracefully handling distfiles that use a tag that is not + associated with any sites (#25332, jmr in r68965) + + - Fixed running 'port deps' on multiple ports, and changed its output + format back to how it was in 1.8 (#25324, jmr in r68950) + + - Fixed premature privilege dropping (#25331, jmr in r68952) + Release 1.9.1 (2010-06-18): - Fixed a couple of problems with new 1.9 features when using the flat registry format (jmr in r68910, r68913) @@ -200,9 +240,6 @@ - Use CommonCrypto/CommonDigest instead of OpenSSL libcrypto. (toby in r58131, jberry in r59715) - - Add SHA256 checksums in addition to MD5, SHA1 and RIPEMD160. - (afb in r57888, r57913) - - New "patch.type gnu" for GNU patch, similar to "build.type gnu" for GNU make. Only makes a difference for BSD patch and BSD make. (afb in r58020)

1 0

[70273] trunk/dports/science/plplot
by takeshi＠macports.org 04 Aug '10

04 Aug '10

Revision: 70273 http://trac.macports.org/changeset/70273 Author: takeshi(a)macports.org Date: 2010-08-04 03:22:34 -0700 (Wed, 04 Aug 2010) Log Message: ----------- plplot: commented out error generating part added for 5.9.6 in f95 binding. Modified Paths: -------------- trunk/dports/science/plplot/Portfile Added Paths: ----------- trunk/dports/science/plplot/files/patch-sfstubsf95.f90.diff Modified: trunk/dports/science/plplot/Portfile =================================================================== --- trunk/dports/science/plplot/Portfile 2010-08-04 07:29:46 UTC (rev 70272) +++ trunk/dports/science/plplot/Portfile 2010-08-04 10:22:34 UTC (rev 70273) @@ -36,7 +36,8 @@ port:tk \ port:zlib -patchfiles patch-x18f.f90.diff +patchfiles patch-x18f.f90.diff \ + patch-sfstubsf95.f90.diff post-patch { reinplace "s|-framework AquaTerm|-F${prefix}/Library/Frameworks -framework AquaTerm|" ${worksrcpath}/cmake/modules/aqt.cmake } Added: trunk/dports/science/plplot/files/patch-sfstubsf95.f90.diff =================================================================== --- trunk/dports/science/plplot/files/patch-sfstubsf95.f90.diff (rev 0) +++ trunk/dports/science/plplot/files/patch-sfstubsf95.f90.diff 2010-08-04 10:22:34 UTC (rev 70273) @@ -0,0 +1,147 @@ +--- bindings/f95/sfstubsf95.f90 2010-06-06 01:11:40.000000000 +0900 ++++ bindings/f95/sfstubsf95.f90.new 2010-08-04 19:15:33.000000000 +0900 +@@ -505,13 +505,13 @@ + end subroutine pllsty + end interface + +- interface plmap +- module procedure plmap1, plmap2 +- end interface plmap +- +- interface plmeridians +- module procedure plmeridians1, plmeridians2 +- end interface plmeridians ++! interface plmap ++! module procedure plmap1, plmap2 ++! end interface plmap ++ ++! interface plmeridians ++! module procedure plmeridians1, plmeridians2 ++! end interface plmeridians + + interface plmesh + module procedure plmesh +@@ -1110,66 +1110,66 @@ + call plline3f77( size(x), x, y, z ) + end subroutine plline3 + +- subroutine plmap1(mapform,mapname,minx,maxx,miny,maxy) +- use plplot_flt +- implicit none +- real(kind=plflt) minx, maxx, miny, maxy +- character*(*) mapname +- external mapform +- +- include 'sfstubs.h' +- +- call plstrf2c(mapname, string1, maxlen) +- +- call plsetmapformc(mapform) +- s1 = transfer( string1, s1 ) +- call plmap7(s1,minx,maxx,miny,maxy) +- +- end subroutine plmap1 ++! subroutine plmap1(mapform,mapname,minx,maxx,miny,maxy) ++! use plplot_flt ++! implicit none ++! real(kind=plflt) minx, maxx, miny, maxy ++! character*(*) mapname ++! external mapform ++! ++! include 'sfstubs.h' ++! ++! call plstrf2c(mapname, string1, maxlen) ++! ++! call plsetmapformc(mapform) ++! s1 = transfer( string1, s1 ) ++! call plmap7(s1,minx,maxx,miny,maxy) ++! ++! end subroutine plmap1 + +- subroutine plmap2(mapname,minx,maxx,miny,maxy) +- use plplot_flt +- implicit none +- real(kind=plflt) minx, maxx, miny, maxy +- character*(*) mapname +- +- include 'sfstubs.h' +- +- call plstrf2c(mapname, string1, maxlen) +- +- call plclearmapformc() +- s1 = transfer( string1, s1 ) +- call plmap7(s1,minx,maxx,miny,maxy) +- +- end subroutine plmap2 ++! subroutine plmap2(mapname,minx,maxx,miny,maxy) ++! use plplot_flt ++! implicit none ++! real(kind=plflt) minx, maxx, miny, maxy ++! character*(*) mapname ++! ++! include 'sfstubs.h' ++! ++! call plstrf2c(mapname, string1, maxlen) ++! ++! call plclearmapformc() ++! s1 = transfer( string1, s1 ) ++! call plmap7(s1,minx,maxx,miny,maxy) ++! ++! end subroutine plmap2 + +- subroutine plmeridians1(mapform,dlong,dlat,minlong,maxlong, & +- minlat,maxlat) +- +- implicit none +- real(kind=plflt) dlong, dlat, minlong, maxlong, minlat, maxlat +- external mapform +- +- include 'sfstubs.h' +- +- call plsetmapformc(mapform) +- call plmeridians7(dlong,dlat,minlong,maxlong,minlat,maxlat) +- +- end subroutine plmeridians1 +- +- subroutine plmeridians2(dlong,dlat,minlong,maxlong, & +- minlat,maxlat) +- +- implicit none +- real(kind=plflt) dlong, dlat, minlong, maxlong, minlat, maxlat +- external mapform +- +- include 'sfstubs.h' +- +- call plclearmapformc +- call plmeridians7(dlong,dlat,minlong,maxlong,minlat,maxlat) ++! subroutine plmeridians1(mapform,dlong,dlat,minlong,maxlong, & ++! minlat,maxlat) ++! ++! implicit none ++! real(kind=plflt) dlong, dlat, minlong, maxlong, minlat, maxlat ++! external mapform ++! ++! include 'sfstubs.h' ++! ++! call plsetmapformc(mapform) ++! call plmeridians7(dlong,dlat,minlong,maxlong,minlat,maxlat) ++! ++! end subroutine plmeridians1 + +- end subroutine plmeridians2 ++! subroutine plmeridians2(dlong,dlat,minlong,maxlong, & ++! minlat,maxlat) ++! ++! implicit none ++! real(kind=plflt) dlong, dlat, minlong, maxlong, minlat, maxlat ++! external mapform ++! ++! include 'sfstubs.h' ++! ++! call plclearmapformc ++! call plmeridians7(dlong,dlat,minlong,maxlong,minlat,maxlat) ++! ++! end subroutine plmeridians2 + + subroutine plmesh( x, y, z, opt ) + integer :: opt

1 0