summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd>2007-05-23 12:38:23 +0000
committermarkd <markd>2007-05-23 12:38:23 +0000
commitc3171fd2ffb2a58f822f00ad271e410934de1e81 (patch)
tree88a50d256380afaffcda1a8bc75575c8621e71ea
parent28b925c7166da70c1880514a680381f27919ee7d (diff)
downloadpkgsrc-c3171fd2ffb2a58f822f00ad271e410934de1e81.tar.gz
Fix SEGV on startup. Bump PKGREVISION.
-rw-r--r--sysutils/k3b/Makefile3
-rw-r--r--sysutils/k3b/distinfo3
-rw-r--r--sysutils/k3b/patches/patch-ad20
3 files changed, 24 insertions, 2 deletions
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 4dde71b61c6..db699ebdfab 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2007/05/05 21:36:07 markd Exp $
+# $NetBSD: Makefile,v 1.20 2007/05/23 12:38:23 markd Exp $
#
DISTNAME= k3b-1.0.1
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=k3b/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo
index 24506d29994..3096268ac6e 100644
--- a/sysutils/k3b/distinfo
+++ b/sysutils/k3b/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.12 2007/05/05 21:36:07 markd Exp $
+$NetBSD: distinfo,v 1.13 2007/05/23 12:38:23 markd Exp $
SHA1 (k3b-1.0.1.tar.bz2) = 5473aeaf974ba058d2f9124b0314b64838d0e2bd
RMD160 (k3b-1.0.1.tar.bz2) = e4eeab9bec1a2ac222ed91fd6688a3c272ec7670
Size (k3b-1.0.1.tar.bz2) = 5097997 bytes
SHA1 (patch-ab) = 4f382751e9a7ade09aad6f8d594e76f9e5bfa5d5
SHA1 (patch-ac) = 38902921193ff0219c1769ffa3b793de6f3f4c0c
+SHA1 (patch-ad) = ec7e75ff39bf7ea7aeddcd44c77a14b8aeca2892
diff --git a/sysutils/k3b/patches/patch-ad b/sysutils/k3b/patches/patch-ad
new file mode 100644
index 00000000000..16ecbe3abc5
--- /dev/null
+++ b/sysutils/k3b/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.3 2007/05/23 12:38:23 markd Exp $
+
+--- libk3bdevice/k3bscsicommand_netbsd.cpp.orig 2007-05-22 12:15:54.000000000 +1200
++++ libk3bdevice/k3bscsicommand_netbsd.cpp
+@@ -83,9 +83,13 @@ int K3bDevice::ScsiCommand::transport( T
+ break;
+ }
+
+- m_device->usageLock();
++ if ( m_device ) {
++ m_device->usageLock();
++ }
+ int i = ::ioctl( m_deviceHandle, SCIOCCOMMAND, &d->cmd );
+- m_device->usageUnlock();
++ if ( m_device ) {
++ m_device->usageUnlock();
++ }
+
+ if( needToClose )
+ m_device->close();