17 files changed, 59 insertions, 45 deletions

diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 42f8ee3f91e6..92aa1281573f 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	k3b
-PORTVERSION=	0.11.9
-PORTREVISION=	1
+PORTVERSION=	0.11.12
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo
index f87a9ba30f2e..0527239a1985 100644
--- a/sysutils/k3b/distinfo
+++ b/sysutils/k3b/distinfo
@@ -1,2 +1,2 @@
-MD5 (k3b-0.11.9.tar.bz2) = 88f46a5cfbda5fa89b4bfee504567df1
-SIZE (k3b-0.11.9.tar.bz2) = 3217141
+MD5 (k3b-0.11.12.tar.bz2) = 32537417ea39adbc5c4d7bd30c07f8b5
+SIZE (k3b-0.11.12.tar.bz2) = 3187611
\ No newline at end of file
diff --git a/sysutils/k3b/files/patch-src-Makefile.in b/sysutils/k3b/files/patch-src-Makefile.in
index c3dd4bab796b..883e18fff1c6 100644
--- a/sysutils/k3b/files/patch-src-Makefile.in
+++ b/sysutils/k3b/files/patch-src-Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	Mon Mar 29 20:04:54 2004
-+++ src/Makefile.in	Tue May 11 22:57:03 2004
-@@ -272,7 +272,7 @@
+--- src/Makefile.in.orig	Thu Jun 24 19:34:03 2004
++++ src/Makefile.in	Sun Jul 11 12:24:22 2004
+@@ -287,7 +287,7 @@
  #>+ 1
  k3b_SOURCES=k3bwelcomewidget.cpp k3bapplication.cpp k3bdiroperator.cpp kdndfileview.cpp k3bfiletreeview.cpp k3bcddbmultientriesdialog.cpp k3baudioplayer.cpp k3bprojecttabbar.cpp k3bprojecttabwidget.cpp k3bsplash.cpp k3bblankingdialog.cpp k3bfileview.cpp k3bdirview.cpp k3btoolbox.cpp k3b.cpp main.cpp k3bstatusbarmanager.cpp k3bfiletreecombobox.cpp k3breadcdreader.cpp k3binterface.cpp  k3bprojectinterface.cpp  k3bsystemproblemdialog.cpp k3bcdcontentsview.cpp k3bwriterspeedverificationdialog.cpp k3bdatatrackreader.cpp k3binterface_skel.cpp k3bprojectinterface_skel.cpp
  
diff --git a/sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp b/sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp
index 3fe07352d47f..abe5006e3703 100644
--- a/sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp
+++ b/sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp
@@ -1,5 +1,5 @@
---- src/core/k3bdefaultexternalprograms.cpp.orig	Mon Mar 22 18:13:21 2004
-+++ src/core/k3bdefaultexternalprograms.cpp	Tue May 11 22:57:03 2004
+--- src/core/k3bdefaultexternalprograms.cpp.orig	Fri May 21 19:03:21 2004
++++ src/core/k3bdefaultexternalprograms.cpp	Sun Jul 11 12:24:22 2004
 @@ -30,6 +30,7 @@
  #include <unistd.h>
  #include <sys/stat.h>
@@ -143,7 +143,7 @@
    K3bProcess::OutputCollector out( &vp );
  
    vp << path;
-@@ -911,7 +912,7 @@
+@@ -913,7 +914,7 @@
    K3bExternalBin* bin = 0;
  
    // probe version
diff --git a/sysutils/k3b/files/patch-src-core-k3bprocess.cpp b/sysutils/k3b/files/patch-src-core-k3bprocess.cpp
index 425eec00ad79..5afbd5bb8461 100644
--- a/sysutils/k3b/files/patch-src-core-k3bprocess.cpp
+++ b/sysutils/k3b/files/patch-src-core-k3bprocess.cpp
@@ -1,5 +1,5 @@
 --- src/core/k3bprocess.cpp.orig	Sun Feb  1 09:18:58 2004
-+++ src/core/k3bprocess.cpp	Tue May 11 22:57:03 2004
++++ src/core/k3bprocess.cpp	Sun Jul 11 12:24:22 2004
 @@ -28,6 +28,60 @@
  #include <unistd.h>
  #include <stdio.h>
diff --git a/sysutils/k3b/files/patch-src-core-k3bprocess.h b/sysutils/k3b/files/patch-src-core-k3bprocess.h
index 10fae690100f..c4c3658a0965 100644
--- a/sysutils/k3b/files/patch-src-core-k3bprocess.h
+++ b/sysutils/k3b/files/patch-src-core-k3bprocess.h
@@ -1,5 +1,5 @@
 --- src/core/k3bprocess.h.orig	Tue Jan 27 09:19:13 2004
-+++ src/core/k3bprocess.h	Tue May 11 22:57:03 2004
++++ src/core/k3bprocess.h	Sun Jul 11 12:24:22 2004
 @@ -194,4 +194,21 @@
    KProcess* m_process;
  };
diff --git a/sysutils/k3b/files/patch-src-device-k3bdevice.cpp b/sysutils/k3b/files/patch-src-device-k3bdevice.cpp
index 5315827ee675..06c1ddca7aa6 100644
--- a/sysutils/k3b/files/patch-src-device-k3bdevice.cpp
+++ b/sysutils/k3b/files/patch-src-device-k3bdevice.cpp
@@ -1,6 +1,6 @@
---- src/device/k3bdevice.cpp.orig	Sun Mar 14 17:35:20 2004
-+++ src/device/k3bdevice.cpp	Mon May 24 23:31:19 2004
-@@ -56,6 +56,12 @@
+--- src/device/k3bdevice.cpp.orig	Wed Jun 23 12:06:46 2004
++++ src/device/k3bdevice.cpp	Sun Jul 11 12:24:22 2004
+@@ -57,6 +57,13 @@
  
  #endif // Q_OS_LINUX
  
@@ -8,12 +8,13 @@
 +#define __BYTE_ORDER BYTE_ORDER
 +#define __BIG_ENDIAN BIG_ENDIAN
 +#define CD_FRAMESIZE_RAW 2352
++#define nearbyint(x) rint(x)
 +#endif
 +
  
  #ifdef HAVE_RESMGR
  extern "C" {
-@@ -152,8 +158,10 @@
+@@ -153,8 +160,10 @@
  
    d->supportedProfiles = 0;
  
@@ -24,7 +25,7 @@
  
  
    //
-@@ -192,6 +200,7 @@
+@@ -193,6 +202,7 @@
    unsigned char header[2048];
    ::memset( header, 0, 2048 );
  
@@ -32,7 +33,7 @@
    cmd[0] = MMC::GET_CONFIGURATION;
    cmd[8] = 8;
    if( cmd.transport( TR_DIR_READ, header, 8 ) ) {
-@@ -733,6 +742,14 @@
+@@ -769,6 +779,14 @@
        m_bufferSize = 1024;
        d->burnfree = false;
      }
@@ -45,9 +46,9 @@
 +      d->burnfree = false;
 +    }
    }
-   else if( vendor().startsWith("MATSHITA") ) {
-     if( description().startsWith("CD-R   CW-7501") ) {
-@@ -2317,10 +2334,12 @@
+   else if( vendor().startsWith("HP") ) {
+     if( description().startsWith("CD-Writer 6020") ) {
+@@ -2559,10 +2577,12 @@
  {
    // if the device is already opened we do not close it
    // to allow fast multible method calls in a row
@@ -60,7 +61,7 @@
  
    // header size is 8
    unsigned char* buffer = 0;
-@@ -2406,13 +2425,16 @@
+@@ -2648,13 +2668,16 @@
      delete [] buffer;
    }
      
diff --git a/sysutils/k3b/files/patch-src-device-k3bdevice.h b/sysutils/k3b/files/patch-src-device-k3bdevice.h
index 836458ced45e..518610003db0 100644
--- a/sysutils/k3b/files/patch-src-device-k3bdevice.h
+++ b/sysutils/k3b/files/patch-src-device-k3bdevice.h
@@ -1,6 +1,6 @@
---- src/device/k3bdevice.h.orig	Sun Mar 14 17:35:20 2004
-+++ src/device/k3bdevice.h	Tue May 11 22:57:03 2004
-@@ -661,6 +661,10 @@
+--- src/device/k3bdevice.h.orig	Wed Jun  9 18:36:58 2004
++++ src/device/k3bdevice.h	Sun Jul 11 12:24:22 2004
+@@ -677,6 +677,10 @@
  
      class Private;
      Private* d;
diff --git a/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp b/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp
index 7b40314e293a..934ccf2268c8 100644
--- a/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp
+++ b/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp
@@ -1,5 +1,5 @@
---- src/device/k3bdevicemanager.cpp.orig	Sun Feb 29 13:52:41 2004
-+++ src/device/k3bdevicemanager.cpp	Tue May 11 22:57:03 2004
+--- src/device/k3bdevicemanager.cpp.orig	Tue Jun 22 21:50:55 2004
++++ src/device/k3bdevicemanager.cpp	Sun Jul 11 12:24:22 2004
 @@ -49,6 +49,12 @@
  #include <sys/stat.h>
  #include <sys/ioctl.h>
@@ -35,7 +35,7 @@
    scanFstab();
  
    return m_foundDevices;
-@@ -427,6 +441,7 @@
+@@ -421,6 +435,7 @@
  bool K3bCdDevice::DeviceManager::testForCdrom(const QString& devicename)
  {
    bool ret = false;
@@ -43,7 +43,7 @@
    int cdromfd = K3bCdDevice::openDevice( devicename.ascii() );
    if (cdromfd < 0) {
      kdDebug() << "could not open device " << devicename << " (" << strerror(errno) << ")" << endl;
-@@ -467,11 +482,36 @@
+@@ -461,11 +476,36 @@
    }
  
    ::close( cdromfd );
@@ -80,7 +80,7 @@
    K3bDevice* device = 0;
  
    // resolve all symlinks
-@@ -503,6 +543,7 @@
+@@ -497,6 +537,7 @@
      device->m_target = target;
      device->m_lun = lun;
    }
@@ -88,7 +88,7 @@
  
    if( !device->init() ) {
      kdDebug() << "Could not initialize device " << devicename << endl;
-@@ -578,9 +619,20 @@
+@@ -572,9 +613,20 @@
  
      if( K3bDevice* dev = findDevice( resolveSymLink(md) ) )
      {
@@ -109,7 +109,7 @@
          dev->setMountDevice( md );
  	dev->m_supermount = supermount;
        }
-@@ -589,6 +641,8 @@
+@@ -583,6 +635,8 @@
      {
        // compare bus, id, lun since the same device can for example be
        // determined as /dev/srX or /dev/scdX
@@ -118,7 +118,7 @@
        int bus = -1, id = -1, lun = -1;
        if( determineBusIdLun( mountInfo->fs_spec, bus, id, lun ) ) {
          if( K3bDevice* dev = findDevice( bus, id, lun ) ) {
-@@ -599,6 +653,17 @@
+@@ -593,6 +647,17 @@
            }
          }
        }
@@ -136,7 +136,7 @@
  
  
      }
-@@ -674,5 +739,131 @@
+@@ -668,5 +733,131 @@
    return QString::fromLatin1( resolved );
  }
  
diff --git a/sysutils/k3b/files/patch-src-device-k3bdevicemanager.h b/sysutils/k3b/files/patch-src-device-k3bdevicemanager.h
index eb08ec300f78..6311c213fc61 100644
--- a/sysutils/k3b/files/patch-src-device-k3bdevicemanager.h
+++ b/sysutils/k3b/files/patch-src-device-k3bdevicemanager.h
@@ -1,5 +1,5 @@
 --- src/device/k3bdevicemanager.h.orig	Wed Jan 21 11:20:11 2004
-+++ src/device/k3bdevicemanager.h	Tue May 11 22:57:03 2004
++++ src/device/k3bdevicemanager.h	Sun Jul 11 12:24:22 2004
 @@ -112,6 +112,10 @@
  
        class Private;
diff --git a/sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp b/sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp
index f4814b46bbff..58024d2def26 100644
--- a/sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp
+++ b/sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp
@@ -1,5 +1,5 @@
 --- src/device/k3bscsicommand.cpp.orig	Wed Jan 21 11:20:11 2004
-+++ src/device/k3bscsicommand.cpp	Mon May 24 23:32:04 2004
++++ src/device/k3bscsicommand.cpp	Sun Jul 11 12:24:22 2004
 @@ -58,13 +58,14 @@
  
  
diff --git a/sysutils/k3b/files/patch-src-device-k3bscsicommand.h b/sysutils/k3b/files/patch-src-device-k3bscsicommand.h
index e50cd874fde6..9850d9ef3405 100644
--- a/sysutils/k3b/files/patch-src-device-k3bscsicommand.h
+++ b/sysutils/k3b/files/patch-src-device-k3bscsicommand.h
@@ -1,5 +1,5 @@
 --- src/device/k3bscsicommand.h.orig	Wed Jan 21 11:20:11 2004
-+++ src/device/k3bscsicommand.h	Tue May 11 22:57:03 2004
++++ src/device/k3bscsicommand.h	Sun Jul 11 12:24:22 2004
 @@ -17,9 +17,27 @@
  #define _K3B_SCSI_COMMAND_H_
  
diff --git a/sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp b/sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp
index 3406f0b1f2e2..d2298efb8610 100644
--- a/sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp
+++ b/sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp
@@ -1,6 +1,6 @@
---- src/rip/k3bdvdrippingprocess.cpp.orig	Wed Jan 21 11:20:20 2004
-+++ src/rip/k3bdvdrippingprocess.cpp	Tue May 11 22:57:03 2004
-@@ -278,10 +278,13 @@
+--- src/rip/k3bdvdrippingprocess.cpp.orig	Wed Jun  2 11:31:41 2004
++++ src/rip/k3bdvdrippingprocess.cpp	Sun Jul 11 12:24:22 2004
+@@ -285,10 +285,13 @@
  void K3bDvdRippingProcess::slotPreProcessingDvd() {
      QString video;
      QDir video_ts( m_mountPoint + "/VIDEO_TS");
diff --git a/sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp b/sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp
index 214c1d362c8e..f2a6b73386cc 100644
--- a/sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp
+++ b/sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp
@@ -1,5 +1,5 @@
 --- src/rip/k3bmovieview.cpp.orig	Fri Feb  6 12:08:51 2004
-+++ src/rip/k3bmovieview.cpp	Tue May 11 22:57:03 2004
++++ src/rip/k3bmovieview.cpp	Sun Jul 11 12:24:22 2004
 @@ -223,8 +223,11 @@
      }
  
diff --git a/sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp b/sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp
index 3ea66527aaa7..ca78a939fd7d 100644
--- a/sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp
+++ b/sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp
@@ -1,5 +1,5 @@
 --- src/rip/k3btcwrapper.cpp.orig	Wed Jan 21 11:20:20 2004
-+++ src/rip/k3btcwrapper.cpp	Tue May 11 22:57:03 2004
++++ src/rip/k3btcwrapper.cpp	Sun Jul 11 12:24:22 2004
 @@ -65,7 +65,12 @@
    //K3bProcess *p = new K3bProcess();
    emit tcprobeTitleParsed( m_currentTitle );
diff --git a/sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp b/sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp
new file mode 100644
index 000000000000..d9c48dc0abf5
--- /dev/null
+++ b/sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp
@@ -0,0 +1,12 @@
+--- src/rip/k3bvideocdrip.cpp.orig	Sun Jul 11 15:13:42 2004
++++ src/rip/k3bvideocdrip.cpp	Sun Jul 11 15:14:07 2004
+@@ -41,7 +41,8 @@
+         m_ripsourceType( 0 ),
+         m_videooptions( options ),
+         m_canceled( false ),
+-        m_process( 0 )
++        m_process( 0 ),
++	m_subPosition( 0 )
+ {}
+ 
+ 
diff --git a/sysutils/k3b/pkg-message b/sysutils/k3b/pkg-message
index d28ebfa63e81..634f308ad372 100644
--- a/sysutils/k3b/pkg-message
+++ b/sysutils/k3b/pkg-message
@@ -3,10 +3,10 @@ Notes:
    drives, use them through the cam system. See Chapter 12.5.9 of the handbook
    (http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/creating-cds.html#ATAPICAM)
 2. Your CD and DVD drives must have a mount point in /etc/fstab. They have
-   to be accessed through their atapicam device. I.e. the drives
-   have to be adressed by e.g. /dev/cd0c instead of /dev/acd0c.
+   to be accessed through their atapicam device if possible. I.e. the drives
+   have to be adressed by e.g. /dev/cd0c instead of /dev/acd0c (/dev/cd0 on FreeBSD 5.x).
 3. k3b has to be started from a root console, which is not recommended.
-   Alternatively do all of the following:
+   Alternatively do ALL of the following:
 3a. set the suid flag on cdrecord and cdrdao. The 'Notes' the chapter of
     'man cdrecord' discusses this.
 3b. - For every user who should be able to use k3b and for every CD or DVD
@@ -16,6 +16,8 @@ Notes:
         /dev/cd0c  /usr/home/XXX/cdrom  cd9660  ro,noauto,nodev,nosuid  0  0
       Furthermore allow user mounts as described in topic 9.22 of the FAQ:
       http://www.freebsd.org/doc/en_US.ISO8859-1/books/faq/disks.html#USER-FLOPPYMOUNT
+      Note: If you are using FreeBSD 5.x you might want to edit your /etc/devfs.conf.
+      See http://sig9.com/archive/articles/HOWTO-mount-fs.html for details.
     - or just give mount and umount the suid flag, which is a security leak.
 3c. - Every user who should be able to use k3b must have read and write access
       to all pass through devices connected with CD and DVD drives and to the /dev/xpt0