[pkgsrc/trunk]: pkgsrc/sysutils/k3b Recent cdrecord's insist that the atapi c...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/36ee5696da53
branches:  trunk
changeset: 568408:36ee5696da53
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Dec 12 19:39:24 2009 +0000

description:
Recent cdrecord's insist that the atapi cd drive be referenced as 31,0,0.
Fix k3b to actually do that (rather than 15,0,0).

diffstat:

 sysutils/k3b/Makefile         |   4 ++--
 sysutils/k3b/distinfo         |   4 ++--
 sysutils/k3b/patches/patch-ad |  13 +++++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 0115237a9ad2 -r 36ee5696da53 sysutils/k3b/Makefile
--- a/sysutils/k3b/Makefile     Sat Dec 12 19:34:46 2009 +0000
+++ b/sysutils/k3b/Makefile     Sat Dec 12 19:39:24 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2009/08/26 19:58:19 sno Exp $
+# $NetBSD: Makefile,v 1.30 2009/12/12 19:39:24 markd Exp $
 #
 
 DISTNAME=              k3b-1.0.5
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=k3b/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 0115237a9ad2 -r 36ee5696da53 sysutils/k3b/distinfo
--- a/sysutils/k3b/distinfo     Sat Dec 12 19:34:46 2009 +0000
+++ b/sysutils/k3b/distinfo     Sat Dec 12 19:39:24 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2008/10/15 07:44:57 markd Exp $
+$NetBSD: distinfo,v 1.17 2009/12/12 19:39:24 markd Exp $
 
 SHA1 (k3b-1.0.5.tar.bz2) = c45d6f2a36b1bc7ea14101d444149c40fd4b700e
 RMD160 (k3b-1.0.5.tar.bz2) = b562746015cc2e4226652402725b4e69eb846822
 Size (k3b-1.0.5.tar.bz2) = 5113060 bytes
 SHA1 (patch-ab) = 4f382751e9a7ade09aad6f8d594e76f9e5bfa5d5
 SHA1 (patch-ac) = 38902921193ff0219c1769ffa3b793de6f3f4c0c
-SHA1 (patch-ad) = 3b288a809a043657cb6677c2bb1d60c78e82f9f1
+SHA1 (patch-ad) = 895ec31a9a05f0168daba78bcb3ff8969f98637b
 SHA1 (patch-ae) = d5fb26c88710b9cdf14e19aa530f60e429b47941
diff -r 0115237a9ad2 -r 36ee5696da53 sysutils/k3b/patches/patch-ad
--- a/sysutils/k3b/patches/patch-ad     Sat Dec 12 19:34:46 2009 +0000
+++ b/sysutils/k3b/patches/patch-ad     Sat Dec 12 19:39:24 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.5 2007/08/04 23:21:11 markd Exp $
+$NetBSD: patch-ad,v 1.6 2009/12/12 19:39:24 markd Exp $
 
---- libk3bdevice/k3bdevicemanager.cpp.orig     2007-07-22 07:53:25.000000000 +1200
+--- libk3bdevice/k3bdevicemanager.cpp.orig     2008-05-27 20:23:39.000000000 +1200
 +++ libk3bdevice/k3bdevicemanager.cpp
 @@ -99,6 +99,7 @@ typedef unsigned char u8;
  
@@ -27,3 +27,12 @@
  #endif
  
    char devicename[11]; // /dev/rcdXd + trailing zero
+@@ -831,7 +828,7 @@ bool K3bDevice::DeviceManager::determine
+     // XXX Re-map atapibus, so it doesn't conflict with "real" scsi
+     // busses
+ 
+-    bus = 15;
++    bus = 31;
+     id  = my_addr.addr.atapi.drive + 2 * my_addr.addr.atapi.atbus;
+     lun = 0;
+   }