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

[70272] branches/release_1_9/base/src/port1.0/portfetch.tcl
by jmr＠macports.org 04 Aug '10

04 Aug '10

Revision: 70272 http://trac.macports.org/changeset/70272 Author: jmr(a)macports.org Date: 2010-08-04 00:29:46 -0700 (Wed, 04 Aug 2010) Log Message: ----------- merge r70271 from trunk: when distfiles are only present in the altworkpath, link/copy into distpath so ports can find them there (#25937) Revision Links: -------------- http://trac.macports.org/changeset/70271 Modified Paths: -------------- branches/release_1_9/base/src/port1.0/portfetch.tcl Modified: branches/release_1_9/base/src/port1.0/portfetch.tcl =================================================================== --- branches/release_1_9/base/src/port1.0/portfetch.tcl 2010-08-04 07:27:22 UTC (rev 70271) +++ branches/release_1_9/base/src/port1.0/portfetch.tcl 2010-08-04 07:29:46 UTC (rev 70272) @@ -460,11 +460,19 @@ set sorted no foreach {url_var distfile} $fetch_urls { - if {![file isfile $distpath/$distfile] && ($usealtworkpath || ![file isfile ${altprefix}${distpath}/$distfile])} { + if {![file isfile "${distpath}/${distfile}"]} { ui_info "$UI_PREFIX [format [msgcat::mc "%s doesn't seem to exist in %s"] $distfile $distpath]" if {![file writable $distpath]} { return -code error [format [msgcat::mc "%s must be writable"] $distpath] } + if {!$usealtworkpath && [file isfile ${altprefix}${distpath}/${distfile}]} { + if {[catch {file link -hard "${distpath}/${distfile}" "${altprefix}${distpath}/${distfile}"}]} { + ui_debug "failed to hardlink ${distfile} into distpath, copying instead" + file copy "${altprefix}${distpath}/${distfile}" "${distpath}/${distfile}" + } + ui_info "Found $distfile in ${altprefix}${distpath}" + continue + } if {!$sorted} { sortsites fetch_urls [mirror_sites $fallback_mirror_site {} {} [get_full_mirror_sites_path]] master_sites set sorted yes

1 0

[70271] trunk/base/src/port1.0/portfetch.tcl
by jmr＠macports.org 04 Aug '10

04 Aug '10

Revision: 70271 http://trac.macports.org/changeset/70271 Author: jmr(a)macports.org Date: 2010-08-04 00:27:22 -0700 (Wed, 04 Aug 2010) Log Message: ----------- when distfiles are only present in the altworkpath, link/copy into distpath so ports can find them there (#25937) Modified Paths: -------------- trunk/base/src/port1.0/portfetch.tcl Modified: trunk/base/src/port1.0/portfetch.tcl =================================================================== --- trunk/base/src/port1.0/portfetch.tcl 2010-08-04 07:20:13 UTC (rev 70270) +++ trunk/base/src/port1.0/portfetch.tcl 2010-08-04 07:27:22 UTC (rev 70271) @@ -460,11 +460,19 @@ set sorted no foreach {url_var distfile} $fetch_urls { - if {![file isfile $distpath/$distfile] && ($usealtworkpath || ![file isfile ${altprefix}${distpath}/$distfile])} { + if {![file isfile "${distpath}/${distfile}"]} { ui_info "$UI_PREFIX [format [msgcat::mc "%s doesn't seem to exist in %s"] $distfile $distpath]" if {![file writable $distpath]} { return -code error [format [msgcat::mc "%s must be writable"] $distpath] } + if {!$usealtworkpath && [file isfile ${altprefix}${distpath}/${distfile}]} { + if {[catch {file link -hard "${distpath}/${distfile}" "${altprefix}${distpath}/${distfile}"}]} { + ui_debug "failed to hardlink ${distfile} into distpath, copying instead" + file copy "${altprefix}${distpath}/${distfile}" "${distpath}/${distfile}" + } + ui_info "Found $distfile in ${altprefix}${distpath}" + continue + } if {!$sorted} { sortsites fetch_urls [mirror_sites $fallback_mirror_site {} {} [get_full_mirror_sites_path]] master_sites set sorted yes

1 0

[70270] branches/release_1_9/base/src/registry2.0
by jmr＠macports.org 04 Aug '10

04 Aug '10

Revision: 70270 http://trac.macports.org/changeset/70270 Author: jmr(a)macports.org Date: 2010-08-04 00:20:13 -0700 (Wed, 04 Aug 2010) Log Message: ----------- merge r70269 from trunk: skip locking when registry dir is unwritable Revision Links: -------------- http://trac.macports.org/changeset/70269 Modified Paths: -------------- branches/release_1_9/base/src/registry2.0/registry.tcl Property Changed: ---------------- branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl Property changes on: branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937 /branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371 /branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323 /branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/registry2.0/receipt_sqlite.tcl:67304-67305,67307,67384,67449,67451,67487,67593,67595,67717,67763,67792,67838,68058,68281,68286,68288,68413,68416,68463,68593,68620,68675-68676,68680,68683-68684,68691,68697,68746,68749,68764,68779,68786,68806,68816-68817,68849,68851,68864,68872,68902,68910,68913,68919,68950,68952,68965,69001,69019,69022,69105,69191,69316,69318,69334-69335,69387,69436,69470,69887,70009-70010,70120,70135,70138,70143,70163,70174 /users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060 /users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692 + /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937 /branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371 /branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323 /branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/registry2.0/receipt_sqlite.tcl:67304-67305,67307,67384,67449,67451,67487,67593,67595,67717,67763,67792,67838,68058,68281,68286,68288,68413,68416,68463,68593,68620,68675-68676,68680,68683-68684,68691,68697,68746,68749,68764,68779,68786,68806,68816-68817,68849,68851,68864,68872,68902,68910,68913,68919,68950,68952,68965,69001,69019,69022,69105,69191,69316,69318,69334-69335,69387,69436,69470,69887,70009-70010,70120,70135,70138,70143,70163,70174,70269 /users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060 /users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692 Modified: branches/release_1_9/base/src/registry2.0/registry.tcl =================================================================== --- branches/release_1_9/base/src/registry2.0/registry.tcl 2010-08-04 07:17:19 UTC (rev 70269) +++ branches/release_1_9/base/src/registry2.0/registry.tcl 2010-08-04 07:20:13 UTC (rev 70270) @@ -401,6 +401,10 @@ } set lockpath [file join ${registry.path} registry .registry.lock] if {![info exists lockfd]} { + if {![file writable [file dirname $lockpath]]} { + # skip locking, registry can't be modified anyway + return + } set lockfd [::open $lockpath w] } if {[catch {flock $lockfd -exclusive -noblock} result]} {

1 0

[70269] trunk/base/src/registry2.0/registry.tcl
by jmr＠macports.org 04 Aug '10

04 Aug '10

Revision: 70269 http://trac.macports.org/changeset/70269 Author: jmr(a)macports.org Date: 2010-08-04 00:17:19 -0700 (Wed, 04 Aug 2010) Log Message: ----------- skip locking when registry dir is unwritable Modified Paths: -------------- trunk/base/src/registry2.0/registry.tcl Modified: trunk/base/src/registry2.0/registry.tcl =================================================================== --- trunk/base/src/registry2.0/registry.tcl 2010-08-04 06:51:39 UTC (rev 70268) +++ trunk/base/src/registry2.0/registry.tcl 2010-08-04 07:17:19 UTC (rev 70269) @@ -401,6 +401,10 @@ } set lockpath [file join ${registry.path} registry .registry.lock] if {![info exists lockfd]} { + if {![file writable [file dirname $lockpath]]} { + # skip locking, registry can't be modified anyway + return + } set lockfd [::open $lockpath w] } if {[catch {flock $lockfd -exclusive -noblock} result]} {

1 0

[70268] trunk/dports/sysutils/di/Portfile
by mww＠macports.org 04 Aug '10

04 Aug '10

Revision: 70268 http://trac.macports.org/changeset/70268 Author: mww(a)macports.org Date: 2010-08-03 23:51:39 -0700 (Tue, 03 Aug 2010) Log Message: ----------- version 4.26 -- #25938, thanks to nonstop.server(a)gmail.com and ryandesign Modified Paths: -------------- trunk/dports/sysutils/di/Portfile Modified: trunk/dports/sysutils/di/Portfile =================================================================== --- trunk/dports/sysutils/di/Portfile 2010-08-04 06:34:48 UTC (rev 70267) +++ trunk/dports/sysutils/di/Portfile 2010-08-04 06:51:39 UTC (rev 70268) @@ -3,7 +3,7 @@ PortSystem 1.0 name di -version 4.13 +version 4.26 categories sysutils platforms darwin maintainers mww @@ -13,16 +13,19 @@ homepage http://www.gentoo.com/di/ master_sites ${homepage} http://fresh.t-systems-sfr.com/unix/src/privat2/ -checksums sha1 6cd254482f6075b83191e58b327516e6701840fb +checksums md5 7568e18b1c5c72bfbe3d9ba55c30d1ed \ + sha1 9ea24a64fef957571dada1d53d4cfddce96b8c53 \ + rmd160 d7513b743291c810154c3d86b002398389143e85 + +depends_lib port:gettext + use_configure no -build.cmd ./Build build.target -build.env prefix=${prefix} +build.args prefix=${prefix} CC="${configure.cc}" -destroot.cmd ${build.cmd} -destroot.env prefix=${destroot}${prefix} +destroot.args prefix=${destroot}${prefix} livecheck.type freshmeat livecheck.name diskinfo

1 0

[70267] trunk/dports/multimedia/libvpx/Portfile
by ryandesign＠macports.org 04 Aug '10

04 Aug '10

Revision: 70267 http://trac.macports.org/changeset/70267 Author: ryandesign(a)macports.org Date: 2010-08-03 23:34:48 -0700 (Tue, 03 Aug 2010) Log Message: ----------- libvpx: fix "virtual memory exhausted" on Tiger during destroot; see #25943 Modified Paths: -------------- trunk/dports/multimedia/libvpx/Portfile Modified: trunk/dports/multimedia/libvpx/Portfile =================================================================== --- trunk/dports/multimedia/libvpx/Portfile 2010-08-04 04:14:16 UTC (rev 70266) +++ trunk/dports/multimedia/libvpx/Portfile 2010-08-04 06:34:48 UTC (rev 70267) @@ -51,6 +51,12 @@ # configure.args-append --enable-install-docs #} +platform darwin 8 { + # Tiger's make 3.80 experiences "virtual memory exhausted" during destroot + depends_build-append port:gmake + build.cmd ${prefix}/bin/gmake +} + build.target build.args verbose=1

1 0

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

04 Aug '10

Revision: 70266 http://trac.macports.org/changeset/70266 Author: macsforever2000(a)macports.org Date: 2010-08-03 21:14:16 -0700 (Tue, 03 Aug 2010) Log Message: ----------- Fix for mac version reporting. (#22278) Modified Paths: -------------- trunk/dports/lang/python24/Portfile Added Paths: ----------- trunk/dports/lang/python24/files/patch-macosmodule.diff trunk/dports/lang/python24/files/patch-mactoolboxglue.diff trunk/dports/lang/python24/files/patch-pymactoolbox.diff Modified: trunk/dports/lang/python24/Portfile =================================================================== --- trunk/dports/lang/python24/Portfile 2010-08-04 02:10:50 UTC (rev 70265) +++ trunk/dports/lang/python24/Portfile 2010-08-04 04:14:16 UTC (rev 70266) @@ -163,6 +163,10 @@ post-configure { reinplace "s|#define _POSIX_C_SOURCE 200112L|#undef _POSIX_C_SOURCE|g" ${worksrcpath}/pyconfig.h reinplace "s|#define _XOPEN_SOURCE 600|#undef _XOPEN_SOURCE|g" ${worksrcpath}/pyconfig.h + + patchfiles-append patch-macosmodule.diff \ + patch-mactoolboxglue.diff \ + patch-pymactoolbox.diff } } Added: trunk/dports/lang/python24/files/patch-macosmodule.diff =================================================================== --- trunk/dports/lang/python24/files/patch-macosmodule.diff (rev 0) +++ trunk/dports/lang/python24/files/patch-macosmodule.diff 2010-08-04 04:14:16 UTC (rev 70266) @@ -0,0 +1,427 @@ +--- Mac/Modules/macosmodule.c 2004-11-05 08:02:59.000000000 +0100 ++++ Mac/Modules/macosmodule.c 2009-09-05 02:07:14.000000000 +0200 +@@ -40,7 +40,7 @@ + + typedef struct { + PyObject_HEAD +- short fRefNum; ++ FSIORefNum fRefNum; + int isclosed; + } rfobject; + +@@ -54,7 +54,7 @@ + do_close(rfobject *self) + { + if (self->isclosed ) return; +- (void)FSClose(self->fRefNum); ++ (void)FSCloseFork(self->fRefNum); + self->isclosed = 1; + } + +@@ -68,6 +68,7 @@ + long n; + PyObject *v; + OSErr err; ++ ByteCount n2; + + if (self->isclosed) { + PyErr_SetString(PyExc_ValueError, "Operation on closed file"); +@@ -81,13 +82,13 @@ + if (v == NULL) + return NULL; + +- err = FSRead(self->fRefNum, &n, PyString_AsString(v)); ++ err = FSReadFork(self->fRefNum, fsAtMark, 0, n, PyString_AsString(v), &n2); + if (err && err != eofErr) { + PyMac_Error(err); + Py_DECREF(v); + return NULL; + } +- _PyString_Resize(&v, n); ++ _PyString_Resize(&v, n2); + return v; + } + +@@ -109,7 +110,7 @@ + } + if (!PyArg_ParseTuple(args, "s#", &buffer, &size)) + return NULL; +- err = FSWrite(self->fRefNum, &size, buffer); ++ err = FSWriteFork(self->fRefNum, fsAtMark, 0, size, buffer, NULL); + if (err) { + PyMac_Error(err); + return NULL; +@@ -126,47 +127,36 @@ + static PyObject * + rf_seek(rfobject *self, PyObject *args) + { +- long amount, pos; ++ long amount; + int whence = SEEK_SET; +- long eof; ++ int mode; + OSErr err; + + if (self->isclosed) { + PyErr_SetString(PyExc_ValueError, "Operation on closed file"); + return NULL; + } +- if (!PyArg_ParseTuple(args, "l|i", &amount, &whence)) ++ if (!PyArg_ParseTuple(args, "l|i", &amount, &whence)) { + return NULL; +- +- if ((err = GetEOF(self->fRefNum, &eof))) +- goto ioerr; ++ } + + switch (whence) { + case SEEK_CUR: +- if ((err = GetFPos(self->fRefNum, &pos))) +- goto ioerr; ++ mode = fsFromMark; + break; + case SEEK_END: +- pos = eof; ++ mode = fsFromLEOF; + break; + case SEEK_SET: +- pos = 0; ++ mode = fsFromStart; + break; + default: + PyErr_BadArgument(); + return NULL; + } +- +- pos += amount; +- +- /* Don't bother implementing seek past EOF */ +- if (pos > eof || pos < 0) { +- PyErr_BadArgument(); +- return NULL; +- } +- +- if ((err = SetFPos(self->fRefNum, fsFromStart, pos)) ) { +-ioerr: ++ ++ err = FSSetForkPosition(self->fRefNum, mode, amount); ++ if (err != noErr) { + PyMac_Error(err); + return NULL; + } +@@ -182,7 +172,7 @@ + static PyObject * + rf_tell(rfobject *self, PyObject *args) + { +- long where; ++ long long where; + OSErr err; + + if (self->isclosed) { +@@ -191,11 +181,13 @@ + } + if (!PyArg_ParseTuple(args, "")) + return NULL; +- if ((err = GetFPos(self->fRefNum, &where)) ) { ++ ++ err = FSGetForkPosition(self->fRefNum, &where); ++ if (err != noErr) { + PyMac_Error(err); + return NULL; + } +- return PyInt_FromLong(where); ++ return PyLong_FromLongLong(where); + } + + static char rf_close__doc__[] = +@@ -281,6 +273,7 @@ + Rftype__doc__ /* Documentation string */ + }; + ++ + /* End of code for Resource fork objects */ + /* -------------------------------------------------------- */ + +@@ -292,17 +285,61 @@ + static PyObject * + MacOS_GetCreatorAndType(PyObject *self, PyObject *args) + { +- FSSpec fss; +- FInfo info; + PyObject *creator, *type, *res; + OSErr err; +- +- if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSSpec, &fss)) ++ FSRef ref; ++ FSCatalogInfo cataloginfo; ++ FileInfo* finfo; ++ ++ if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSRef, &ref)) { ++#ifndef __LP64__ ++ /* This function is documented to take an FSSpec as well, ++ * which only works in 32-bit mode. ++ */ ++ PyErr_Clear(); ++ FSSpec fss; ++ FInfo info; ++ ++ if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSSpec, &fss)) ++ return NULL; ++ ++ if ((err = FSpGetFInfo(&fss, &info)) != noErr) { ++ return PyErr_Mac(MacOS_Error, err); ++ } ++ creator = PyString_FromStringAndSize( ++ (char *)&info.fdCreator, 4); ++ type = PyString_FromStringAndSize((char *)&info.fdType, 4); ++ res = Py_BuildValue("OO", creator, type); ++ Py_DECREF(creator); ++ Py_DECREF(type); ++ return res; ++#else /* __LP64__ */ ++ return NULL; ++#endif /* __LP64__ */ ++ } ++ ++ err = FSGetCatalogInfo(&ref, ++ kFSCatInfoFinderInfo|kFSCatInfoNodeFlags, &cataloginfo, ++ NULL, NULL, NULL); ++ if (err != noErr) { ++ PyErr_Mac(MacOS_Error, err); + return NULL; +- if ((err = FSpGetFInfo(&fss, &info)) != noErr) +- return PyErr_Mac(MacOS_Error, err); +- creator = PyString_FromStringAndSize((char *)&info.fdCreator, 4); +- type = PyString_FromStringAndSize((char *)&info.fdType, 4); ++ } ++ ++ if ((cataloginfo.nodeFlags & kFSNodeIsDirectoryMask) != 0) { ++ /* Directory: doesn't have type/creator info. ++ * ++ * The specific error code is for backward compatibility with ++ * earlier versions. ++ */ ++ PyErr_Mac(MacOS_Error, fnfErr); ++ return NULL; ++ ++ } ++ finfo = (FileInfo*)&(cataloginfo.finderInfo); ++ creator = PyString_FromStringAndSize((char*)&(finfo->fileCreator), 4); ++ type = PyString_FromStringAndSize((char*)&(finfo->fileType), 4); ++ + res = Py_BuildValue("OO", creator, type); + Py_DECREF(creator); + Py_DECREF(type); +@@ -314,20 +351,66 @@ + static PyObject * + MacOS_SetCreatorAndType(PyObject *self, PyObject *args) + { +- FSSpec fss; + ResType creator, type; +- FInfo info; ++ FSRef ref; ++ FileInfo* finfo; + OSErr err; +- ++ FSCatalogInfo cataloginfo; ++ + if (!PyArg_ParseTuple(args, "O&O&O&", ++ PyMac_GetFSRef, &ref, PyMac_GetOSType, &creator, PyMac_GetOSType, &type)) { ++#ifndef __LP64__ ++ /* Try to handle FSSpec arguments, for backward compatibility */ ++ FSSpec fss; ++ FInfo info; ++ ++ if (!PyArg_ParseTuple(args, "O&O&O&", + PyMac_GetFSSpec, &fss, PyMac_GetOSType, &creator, PyMac_GetOSType, &type)) ++ return NULL; ++ ++ if ((err = FSpGetFInfo(&fss, &info)) != noErr) ++ return PyErr_Mac(MacOS_Error, err); ++ ++ info.fdCreator = creator; ++ info.fdType = type; ++ ++ if ((err = FSpSetFInfo(&fss, &info)) != noErr) ++ return PyErr_Mac(MacOS_Error, err); ++ Py_INCREF(Py_None); ++ return Py_None; ++#else /* __LP64__ */ + return NULL; +- if ((err = FSpGetFInfo(&fss, &info)) != noErr) +- return PyErr_Mac(MacOS_Error, err); +- info.fdCreator = creator; +- info.fdType = type; +- if ((err = FSpSetFInfo(&fss, &info)) != noErr) +- return PyErr_Mac(MacOS_Error, err); ++#endif /* __LP64__ */ ++ } ++ ++ err = FSGetCatalogInfo(&ref, ++ kFSCatInfoFinderInfo|kFSCatInfoNodeFlags, &cataloginfo, ++ NULL, NULL, NULL); ++ if (err != noErr) { ++ PyErr_Mac(MacOS_Error, err); ++ return NULL; ++ } ++ ++ if ((cataloginfo.nodeFlags & kFSNodeIsDirectoryMask) != 0) { ++ /* Directory: doesn't have type/creator info. ++ * ++ * The specific error code is for backward compatibility with ++ * earlier versions. ++ */ ++ PyErr_Mac(MacOS_Error, fnfErr); ++ return NULL; ++ ++ } ++ finfo = (FileInfo*)&(cataloginfo.finderInfo); ++ finfo->fileCreator = creator; ++ finfo->fileType = type; ++ ++ err = FSSetCatalogInfo(&ref, kFSCatInfoFinderInfo, &cataloginfo); ++ if (err != noErr) { ++ PyErr_Mac(MacOS_Error, fnfErr); ++ return NULL; ++ } ++ + Py_INCREF(Py_None); + return Py_None; + } +@@ -375,6 +458,7 @@ + /* And try again... */ + h = GetResource('Estr', err); + } ++ Py_DECREF(m); + } + } + /* +@@ -398,6 +482,9 @@ + return Py_BuildValue("s", buf); + } + ++ ++#ifndef __LP64__ ++ + static char splash_doc[] = "Open a splash-screen dialog by resource-id (0=close)"; + + static PyObject * +@@ -416,7 +503,7 @@ + return NULL; + olddialog = curdialog; + curdialog = NULL; +- ++ + if ( resid != -1 ) { + curdialog = GetNewDialog(resid, NULL, (WindowPtr)-1); + if ( curdialog ) { +@@ -451,11 +538,13 @@ + + if (!PyArg_ParseTuple(args, "O&|O", PyMac_GetStr255, message, &object)) + return NULL; ++ + DebugStr(message); + Py_INCREF(Py_None); + return Py_None; + } + ++ + static char SysBeep_doc[] = "BEEEEEP!!!"; + + static PyObject * +@@ -470,6 +559,8 @@ + return Py_None; + } + ++#endif /* __LP64__ */ ++ + static char WMAvailable_doc[] = + "True if this process can interact with the display." + "Will foreground the application on the first call as a side-effect." +@@ -529,51 +620,37 @@ + { + OSErr err; + char *mode = "r"; +- FSSpec fss; +- SignedByte permission = 1; ++ FSRef ref; ++ SInt8 permission = fsRdPerm; + rfobject *fp; ++ HFSUniStr255 name; + +- if (!PyArg_ParseTuple(args, "O&|s", PyMac_GetFSSpec, &fss, &mode)) ++ if (!PyArg_ParseTuple(args, "O&|s", PyMac_GetFSRef, &ref, &mode)) + return NULL; + while (*mode) { + switch (*mode++) { + case '*': break; +- case 'r': permission = 1; break; +- case 'w': permission = 2; break; ++ case 'r': permission = fsRdPerm; break; ++ case 'w': permission = fsWrPerm; break; + case 'b': break; + default: + PyErr_BadArgument(); + return NULL; + } + } ++ ++ err = FSGetResourceForkName(&name); ++ if (err != noErr) { ++ PyMac_Error(err); ++ return NULL; ++ } + + if ( (fp = newrfobject()) == NULL ) + return NULL; +- +- err = HOpenRF(fss.vRefNum, fss.parID, fss.name, permission, &fp->fRefNum); ++ + +- if ( err == fnfErr ) { +- /* In stead of doing complicated things here to get creator/type +- ** correct we let the standard i/o library handle it +- */ +- FILE *tfp; +- char pathname[PATHNAMELEN]; +- +- if ( (err=PyMac_GetFullPathname(&fss, pathname, PATHNAMELEN)) ) { +- PyMac_Error(err); +- Py_DECREF(fp); +- return NULL; +- } +- +- if ( (tfp = fopen(pathname, "w")) == NULL ) { +- PyMac_Error(fnfErr); /* What else... */ +- Py_DECREF(fp); +- return NULL; +- } +- fclose(tfp); +- err = HOpenRF(fss.vRefNum, fss.parID, fss.name, permission, &fp->fRefNum); +- } +- if ( err ) { ++ err = FSOpenFork(&ref, name.length, name.unicode, permission, &fp->fRefNum); ++ if (err != noErr) { + Py_DECREF(fp); + PyMac_Error(err); + return NULL; +@@ -583,15 +660,18 @@ + } + + ++ + static PyMethodDef MacOS_Methods[] = { + {"GetCreatorAndType", MacOS_GetCreatorAndType, 1, getcrtp_doc}, + {"SetCreatorAndType", MacOS_SetCreatorAndType, 1, setcrtp_doc}, + {"GetErrorString", MacOS_GetErrorString, 1, geterr_doc}, + {"openrf", MacOS_openrf, 1, openrf_doc}, ++#ifndef __LP64__ + {"splash", MacOS_splash, 1, splash_doc}, + {"DebugStr", MacOS_DebugStr, 1, DebugStr_doc}, +- {"GetTicks", MacOS_GetTicks, 1, GetTicks_doc}, + {"SysBeep", MacOS_SysBeep, 1, SysBeep_doc}, ++#endif /* __LP64__ */ ++ {"GetTicks", MacOS_GetTicks, 1, GetTicks_doc}, + {"WMAvailable", MacOS_WMAvailable, 1, WMAvailable_doc}, + {NULL, NULL} /* Sentinel */ + }; Added: trunk/dports/lang/python24/files/patch-mactoolboxglue.diff =================================================================== --- trunk/dports/lang/python24/files/patch-mactoolboxglue.diff (rev 0) +++ trunk/dports/lang/python24/files/patch-mactoolboxglue.diff 2010-08-04 04:14:16 UTC (rev 70266) @@ -0,0 +1,20 @@ +--- Python/mactoolboxglue.c 2006-10-08 19:41:25.000000000 +0200 ++++ Python/mactoolboxglue.c 2009-09-05 01:25:57.000000000 +0200 +@@ -414,7 +414,7 @@ + + GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs") + GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs") +- ++/* + GLUE_NEW(Track, TrackObj_New, "Carbon.Qt") + GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt") + GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt") +@@ -427,7 +427,7 @@ + GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt") + GLUE_NEW(Media, MediaObj_New, "Carbon.Qt") + GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt") +- ++*/ + GLUE_NEW(Handle, ResObj_New, "Carbon.Res") + GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res") + GLUE_NEW(Handle, OptResObj_New, "Carbon.Res") Added: trunk/dports/lang/python24/files/patch-pymactoolbox.diff =================================================================== --- trunk/dports/lang/python24/files/patch-pymactoolbox.diff (rev 0) +++ trunk/dports/lang/python24/files/patch-pymactoolbox.diff 2010-08-04 04:14:16 UTC (rev 70266) @@ -0,0 +1,18 @@ +--- Include/pymactoolbox.h 2004-11-05 08:02:59.000000000 +0100 ++++ Include/pymactoolbox.h 2009-09-05 01:26:30.000000000 +0200 +@@ -134,6 +134,7 @@ + extern int GWorldObj_Convert(PyObject *, GWorldPtr *); + + /* Qt exports */ ++/* + extern PyObject *TrackObj_New(Track); + extern int TrackObj_Convert(PyObject *, Track *); + extern PyObject *MovieObj_New(Movie); +@@ -146,6 +147,7 @@ + extern int UserDataObj_Convert(PyObject *, UserData *); + extern PyObject *MediaObj_New(Media); + extern int MediaObj_Convert(PyObject *, Media *); ++*/ + + /* Res exports */ + extern PyObject *ResObj_New(Handle);

1 0

[70265] trunk/dports/mail/maildrop/Portfile
by blb＠macports.org 04 Aug '10

04 Aug '10

Revision: 70265 http://trac.macports.org/changeset/70265 Author: blb(a)macports.org Date: 2010-08-03 19:10:50 -0700 (Tue, 03 Aug 2010) Log Message: ----------- mail/maildrop - update to 2.5.0 and add dependency on libidn since it uses that as well, ticket #23477 (maintainer timeout) Modified Paths: -------------- trunk/dports/mail/maildrop/Portfile Modified: trunk/dports/mail/maildrop/Portfile =================================================================== --- trunk/dports/mail/maildrop/Portfile 2010-08-04 02:06:41 UTC (rev 70264) +++ trunk/dports/mail/maildrop/Portfile 2010-08-04 02:10:50 UTC (rev 70265) @@ -3,8 +3,7 @@ PortSystem 1.0 name maildrop -version 2.2.0 -revision 2 +version 2.5.0 categories mail maintainers tnpi.biz:matt description Mail delivery agent (MDA) with filtering abilities @@ -13,13 +12,13 @@ platforms darwin master_sites sourceforge:courier use_bzip2 yes -checksums md5 1fd5293c73adb64a01cb3d3e59e54618 \ - sha1 a6af98724fda72c4d1ebfd6e6f5fc5f38caf9e38 \ - rmd160 8c715af18693c375ca197450cdb57e39813ea8cd +checksums md5 efdd9a1324aa0c5b427a77d305ed5ecb \ + sha1 e09255dec179d796e55af008a8a536479aec55ac \ + rmd160 ad7880bace6e6e6135d9bc25aec7397d7ac96837 configure.args --mandir=${prefix}/share/man \ --with-etcdir=${prefix}/etc \ --enable-syslog=1 -depends_lib port:pcre port:gdbm +depends_lib port:pcre port:gdbm port:libidn variant vpopmail description {For use with vpopmail} { configure.args-append --enable-maildrop-gid=vchkpw

1 0

[70264] trunk/dports/mail/msmtp/Portfile
by blb＠macports.org 04 Aug '10

04 Aug '10

Revision: 70264 http://trac.macports.org/changeset/70264 Author: blb(a)macports.org Date: 2010-08-03 19:06:41 -0700 (Tue, 03 Aug 2010) Log Message: ----------- mail/msmtp - update to 1.4.21, ticket #24788 (maintainer timeout) Modified Paths: -------------- trunk/dports/mail/msmtp/Portfile Modified: trunk/dports/mail/msmtp/Portfile =================================================================== --- trunk/dports/mail/msmtp/Portfile 2010-08-04 01:26:04 UTC (rev 70263) +++ trunk/dports/mail/msmtp/Portfile 2010-08-04 02:06:41 UTC (rev 70264) @@ -4,8 +4,7 @@ PortSystem 1.0 name msmtp -version 1.4.18 -revision 1 +version 1.4.21 categories mail platforms darwin maintainers mww @@ -19,7 +18,9 @@ homepage http://msmtp.sourceforge.net/ master_sites sourceforge -checksums sha1 f7b42a2a6f4c9c21687dde86dfa827d728a08d76 +checksums md5 9d764cd9036168f49bc9d6531a7f3dba \ + sha1 40aabe0c65b8f31d402b2429581178e15f8bfe90 \ + rmd160 047605c85e0abe4ea8d3d01dc99cd75bbf33e3d0 use_bzip2 yes depends_lib port:openssl port:gettext port:gnutls port:libgcrypt \

1 0

[70263] trunk/dports/audio/aacgain/Portfile
by ryandesign＠macports.org 04 Aug '10

04 Aug '10

Revision: 70263 http://trac.macports.org/changeset/70263 Author: ryandesign(a)macports.org Date: 2010-08-03 18:26:04 -0700 (Tue, 03 Aug 2010) Log Message: ----------- aacgain: update to 1.8; see #19473 (maintainer timeout) Modified Paths: -------------- trunk/dports/audio/aacgain/Portfile Modified: trunk/dports/audio/aacgain/Portfile =================================================================== --- trunk/dports/audio/aacgain/Portfile 2010-08-04 01:23:57 UTC (rev 70262) +++ trunk/dports/audio/aacgain/Portfile 2010-08-04 01:26:04 UTC (rev 70263) @@ -3,7 +3,7 @@ PortSystem 1.0 name aacgain -version 1.7 +version 1.8 categories audio platforms darwin maintainers cs.dartmouth.edu:tristan @@ -16,7 +16,11 @@ master_sites http://altosdesign.com/aacgain/ \ freebsd use_bzip2 yes -checksums md5 de7a95488dac7c34c45896a4c0772709 + +checksums md5 61ce9e648fa1773adb3d4b3c84c6e4ca \ + sha1 331039c4231e4d85ae878795ce3095dd96dcbfdb \ + rmd160 8f97121f3797cde45f71839dbe14251b74365ccd + patchfiles patch-libfaad-common.h depends_lib port:mp4v2 port:faad2

1 0