Update k3b to 1.0

Changes since rc4:
bug fixes.
new themes.

5 files changed, 75 insertions, 32 deletions

diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index a28de13fa59..0ba22f53ef5 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/02/22 19:30:06 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/03/18 13:25:56 markd Exp $
 #
 
-DISTNAME=		k3b-1.0rc4
-PKGREVISION=		2
+DISTNAME=		k3b-1.0
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=k3b/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/k3b/PLIST b/sysutils/k3b/PLIST
index db13cbd13b7..c2af5624f5f 100644
--- a/sysutils/k3b/PLIST
+++ b/sysutils/k3b/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/01/26 04:34:53 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/03/18 13:25:56 markd Exp $
 bin/k3b
 bin/k3bsetup
 include/k3b_export.h
@@ -153,7 +153,6 @@ share/doc/kde/HTML/en/k3b/index.cache.bz2
 share/doc/kde/HTML/en/k3b/index.docbook
 share/doc/kde/HTML/en/k3b/select_audiofiles.png
 share/doc/kde/HTML/en/k3b/select_project.png
-share/doc/kde/HTML/en/k3b/video-encoding.docbook
 share/icons/hicolor/128x128/apps/k3b.png
 share/icons/hicolor/16x16/apps/k3b.png
 share/icons/hicolor/22x22/apps/k3b.png
@@ -278,6 +277,24 @@ share/kde/apps/k3b/pics/73lab/project_left.png
 share/kde/apps/k3b/pics/73lab/project_right.png
 share/kde/apps/k3b/pics/73lab/splash.png
 share/kde/apps/k3b/pics/73lab/welcome_bg.png
+share/kde/apps/k3b/pics/RobsTheme/dialog_left.png
+share/kde/apps/k3b/pics/RobsTheme/dialog_right.png
+share/kde/apps/k3b/pics/RobsTheme/k3b.theme
+share/kde/apps/k3b/pics/RobsTheme/media_audio.png
+share/kde/apps/k3b/pics/RobsTheme/media_data.png
+share/kde/apps/k3b/pics/RobsTheme/media_empty.png
+share/kde/apps/k3b/pics/RobsTheme/media_left.png
+share/kde/apps/k3b/pics/RobsTheme/media_mixed.png
+share/kde/apps/k3b/pics/RobsTheme/media_none.png
+share/kde/apps/k3b/pics/RobsTheme/media_video.png
+share/kde/apps/k3b/pics/RobsTheme/progress_fail.png
+share/kde/apps/k3b/pics/RobsTheme/progress_right.png
+share/kde/apps/k3b/pics/RobsTheme/progress_success.png
+share/kde/apps/k3b/pics/RobsTheme/progress_working.png
+share/kde/apps/k3b/pics/RobsTheme/project_left.png
+share/kde/apps/k3b/pics/RobsTheme/project_right.png
+share/kde/apps/k3b/pics/RobsTheme/splash.png
+share/kde/apps/k3b/pics/RobsTheme/welcome_bg.png
 share/kde/apps/k3b/pics/crystal/dialog_left.png
 share/kde/apps/k3b/pics/crystal/dialog_right.png
 share/kde/apps/k3b/pics/crystal/k3b.theme
@@ -297,6 +314,24 @@ share/kde/apps/k3b/pics/crystal/project_left.png
 share/kde/apps/k3b/pics/crystal/project_right.png
 share/kde/apps/k3b/pics/crystal/splash.png
 share/kde/apps/k3b/pics/crystal/welcome_bg.png
+share/kde/apps/k3b/pics/quant/dialog_left.png
+share/kde/apps/k3b/pics/quant/dialog_right.png
+share/kde/apps/k3b/pics/quant/k3b.theme
+share/kde/apps/k3b/pics/quant/media_audio.png
+share/kde/apps/k3b/pics/quant/media_data.png
+share/kde/apps/k3b/pics/quant/media_empty.png
+share/kde/apps/k3b/pics/quant/media_left.png
+share/kde/apps/k3b/pics/quant/media_mixed.png
+share/kde/apps/k3b/pics/quant/media_none.png
+share/kde/apps/k3b/pics/quant/media_video.png
+share/kde/apps/k3b/pics/quant/progress_fail.png
+share/kde/apps/k3b/pics/quant/progress_right.png
+share/kde/apps/k3b/pics/quant/progress_success.png
+share/kde/apps/k3b/pics/quant/progress_working.png
+share/kde/apps/k3b/pics/quant/project_left.png
+share/kde/apps/k3b/pics/quant/project_right.png
+share/kde/apps/k3b/pics/quant/splash.png
+share/kde/apps/k3b/pics/quant/welcome_bg.png
 share/kde/apps/k3b/plugins/k3bartsoutputplugin.plugin
 share/kde/apps/k3b/plugins/k3baudiometainforenamerplugin.plugin
 share/kde/apps/k3b/plugins/k3baudioprojectcddbplugin.plugin
@@ -328,11 +363,15 @@ share/kde/sounds/k3b_error1.wav
 share/kde/sounds/k3b_success1.wav
 share/kde/sounds/k3b_wait_media1.wav
 @comment in kde: @dirrm share/kde/sounds
+@comment in kde: @dirrm share/kde/services
 @comment in kde: @dirrm share/kde/mimelnk/application
 @comment in kde: @dirrm share/kde/apps/konqueror/servicemenus
+@comment in kde: @dirrm share/kde/apps/konqsidebartng/virtual_folders/services
 @dirrm share/kde/apps/k3b/servicemenus
 @dirrm share/kde/apps/k3b/plugins
+@dirrm share/kde/apps/k3b/pics/quant
 @dirrm share/kde/apps/k3b/pics/crystal
+@dirrm share/kde/apps/k3b/pics/RobsTheme
 @dirrm share/kde/apps/k3b/pics/73lab
 @dirrm share/kde/apps/k3b/pics
 @dirrm share/kde/apps/k3b/icons/hicolor/scalable/actions
@@ -365,6 +404,7 @@ share/kde/sounds/k3b_wait_media1.wav
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/doc/kde/HTML/en/k3b
 @comment in kde: @dirrm share/doc/kde/HTML/en
 @comment in kde: @dirrm share/applications/kde
diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo
index b3373834342..4105eefca40 100644
--- a/sysutils/k3b/distinfo
+++ b/sysutils/k3b/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2007/01/16 22:38:08 joerg Exp $
+$NetBSD: distinfo,v 1.11 2007/03/18 13:25:56 markd Exp $
 
-SHA1 (k3b-1.0rc4.tar.bz2) = 5b42ef4a74aa04cb9aef220d65c4f26f64afdb8f
-RMD160 (k3b-1.0rc4.tar.bz2) = d9e8253257a0a9c6213ce4fab3366ed2c71b2c76
-Size (k3b-1.0rc4.tar.bz2) = 3828519 bytes
-SHA1 (patch-aa) = 2d6bcf8ee4eeaf7802cf5278bb69db8336c26a62
-SHA1 (patch-ab) = f1d082c09351d687de9aaa621a801469fa383fff
+SHA1 (k3b-1.0.tar.bz2) = b6879517825c336df36f65b212a871ef77762981
+RMD160 (k3b-1.0.tar.bz2) = 27c2cf0a96a037f0807a7b4f6ae393c1c68a2442
+Size (k3b-1.0.tar.bz2) = 5102225 bytes
+SHA1 (patch-aa) = 79d0833335f7cc0600685ed996779a600b6bc2a7
+SHA1 (patch-ab) = 4f382751e9a7ade09aad6f8d594e76f9e5bfa5d5
 SHA1 (patch-ac) = 38902921193ff0219c1769ffa3b793de6f3f4c0c
diff --git a/sysutils/k3b/patches/patch-aa b/sysutils/k3b/patches/patch-aa
index d3de4291d7c..d373cf60209 100644
--- a/sysutils/k3b/patches/patch-aa
+++ b/sysutils/k3b/patches/patch-aa
@@ -1,18 +1,22 @@
-$NetBSD: patch-aa,v 1.5 2007/01/14 09:33:58 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2007/03/18 13:25:56 markd Exp $
 
---- libk3b/tools/k3bfilesysteminfo.cpp.orig	2007-01-09 13:49:54.000000000 +0000
-+++ libk3b/tools/k3bfilesysteminfo.cpp
-@@ -31,6 +31,13 @@
- #endif
- #ifdef HAVE_SYS_STATVFS_H
- #  include <sys/statvfs.h>
-+#  if defined(Q_OS_NETBSD)
-+#    include <sys/param.h>
-+#    if __NetBSD_Version__ > 299000000
-+#      define statfs		statvfs
-+#      define f_type		f_fsid
-+#    endif
-+#  endif
- #endif
- #ifdef HAVE_SYS_VFS_H
- #  include <sys/vfs.h>
+--- libk3bdevice/k3bdevice.cpp.orig	2007-03-17 08:03:46.000000000 +1300
++++ libk3bdevice/k3bdevice.cpp
+@@ -1546,7 +1546,7 @@ bool K3bDevice::Device::eject() const
+       close();
+   }
+   return success;
+-#elifdef Q_OS_LINUX
++#elif Q_OS_LINUX
+   bool success = false;
+   bool needToClose = !isOpen();
+ 
+@@ -1588,7 +1588,7 @@ bool K3bDevice::Device::load() const
+       close();
+   }
+   return success;
+-#elifdef Q_OS_LINUX
++#elif Q_OS_LINUX
+   bool success = false;
+   bool needToClose = !isOpen();
+ 
diff --git a/sysutils/k3b/patches/patch-ab b/sysutils/k3b/patches/patch-ab
index 67cbe5e78f1..d1964374bb9 100644
--- a/sysutils/k3b/patches/patch-ab
+++ b/sysutils/k3b/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.5 2007/01/16 22:38:08 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2007/03/18 13:25:56 markd Exp $
 
---- src/projects/k3bencodingconverter.cpp.orig	2007-01-09 13:36:36.000000000 +0000
+--- src/projects/k3bencodingconverter.cpp.orig	2007-03-17 08:04:05.000000000 +1300
 +++ src/projects/k3bencodingconverter.cpp
 @@ -62,7 +62,7 @@ bool K3bEncodingConverter::encodedLocall
  {
  #ifdef HAVE_ICONV_H
    QCString utf8Encoded( s.length()*2 );
--#ifdef Q_OS_FREEBSD
+-#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
 +#if (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && !defined(__DragonFly__)
    const char* in = s.data();
  #else
@@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.5 2007/01/16 22:38:08 joerg Exp $
    iconv_t ic = ::iconv_open( to.local8Bit(), from.local8Bit() );
  
    result.resize( s.length() * 2 );
--#ifdef Q_OS_FREEBSD
+-#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
 +#if (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && !defined(__DragonFly__)
    const char* in = s.data();
  #else