Forward declaration must not be qualified with a namespace. Adjust.

44 files changed, 435 insertions, 14 deletions

diff --git a/audio/bmpx/distinfo b/audio/bmpx/distinfo
index b2e77b5ee64..baecb86e3d8 100644
--- a/audio/bmpx/distinfo
+++ b/audio/bmpx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2012/11/16 20:05:35 joerg Exp $
+$NetBSD: distinfo,v 1.18 2013/03/28 21:43:05 joerg Exp $
 
 SHA1 (bmpx-0.40.14.tar.bz2) = 3284843c45cab302f414663a5cb31eb4373d07c7
 RMD160 (bmpx-0.40.14.tar.bz2) = 12a9939d53b58a43ee9deefa43188ac6b33dae72
@@ -29,6 +29,7 @@ SHA1 (patch-src_logger_hh) = 7ec25dc4d7b51d60e5390aef7b54d34efb66927e
 SHA1 (patch-src_playbacksource_cc) = 5dd3d47b8a0306c344bace766f60d23b9bcdc6d0
 SHA1 (patch-src_playbacksource_hh) = a79da6855f3d581aea66c5713f76a45ca014b50e
 SHA1 (patch-src_sanity_h) = 82acd300b2c0ad7eaf7f9a63bb0df19d4e71dd2c
+SHA1 (patch-src_shell.cc) = f428d07ddbadf33fd9666b4b8e1bf757cb21a5aa
 SHA1 (patch-src_shell_hh) = b799ea9358b182ccc40c9c104be8fd6548b4c9dc
 SHA1 (patch-src_ui-part-cdda.hh) = 748a43c39ca720009af14affac6eb0b3b658e041
 SHA1 (patch-src_ui-part-podcasts_hh) = 0b73330a4ae7e3bd7d3b6d84817482916ee291ea
diff --git a/audio/bmpx/patches/patch-src_shell.cc b/audio/bmpx/patches/patch-src_shell.cc
new file mode 100644
index 00000000000..d3fa0c77293
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_shell.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_shell.cc,v 1.1 2013/03/28 21:43:05 joerg Exp $
+
+--- src/shell.cc.orig	2013-03-28 12:01:36.000000000 +0000
++++ src/shell.cc
+@@ -1288,7 +1288,6 @@ namespace Bmp
+     static guint mpris_player_signals[LAST_SIGNAL] = { 0 };
+   }
+ 
+-  class PlayerShell::Player;
+   struct PlayerClass
+   {
+     GObjectClass parent;
diff --git a/editors/kile-kde3/distinfo b/editors/kile-kde3/distinfo
index 0e7044d340e..e41a3621ece 100644
--- a/editors/kile-kde3/distinfo
+++ b/editors/kile-kde3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/03/21 22:55:07 markd Exp $
+$NetBSD: distinfo,v 1.2 2013/03/28 21:43:05 joerg Exp $
 
 SHA1 (kile-2.0.2.tar.bz2) = 6666470d41beff4a26b3e85a161da276ebc30d76
 RMD160 (kile-2.0.2.tar.bz2) = 736107cc5a676df91e2b9f8f158ca58ec4697237
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = b8705f330e7601e2af6ee7db2e8c3cc7aac9f175
 SHA1 (patch-ac) = 15f9ff76688923eadae8844cc31845bdfc75be8e
 SHA1 (patch-ad) = 33225c1a7284ba654d8ba23ae5029ce8f4a39181
 SHA1 (patch-ae) = 18f982fe814cc747f8a8c0633ed191fcc19d4bb7
+SHA1 (patch-src_kile_kileprojectview.h) = 283fe984714c1edd577bada134a211ea03a0ca3a
diff --git a/editors/kile-kde3/patches/patch-src_kile_kileprojectview.h b/editors/kile-kde3/patches/patch-src_kile_kileprojectview.h
new file mode 100644
index 00000000000..1c575a3ace3
--- /dev/null
+++ b/editors/kile-kde3/patches/patch-src_kile_kileprojectview.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_kile_kileprojectview.h,v 1.1 2013/03/28 21:43:06 joerg Exp $
+
+--- src/kile/kileprojectview.h.orig	2013-03-28 13:28:50.000000000 +0000
++++ src/kile/kileprojectview.h
+@@ -25,7 +25,6 @@
+ class KURL;
+ class KPopupMenu;
+ class KToggleAction;
+-class KileDocument::Info;
+ class KileInfo;
+ 
+ namespace KileType {enum ProjectView { Project=0, ProjectItem, ProjectExtra, File, Folder};}
diff --git a/graphics/cinepaint/distinfo b/graphics/cinepaint/distinfo
index 171dd0c680a..e4c1528f25a 100644
--- a/graphics/cinepaint/distinfo
+++ b/graphics/cinepaint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2012/08/12 22:04:47 wiz Exp $
+$NetBSD: distinfo,v 1.18 2013/03/28 21:43:06 joerg Exp $
 
 SHA1 (cinepaint-0.22-1.tar.gz) = 717580b9b8b1044d76f1f0e4330e1c8104e2a206
 RMD160 (cinepaint-0.22-1.tar.gz) = 1f8e06486ed5e74ad483abec305d4fcef0538572
@@ -15,6 +15,7 @@ SHA1 (patch-app_gradient.c) = 9b6d38f1d3a5c417b3f69f4107637ec1ec33da0c
 SHA1 (patch-app_layers__dialog.c) = a9c4459edc83bd7e3faf1c90d9f4cff5d5e69a19
 SHA1 (patch-plug-ins_bracketing__to__hdr_br__core_ResponseSolver.hpp) = e5e457d8f8ceb0ae3b4b965cbc740969b4ed81d4
 SHA1 (patch-plug-ins_bracketing__to__hdr_br__core_br__Image.cpp) = a369c351d8bb05e79afa6c19592fbc148143d985
+SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__examin.h) = eb4dba58efd6ff19c5eae770361b49fdacd4b375
 SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__oyranos.h) = a5a72d106b655f79932b0d2d032136a32acbeafb
 SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__oyranos__extern.cpp) = 2e733a0c557236a735b97a7174795965b4bd4e0c
 SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__speicher.h) = 1eef5be81fe36c2eb9ecf50606ecb294644e15f4
diff --git a/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__examin.h b/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__examin.h
new file mode 100644
index 00000000000..96a610608f9
--- /dev/null
+++ b/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__examin.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-plug-ins_icc__examin_icc__examin_icc__examin.h,v 1.1 2013/03/28 21:43:06 joerg Exp $
+
+--- plug-ins/icc_examin/icc_examin/icc_examin.h.orig	2013-03-28 13:10:09.000000000 +0000
++++ plug-ins/icc_examin/icc_examin/icc_examin.h
+@@ -47,7 +47,6 @@ class  ICCwaehler;
+ class  ICCexamin;
+ extern ICCexamin *icc_examin;
+ class  ICCexaminIO;
+-class  icc_examin_ns::EinModell;
+ 
+ namespace icc_examin_ns {
+     enum IccGamutFormat {
diff --git a/graphics/digikam-kde3/distinfo b/graphics/digikam-kde3/distinfo
index bfa37e08f26..7650d87e359 100644
--- a/graphics/digikam-kde3/distinfo
+++ b/graphics/digikam-kde3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2012/07/03 18:08:58 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/03/28 21:43:06 joerg Exp $
 
 SHA1 (digikam-0.9.6.tar.bz2) = e63148a13c40e87957eeb8b17dc8047dffa2a1a5
 RMD160 (digikam-0.9.6.tar.bz2) = 3abc8d6d7dc4a95473b00eacc8800c044b110215
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = 8f19dd6698647434bb20f222ef25024473a7ff2d
 SHA1 (patch-af) = d34710baea502e96cd8254164157ef68a4ef276f
 SHA1 (patch-ag) = 3dc532aa36451f7df8d10aa35149db767b295d8c
 SHA1 (patch-digikam_digikam_albummanager.cpp) = 49df2695fd8aae3b13257efaf07af96adac6a638
+SHA1 (patch-digikam_digikam_albumwidgetstack.h) = ee709372079cedbe0cb020caaf8aa1631376ec9d
diff --git a/graphics/digikam-kde3/patches/patch-digikam_digikam_albumwidgetstack.h b/graphics/digikam-kde3/patches/patch-digikam_digikam_albumwidgetstack.h
new file mode 100644
index 00000000000..0edf86bf9dd
--- /dev/null
+++ b/graphics/digikam-kde3/patches/patch-digikam_digikam_albumwidgetstack.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-digikam_digikam_albumwidgetstack.h,v 1.1 2013/03/28 21:43:06 joerg Exp $
+
+--- digikam/digikam/albumwidgetstack.h.orig	2013-03-28 12:25:46.000000000 +0000
++++ digikam/digikam/albumwidgetstack.h
+@@ -35,8 +35,6 @@
+ 
+ #include "digikam_export.h"
+ 
+-class KURL::List;
+-
+ namespace Digikam
+ {
+ 
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 5f050974ed0..51671a41f20 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2012/12/30 10:31:14 adam Exp $
+$NetBSD: distinfo,v 1.46 2013/03/28 21:43:07 joerg Exp $
 
 SHA1 (inkscape-0.48.4.tar.bz2) = 5f26f6ad191d1e7c2a9fb69a438722beb172224c
 RMD160 (inkscape-0.48.4.tar.bz2) = b089ced7694a9803fac8588d93e7e6239c71d3e8
@@ -23,6 +23,7 @@ SHA1 (patch-src_dom_io_domstream.cpp) = 6b525b8e730e4497afdf1da0ae27f0dc69bfad40
 SHA1 (patch-src_dom_io_domstream.h) = 9325fc9d211eb3349628a736283ed0c475399a8b
 SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 02742a022a8a55852d7f0a39969153bf7f24f17e
 SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = 9e9e76049b9fdcc5192e225b4b477a104902894b
+SHA1 (patch-src_libvpsc_csolve__VPSC.h) = 33aa27678fa9e802af6ab95b9ea28b69d822c4cb
 SHA1 (patch-src_ui_dialog_inkscape-preferences.cpp) = f95af6d326ddf7512b67f68efe0b23bc3ebe651e
 SHA1 (patch-src_ui_widget_registered-widget.h) = a5c16bcd28a015959121ed8b92423762f182a71b
 SHA1 (patch-src_widgets_desktop-widget.h) = 6528b3105590bfa8b5d33d428aa8c9cbc3561225
diff --git a/graphics/inkscape/patches/patch-src_libvpsc_csolve__VPSC.h b/graphics/inkscape/patches/patch-src_libvpsc_csolve__VPSC.h
new file mode 100644
index 00000000000..44f430cd6cf
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_libvpsc_csolve__VPSC.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libvpsc_csolve__VPSC.h,v 1.1 2013/03/28 21:43:07 joerg Exp $
+
+--- src/libvpsc/csolve_VPSC.h.orig	2013-03-27 22:12:45.000000000 +0000
++++ src/libvpsc/csolve_VPSC.h
+@@ -11,10 +11,6 @@
+ #ifndef _CSOLVE_VPSC_H_
+ #define _CSOLVE_VPSC_H_
+ #ifdef __cplusplus
+-class vpsc::Variable;
+-class vpsc::Constraint;
+-class vpsc::Solver;
+-class vpsc::IncSolver;
+ using namespace vpsc;
+ extern "C" {
+ #else
diff --git a/graphics/kipi-plugins-kde3/distinfo b/graphics/kipi-plugins-kde3/distinfo
index 4f607b3a38a..47d13c23a46 100644
--- a/graphics/kipi-plugins-kde3/distinfo
+++ b/graphics/kipi-plugins-kde3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2013/02/26 11:12:53 joerg Exp $
+$NetBSD: distinfo,v 1.7 2013/03/28 21:43:07 joerg Exp $
 
 SHA1 (kipi-plugins-0.1.7.tar.bz2) = 520b6b9d36a8c5b8893c3a6b5a1a14f6b9cbd216
 RMD160 (kipi-plugins-0.1.7.tar.bz2) = f66473c11e66f9e06aa6772c7952b640b565def9
@@ -8,7 +8,11 @@ SHA1 (patch-ab) = 777834238d49c0b02c7e1d5c63dbdf0d27f13e24
 SHA1 (patch-ac) = 0022166061696e3db820c97be64e2780a63e8b4c
 SHA1 (patch-ad) = b33efd502e1bd305242debe0e9837903ab34021f
 SHA1 (patch-ae) = 6e12d87f6169d3ba1687eaa202c2edb1ac5ec7a4
+SHA1 (patch-kipi-plugins_batchprocessimages_plugin__batchprocessimages.h) = 699e11538538ae06232ecdd495cce0ce59240dd1
 SHA1 (patch-kipi-plugins_flickrexport_imageslist.cpp) = 43b3a56f1b686253e94eab921670447822c1695b
 SHA1 (patch-kipi-plugins_imageviewer_viewerwidget.cpp) = 173a70306d89fec21e27bb3cf6a14198b4eeffca
+SHA1 (patch-kipi-plugins_mpegencoder_kimg2mpg.h) = 8a594ee6610e2cb3726dd4179505c0450c1443ef
 SHA1 (patch-kipi-plugins_printwizard_cropframe.cpp) = 308813ad515ef0f9e9d7f863c456dd968ca78d39
 SHA1 (patch-kipi-plugins_rawconverter_rawdecodingiface.cpp) = 2105ef9bee4f4c64f1205ff40431fec2ef1517a5
+SHA1 (patch-kipi-plugins_sendimages_listimageserrordialog.h) = 0763f257034d7aa7f59129743b5a1b98cefae529
+SHA1 (patch-kipi-plugins_sendimages_plugin__sendimages.h) = 1340bc3e8d9c6972ae622bcb9592b5d3aaecec74
diff --git a/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_batchprocessimages_plugin__batchprocessimages.h b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_batchprocessimages_plugin__batchprocessimages.h
new file mode 100644
index 00000000000..a530cf81f23
--- /dev/null
+++ b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_batchprocessimages_plugin__batchprocessimages.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-kipi-plugins_batchprocessimages_plugin__batchprocessimages.h,v 1.1 2013/03/28 21:43:07 joerg Exp $
+
+--- kipi-plugins/batchprocessimages/plugin_batchprocessimages.h.orig	2013-03-27 16:29:57.000000000 +0000
++++ kipi-plugins/batchprocessimages/plugin_batchprocessimages.h
+@@ -33,15 +33,6 @@
+ 
+ class KAction;
+ 
+-class KIPIBatchProcessImagesPlugin::BorderImagesDialog;
+-class KIPIBatchProcessImagesPlugin::ColorImagesDialog;
+-class KIPIBatchProcessImagesPlugin::ConvertImagesDialog;
+-class KIPIBatchProcessImagesPlugin::EffectImagesDialog;
+-class KIPIBatchProcessImagesPlugin::FilterImagesDialog;
+-class KIPIBatchProcessImagesPlugin::RenameImagesDialog;
+-class KIPIBatchProcessImagesPlugin::RecompressImagesDialog;
+-class KIPIBatchProcessImagesPlugin::ResizeImagesDialog;
+-
+ class Plugin_BatchProcessImages : public KIPI::Plugin
+ {
+ Q_OBJECT
diff --git a/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_mpegencoder_kimg2mpg.h b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_mpegencoder_kimg2mpg.h
new file mode 100644
index 00000000000..078de84731c
--- /dev/null
+++ b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_mpegencoder_kimg2mpg.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-kipi-plugins_mpegencoder_kimg2mpg.h,v 1.1 2013/03/28 21:43:08 joerg Exp $
+
+--- kipi-plugins/mpegencoder/kimg2mpg.h.orig	2013-03-27 16:36:59.000000000 +0000
++++ kipi-plugins/mpegencoder/kimg2mpg.h
+@@ -66,7 +66,6 @@ class KColorButton;
+ class KListBox;
+ class KButtonBox;
+ class KProgress;
+-class KURL::List;
+ 
+ namespace KIPIMPEGEncoderPlugin
+ {
diff --git a/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_sendimages_listimageserrordialog.h b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_sendimages_listimageserrordialog.h
new file mode 100644
index 00000000000..d3c6b7c3a2f
--- /dev/null
+++ b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_sendimages_listimageserrordialog.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-kipi-plugins_sendimages_listimageserrordialog.h,v 1.1 2013/03/28 21:43:08 joerg Exp $
+
+--- kipi-plugins/sendimages/listimageserrordialog.h.orig	2013-03-27 16:40:27.000000000 +0000
++++ kipi-plugins/sendimages/listimageserrordialog.h
+@@ -28,7 +28,6 @@
+ #include <kdialogbase.h>
+ 
+ class KListView;
+-class KURL::List;
+ 
+ namespace KIPISendimagesPlugin
+ {
diff --git a/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_sendimages_plugin__sendimages.h b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_sendimages_plugin__sendimages.h
new file mode 100644
index 00000000000..aa8e03657ec
--- /dev/null
+++ b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_sendimages_plugin__sendimages.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-kipi-plugins_sendimages_plugin__sendimages.h,v 1.1 2013/03/28 21:43:08 joerg Exp $
+
+--- kipi-plugins/sendimages/plugin_sendimages.h.orig	2013-03-27 16:41:39.000000000 +0000
++++ kipi-plugins/sendimages/plugin_sendimages.h
+@@ -30,7 +30,6 @@
+ class QCustomEvent;
+ 
+ class KAction;
+-class KIPISendimagesPlugin::SendImages;
+ 
+ namespace KIPI
+ {
diff --git a/graphics/showimg/distinfo b/graphics/showimg/distinfo
index c4ce84048f9..52df4d768d2 100644
--- a/graphics/showimg/distinfo
+++ b/graphics/showimg/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.5 2011/01/29 22:00:59 markd Exp $
+$NetBSD: distinfo,v 1.6 2013/03/28 21:43:08 joerg Exp $
 
 SHA1 (showimg-0.9.5.tar.bz2) = 59d3a1f1a22761e0576d98e6cc6f430cc3822643
 RMD160 (showimg-0.9.5.tar.bz2) = 150dc74f400b72a22f6a117aa3acd8201a059a39
 Size (showimg-0.9.5.tar.bz2) = 4117897 bytes
 SHA1 (patch-aa) = 90d10f0989e66c29e8a9bae4ee51527818bc0cb1
 SHA1 (patch-ab) = 0d90531ac8edc44cff1d6533548f5d564e2e373f
+SHA1 (patch-showimg_showimg_listitemview.h) = 50b54d099ce66fc25ef76311df30d5e97fe8a7cf
+SHA1 (patch-showimg_showimg_mainwindow.h) = a8f2e37f1e3d6c2455f5417a0ab4b70bac669c2f
diff --git a/graphics/showimg/patches/patch-showimg_showimg_listitemview.h b/graphics/showimg/patches/patch-showimg_showimg_listitemview.h
new file mode 100644
index 00000000000..643c31a9c93
--- /dev/null
+++ b/graphics/showimg/patches/patch-showimg_showimg_listitemview.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-showimg_showimg_listitemview.h,v 1.1 2013/03/28 21:43:08 joerg Exp $
+
+--- showimg/showimg/listitemview.h.orig	2013-03-28 12:11:17.000000000 +0000
++++ showimg/showimg/listitemview.h
+@@ -38,7 +38,6 @@ class KAction;
+ class KDirWatch;
+ class KListView;
+ class KPopupMenu;
+-class KIO::Job;
+ 
+ class QDragEnterEvent;
+ class QDropEvent;
diff --git a/graphics/showimg/patches/patch-showimg_showimg_mainwindow.h b/graphics/showimg/patches/patch-showimg_showimg_mainwindow.h
new file mode 100644
index 00000000000..f54acb8bd47
--- /dev/null
+++ b/graphics/showimg/patches/patch-showimg_showimg_mainwindow.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-showimg_showimg_mainwindow.h,v 1.1 2013/03/28 21:43:08 joerg Exp $
+
+--- showimg/showimg/mainwindow.h.orig	2013-03-28 12:13:26.000000000 +0000
++++ showimg/showimg/mainwindow.h
+@@ -113,7 +113,6 @@ class KHistoryCombo;
+ class KSqueezedTextLabel;
+ class KMdiChildView;
+ class KMdiToolViewAccessor;
+-class KParts::ReadOnlyPart;
+ 
+ class SHOWIMGCORE_EXPORT MainWindow : public KParts::DockMainWindow, public KBookmarkOwner
+ {
diff --git a/misc/basket/distinfo b/misc/basket/distinfo
index 091c6c9521d..0706472efc4 100644
--- a/misc/basket/distinfo
+++ b/misc/basket/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2011/11/25 22:07:34 joerg Exp $
+$NetBSD: distinfo,v 1.4 2013/03/28 21:43:09 joerg Exp $
 
 SHA1 (basket-1.0.2.tar.gz) = 8f227c45d84e3739750d39b32700b3329b8c3c84
 RMD160 (basket-1.0.2.tar.gz) = 02e5a9bea054f0dc2aaa5c7f916a106dc970a1fd
@@ -6,3 +6,4 @@ Size (basket-1.0.2.tar.gz) = 6046068 bytes
 SHA1 (patch-aa) = 204154819ad1d53ec8d8c2e7ff25c6f508e9b311
 SHA1 (patch-src_backup.cpp) = 6f788a8ee4890a2c30ebc0ce669653d21938d581
 SHA1 (patch-src_bnpview.cpp) = e55093b14a1563e0018a53c447e5e44d9f645466
+SHA1 (patch-src_notefactory.h) = 349b8fcd86afc782e7501c92a3c7d7871cf56ba6
diff --git a/misc/basket/patches/patch-src_notefactory.h b/misc/basket/patches/patch-src_notefactory.h
new file mode 100644
index 00000000000..1e572ba437f
--- /dev/null
+++ b/misc/basket/patches/patch-src_notefactory.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_notefactory.h,v 1.1 2013/03/28 21:43:09 joerg Exp $
+
+--- src/notefactory.h.orig	2013-03-28 12:33:12.000000000 +0000
++++ src/notefactory.h
+@@ -32,8 +32,6 @@ class QColor;
+ class Basket;
+ class Note;
+ 
+-enum NoteType::Id;
+-
+ /** Factory class to create (new, drop, past) or load BasketIem, and eventuelly save them (?)
+   * @author Sébastien Laoût
+   */
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 85b237a8342..4706613507c 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2013/03/26 23:27:09 joerg Exp $
+$NetBSD: distinfo,v 1.54 2013/03/28 21:43:09 joerg Exp $
 
 SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae
 RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4
@@ -20,8 +20,9 @@ SHA1 (patch-ak) = 5738bb6b043f8657c473c4d14e2c74d97d4974f8
 SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53
 SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c
 SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7
-SHA1 (patch-filters_krita_png_kis__png__converter.h) = f19ed6af46344b3516580ca91974d0d8382e5201
 SHA1 (patch-filters_kword_msword_graphicshandler.cpp) = a49e22d237c3b968b066ba56fa98fe34e67893dd
+SHA1 (patch-filters_kword_mswrite_mswriteimport.h) = b2ca756c351aad2ce4b41c3badebb87c896e3a6f
+SHA1 (patch-filters_krita_png_kis__png__converter.h) = f19ed6af46344b3516580ca91974d0d8382e5201
 SHA1 (patch-kexi_plugins_forms_widgets_kexidblabel_cpp) = 39bf8dcc00a024461cc54b4991f1dfb8a7bdc41b
 SHA1 (patch-kexi_plugins_forms_widgets_kexiframe_cpp) = 8a19ef7efc3a15d0e54ae84c0df822a8c12caba6
 SHA1 (patch-kexi_plugins_importexport_csv_kexicsvexport_cpp) = d8e82dd72e29fcd50f0670d70cbf48550fa5d2be
diff --git a/misc/koffice/patches/patch-filters_kword_mswrite_mswriteimport.h b/misc/koffice/patches/patch-filters_kword_mswrite_mswriteimport.h
new file mode 100644
index 00000000000..eb9233cdfee
--- /dev/null
+++ b/misc/koffice/patches/patch-filters_kword_mswrite_mswriteimport.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-filters_kword_mswrite_mswriteimport.h,v 1.1 2013/03/28 21:43:09 joerg Exp $
+
+--- filters/kword/mswrite/mswriteimport.h.orig	2013-03-28 15:51:07.000000000 +0000
++++ filters/kword/mswrite/mswriteimport.h
+@@ -23,7 +23,6 @@
+ #include <KoFilter.h>
+ 
+ class WRIDevice;
+-class MSWrite::InternalParser;
+ class KWordGenerator;
+ 
+ class MSWriteImport : public KoFilter
diff --git a/print/kbibtex-kde3/distinfo b/print/kbibtex-kde3/distinfo
index 318145504a4..aa558184c5b 100644
--- a/print/kbibtex-kde3/distinfo
+++ b/print/kbibtex-kde3/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/03/22 06:58:08 markd Exp $
+$NetBSD: distinfo,v 1.2 2013/03/28 21:43:10 joerg Exp $
 
 SHA1 (kbibtex-0.2.1.tar.bz2) = 2448b8c8358ed1999858e8069dfe523aa1029d70
 RMD160 (kbibtex-0.2.1.tar.bz2) = a9cb38386154204fb24d16a1b686977a96feafbd
 Size (kbibtex-0.2.1.tar.bz2) = 722618 bytes
+SHA1 (patch-src_documentlistview.h) = 4f42bfe95811e2785bb7a3181613b8bab554609c
+SHA1 (patch-src_entrywidgetother.h) = 5a37aee1996075c32868ca3453fe01c76c38e6e4
+SHA1 (patch-src_kbibtex__part.h) = 682e1ba39b29d0526a3b724132009ea6c3389ee9
+SHA1 (patch-src_settings.h) = ba7c8a8e860c551383fa4ec3bee60f72ec264954
+SHA1 (patch-src_webquerypubmed.h) = cd095faa431728537f99f11aa0761957dd5260e1
diff --git a/print/kbibtex-kde3/patches/patch-src_documentlistview.h b/print/kbibtex-kde3/patches/patch-src_documentlistview.h
new file mode 100644
index 00000000000..6db76fb69e7
--- /dev/null
+++ b/print/kbibtex-kde3/patches/patch-src_documentlistview.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_documentlistview.h,v 1.1 2013/03/28 21:43:10 joerg Exp $
+
+--- src/documentlistview.h.orig	2013-03-27 10:46:40.000000000 +0000
++++ src/documentlistview.h
+@@ -32,8 +32,6 @@ class KURL;
+ class KActionMenu;
+ class KPopupMenu;
+ 
+-enum BibTeX::Element::FilterType;
+-
+ namespace KBibTeX
+ {
+     class DocumentWidget;
diff --git a/print/kbibtex-kde3/patches/patch-src_entrywidgetother.h b/print/kbibtex-kde3/patches/patch-src_entrywidgetother.h
new file mode 100644
index 00000000000..d9fde06630e
--- /dev/null
+++ b/print/kbibtex-kde3/patches/patch-src_entrywidgetother.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_entrywidgetother.h,v 1.1 2013/03/28 21:43:10 joerg Exp $
+
+--- src/entrywidgetother.h.orig	2013-03-27 10:50:50.000000000 +0000
++++ src/entrywidgetother.h
+@@ -29,7 +29,6 @@
+ class QPushButton;
+ class KListView;
+ class QLineEdit;
+-class KBibTeX::FieldLineEdit;
+ 
+ namespace KBibTeX
+ {
diff --git a/print/kbibtex-kde3/patches/patch-src_kbibtex__part.h b/print/kbibtex-kde3/patches/patch-src_kbibtex__part.h
new file mode 100644
index 00000000000..f798073e9b8
--- /dev/null
+++ b/print/kbibtex-kde3/patches/patch-src_kbibtex__part.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_kbibtex__part.h,v 1.1 2013/03/28 21:43:10 joerg Exp $
+
+--- src/kbibtex_part.h.orig	2013-03-27 10:48:10.000000000 +0000
++++ src/kbibtex_part.h
+@@ -43,7 +43,6 @@ class KAction;
+ class KActionMenu;
+ class KToggleAction;
+ class KMainWindow;
+-class KBibTeX::WebQuery;
+ 
+ class KBibTeXPart : public KParts::ReadWritePart
+ {
diff --git a/print/kbibtex-kde3/patches/patch-src_settings.h b/print/kbibtex-kde3/patches/patch-src_settings.h
new file mode 100644
index 00000000000..97bf740f808
--- /dev/null
+++ b/print/kbibtex-kde3/patches/patch-src_settings.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_settings.h,v 1.1 2013/03/28 21:43:10 joerg Exp $
+
+--- src/settings.h.orig	2013-03-27 10:47:43.000000000 +0000
++++ src/settings.h
+@@ -36,7 +36,6 @@ class KURL;
+ class QString;
+ class QChar;
+ class QFont;
+-class BibTeX::Element;
+ 
+ namespace KBibTeX
+ {
diff --git a/print/kbibtex-kde3/patches/patch-src_webquerypubmed.h b/print/kbibtex-kde3/patches/patch-src_webquerypubmed.h
new file mode 100644
index 00000000000..c3bc715b3f1
--- /dev/null
+++ b/print/kbibtex-kde3/patches/patch-src_webquerypubmed.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_webquerypubmed.h,v 1.1 2013/03/28 21:43:10 joerg Exp $
+
+--- src/webquerypubmed.h.orig	2013-03-27 10:50:22.000000000 +0000
++++ src/webquerypubmed.h
+@@ -29,7 +29,6 @@
+ class QStringList;
+ class QDomElement;
+ class QDate;
+-class BibTeX::File;
+ 
+ namespace KBibTeX
+ {
diff --git a/security/MyPasswordSafe/distinfo b/security/MyPasswordSafe/distinfo
index 79a54d8ac7e..3fbf2ee39c0 100644
--- a/security/MyPasswordSafe/distinfo
+++ b/security/MyPasswordSafe/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2012/03/02 15:07:16 hans Exp $
+$NetBSD: distinfo,v 1.12 2013/03/28 21:43:10 joerg Exp $
 
 SHA1 (MyPasswordSafe-20061216.src.tgz) = 37bb3f7491b42c8aac5d71cc6546ced018a15119
 RMD160 (MyPasswordSafe-20061216.src.tgz) = b61f1525aed3160b88c1ef6c6922ff131ad2248c
@@ -12,3 +12,4 @@ SHA1 (patch-src-crypto-bfproxy.cpp) = cb84b4c5f474f057f0b702ff541d0587369a21e8
 SHA1 (patch-src-encryptedstring.cpp) = 715f7918fce45d3c4516acbcadd99e87f58a6492
 SHA1 (patch-src-pwsafe-Util.cpp) = 81b660bfbaa1472071c2ff6d859e5489b133596e
 SHA1 (patch-src-safeserializer.cpp) = e63997bc2ebb452056831bf5c147435a3edb2a14
+SHA1 (patch-src_xmlserializer.hpp) = 49c91a388b521c5efe5d511adee9a2bd0479ed2e
diff --git a/security/MyPasswordSafe/patches/patch-src_xmlserializer.hpp b/security/MyPasswordSafe/patches/patch-src_xmlserializer.hpp
new file mode 100644
index 00000000000..4677c4da9c2
--- /dev/null
+++ b/security/MyPasswordSafe/patches/patch-src_xmlserializer.hpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_xmlserializer.hpp,v 1.1 2013/03/28 21:43:11 joerg Exp $
+
+--- src/xmlserializer.hpp.orig	2013-03-27 10:08:42.000000000 +0000
++++ src/xmlserializer.hpp
+@@ -22,7 +22,6 @@
+ #include "safeserializer.hpp"
+ 
+ class Safe;
+-enum Safe::Error;
+ class EncryptedString;
+ class SecuredString;
+ 
diff --git a/sysutils/k3b-kde3/distinfo b/sysutils/k3b-kde3/distinfo
index e68d0c1b206..18cbf43a8d2 100644
--- a/sysutils/k3b-kde3/distinfo
+++ b/sysutils/k3b-kde3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2013/01/17 16:03:01 joerg Exp $
+$NetBSD: distinfo,v 1.3 2013/03/28 21:43:11 joerg Exp $
 
 SHA1 (k3b-1.0.5.tar.bz2) = c45d6f2a36b1bc7ea14101d444149c40fd4b700e
 RMD160 (k3b-1.0.5.tar.bz2) = b562746015cc2e4226652402725b4e69eb846822
@@ -7,4 +7,15 @@ SHA1 (patch-ab) = 4f382751e9a7ade09aad6f8d594e76f9e5bfa5d5
 SHA1 (patch-ac) = 38902921193ff0219c1769ffa3b793de6f3f4c0c
 SHA1 (patch-ad) = 895ec31a9a05f0168daba78bcb3ff8969f98637b
 SHA1 (patch-ae) = d5fb26c88710b9cdf14e19aa530f60e429b47941
+SHA1 (patch-libk3b_jobs_k3bblankingjob.h) = 72eccf567c0128663e99ce19a70513683b30df47
+SHA1 (patch-libk3b_projects_audiocd_k3baudiojob.h) = 79d6a522ac6f81645f2b48e576d331d5de94d081
+SHA1 (patch-libk3b_projects_datacd_k3bisoimager.h) = f71aae547bb2de3e5293ffc4235082eb5cbae51b
+SHA1 (patch-libk3b_projects_k3babstractwriter.h) = 84170eaceb60daf620a7a5d57dbc509882c7b06d
+SHA1 (patch-libk3b_projects_k3bcdrdaowriter.h) = 041381c22145e5a2e74cb90643fbc6f2489eb354
+SHA1 (patch-libk3b_projects_k3bcdrecordwriter.h) = 3425d02750306ef7f12ee87a5f5f135107e12653
+SHA1 (patch-libk3b_projects_k3bdvdrecordwriter.h) = a91530f2d747a1d9894d6da447c5288f01f8e368
+SHA1 (patch-libk3b_projects_mixedcd_k3bmixedjob.h) = 4b16bc79512f353f9098aa3d61aaa9b9361f46f2
+SHA1 (patch-libk3b_projects_movixcd_k3bmovixjob.h) = 86b21043b5f82b38a1b5720d8b404652b1b220dc
+SHA1 (patch-libk3b_projects_movixdvd_k3bmovixdvdjob.h) = 992799fba5298d82e51e47c433b81f1258ade0db
+SHA1 (patch-libk3b_projects_videocd_k3bvcdjob.h) = 231e05aa5e6d6996ee2f76f2ab159e921854d483
 SHA1 (patch-src_projects_k3baudioeditorwidget.cpp) = 4f4ca910596b75b656bd844290cd899659feb3cb
diff --git a/sysutils/k3b-kde3/patches/patch-libk3b_jobs_k3bblankingjob.h b/sysutils/k3b-kde3/patches/patch-libk3b_jobs_k3bblankingjob.h
new file mode 100644
index 00000000000..ce51448c8f4
--- /dev/null
+++ b/sysutils/k3b-kde3/patches/patch-libk3b_jobs_k3bblankingjob.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-libk3b_jobs_k3bblankingjob.h,v 1.1 2013/03/28 21:43:11 joerg Exp $
+
+--- libk3b/jobs/k3bblankingjob.h.orig	2013-03-28 15:19:26.000000000 +0000
++++ libk3b/jobs/k3bblankingjob.h
+@@ -20,7 +20,6 @@
+ #include "k3b_export.h"
+ class KProcess;
+ class QString;
+-class K3bDevice::Device;
+ class K3bAbstractWriter;
+ 
+ 
diff --git a/sysutils/k3b-kde3/patches/patch-libk3b_projects_audiocd_k3baudiojob.h b/sysutils/k3b-kde3/patches/patch-libk3b_projects_audiocd_k3baudiojob.h
new file mode 100644
index 00000000000..9d0a04a7e29
--- /dev/null
+++ b/sysutils/k3b-kde3/patches/patch-libk3b_projects_audiocd_k3baudiojob.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-libk3b_projects_audiocd_k3baudiojob.h,v 1.1 2013/03/28 21:43:11 joerg Exp $
+
+--- libk3b/projects/audiocd/k3baudiojob.h.orig	2013-03-27 21:08:56.000000000 +0000
++++ libk3b/projects/audiocd/k3baudiojob.h
+@@ -29,7 +29,6 @@ class KTempFile;
+ class K3bCdrecordWriter;
+ class K3bAudioNormalizeJob;
+ class K3bAudioJobTempData;
+-class K3bDevice::Device;
+ class K3bAudioMaxSpeedJob;
+ 
+ /**
diff --git a/sysutils/k3b-kde3/patches/patch-libk3b_projects_datacd_k3bisoimager.h b/sysutils/k3b-kde3/patches/patch-libk3b_projects_datacd_k3bisoimager.h
new file mode 100644
index 00000000000..5e24f5e7967
--- /dev/null
+++ b/sysutils/k3b-kde3/patches/patch-libk3b_projects_datacd_k3bisoimager.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-libk3b_projects_datacd_k3bisoimager.h,v 1.1 2013/03/28 21:43:11 joerg Exp $
+
+--- libk3b/projects/datacd/k3bisoimager.h.orig	2013-03-27 21:04:37.000000000 +0000
++++ libk3b/projects/datacd/k3bisoimager.h
+@@ -29,7 +29,6 @@ class K3bFileItem;
+ class QTextStream;
+ class K3bProcess;
+ class KProcess;
+-class K3bDevice::Device;
+ class KTempFile;
+ 
+ 
diff --git a/sysutils/k3b-kde3/patches/patch-libk3b_projects_k3babstractwriter.h b/sysutils/k3b-kde3/patches/patch-libk3b_projects_k3babstractwriter.h
new file mode 100644
index 00000000000..892486957ed
--- /dev/null
+++ b/sysutils/k3b-kde3/patches/patch-libk3b_projects_k3babstractwriter.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-libk3b_projects_k3babstractwriter.h,v 1.1 2013/03/28 21:43:11 joerg Exp $
+
+--- libk3b/projects/k3babstractwriter.h.orig	2013-03-27 21:05:23.000000000 +0000
++++ libk3b/projects/k3babstractwriter.h
+@@ -22,7 +22,6 @@
+ 
+ #include <qdatetime.h>
+ 
+-class K3bDevice::Device;
+ class K3bJobHandler;
+ 
+ 
diff --git a/sysutils/k3b-kde3/patches/patch-libk3b_projects_k3bcdrdaowriter.h b/sysutils/k3b-kde3/patches/patch-libk3b_projects_k3bcdrdaowriter.h
new file mode 100644
index 00000000000..4562555f963
--- /dev/null
+++ b/sysutils/k3b-kde3/patches/patch-libk3b_projects_k3bcdrdaowriter.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-libk3b_projects_k3bcdrdaowriter.h,v 1.1 2013/03/28 21:43:11 joerg Exp $
+
+--- libk3b/projects/k3bcdrdaowriter.h.orig	2013-03-27 21:05:41.000000000 +0000
++++ libk3b/projects/k3bcdrdaowriter.h
+@@ -24,7 +24,6 @@
+ class K3bExternalBin;
+ class K3bProcess;
+ class KProcess;
+-class K3bDevice::Device;
+ class QSocket;
+ 
+ 
diff --git a/sysutils/k3b-kde3/patches/patch-libk3b_projects_k3bcdrecordwriter.h b/sysutils/k3b-kde3/patches/patch-libk3b_projects_k3bcdrecordwriter.h
new file mode 100644
index 00000000000..27a8e325297
--- /dev/null
+++ b/sysutils/k3b-kde3/patches/patch-libk3b_projects_k3bcdrecordwriter.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-libk3b_projects_k3bcdrecordwriter.h,v 1.1 2013/03/28 21:43:12 joerg Exp $
+
+--- libk3b/projects/k3bcdrecordwriter.h.orig	2013-03-27 21:05:09.000000000 +0000
++++ libk3b/projects/k3bcdrecordwriter.h
+@@ -25,7 +25,6 @@
+ class K3bExternalBin;
+ class K3bProcess;
+ class KProcess;
+-class K3bDevice::Device;
+ 
+ 
+ class K3bCdrecordWriter : public K3bAbstractWriter
diff --git a/sysutils/k3b-kde3/patches/patch-libk3b_projects_k3bdvdrecordwriter.h b/sysutils/k3b-kde3/patches/patch-libk3b_projects_k3bdvdrecordwriter.h
new file mode 100644
index 00000000000..6b47630823d
--- /dev/null
+++ b/sysutils/k3b-kde3/patches/patch-libk3b_projects_k3bdvdrecordwriter.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-libk3b_projects_k3bdvdrecordwriter.h,v 1.1 2013/03/28 21:43:12 joerg Exp $
+
+--- libk3b/projects/k3bdvdrecordwriter.h.orig	2013-03-27 21:16:40.000000000 +0000
++++ libk3b/projects/k3bdvdrecordwriter.h
+@@ -18,9 +18,6 @@
+ 
+ #include "k3bcdrecordwriter.h"
+ 
+-
+-class K3bDevice::Device;
+-
+ /**
+  * Basically this is just a wrapper around K3bCdrecordWriter
+  * which uses another K3bExternalBin and ignores the writingMode setting.
diff --git a/sysutils/k3b-kde3/patches/patch-libk3b_projects_mixedcd_k3bmixedjob.h b/sysutils/k3b-kde3/patches/patch-libk3b_projects_mixedcd_k3bmixedjob.h
new file mode 100644
index 00000000000..48e16fc5596
--- /dev/null
+++ b/sysutils/k3b-kde3/patches/patch-libk3b_projects_mixedcd_k3bmixedjob.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-libk3b_projects_mixedcd_k3bmixedjob.h,v 1.1 2013/03/28 21:43:12 joerg Exp $
+
+--- libk3b/projects/mixedcd/k3bmixedjob.h.orig	2013-03-27 21:09:34.000000000 +0000
++++ libk3b/projects/mixedcd/k3bmixedjob.h
+@@ -32,7 +32,6 @@ class K3bCdrecordWriter;
+ class K3bMsInfoFetcher;
+ class K3bAudioNormalizeJob;
+ class K3bAudioJobTempData;
+-class K3bDevice::Device;
+ 
+ /**
+   *@author Sebastian Trueg
diff --git a/sysutils/k3b-kde3/patches/patch-libk3b_projects_movixcd_k3bmovixjob.h b/sysutils/k3b-kde3/patches/patch-libk3b_projects_movixcd_k3bmovixjob.h
new file mode 100644
index 00000000000..38f9964d464
--- /dev/null
+++ b/sysutils/k3b-kde3/patches/patch-libk3b_projects_movixcd_k3bmovixjob.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-libk3b_projects_movixcd_k3bmovixjob.h,v 1.1 2013/03/28 21:43:12 joerg Exp $
+
+--- libk3b/projects/movixcd/k3bmovixjob.h.orig	2013-03-27 21:12:37.000000000 +0000
++++ libk3b/projects/movixcd/k3bmovixjob.h
+@@ -20,7 +20,6 @@
+ #include <k3bjob.h>
+ 
+ class K3bMovixDoc;
+-class K3bDevice::Device;
+ class K3bDataJob;
+ class KTempFile;
+ class K3bMovixInstallation;
diff --git a/sysutils/k3b-kde3/patches/patch-libk3b_projects_movixdvd_k3bmovixdvdjob.h b/sysutils/k3b-kde3/patches/patch-libk3b_projects_movixdvd_k3bmovixdvdjob.h
new file mode 100644
index 00000000000..71d5859f0d2
--- /dev/null
+++ b/sysutils/k3b-kde3/patches/patch-libk3b_projects_movixdvd_k3bmovixdvdjob.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-libk3b_projects_movixdvd_k3bmovixdvdjob.h,v 1.1 2013/03/28 21:43:12 joerg Exp $
+
+--- libk3b/projects/movixdvd/k3bmovixdvdjob.h.orig	2013-03-27 21:11:36.000000000 +0000
++++ libk3b/projects/movixdvd/k3bmovixdvdjob.h
+@@ -20,7 +20,6 @@
+ #include <k3bjob.h>
+ 
+ class K3bMovixDvdDoc;
+-class K3bDevice::Device;
+ class K3bDvdJob;
+ class KTempFile;
+ class K3bMovixInstallation;
diff --git a/sysutils/k3b-kde3/patches/patch-libk3b_projects_videocd_k3bvcdjob.h b/sysutils/k3b-kde3/patches/patch-libk3b_projects_videocd_k3bvcdjob.h
new file mode 100644
index 00000000000..dc764266366
--- /dev/null
+++ b/sysutils/k3b-kde3/patches/patch-libk3b_projects_videocd_k3bvcdjob.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-libk3b_projects_videocd_k3bvcdjob.h,v 1.1 2013/03/28 21:43:12 joerg Exp $
+
+--- libk3b/projects/videocd/k3bvcdjob.h.orig	2013-03-27 21:14:00.000000000 +0000
++++ libk3b/projects/videocd/k3bvcdjob.h
+@@ -25,8 +25,6 @@ class K3bProcess;
+ class KProcess;
+ class QDataStream;
+ class K3bAbstractWriter;
+-class K3bDevice::Device;
+-
+ 
+ class K3bVcdJob : public K3bBurnJob
+ {
diff --git a/sysutils/kdirstat/distinfo b/sysutils/kdirstat/distinfo
index 8dbd70a98eb..a05b212df1c 100644
--- a/sysutils/kdirstat/distinfo
+++ b/sysutils/kdirstat/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/01/26 04:37:27 markd Exp $
+$NetBSD: distinfo,v 1.6 2013/03/28 21:43:12 joerg Exp $
 
 SHA1 (kdirstat-2.4.4.tar.bz2) = fb6a5da9abd2094f3bb3c135dffcbd7aea074c6e
 RMD160 (kdirstat-2.4.4.tar.bz2) = e42da54f6da86d3993b946138c9305f4be5cbda0
 Size (kdirstat-2.4.4.tar.bz2) = 642973 bytes
+SHA1 (patch-kdirstat_kstdcleanup.h) = 2961bedf0d1d1e7169ee36909dd3b62b820a5e7b
diff --git a/sysutils/kdirstat/patches/patch-kdirstat_kstdcleanup.h b/sysutils/kdirstat/patches/patch-kdirstat_kstdcleanup.h
new file mode 100644
index 00000000000..5ead983055a
--- /dev/null
+++ b/sysutils/kdirstat/patches/patch-kdirstat_kstdcleanup.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-kdirstat_kstdcleanup.h,v 1.1 2013/03/28 21:43:12 joerg Exp $
+
+--- kdirstat/kstdcleanup.h.orig	2013-03-27 10:56:59.000000000 +0000
++++ kdirstat/kstdcleanup.h
+@@ -18,8 +18,6 @@
+ 
+ // Forward declarations
+ class KActionCollection;
+-class KDirStat::KCleanup;
+-
+ 
+ namespace KDirStat
+ {