Index: head/graphics/digikam/Makefile
===================================================================
--- head/graphics/digikam/Makefile	(revision 221507)
+++ head/graphics/digikam/Makefile	(revision 221508)
@@ -1,46 +1,46 @@
 # New ports collection makefile for:	digikam
 # Date created: 			3 February 2003
 # Whom:					Arjan van Leeuwen <avleeuwen@piwebs.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	digikam
 DISTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	SFE
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	An advanced digital photo management application for KDE
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		kipi.2:${PORTSDIR}/graphics/libkipi \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
 		kexiv2.4:${PORTSDIR}/graphics/libkexiv2 \
 		lcms.1:${PORTSDIR}/graphics/lcms \
 		kdcraw.4:${PORTSDIR}/graphics/libkdcraw \
 		png.5:${PORTSDIR}/graphics/png \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		jasper.4:${PORTSDIR}/graphics/jasper
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 CONFIGURE_ARGS=	--without-included-sqlite3
 
 MAN1=		digitaglinktree.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g;s|-fno-schedule-insns -fno-inline||g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} 's/install-data-local: install-apidox/install-data-local:/' \
 		${WRKSRC}/digikam/Makefile.in ${WRKSRC}/digikam/digikam/Makefile.in
 
 .include <bsd.port.mk>

Property changes on: head/graphics/digikam/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.44
\ No newline at end of property
+1.45
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_digikam_albumfiletip.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_digikam_albumfiletip.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_digikam_albumfiletip.cpp	(revision 221508)
@@ -0,0 +1,20 @@
+--- digikam/digikam/albumfiletip.cpp.orig	2008-10-12 15:02:22.000000000 +0200
++++ digikam/digikam/albumfiletip.cpp	2008-10-12 15:02:50.000000000 +0200
+@@ -48,7 +48,7 @@
+ 
+ // LibKDcraw includes. 
+  
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+  
+ // Local includes.
+ 
+@@ -366,7 +366,7 @@ void AlbumFileTip::updateText()
+         }
+ 
+         QSize   dims;
+-        QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++        QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+         QString ext = fileInfo.extension(false).upper();
+ 
+         if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))

Property changes on: head/graphics/digikam/files/patch-digikam_digikam_albumfiletip.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_digikam_albumiconview.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_digikam_albumiconview.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_digikam_albumiconview.cpp	(revision 221508)
@@ -0,0 +1,18 @@
+--- digikam/digikam/albumiconview.cpp.orig	2008-10-12 15:01:31.000000000 +0200
++++ digikam/digikam/albumiconview.cpp	2008-10-12 15:02:03.000000000 +0200
+@@ -96,7 +96,6 @@ extern "C"
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ 
+ // Local includes.
+ 
+@@ -1098,7 +1097,6 @@ void AlbumIconView::slotDisplayItem(Albu
+     QString imagefilter = settings->getImageFileFilter().lower() +
+                           settings->getImageFileFilter().upper();
+ 
+-    if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
+     {
+         // add raw files only if dcraw is available
+         imagefilter += settings->getRawFileFilter().lower() +

Property changes on: head/graphics/digikam/files/patch-digikam_digikam_albumiconview.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_digikam_albumsettings.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_digikam_albumsettings.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_digikam_albumsettings.cpp	(revision 221508)
@@ -0,0 +1,20 @@
+--- digikam/digikam/albumsettings.cpp.orig	2008-10-12 15:02:59.000000000 +0200
++++ digikam/digikam/albumsettings.cpp	2008-10-12 15:03:20.000000000 +0200
+@@ -36,7 +36,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -184,7 +184,7 @@ void AlbumSettings::init()
+ 
+     // RAW files estentions supported by dcraw program and 
+     // defines to digikam/libs/dcraw/rawfiles.h
+-    d->defaultRawFilefilter         = QString(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    d->defaultRawFilefilter         = QString(KDcrawIface::KDcraw::rawFiles());
+ 
+     d->imageFilefilter              = d->defaultImageFilefilter;
+     d->movieFilefilter              = d->defaultMovieFilefilter;

Property changes on: head/graphics/digikam/files/patch-digikam_digikam_albumsettings.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_digikam_digikamapp.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_digikam_digikamapp.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_digikam_digikamapp.cpp	(revision 221508)
@@ -0,0 +1,34 @@
+--- digikam/digikam/digikamapp.cpp.orig	2008-10-12 14:53:14.000000000 +0200
++++ digikam/digikam/digikamapp.cpp	2008-10-12 14:55:23.000000000 +0200
+@@ -62,7 +62,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ 
+ // Local includes.
+ 
+@@ -163,7 +162,6 @@ DigikamApp::DigikamApp()
+     if(d->splashScreen)
+         d->splashScreen->message(i18n("Checking dcraw version"), AlignLeft, white);
+ 
+-    KDcrawIface::DcrawBinary::instance()->checkSystem();
+ 
+     if(d->splashScreen)
+         d->splashScreen->message(i18n("Scan Albums"), AlignLeft, white);
+@@ -221,7 +219,6 @@ DigikamApp::~DigikamApp()
+ 
+     ImageAttributesWatch::cleanUp();
+     LoadingCacheInterface::cleanUp();
+-    KDcrawIface::DcrawBinary::cleanUp();
+     AlbumThumbnailLoader::cleanUp();
+ 
+     m_instance = 0;
+@@ -276,7 +273,6 @@ void DigikamApp::show()
+     }
+ 
+     // Report errors from dcraw detection.
+-    KDcrawIface::DcrawBinary::instance()->checkReport();
+ 
+     // Init album icon view zoom factor. 
+     slotThumbSizeChanged(d->albumSettings->getDefaultIconSize());

Property changes on: head/graphics/digikam/files/patch-digikam_digikam_digikamapp.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_digikam_main.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_digikam_main.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_digikam_main.cpp	(revision 221508)
@@ -0,0 +1,28 @@
+--- digikam/digikam/main.cpp.orig	2008-10-12 14:55:41.000000000 +0200
++++ digikam/digikam/main.cpp	2008-10-12 15:00:03.000000000 +0200
+@@ -58,7 +58,6 @@
+ // Libkdcraw includes.
+ 
+ #include <libkdcraw/kdcraw.h>
+-#include <libkdcraw/dcrawbinary.h>
+ 
+ // C Ansi includes.
+ 
+@@ -84,7 +83,7 @@ static KCmdLineOptions options[] =
+ 
+ int main(int argc, char *argv[])
+ {
+-    QString DcrawVer    = KDcrawIface::DcrawBinary::internalVersion();
++    QString DcrawVer    = KDcrawIface::KDcraw::librawVersion();
+ 
+     QString Exiv2Ver    = KExiv2Iface::KExiv2::Exiv2Version();
+ 
+@@ -112,8 +111,8 @@ int main(int argc, char *argv[])
+                           QString("\n") +
+                           QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) +
+                           QString("\n") +
+-                          QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) +
++                          QString(I18N_NOOP("Using LibRaw library version %1")).arg(DcrawVer) +
+                           QString("\n") +
+                           QString(I18N_NOOP("Using PNG library version %1")).arg(PNG_LIBPNG_VER_STRING) +
+                           QString("\n") +

Property changes on: head/graphics/digikam/files/patch-digikam_digikam_main.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_digikam_scanlib.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_digikam_scanlib.cpp	(revision 221507)
+++ head/graphics/digikam/files/patch-digikam_digikam_scanlib.cpp	(revision 221508)
@@ -1,20 +1,20 @@
---- digikam/digikam/scanlib.cpp.orig	Tue Apr 11 13:48:55 2006
-+++ digikam/digikam/scanlib.cpp	Tue Apr 11 13:50:28 2006
-@@ -260,7 +260,7 @@
+--- digikam/digikam/scanlib.cpp.orig	2008-07-16 21:05:55.000000000 +0200
++++ digikam/digikam/scanlib.cpp	2008-10-12 09:57:53.000000000 +0200
+@@ -299,7 +299,7 @@
      int items = 0;
  
      QDir dir( directory );
 -    if ( !dir.exists() or !dir.isReadable() )
 +    if ( !dir.exists() || !dir.isReadable() )
          return 0;
  
      const QFileInfoList *list = dir.entryInfoList();
-@@ -287,7 +287,7 @@
+@@ -326,7 +326,7 @@
  void ScanLib::allFiles(const QString& directory)
  {
      QDir dir( directory );
 -    if ( !dir.exists() or !dir.isReadable() )
 +    if ( !dir.exists() || !dir.isReadable() )
      {
-         kdWarning() << "Folder does not exist or is not readable: "
+         DWarning() << "Folder does not exist or is not readable: "
                      << directory << endl;

Property changes on: head/graphics/digikam/files/patch-digikam_digikam_scanlib.cpp
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_kioslave_digikamalbums.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_kioslave_digikamalbums.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_kioslave_digikamalbums.cpp	(revision 221508)
@@ -0,0 +1,20 @@
+--- digikam/kioslave/digikamalbums.cpp.orig	2008-10-12 14:51:40.000000000 +0200
++++ digikam/kioslave/digikamalbums.cpp	2008-10-12 14:52:08.000000000 +0200
+@@ -72,7 +72,7 @@ extern "C" 
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -269,7 +269,7 @@ void kio_digikamalbums::special(const QB
+                 if (getDimensions)
+                 {
+                     QFileInfo fileInfo(base + name);
+-                    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++                    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+                     QString ext = fileInfo.extension(false).upper();
+     
+                     if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))

Property changes on: head/graphics/digikam/files/patch-digikam_kioslave_digikamalbums.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_kioslave_digikamthumbnail.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_kioslave_digikamthumbnail.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_kioslave_digikamthumbnail.cpp	(revision 221508)
@@ -0,0 +1,19 @@
+--- digikam/kioslave/digikamthumbnail.cpp.orig	2008-10-12 14:52:20.000000000 +0200
++++ digikam/kioslave/digikamthumbnail.cpp	2008-10-12 14:52:51.000000000 +0200
+@@ -69,7 +69,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // Local includes
+@@ -264,7 +263,7 @@ bool kio_digikamthumbnailProtocol::loadB
+         
+     // Else, use the right way depending of image file extension.
+     QString ext = fileInfo.extension(false).upper();
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ 
+     if (!ext.isEmpty())
+     {

Property changes on: head/graphics/digikam/files/patch-digikam_kioslave_digikamthumbnail.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_libs_dialogs_imagedialog.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_libs_dialogs_imagedialog.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_libs_dialogs_imagedialog.cpp	(revision 221508)
@@ -0,0 +1,33 @@
+--- digikam/libs/dialogs/imagedialog.cpp.orig	2008-10-12 14:50:22.000000000 +0200
++++ digikam/libs/dialogs/imagedialog.cpp	2008-10-12 14:51:29.000000000 +0200
+@@ -39,7 +39,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -267,9 +267,8 @@ ImageDialog::ImageDialog(QWidget* parent
+     QString allPictures = patternList[0];
+ 
+     // Add other files format witch are missing to All Images" type mime provided by KDE and remplace current.
+-    if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
+     {
+-        allPictures.insert(allPictures.find("|"), QString(KDcrawIface::DcrawBinary::instance()->rawFiles()) + QString(" *.JPE *.TIF"));
++        allPictures.insert(allPictures.find("|"), QString(KDcrawIface::KDcraw::rawFiles()) + QString(" *.JPE *.TIF"));
+         patternList.remove(patternList[0]);
+         patternList.prepend(allPictures);
+     }
+@@ -277,9 +276,8 @@ ImageDialog::ImageDialog(QWidget* parent
+     // Added RAW file formats supported by dcraw program like a type mime. 
+     // Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete 
+     // or unavailable(dcraw_0)(see file #121242 in B.K.O).
+-    if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
+     {
+-        patternList.append(i18n("\n%1|Camera RAW files").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
++        patternList.append(i18n("\n%1|Camera RAW files").arg(QString(KDcrawIface::KDcraw::rawFiles())));
+     }
+ 
+     d->fileformats = patternList.join("\n");

Property changes on: head/graphics/digikam/files/patch-digikam_libs_dialogs_imagedialog.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_libs_dialogs_rawcameradlg.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_libs_dialogs_rawcameradlg.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_libs_dialogs_rawcameradlg.cpp	(revision 221508)
@@ -0,0 +1,30 @@
+--- digikam/libs/dialogs/rawcameradlg.cpp.orig	2008-07-16 21:05:55.000000000 +0200
++++ digikam/libs/dialogs/rawcameradlg.cpp	2008-10-12 15:18:00.000000000 +0200
+@@ -40,7 +40,6 @@
+ // LibKDcraw includes.
+ 
+ #include <libkdcraw/kdcraw.h>
+-#include <libkdcraw/dcrawbinary.h>
+ 
+ // Local includes.
+ 
+@@ -77,8 +76,8 @@
+     QWidget *page     = makeMainWidget();
+     QGridLayout* grid = new QGridLayout(page, 2, 2, 0, spacingHint());
+ 
+-    QStringList list      = KDcrawIface::DcrawBinary::instance()->supportedCamera();
+-    QString     dcrawVer  = KDcrawIface::DcrawBinary::instance()->internalVersion();
++    QStringList list      = KDcrawIface::KDcraw::supportedCamera();
++    QString     dcrawVer  = KDcrawIface::KDcraw::librawVersion();
+     QString     KDcrawVer = KDcrawIface::KDcraw::version();
+ 
+     // --------------------------------------------------------
+@@ -95,7 +94,7 @@
+ 
+     QLabel *header = new QLabel(page);
+     header->setText(i18n("<p>Using KDcraw library version %1"
+-                         "<p>Using Dcraw program version %2"
++                         "<p>Using LibRaw library version %2"
+                          "<p>%3 models in the list")
+                          .arg(KDcrawVer).arg(dcrawVer).arg(list.count()));
+ 

Property changes on: head/graphics/digikam/files/patch-digikam_libs_dialogs_rawcameradlg.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_libs_dimg_dimg.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_libs_dimg_dimg.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_libs_dimg_dimg.cpp	(revision 221508)
@@ -0,0 +1,19 @@
+--- digikam/libs/dimg/dimg.cpp.orig	2008-10-12 10:03:41.000000000 +0200
++++ digikam/libs/dimg/dimg.cpp	2008-10-12 10:07:25.000000000 +0200
+@@ -42,7 +42,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+@@ -493,7 +492,7 @@
+         return NONE;
+     }
+ 
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+     QString ext = fileInfo.extension(false).upper();
+ 
+     if (!ext.isEmpty())

Property changes on: head/graphics/digikam/files/patch-digikam_libs_dimg_dimg.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp	(revision 221508)
@@ -0,0 +1,20 @@
+--- digikam/libs/imageproperties/imagepropertiestab.cpp.orig	2008-10-12 14:48:42.000000000 +0200
++++ digikam/libs/imageproperties/imagepropertiestab.cpp	2008-10-12 14:49:11.000000000 +0200
+@@ -42,7 +42,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -424,7 +424,7 @@ void ImagePropertiesTab::setCurrentURL(c
+ 
+     QSize   dims;
+     QString compression, bitDepth, colorMode;
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+     QString ext = fileInfo.extension(false).upper();
+ 
+     if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))

Property changes on: head/graphics/digikam/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_libs_thumbbar_thumbbar.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_libs_thumbbar_thumbbar.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_libs_thumbbar_thumbbar.cpp	(revision 221508)
@@ -0,0 +1,20 @@
+--- digikam/libs/thumbbar/thumbbar.cpp.orig	2008-10-12 14:49:37.000000000 +0200
++++ digikam/libs/thumbbar/thumbbar.cpp	2008-10-12 14:50:05.000000000 +0200
+@@ -59,7 +59,7 @@ extern "C"
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -957,7 +957,7 @@ QString ThumbBarToolTip::tipContent(Thum
+         }
+ 
+         QSize   dims;
+-        QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++        QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+         QString ext = fileInfo.extension(false).upper();
+ 
+         if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))

Property changes on: head/graphics/digikam/files/patch-digikam_libs_thumbbar_thumbbar.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_showfoto_main.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_showfoto_main.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_showfoto_main.cpp	(revision 221508)
@@ -0,0 +1,28 @@
+--- digikam/showfoto/main.cpp.orig	2008-10-12 15:05:29.000000000 +0200
++++ digikam/showfoto/main.cpp	2008-10-12 15:06:03.000000000 +0200
+@@ -45,7 +45,6 @@
+ // Libkdcraw includes.
+ 
+ #include <libkdcraw/kdcraw.h>
+-#include <libkdcraw/dcrawbinary.h>
+ 
+ // C Ansi includes.
+ 
+@@ -66,7 +65,7 @@ static KCmdLineOptions options[] =
+ 
+ int main(int argc, char *argv[])
+ {
+-    QString DcrawVer    = KDcrawIface::DcrawBinary::internalVersion();
++    QString DcrawVer    = KDcrawIface::KDcraw::librawVersion();
+ 
+     QString Exiv2Ver    = KExiv2Iface::KExiv2::Exiv2Version();
+ 
+@@ -84,7 +83,7 @@ int main(int argc, char *argv[])
+                           QString("\n") +                           
+                           QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) +
+                           QString("\n") +                           
+-                          QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) +
++                          QString(I18N_NOOP("Using LibRaw library version %1")).arg(DcrawVer) +
+                           QString("\n") +                           
+                           QString(I18N_NOOP("Using PNG library version %1")).arg(PNG_LIBPNG_VER_STRING);
+ 

Property changes on: head/graphics/digikam/files/patch-digikam_showfoto_main.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_showfoto_showfoto.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_showfoto_showfoto.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_showfoto_showfoto.cpp	(revision 221508)
@@ -0,0 +1,36 @@
+--- digikam/showfoto/showfoto.cpp.orig	2008-10-12 15:04:49.000000000 +0200
++++ digikam/showfoto/showfoto.cpp	2008-10-12 15:05:20.000000000 +0200
+@@ -73,7 +73,7 @@ extern "C"
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -179,7 +179,6 @@ ShowFoto::ShowFoto(const KURL::List& url
+     if(d->splash)
+         d->splash->message(i18n("Checking dcraw version"), AlignLeft, white);
+ 
+-    KDcrawIface::DcrawBinary::instance()->checkSystem();
+ 
+     // Populate Themes
+ 
+@@ -370,7 +369,6 @@ void ShowFoto::show()
+ 
+     // Report errors from dcraw detection.
+ 
+-    KDcrawIface::DcrawBinary::instance()->checkReport();  
+ }
+ 
+ void ShowFoto::setupConnections()
+@@ -832,7 +830,7 @@ void ShowFoto::openFolder(const KURL& ur
+     // Added RAW files estentions supported by dcraw program and 
+     // defines to digikam/libs/dcraw/rawfiles.h
+     filter.append (" ");
+-    filter.append ( QString(KDcrawIface::DcrawBinary::instance()->rawFiles()) );  
++    filter.append ( QString(KDcrawIface::KDcraw::rawFiles()) );  
+     filter.append (" ");
+ 
+     QString patterns = filter.lower();

Property changes on: head/graphics/digikam/files/patch-digikam_showfoto_showfoto.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_utilities_cameragui_cameraui.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_utilities_cameragui_cameraui.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_utilities_cameragui_cameraui.cpp	(revision 221508)
@@ -0,0 +1,28 @@
+--- digikam/utilities/cameragui/cameraui.cpp.orig	2008-10-12 15:04:12.000000000 +0200
++++ digikam/utilities/cameragui/cameraui.cpp	2008-10-12 15:04:41.000000000 +0200
+@@ -76,7 +76,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -944,14 +944,14 @@ void CameraUI::slotUpload()
+     QString allPictures = patternList[0];
+     
+     // Add RAW file format to All Images" type mime and remplace current.
+-    allPictures.insert(allPictures.find("|"), QString(KDcrawIface::DcrawBinary::instance()->rawFiles()));
++    allPictures.insert(allPictures.find("|"), QString(KDcrawIface::KDcraw::rawFiles()));
+     patternList.remove(patternList[0]);
+     patternList.prepend(allPictures);
+     
+     // Added RAW file formats supported by dcraw program like a type mime. 
+     // Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete 
+     // or unavailable(dcraw_0)(see file #121242 in B.K.O).
+-    patternList.append(QString("\n%1|Camera RAW files").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
++    patternList.append(QString("\n%1|Camera RAW files").arg(QString(KDcrawIface::KDcraw::rawFiles())));
+     
+     fileformats = patternList.join("\n");
+ 

Property changes on: head/graphics/digikam/files/patch-digikam_utilities_cameragui_cameraui.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp
===================================================================
--- head/graphics/digikam/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp	(nonexistent)
+++ head/graphics/digikam/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp	(revision 221508)
@@ -0,0 +1,18 @@
+--- digikam/utilities/lighttable/lighttablewindow.cpp.orig	2008-10-12 15:03:34.000000000 +0200
++++ digikam/utilities/lighttable/lighttablewindow.cpp	2008-10-12 15:03:58.000000000 +0200
+@@ -40,7 +40,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ 
+ // Local includes.
+ 
+@@ -575,7 +574,6 @@ void LightTableWindow::loadImageInfos(co
+     QString imagefilter = settings->getImageFileFilter().lower() +
+                           settings->getImageFileFilter().upper();
+ 
+-    if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
+     {
+         // add raw files only if dcraw is available
+         imagefilter += settings->getRawFileFilter().lower() +

Property changes on: head/graphics/digikam/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/Makefile
===================================================================
--- head/graphics/digikam-kde4/Makefile	(revision 221507)
+++ head/graphics/digikam-kde4/Makefile	(revision 221508)
@@ -1,46 +1,46 @@
 # New ports collection makefile for:	digikam
 # Date created: 			3 February 2003
 # Whom:					Arjan van Leeuwen <avleeuwen@piwebs.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	digikam
 DISTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	SFE
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	An advanced digital photo management application for KDE
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		kipi.2:${PORTSDIR}/graphics/libkipi \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
 		kexiv2.4:${PORTSDIR}/graphics/libkexiv2 \
 		lcms.1:${PORTSDIR}/graphics/lcms \
 		kdcraw.4:${PORTSDIR}/graphics/libkdcraw \
 		png.5:${PORTSDIR}/graphics/png \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		jasper.4:${PORTSDIR}/graphics/jasper
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 CONFIGURE_ARGS=	--without-included-sqlite3
 
 MAN1=		digitaglinktree.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g;s|-fno-schedule-insns -fno-inline||g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} 's/install-data-local: install-apidox/install-data-local:/' \
 		${WRKSRC}/digikam/Makefile.in ${WRKSRC}/digikam/digikam/Makefile.in
 
 .include <bsd.port.mk>

Property changes on: head/graphics/digikam-kde4/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.44
\ No newline at end of property
+1.45
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_digikam_albumfiletip.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_digikam_albumfiletip.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_digikam_albumfiletip.cpp	(revision 221508)
@@ -0,0 +1,20 @@
+--- digikam/digikam/albumfiletip.cpp.orig	2008-10-12 15:02:22.000000000 +0200
++++ digikam/digikam/albumfiletip.cpp	2008-10-12 15:02:50.000000000 +0200
+@@ -48,7 +48,7 @@
+ 
+ // LibKDcraw includes. 
+  
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+  
+ // Local includes.
+ 
+@@ -366,7 +366,7 @@ void AlbumFileTip::updateText()
+         }
+ 
+         QSize   dims;
+-        QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++        QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+         QString ext = fileInfo.extension(false).upper();
+ 
+         if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_digikam_albumfiletip.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_digikam_albumiconview.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_digikam_albumiconview.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_digikam_albumiconview.cpp	(revision 221508)
@@ -0,0 +1,18 @@
+--- digikam/digikam/albumiconview.cpp.orig	2008-10-12 15:01:31.000000000 +0200
++++ digikam/digikam/albumiconview.cpp	2008-10-12 15:02:03.000000000 +0200
+@@ -96,7 +96,6 @@ extern "C"
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ 
+ // Local includes.
+ 
+@@ -1098,7 +1097,6 @@ void AlbumIconView::slotDisplayItem(Albu
+     QString imagefilter = settings->getImageFileFilter().lower() +
+                           settings->getImageFileFilter().upper();
+ 
+-    if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
+     {
+         // add raw files only if dcraw is available
+         imagefilter += settings->getRawFileFilter().lower() +

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_digikam_albumiconview.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_digikam_albumsettings.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_digikam_albumsettings.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_digikam_albumsettings.cpp	(revision 221508)
@@ -0,0 +1,20 @@
+--- digikam/digikam/albumsettings.cpp.orig	2008-10-12 15:02:59.000000000 +0200
++++ digikam/digikam/albumsettings.cpp	2008-10-12 15:03:20.000000000 +0200
+@@ -36,7 +36,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -184,7 +184,7 @@ void AlbumSettings::init()
+ 
+     // RAW files estentions supported by dcraw program and 
+     // defines to digikam/libs/dcraw/rawfiles.h
+-    d->defaultRawFilefilter         = QString(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    d->defaultRawFilefilter         = QString(KDcrawIface::KDcraw::rawFiles());
+ 
+     d->imageFilefilter              = d->defaultImageFilefilter;
+     d->movieFilefilter              = d->defaultMovieFilefilter;

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_digikam_albumsettings.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_digikam_digikamapp.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_digikam_digikamapp.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_digikam_digikamapp.cpp	(revision 221508)
@@ -0,0 +1,34 @@
+--- digikam/digikam/digikamapp.cpp.orig	2008-10-12 14:53:14.000000000 +0200
++++ digikam/digikam/digikamapp.cpp	2008-10-12 14:55:23.000000000 +0200
+@@ -62,7 +62,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ 
+ // Local includes.
+ 
+@@ -163,7 +162,6 @@ DigikamApp::DigikamApp()
+     if(d->splashScreen)
+         d->splashScreen->message(i18n("Checking dcraw version"), AlignLeft, white);
+ 
+-    KDcrawIface::DcrawBinary::instance()->checkSystem();
+ 
+     if(d->splashScreen)
+         d->splashScreen->message(i18n("Scan Albums"), AlignLeft, white);
+@@ -221,7 +219,6 @@ DigikamApp::~DigikamApp()
+ 
+     ImageAttributesWatch::cleanUp();
+     LoadingCacheInterface::cleanUp();
+-    KDcrawIface::DcrawBinary::cleanUp();
+     AlbumThumbnailLoader::cleanUp();
+ 
+     m_instance = 0;
+@@ -276,7 +273,6 @@ void DigikamApp::show()
+     }
+ 
+     // Report errors from dcraw detection.
+-    KDcrawIface::DcrawBinary::instance()->checkReport();
+ 
+     // Init album icon view zoom factor. 
+     slotThumbSizeChanged(d->albumSettings->getDefaultIconSize());

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_digikam_digikamapp.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_digikam_main.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_digikam_main.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_digikam_main.cpp	(revision 221508)
@@ -0,0 +1,28 @@
+--- digikam/digikam/main.cpp.orig	2008-10-12 14:55:41.000000000 +0200
++++ digikam/digikam/main.cpp	2008-10-12 15:00:03.000000000 +0200
+@@ -58,7 +58,6 @@
+ // Libkdcraw includes.
+ 
+ #include <libkdcraw/kdcraw.h>
+-#include <libkdcraw/dcrawbinary.h>
+ 
+ // C Ansi includes.
+ 
+@@ -84,7 +83,7 @@ static KCmdLineOptions options[] =
+ 
+ int main(int argc, char *argv[])
+ {
+-    QString DcrawVer    = KDcrawIface::DcrawBinary::internalVersion();
++    QString DcrawVer    = KDcrawIface::KDcraw::librawVersion();
+ 
+     QString Exiv2Ver    = KExiv2Iface::KExiv2::Exiv2Version();
+ 
+@@ -112,8 +111,8 @@ int main(int argc, char *argv[])
+                           QString("\n") +
+                           QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) +
+                           QString("\n") +
+-                          QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) +
++                          QString(I18N_NOOP("Using LibRaw library version %1")).arg(DcrawVer) +
+                           QString("\n") +
+                           QString(I18N_NOOP("Using PNG library version %1")).arg(PNG_LIBPNG_VER_STRING) +
+                           QString("\n") +

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_digikam_main.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp	(revision 221507)
+++ head/graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp	(revision 221508)
@@ -1,20 +1,20 @@
---- digikam/digikam/scanlib.cpp.orig	Tue Apr 11 13:48:55 2006
-+++ digikam/digikam/scanlib.cpp	Tue Apr 11 13:50:28 2006
-@@ -260,7 +260,7 @@
+--- digikam/digikam/scanlib.cpp.orig	2008-07-16 21:05:55.000000000 +0200
++++ digikam/digikam/scanlib.cpp	2008-10-12 09:57:53.000000000 +0200
+@@ -299,7 +299,7 @@
      int items = 0;
  
      QDir dir( directory );
 -    if ( !dir.exists() or !dir.isReadable() )
 +    if ( !dir.exists() || !dir.isReadable() )
          return 0;
  
      const QFileInfoList *list = dir.entryInfoList();
-@@ -287,7 +287,7 @@
+@@ -326,7 +326,7 @@
  void ScanLib::allFiles(const QString& directory)
  {
      QDir dir( directory );
 -    if ( !dir.exists() or !dir.isReadable() )
 +    if ( !dir.exists() || !dir.isReadable() )
      {
-         kdWarning() << "Folder does not exist or is not readable: "
+         DWarning() << "Folder does not exist or is not readable: "
                      << directory << endl;

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamalbums.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamalbums.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamalbums.cpp	(revision 221508)
@@ -0,0 +1,20 @@
+--- digikam/kioslave/digikamalbums.cpp.orig	2008-10-12 14:51:40.000000000 +0200
++++ digikam/kioslave/digikamalbums.cpp	2008-10-12 14:52:08.000000000 +0200
+@@ -72,7 +72,7 @@ extern "C" 
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -269,7 +269,7 @@ void kio_digikamalbums::special(const QB
+                 if (getDimensions)
+                 {
+                     QFileInfo fileInfo(base + name);
+-                    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++                    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+                     QString ext = fileInfo.extension(false).upper();
+     
+                     if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamalbums.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamthumbnail.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamthumbnail.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamthumbnail.cpp	(revision 221508)
@@ -0,0 +1,19 @@
+--- digikam/kioslave/digikamthumbnail.cpp.orig	2008-10-12 14:52:20.000000000 +0200
++++ digikam/kioslave/digikamthumbnail.cpp	2008-10-12 14:52:51.000000000 +0200
+@@ -69,7 +69,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // Local includes
+@@ -264,7 +263,7 @@ bool kio_digikamthumbnailProtocol::loadB
+         
+     // Else, use the right way depending of image file extension.
+     QString ext = fileInfo.extension(false).upper();
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ 
+     if (!ext.isEmpty())
+     {

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamthumbnail.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_imagedialog.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_imagedialog.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_imagedialog.cpp	(revision 221508)
@@ -0,0 +1,33 @@
+--- digikam/libs/dialogs/imagedialog.cpp.orig	2008-10-12 14:50:22.000000000 +0200
++++ digikam/libs/dialogs/imagedialog.cpp	2008-10-12 14:51:29.000000000 +0200
+@@ -39,7 +39,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -267,9 +267,8 @@ ImageDialog::ImageDialog(QWidget* parent
+     QString allPictures = patternList[0];
+ 
+     // Add other files format witch are missing to All Images" type mime provided by KDE and remplace current.
+-    if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
+     {
+-        allPictures.insert(allPictures.find("|"), QString(KDcrawIface::DcrawBinary::instance()->rawFiles()) + QString(" *.JPE *.TIF"));
++        allPictures.insert(allPictures.find("|"), QString(KDcrawIface::KDcraw::rawFiles()) + QString(" *.JPE *.TIF"));
+         patternList.remove(patternList[0]);
+         patternList.prepend(allPictures);
+     }
+@@ -277,9 +276,8 @@ ImageDialog::ImageDialog(QWidget* parent
+     // Added RAW file formats supported by dcraw program like a type mime. 
+     // Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete 
+     // or unavailable(dcraw_0)(see file #121242 in B.K.O).
+-    if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
+     {
+-        patternList.append(i18n("\n%1|Camera RAW files").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
++        patternList.append(i18n("\n%1|Camera RAW files").arg(QString(KDcrawIface::KDcraw::rawFiles())));
+     }
+ 
+     d->fileformats = patternList.join("\n");

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_imagedialog.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_rawcameradlg.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_rawcameradlg.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_rawcameradlg.cpp	(revision 221508)
@@ -0,0 +1,30 @@
+--- digikam/libs/dialogs/rawcameradlg.cpp.orig	2008-07-16 21:05:55.000000000 +0200
++++ digikam/libs/dialogs/rawcameradlg.cpp	2008-10-12 15:18:00.000000000 +0200
+@@ -40,7 +40,6 @@
+ // LibKDcraw includes.
+ 
+ #include <libkdcraw/kdcraw.h>
+-#include <libkdcraw/dcrawbinary.h>
+ 
+ // Local includes.
+ 
+@@ -77,8 +76,8 @@
+     QWidget *page     = makeMainWidget();
+     QGridLayout* grid = new QGridLayout(page, 2, 2, 0, spacingHint());
+ 
+-    QStringList list      = KDcrawIface::DcrawBinary::instance()->supportedCamera();
+-    QString     dcrawVer  = KDcrawIface::DcrawBinary::instance()->internalVersion();
++    QStringList list      = KDcrawIface::KDcraw::supportedCamera();
++    QString     dcrawVer  = KDcrawIface::KDcraw::librawVersion();
+     QString     KDcrawVer = KDcrawIface::KDcraw::version();
+ 
+     // --------------------------------------------------------
+@@ -95,7 +94,7 @@
+ 
+     QLabel *header = new QLabel(page);
+     header->setText(i18n("<p>Using KDcraw library version %1"
+-                         "<p>Using Dcraw program version %2"
++                         "<p>Using LibRaw library version %2"
+                          "<p>%3 models in the list")
+                          .arg(KDcrawVer).arg(dcrawVer).arg(list.count()));
+ 

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_libs_dialogs_rawcameradlg.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_libs_dimg_dimg.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_libs_dimg_dimg.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_libs_dimg_dimg.cpp	(revision 221508)
@@ -0,0 +1,19 @@
+--- digikam/libs/dimg/dimg.cpp.orig	2008-10-12 10:03:41.000000000 +0200
++++ digikam/libs/dimg/dimg.cpp	2008-10-12 10:07:25.000000000 +0200
+@@ -42,7 +42,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+@@ -493,7 +492,7 @@
+         return NONE;
+     }
+ 
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+     QString ext = fileInfo.extension(false).upper();
+ 
+     if (!ext.isEmpty())

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_libs_dimg_dimg.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp	(revision 221508)
@@ -0,0 +1,20 @@
+--- digikam/libs/imageproperties/imagepropertiestab.cpp.orig	2008-10-12 14:48:42.000000000 +0200
++++ digikam/libs/imageproperties/imagepropertiestab.cpp	2008-10-12 14:49:11.000000000 +0200
+@@ -42,7 +42,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -424,7 +424,7 @@ void ImagePropertiesTab::setCurrentURL(c
+ 
+     QSize   dims;
+     QString compression, bitDepth, colorMode;
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+     QString ext = fileInfo.extension(false).upper();
+ 
+     if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_libs_thumbbar_thumbbar.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_libs_thumbbar_thumbbar.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_libs_thumbbar_thumbbar.cpp	(revision 221508)
@@ -0,0 +1,20 @@
+--- digikam/libs/thumbbar/thumbbar.cpp.orig	2008-10-12 14:49:37.000000000 +0200
++++ digikam/libs/thumbbar/thumbbar.cpp	2008-10-12 14:50:05.000000000 +0200
+@@ -59,7 +59,7 @@ extern "C"
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -957,7 +957,7 @@ QString ThumbBarToolTip::tipContent(Thum
+         }
+ 
+         QSize   dims;
+-        QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++        QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+         QString ext = fileInfo.extension(false).upper();
+ 
+         if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_libs_thumbbar_thumbbar.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_showfoto_main.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_showfoto_main.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_showfoto_main.cpp	(revision 221508)
@@ -0,0 +1,28 @@
+--- digikam/showfoto/main.cpp.orig	2008-10-12 15:05:29.000000000 +0200
++++ digikam/showfoto/main.cpp	2008-10-12 15:06:03.000000000 +0200
+@@ -45,7 +45,6 @@
+ // Libkdcraw includes.
+ 
+ #include <libkdcraw/kdcraw.h>
+-#include <libkdcraw/dcrawbinary.h>
+ 
+ // C Ansi includes.
+ 
+@@ -66,7 +65,7 @@ static KCmdLineOptions options[] =
+ 
+ int main(int argc, char *argv[])
+ {
+-    QString DcrawVer    = KDcrawIface::DcrawBinary::internalVersion();
++    QString DcrawVer    = KDcrawIface::KDcraw::librawVersion();
+ 
+     QString Exiv2Ver    = KExiv2Iface::KExiv2::Exiv2Version();
+ 
+@@ -84,7 +83,7 @@ int main(int argc, char *argv[])
+                           QString("\n") +                           
+                           QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) +
+                           QString("\n") +                           
+-                          QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) +
++                          QString(I18N_NOOP("Using LibRaw library version %1")).arg(DcrawVer) +
+                           QString("\n") +                           
+                           QString(I18N_NOOP("Using PNG library version %1")).arg(PNG_LIBPNG_VER_STRING);
+ 

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_showfoto_main.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_showfoto_showfoto.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_showfoto_showfoto.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_showfoto_showfoto.cpp	(revision 221508)
@@ -0,0 +1,36 @@
+--- digikam/showfoto/showfoto.cpp.orig	2008-10-12 15:04:49.000000000 +0200
++++ digikam/showfoto/showfoto.cpp	2008-10-12 15:05:20.000000000 +0200
+@@ -73,7 +73,7 @@ extern "C"
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -179,7 +179,6 @@ ShowFoto::ShowFoto(const KURL::List& url
+     if(d->splash)
+         d->splash->message(i18n("Checking dcraw version"), AlignLeft, white);
+ 
+-    KDcrawIface::DcrawBinary::instance()->checkSystem();
+ 
+     // Populate Themes
+ 
+@@ -370,7 +369,6 @@ void ShowFoto::show()
+ 
+     // Report errors from dcraw detection.
+ 
+-    KDcrawIface::DcrawBinary::instance()->checkReport();  
+ }
+ 
+ void ShowFoto::setupConnections()
+@@ -832,7 +830,7 @@ void ShowFoto::openFolder(const KURL& ur
+     // Added RAW files estentions supported by dcraw program and 
+     // defines to digikam/libs/dcraw/rawfiles.h
+     filter.append (" ");
+-    filter.append ( QString(KDcrawIface::DcrawBinary::instance()->rawFiles()) );  
++    filter.append ( QString(KDcrawIface::KDcraw::rawFiles()) );  
+     filter.append (" ");
+ 
+     QString patterns = filter.lower();

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_showfoto_showfoto.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_cameraui.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_cameraui.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_cameraui.cpp	(revision 221508)
@@ -0,0 +1,28 @@
+--- digikam/utilities/cameragui/cameraui.cpp.orig	2008-10-12 15:04:12.000000000 +0200
++++ digikam/utilities/cameragui/cameraui.cpp	2008-10-12 15:04:41.000000000 +0200
+@@ -76,7 +76,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -944,14 +944,14 @@ void CameraUI::slotUpload()
+     QString allPictures = patternList[0];
+     
+     // Add RAW file format to All Images" type mime and remplace current.
+-    allPictures.insert(allPictures.find("|"), QString(KDcrawIface::DcrawBinary::instance()->rawFiles()));
++    allPictures.insert(allPictures.find("|"), QString(KDcrawIface::KDcraw::rawFiles()));
+     patternList.remove(patternList[0]);
+     patternList.prepend(allPictures);
+     
+     // Added RAW file formats supported by dcraw program like a type mime. 
+     // Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete 
+     // or unavailable(dcraw_0)(see file #121242 in B.K.O).
+-    patternList.append(QString("\n%1|Camera RAW files").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
++    patternList.append(QString("\n%1|Camera RAW files").arg(QString(KDcrawIface::KDcraw::rawFiles())));
+     
+     fileformats = patternList.join("\n");
+ 

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_cameraui.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/digikam-kde4/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp
===================================================================
--- head/graphics/digikam-kde4/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp	(nonexistent)
+++ head/graphics/digikam-kde4/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp	(revision 221508)
@@ -0,0 +1,18 @@
+--- digikam/utilities/lighttable/lighttablewindow.cpp.orig	2008-10-12 15:03:34.000000000 +0200
++++ digikam/utilities/lighttable/lighttablewindow.cpp	2008-10-12 15:03:58.000000000 +0200
+@@ -40,7 +40,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ 
+ // Local includes.
+ 
+@@ -575,7 +574,6 @@ void LightTableWindow::loadImageInfos(co
+     QString imagefilter = settings->getImageFileFilter().lower() +
+                           settings->getImageFileFilter().upper();
+ 
+-    if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
+     {
+         // add raw files only if dcraw is available
+         imagefilter += settings->getRawFileFilter().lower() +

Property changes on: head/graphics/digikam-kde4/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins/Makefile
===================================================================
--- head/graphics/kipi-plugins/Makefile	(revision 221507)
+++ head/graphics/kipi-plugins/Makefile	(revision 221508)
@@ -1,226 +1,226 @@
 # New ports collection makefile for:	digikam-plugins
 # Date created: 			15 February 2004
 # Whom:					Arjan van Leeuwen <avleeuwen@piwebs.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kipi-plugins
 PORTVERSION=	0.1.5
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kipi
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	KDE Image Plugin Interface plugins
 
 LIB_DEPENDS=	kipi.2:${PORTSDIR}/graphics/libkipi \
 		kexiv2.4:${PORTSDIR}/graphics/libkexiv2 \
 		kdcraw.4:${PORTSDIR}/graphics/libkdcraw
 
 OPTIONS=	ACQUIREIMAGES "scanner/screenshot plugin" on \
 		BATCHPROCESSIMAGES "batch processing on images" on \
 		CALENDAR "create calendars" on \
 		CDARCHIVING "create album CDs" on \
 		FINDIMAGES "find duplicate images in albums" on \
 		FLICKREXPORT "export images to flickr account" on \
 		GALLERYEXPORT "export images to remote Gallery server" on \
 		GPSSYNC "geolocalize pictures" on \
 		HTMLEXPORT "export images collections into HTML page" on \
 		IMAGEVIEWER "OpenGL based image viewer" on \
 		JPEGLOSSLESS "batch processing without losing metainfo" on \
 		KAMERAKLIENT "GPhoto2 interface (import from cameras)" on \
 		METADATAEDIT "edit EXIF and IPTC pictures metadata" on \
 		MPEGENCODER "tool to build a video from images" on \
 		PICASAWEBEXPORT "export images to Picasa web service" on \
 		PRINTWIZARD "a print wizard" on \
 		RAWCONVERTER "convert RAW images from digital cameras" on \
 		SENDIMAGES "send images by email" on \
 		SIMPLEVIEWEREXPORT "export images to SimpleViewer" on \
 		SLIDESHOW "create a slideshow" on \
 		TIMEADJUST "adjust image file time and date" on \
 		WALLPAPER "set your image as wallpaper" on
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-ipodexport
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_ACQUIREIMAGES)
 PLIST_SUB+=	ACQUIREIMAGES:=""
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 .else
 PLIST_SUB+=	ACQUIREIMAGES:="@comment "
 CONFIGURE_ARGS+=--disable-acquireimages
 .endif
 
 .if !defined(WITHOUT_BATCHPROCESSIMAGES)
 PLIST_SUB+=	BATCHPROCESSIMAGES:=""
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .else
 PLIST_SUB+=	BATCHPROCESSIMAGES:="@comment "
 CONFIGURE_ARGS+=--disable-batchprocessimages
 .endif
 
 .if !defined(WITHOUT_CALENDAR)
 PLIST_SUB+=	CALENDAR:=""
 LIB_DEPENDS+=	kcal.2:${PORTSDIR}/deskutils/kdepim3
 .else
 PLIST_SUB+=	CALENDAR:="@comment "
 CONFIGURE_ARGS+=--disable-calendar
 .endif
 
 .if !defined(WITHOUT_CDARCHIVING)
 PLIST_SUB+=	CDARCHIVING:=""
 RUN_DEPENDS+=	k3b:${PORTSDIR}/sysutils/k3b
 .else
 PLIST_SUB+=	CDARCHIVING:="@comment "
 CONFIGURE_ARGS+=--disable-cdarchiving
 .endif
 
 .if !defined(WITHOUT_FINDIMAGES)
 PLIST_SUB+=	FINDIMAGES:=""
 .else
 PLIST_SUB+=	FINDIMAGES:="@comment "
 CONFIGURE_ARGS+=--disable-findimages
 .endif
 
 .if !defined(WITHOUT_FLICKREXPORT)
 PLIST_SUB+=	FLICKREXPORT:=""
 .else
 PLIST_SUB+=	FLICKREXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-flickrexport
 .endif
 
 .if !defined(WITHOUT_GALLERYEXPORT)
 PLIST_SUB+=	GALLERYEXPORT:=""
 .else
 PLIST_SUB+=	GALLERYEXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-galleryexport
 .endif
 
 .if !defined(WITHOUT_GPSSYNC)
 PLIST_SUB+=	GPSSYNC:=""
 .else
 PLIST_SUB+=	GPSSYNC:="@comment "
 CONFIGURE_ARGS+=--disable-gpssync
 .endif
 
 .if !defined(WITHOUT_HTMLEXPORT)
 PLIST_SUB+=	HTMLEXPORT:=""
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 PLIST_SUB+=	HTMLEXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-htmlexport
 .endif
 
 .if !defined(WITHOUT_IMAGEVIEWER)
 PLIST_SUB+=	IMAGEVIEWER:=""
 .else
 PLIST_SUB+=	IMAGEVIEWER:="@comment "
 CONFIGURE_ARGS+=--disable-imageviewer
 .endif
 
 .if !defined(WITHOUT_JPEGLOSSLESS)
 PLIST_SUB+=	JPEGLOSSLESS:=""
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .else
 PLIST_SUB+=	JPEGLOSSLESS:="@comment "
 CONFIGURE_ARGS+=--disable-jpeglossless
 .endif
 
 .if !defined(WITHOUT_KAMERAKLIENT)
 PLIST_SUB+=	KAMERAKLIENT:=""
 LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 .else
 PLIST_SUB+=	KAMERAKLIENT:="@comment "
 CONFIGURE_ARGS+=--disable-kameraklient
 .endif
 
 .if !defined(WITHOUT_METADATAEDIT)
 PLIST_SUB+=	METADATAEDIT:=""
 .else
 PLIST_SUB+=	METADATAEDIT:="@comment "
 CONFIGURE_ARGS+=--disable-metadataedit
 .endif
 
 .if !defined(WITHOUT_MPEGENCODER)
 PLIST_SUB+=	MPEGENCODER:=""
 RUN_DEPENDS+=	mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
 		convert:${PORTSDIR}/graphics/ImageMagick
 MAN1+=		images2mpg.1
 .else
 PLIST_SUB+=	MPEGENCODER:="@comment "
 CONFIGURE_ARGS+=--disable-mpegencoder
 .endif
 
 .if !defined(WITHOUT_PICASAWEBEXPORT)
 PLIST_SUB+=	PICASAWEBEXPORT:=""
 .else
 PLIST_SUB+=	PICASAWEBEXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-picasawebexport
 .endif
 
 .if !defined(WITHOUT_PRINTWIZARD)
 PLIST_SUB+=	PRINTWIZARD:=""
 .else
 PLIST_SUB+=	PRINTWIZARD:="@comment "
 CONFIGURE_ARGS+=--disable-printwizard
 .endif
 
 .if !defined(WITHOUT_RAWCONVERTER)
 PLIST_SUB+=	RAWCONVERTER:=""
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 .else
 PLIST_SUB+=	RAWCONVERTER:="@comment "
 CONFIGURE_ARGS+=--disable-rawconverter
 .endif
 
 .if !defined(WITHOUT_SENDIMAGES)
 PLIST_SUB+=	SENDIMAGES:=""
 .else
 PLIST_SUB+=	SENDIMAGES:="@comment "
 CONFIGURE_ARGS+=--disable-sendimages
 .endif
 
 .if !defined(WITHOUT_SIMPLEVIEWEREXPORT)
 PLIST_SUB+=	SIMPLEVIEWEREXPORT:=""
 .else
 PLIST_SUB+=	SIMPLEVIEWEREXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-simpleviewerexport
 .endif
 
 .if !defined(WITHOUT_SLIDESHOW)
 PLIST_SUB+=	SLIDESHOW:=""
 .else
 PLIST_SUB+=	SLIDESHOW:="@comment "
 CONFIGURE_ARGS+=--disable-slideshow
 .endif
 
 .if !defined(WITHOUT_TIMEADJUST)
 PLIST_SUB+=	TIMEADJUST:=""
 .else
 PLIST_SUB+=	TIMEADJUST:="@comment "
 CONFIGURE_ARGS+=--disable-timeadjust
 .endif
 
 .if !defined(WITHOUT_WALLPAPER)
 PLIST_SUB+=	WALLPAPER:=""
 .else
 PLIST_SUB+=	WALLPAPER:="@comment "
 CONFIGURE_ARGS+=--disable-wallpaper
 .endif
 
 post-patch::
 	@${REINPLACE_CMD} -e 's|-O2||g;s|-fno-schedule-insns -fno-inline||g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>

Property changes on: head/graphics/kipi-plugins/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.37
\ No newline at end of property
+1.38
\ No newline at end of property
Index: head/graphics/kipi-plugins/files/patch-kipi-plugins_imageviewer_texture.cpp
===================================================================
--- head/graphics/kipi-plugins/files/patch-kipi-plugins_imageviewer_texture.cpp	(nonexistent)
+++ head/graphics/kipi-plugins/files/patch-kipi-plugins_imageviewer_texture.cpp	(revision 221508)
@@ -0,0 +1,19 @@
+--- kipi-plugins/imageviewer/texture.cpp.orig	2008-10-12 10:08:40.000000000 +0200
++++ kipi-plugins/imageviewer/texture.cpp	2008-10-12 10:09:00.000000000 +0200
+@@ -28,7 +28,6 @@
+ #include <kdebug.h>
+ 
+ // LibKDcraw includes
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // Local includes
+@@ -89,7 +88,7 @@
+ 	_texnr=tn;
+ 
+ 	// check if its a RAW file.
+-	QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++	QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ 	QFileInfo fileInfo(fn);
+ 	if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() )) {
+ 		// it's a RAW file, use the libkdcraw loader

Property changes on: head/graphics/kipi-plugins/files/patch-kipi-plugins_imageviewer_texture.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins/files/patch-kipi-plugins_jpeglossless_utils.cpp
===================================================================
--- head/graphics/kipi-plugins/files/patch-kipi-plugins_jpeglossless_utils.cpp	(nonexistent)
+++ head/graphics/kipi-plugins/files/patch-kipi-plugins_jpeglossless_utils.cpp	(revision 221508)
@@ -0,0 +1,20 @@
+--- ./kipi-plugins/jpeglossless/utils.cpp.orig	2008-10-12 10:10:46.000000000 +0200
++++ ./kipi-plugins/jpeglossless/utils.cpp	2008-10-12 10:11:24.000000000 +0200
+@@ -57,7 +57,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -187,7 +187,7 @@
+ 
+ bool Utils::isRAW(const QString& file)
+ {
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ 
+     QFileInfo fileInfo(file);
+     if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))

Property changes on: head/graphics/kipi-plugins/files/patch-kipi-plugins_jpeglossless_utils.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins/files/patch-kipi-plugins_printwizard_tphoto.cpp
===================================================================
--- head/graphics/kipi-plugins/files/patch-kipi-plugins_printwizard_tphoto.cpp	(nonexistent)
+++ head/graphics/kipi-plugins/files/patch-kipi-plugins_printwizard_tphoto.cpp	(revision 221508)
@@ -0,0 +1,19 @@
+--- ./kipi-plugins/printwizard/tphoto.cpp.orig	2008-10-12 10:14:50.000000000 +0200
++++ ./kipi-plugins/printwizard/tphoto.cpp	2008-10-12 10:15:08.000000000 +0200
+@@ -40,7 +40,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ 
+@@ -103,7 +102,7 @@
+   QImage photo;
+ 
+   // Check if RAW file.
+-  QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++  QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+   QFileInfo fileInfo(filename.path());
+   if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+     KDcrawIface::KDcraw::loadDcrawPreview(photo, filename.path());

Property changes on: head/graphics/kipi-plugins/files/patch-kipi-plugins_printwizard_tphoto.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawconverter.cpp
===================================================================
--- head/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawconverter.cpp	(nonexistent)
+++ head/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawconverter.cpp	(revision 221508)
@@ -0,0 +1,31 @@
+--- ./kipi-plugins/rawconverter/plugin_rawconverter.cpp.orig	2008-10-12 10:15:43.000000000 +0200
++++ ./kipi-plugins/rawconverter/plugin_rawconverter.cpp	2008-10-12 10:18:27.000000000 +0200
+@@ -53,7 +53,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -116,7 +116,7 @@
+ 
+ bool Plugin_RawConverter::isRAWFile(const QString& filePath)
+ {
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ 
+     QFileInfo fileInfo(filePath);
+     if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+@@ -127,9 +127,7 @@
+ 
+ bool Plugin_RawConverter::checkBinaries()
+ {
+-    KDcrawIface::DcrawBinary::instance()->checkSystem();
+-    KDcrawIface::DcrawBinary::instance()->checkReport();
+-    return KDcrawIface::DcrawBinary::instance()->isAvailable();
++    return true;
+ }
+ 
+ void Plugin_RawConverter::slotActivateSingle()

Property changes on: head/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawconverter.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawdecodingiface.cpp
===================================================================
--- head/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawdecodingiface.cpp	(nonexistent)
+++ head/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawdecodingiface.cpp	(revision 221508)
@@ -0,0 +1,11 @@
+--- kipi-plugins/rawconverter/rawdecodingiface.cpp.orig	2008-10-12 10:28:10.000000000 +0200
++++ kipi-plugins/rawconverter/rawdecodingiface.cpp	2008-10-12 10:28:31.000000000 +0200
+@@ -63,7 +63,7 @@
+ // LibKDcraw includes.
+ 
+ #include <libkdcraw/rawfiles.h>
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 

Property changes on: head/graphics/kipi-plugins/files/patch-kipi-plugins_rawconverter_rawdecodingiface.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins/files/patch-kipi-plugins_sendimages_sendimages.cpp
===================================================================
--- head/graphics/kipi-plugins/files/patch-kipi-plugins_sendimages_sendimages.cpp	(nonexistent)
+++ head/graphics/kipi-plugins/files/patch-kipi-plugins_sendimages_sendimages.cpp	(revision 221508)
@@ -0,0 +1,19 @@
+--- ./kipi-plugins/sendimages/sendimages.cpp.orig	2008-10-12 10:11:59.000000000 +0200
++++ ./kipi-plugins/sendimages/sendimages.cpp	2008-10-12 10:12:19.000000000 +0200
+@@ -59,7 +59,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+@@ -789,7 +788,7 @@
+     QImage img;
+ 
+     // Check if RAW file.
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+     QFileInfo fileInfo(SourcePath);
+     if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+         KDcrawIface::KDcraw::loadDcrawPreview(img, SourcePath);

Property changes on: head/graphics/kipi-plugins/files/patch-kipi-plugins_sendimages_sendimages.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins/files/patch-kipi-plugins_simpleviewerexport_simpleviewerexport.cpp
===================================================================
--- head/graphics/kipi-plugins/files/patch-kipi-plugins_simpleviewerexport_simpleviewerexport.cpp	(nonexistent)
+++ head/graphics/kipi-plugins/files/patch-kipi-plugins_simpleviewerexport_simpleviewerexport.cpp	(revision 221508)
@@ -0,0 +1,19 @@
+--- ./kipi-plugins/simpleviewerexport/simpleviewerexport.cpp.orig	2008-10-12 10:13:11.000000000 +0200
++++ ./kipi-plugins/simpleviewerexport/simpleviewerexport.cpp	2008-10-12 10:13:42.000000000 +0200
+@@ -52,7 +52,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // LibKExiv2 includes.
+@@ -376,7 +375,7 @@
+             m_progressDlg->addedAction(i18n("Processing %1").arg(url.filename()), KIPI::StartingMessage);
+ 
+             // Check if RAW file.
+-            QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++            QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+             if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+                 KDcrawIface::KDcraw::loadDcrawPreview(image, url.path());
+             else

Property changes on: head/graphics/kipi-plugins/files/patch-kipi-plugins_simpleviewerexport_simpleviewerexport.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins-kde4/Makefile
===================================================================
--- head/graphics/kipi-plugins-kde4/Makefile	(revision 221507)
+++ head/graphics/kipi-plugins-kde4/Makefile	(revision 221508)
@@ -1,226 +1,226 @@
 # New ports collection makefile for:	digikam-plugins
 # Date created: 			15 February 2004
 # Whom:					Arjan van Leeuwen <avleeuwen@piwebs.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kipi-plugins
 PORTVERSION=	0.1.5
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kipi
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	KDE Image Plugin Interface plugins
 
 LIB_DEPENDS=	kipi.2:${PORTSDIR}/graphics/libkipi \
 		kexiv2.4:${PORTSDIR}/graphics/libkexiv2 \
 		kdcraw.4:${PORTSDIR}/graphics/libkdcraw
 
 OPTIONS=	ACQUIREIMAGES "scanner/screenshot plugin" on \
 		BATCHPROCESSIMAGES "batch processing on images" on \
 		CALENDAR "create calendars" on \
 		CDARCHIVING "create album CDs" on \
 		FINDIMAGES "find duplicate images in albums" on \
 		FLICKREXPORT "export images to flickr account" on \
 		GALLERYEXPORT "export images to remote Gallery server" on \
 		GPSSYNC "geolocalize pictures" on \
 		HTMLEXPORT "export images collections into HTML page" on \
 		IMAGEVIEWER "OpenGL based image viewer" on \
 		JPEGLOSSLESS "batch processing without losing metainfo" on \
 		KAMERAKLIENT "GPhoto2 interface (import from cameras)" on \
 		METADATAEDIT "edit EXIF and IPTC pictures metadata" on \
 		MPEGENCODER "tool to build a video from images" on \
 		PICASAWEBEXPORT "export images to Picasa web service" on \
 		PRINTWIZARD "a print wizard" on \
 		RAWCONVERTER "convert RAW images from digital cameras" on \
 		SENDIMAGES "send images by email" on \
 		SIMPLEVIEWEREXPORT "export images to SimpleViewer" on \
 		SLIDESHOW "create a slideshow" on \
 		TIMEADJUST "adjust image file time and date" on \
 		WALLPAPER "set your image as wallpaper" on
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-ipodexport
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_ACQUIREIMAGES)
 PLIST_SUB+=	ACQUIREIMAGES:=""
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 .else
 PLIST_SUB+=	ACQUIREIMAGES:="@comment "
 CONFIGURE_ARGS+=--disable-acquireimages
 .endif
 
 .if !defined(WITHOUT_BATCHPROCESSIMAGES)
 PLIST_SUB+=	BATCHPROCESSIMAGES:=""
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .else
 PLIST_SUB+=	BATCHPROCESSIMAGES:="@comment "
 CONFIGURE_ARGS+=--disable-batchprocessimages
 .endif
 
 .if !defined(WITHOUT_CALENDAR)
 PLIST_SUB+=	CALENDAR:=""
 LIB_DEPENDS+=	kcal.2:${PORTSDIR}/deskutils/kdepim3
 .else
 PLIST_SUB+=	CALENDAR:="@comment "
 CONFIGURE_ARGS+=--disable-calendar
 .endif
 
 .if !defined(WITHOUT_CDARCHIVING)
 PLIST_SUB+=	CDARCHIVING:=""
 RUN_DEPENDS+=	k3b:${PORTSDIR}/sysutils/k3b
 .else
 PLIST_SUB+=	CDARCHIVING:="@comment "
 CONFIGURE_ARGS+=--disable-cdarchiving
 .endif
 
 .if !defined(WITHOUT_FINDIMAGES)
 PLIST_SUB+=	FINDIMAGES:=""
 .else
 PLIST_SUB+=	FINDIMAGES:="@comment "
 CONFIGURE_ARGS+=--disable-findimages
 .endif
 
 .if !defined(WITHOUT_FLICKREXPORT)
 PLIST_SUB+=	FLICKREXPORT:=""
 .else
 PLIST_SUB+=	FLICKREXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-flickrexport
 .endif
 
 .if !defined(WITHOUT_GALLERYEXPORT)
 PLIST_SUB+=	GALLERYEXPORT:=""
 .else
 PLIST_SUB+=	GALLERYEXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-galleryexport
 .endif
 
 .if !defined(WITHOUT_GPSSYNC)
 PLIST_SUB+=	GPSSYNC:=""
 .else
 PLIST_SUB+=	GPSSYNC:="@comment "
 CONFIGURE_ARGS+=--disable-gpssync
 .endif
 
 .if !defined(WITHOUT_HTMLEXPORT)
 PLIST_SUB+=	HTMLEXPORT:=""
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
 PLIST_SUB+=	HTMLEXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-htmlexport
 .endif
 
 .if !defined(WITHOUT_IMAGEVIEWER)
 PLIST_SUB+=	IMAGEVIEWER:=""
 .else
 PLIST_SUB+=	IMAGEVIEWER:="@comment "
 CONFIGURE_ARGS+=--disable-imageviewer
 .endif
 
 .if !defined(WITHOUT_JPEGLOSSLESS)
 PLIST_SUB+=	JPEGLOSSLESS:=""
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .else
 PLIST_SUB+=	JPEGLOSSLESS:="@comment "
 CONFIGURE_ARGS+=--disable-jpeglossless
 .endif
 
 .if !defined(WITHOUT_KAMERAKLIENT)
 PLIST_SUB+=	KAMERAKLIENT:=""
 LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 .else
 PLIST_SUB+=	KAMERAKLIENT:="@comment "
 CONFIGURE_ARGS+=--disable-kameraklient
 .endif
 
 .if !defined(WITHOUT_METADATAEDIT)
 PLIST_SUB+=	METADATAEDIT:=""
 .else
 PLIST_SUB+=	METADATAEDIT:="@comment "
 CONFIGURE_ARGS+=--disable-metadataedit
 .endif
 
 .if !defined(WITHOUT_MPEGENCODER)
 PLIST_SUB+=	MPEGENCODER:=""
 RUN_DEPENDS+=	mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
 		convert:${PORTSDIR}/graphics/ImageMagick
 MAN1+=		images2mpg.1
 .else
 PLIST_SUB+=	MPEGENCODER:="@comment "
 CONFIGURE_ARGS+=--disable-mpegencoder
 .endif
 
 .if !defined(WITHOUT_PICASAWEBEXPORT)
 PLIST_SUB+=	PICASAWEBEXPORT:=""
 .else
 PLIST_SUB+=	PICASAWEBEXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-picasawebexport
 .endif
 
 .if !defined(WITHOUT_PRINTWIZARD)
 PLIST_SUB+=	PRINTWIZARD:=""
 .else
 PLIST_SUB+=	PRINTWIZARD:="@comment "
 CONFIGURE_ARGS+=--disable-printwizard
 .endif
 
 .if !defined(WITHOUT_RAWCONVERTER)
 PLIST_SUB+=	RAWCONVERTER:=""
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 .else
 PLIST_SUB+=	RAWCONVERTER:="@comment "
 CONFIGURE_ARGS+=--disable-rawconverter
 .endif
 
 .if !defined(WITHOUT_SENDIMAGES)
 PLIST_SUB+=	SENDIMAGES:=""
 .else
 PLIST_SUB+=	SENDIMAGES:="@comment "
 CONFIGURE_ARGS+=--disable-sendimages
 .endif
 
 .if !defined(WITHOUT_SIMPLEVIEWEREXPORT)
 PLIST_SUB+=	SIMPLEVIEWEREXPORT:=""
 .else
 PLIST_SUB+=	SIMPLEVIEWEREXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-simpleviewerexport
 .endif
 
 .if !defined(WITHOUT_SLIDESHOW)
 PLIST_SUB+=	SLIDESHOW:=""
 .else
 PLIST_SUB+=	SLIDESHOW:="@comment "
 CONFIGURE_ARGS+=--disable-slideshow
 .endif
 
 .if !defined(WITHOUT_TIMEADJUST)
 PLIST_SUB+=	TIMEADJUST:=""
 .else
 PLIST_SUB+=	TIMEADJUST:="@comment "
 CONFIGURE_ARGS+=--disable-timeadjust
 .endif
 
 .if !defined(WITHOUT_WALLPAPER)
 PLIST_SUB+=	WALLPAPER:=""
 .else
 PLIST_SUB+=	WALLPAPER:="@comment "
 CONFIGURE_ARGS+=--disable-wallpaper
 .endif
 
 post-patch::
 	@${REINPLACE_CMD} -e 's|-O2||g;s|-fno-schedule-insns -fno-inline||g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>

Property changes on: head/graphics/kipi-plugins-kde4/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.37
\ No newline at end of property
+1.38
\ No newline at end of property
Index: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_imageviewer_texture.cpp
===================================================================
--- head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_imageviewer_texture.cpp	(nonexistent)
+++ head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_imageviewer_texture.cpp	(revision 221508)
@@ -0,0 +1,19 @@
+--- kipi-plugins/imageviewer/texture.cpp.orig	2008-10-12 10:08:40.000000000 +0200
++++ kipi-plugins/imageviewer/texture.cpp	2008-10-12 10:09:00.000000000 +0200
+@@ -28,7 +28,6 @@
+ #include <kdebug.h>
+ 
+ // LibKDcraw includes
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // Local includes
+@@ -89,7 +88,7 @@
+ 	_texnr=tn;
+ 
+ 	// check if its a RAW file.
+-	QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++	QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ 	QFileInfo fileInfo(fn);
+ 	if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() )) {
+ 		// it's a RAW file, use the libkdcraw loader

Property changes on: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_imageviewer_texture.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_jpeglossless_utils.cpp
===================================================================
--- head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_jpeglossless_utils.cpp	(nonexistent)
+++ head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_jpeglossless_utils.cpp	(revision 221508)
@@ -0,0 +1,20 @@
+--- ./kipi-plugins/jpeglossless/utils.cpp.orig	2008-10-12 10:10:46.000000000 +0200
++++ ./kipi-plugins/jpeglossless/utils.cpp	2008-10-12 10:11:24.000000000 +0200
+@@ -57,7 +57,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -187,7 +187,7 @@
+ 
+ bool Utils::isRAW(const QString& file)
+ {
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ 
+     QFileInfo fileInfo(file);
+     if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))

Property changes on: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_jpeglossless_utils.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_printwizard_tphoto.cpp
===================================================================
--- head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_printwizard_tphoto.cpp	(nonexistent)
+++ head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_printwizard_tphoto.cpp	(revision 221508)
@@ -0,0 +1,19 @@
+--- ./kipi-plugins/printwizard/tphoto.cpp.orig	2008-10-12 10:14:50.000000000 +0200
++++ ./kipi-plugins/printwizard/tphoto.cpp	2008-10-12 10:15:08.000000000 +0200
+@@ -40,7 +40,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ 
+@@ -103,7 +102,7 @@
+   QImage photo;
+ 
+   // Check if RAW file.
+-  QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++  QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+   QFileInfo fileInfo(filename.path());
+   if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+     KDcrawIface::KDcraw::loadDcrawPreview(photo, filename.path());

Property changes on: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_printwizard_tphoto.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_rawconverter_rawconverter.cpp
===================================================================
--- head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_rawconverter_rawconverter.cpp	(nonexistent)
+++ head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_rawconverter_rawconverter.cpp	(revision 221508)
@@ -0,0 +1,31 @@
+--- ./kipi-plugins/rawconverter/plugin_rawconverter.cpp.orig	2008-10-12 10:15:43.000000000 +0200
++++ ./kipi-plugins/rawconverter/plugin_rawconverter.cpp	2008-10-12 10:18:27.000000000 +0200
+@@ -53,7 +53,7 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 
+@@ -116,7 +116,7 @@
+ 
+ bool Plugin_RawConverter::isRAWFile(const QString& filePath)
+ {
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+ 
+     QFileInfo fileInfo(filePath);
+     if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+@@ -127,9 +127,7 @@
+ 
+ bool Plugin_RawConverter::checkBinaries()
+ {
+-    KDcrawIface::DcrawBinary::instance()->checkSystem();
+-    KDcrawIface::DcrawBinary::instance()->checkReport();
+-    return KDcrawIface::DcrawBinary::instance()->isAvailable();
++    return true;
+ }
+ 
+ void Plugin_RawConverter::slotActivateSingle()

Property changes on: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_rawconverter_rawconverter.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_rawconverter_rawdecodingiface.cpp
===================================================================
--- head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_rawconverter_rawdecodingiface.cpp	(nonexistent)
+++ head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_rawconverter_rawdecodingiface.cpp	(revision 221508)
@@ -0,0 +1,11 @@
+--- kipi-plugins/rawconverter/rawdecodingiface.cpp.orig	2008-10-12 10:28:10.000000000 +0200
++++ kipi-plugins/rawconverter/rawdecodingiface.cpp	2008-10-12 10:28:31.000000000 +0200
+@@ -63,7 +63,7 @@
+ // LibKDcraw includes.
+ 
+ #include <libkdcraw/rawfiles.h>
+-#include <libkdcraw/dcrawbinary.h>
++#include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+ 

Property changes on: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_rawconverter_rawdecodingiface.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_sendimages_sendimages.cpp
===================================================================
--- head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_sendimages_sendimages.cpp	(nonexistent)
+++ head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_sendimages_sendimages.cpp	(revision 221508)
@@ -0,0 +1,19 @@
+--- ./kipi-plugins/sendimages/sendimages.cpp.orig	2008-10-12 10:11:59.000000000 +0200
++++ ./kipi-plugins/sendimages/sendimages.cpp	2008-10-12 10:12:19.000000000 +0200
+@@ -59,7 +59,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // Local includes.
+@@ -789,7 +788,7 @@
+     QImage img;
+ 
+     // Check if RAW file.
+-    QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++    QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+     QFileInfo fileInfo(SourcePath);
+     if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+         KDcrawIface::KDcraw::loadDcrawPreview(img, SourcePath);

Property changes on: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_sendimages_sendimages.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_simpleviewerexport_simpleviewerexport.cpp
===================================================================
--- head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_simpleviewerexport_simpleviewerexport.cpp	(nonexistent)
+++ head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_simpleviewerexport_simpleviewerexport.cpp	(revision 221508)
@@ -0,0 +1,19 @@
+--- ./kipi-plugins/simpleviewerexport/simpleviewerexport.cpp.orig	2008-10-12 10:13:11.000000000 +0200
++++ ./kipi-plugins/simpleviewerexport/simpleviewerexport.cpp	2008-10-12 10:13:42.000000000 +0200
+@@ -52,7 +52,6 @@
+ 
+ // LibKDcraw includes.
+ 
+-#include <libkdcraw/dcrawbinary.h>
+ #include <libkdcraw/kdcraw.h>
+ 
+ // LibKExiv2 includes.
+@@ -376,7 +375,7 @@
+             m_progressDlg->addedAction(i18n("Processing %1").arg(url.filename()), KIPI::StartingMessage);
+ 
+             // Check if RAW file.
+-            QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
++            QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+             if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
+                 KDcrawIface::KDcraw::loadDcrawPreview(image, url.path());
+             else

Property changes on: head/graphics/kipi-plugins-kde4/files/patch-kipi-plugins_simpleviewerexport_simpleviewerexport.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property