Revision: 86712 http://trac.macports.org/changeset/86712 Author: jmr@macports.org Date: 2011-11-01 13:30:33 -0700 (Tue, 01 Nov 2011) Log Message: ----------- cdrdao: increase buffer size for device names, and remove unneeded patchfile (#27819) Modified Paths: -------------- trunk/dports/sysutils/cdrdao/Portfile Added Paths: ----------- trunk/dports/sysutils/cdrdao/files/cdrdao-device-default-bufsize.patch Removed Paths: ------------- trunk/dports/sysutils/cdrdao/files/patch-libscg__scsi-mac-iokit.c Modified: trunk/dports/sysutils/cdrdao/Portfile =================================================================== --- trunk/dports/sysutils/cdrdao/Portfile 2011-11-01 20:23:34 UTC (rev 86711) +++ trunk/dports/sysutils/cdrdao/Portfile 2011-11-01 20:30:33 UTC (rev 86712) @@ -5,6 +5,7 @@ name cdrdao version 1.2.3 +revision 1 description Disk-At-Once Recording of Audio and Data CD-Rs/CD-RWs long_description \ Cdrdao records audio or data CD-Rs in disk-at-once (DAO) mode \ @@ -22,8 +23,8 @@ depends_build port:pkgconfig -patchfiles patch-libscg__scsi-mac-iokit.c \ - patch-dao_ScsiIf-osx.cc.diff +patchfiles patch-dao_ScsiIf-osx.cc.diff \ + cdrdao-device-default-bufsize.patch configure.args --mandir=${prefix}/share/man \ --without-lame --without-xdao --without-ogg-support --without-mp3-support --disable-dependency-tracking Added: trunk/dports/sysutils/cdrdao/files/cdrdao-device-default-bufsize.patch =================================================================== --- trunk/dports/sysutils/cdrdao/files/cdrdao-device-default-bufsize.patch (rev 0) +++ trunk/dports/sysutils/cdrdao/files/cdrdao-device-default-bufsize.patch 2011-11-01 20:30:33 UTC (rev 86712) @@ -0,0 +1,20 @@ +--- dao/main.cc 2011-08-01 12:13:04.000000000 -0400 ++++ dao/main.cc 2011-08-01 12:14:40.000000000 -0400 +@@ -1242,7 +1242,7 @@ + const char* getDefaultDevice(DaoDeviceType req) + { + int i, len; +- static char buf[128]; ++ static char buf[256]; + + // This function should not be called if the command issues + // doesn't actually require a device. +@@ -1270,7 +1270,7 @@ + if (req == NEED_CDRW_W && !rww) + continue; + +- strncpy(buf, sdata[i].dev.c_str(), 128); ++ strncpy(buf, sdata[i].dev.c_str(), 256); + delete[] sdata; + return buf; + } Deleted: trunk/dports/sysutils/cdrdao/files/patch-libscg__scsi-mac-iokit.c =================================================================== --- trunk/dports/sysutils/cdrdao/files/patch-libscg__scsi-mac-iokit.c 2011-11-01 20:23:34 UTC (rev 86711) +++ trunk/dports/sysutils/cdrdao/files/patch-libscg__scsi-mac-iokit.c 2011-11-01 20:30:33 UTC (rev 86712) @@ -1,11 +0,0 @@ ---- scsilib/libscg/scsi-mac-iokit.c 2009-08-29 15:41:19.000000000 -0700 -+++ scsilib/libscg/scsi-mac-iokit.c 2009-08-29 15:42:08.000000000 -0700 -@@ -55,7 +55,7 @@ - #include <Carbon/Carbon.h> - #include <IOKit/IOKitLib.h> - #include <IOKit/IOCFPlugIn.h> --#include <IOKit/scsi-commands/SCSITaskLib.h> -+#include <IOKit/scsi/SCSITaskLib.h> - #include <mach/mach_error.h> - - struct scg_local {