Update Digikam, Digikamimageplugins to 0.7.4

    These patches update graphics/digikam and
    graphics/digikamimageplugins to version 0.7.4.

    Two new ports are included: graphics/digikam-doc and
    graphics/digikamimageplugins-doc. The documentation for these
    ports is now split from the main program.

PR:		ports/85718
Submitted by:	Arjan van Leeuwen <avleeuwen@piwebs.com>

4 files changed, 62 insertions, 208 deletions

diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 51d2dcaaabc1..3fd187abf4ba 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	digikam
-PORTVERSION=	0.7.2
+PORTVERSION=	0.7.4
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo
index 722511b57d31..7ddde1a58dd3 100644
--- a/graphics/digikam/distinfo
+++ b/graphics/digikam/distinfo
@@ -1,2 +1,2 @@
-MD5 (digikam-0.7.2.tar.bz2) = c4573ae34c87b41efad4e69f983c36b9
-SIZE (digikam-0.7.2.tar.bz2) = 11145384
+MD5 (digikam-0.7.4.tar.bz2) = 3df53700ff78caca60cab4ea4116c7c5
+SIZE (digikam-0.7.4.tar.bz2) = 2322119
diff --git a/graphics/digikam/files/patch-externc b/graphics/digikam/files/patch-externc
index bc364216b82b..bd3b9b311c7c 100644
--- a/graphics/digikam/files/patch-externc
+++ b/graphics/digikam/files/patch-externc
@@ -1,11 +1,11 @@
---- digikam/digikam/digikamfirstrun.cpp.orig	Wed Jan  5 10:40:08 2005
-+++ digikam/digikam/digikamfirstrun.cpp	Wed Jan  5 10:40:39 2005
-@@ -20,15 +20,6 @@
-  * 
+--- digikam/digikam/digikamfirstrun.cpp.orig	Sun Sep  4 17:47:15 2005
++++ digikam/digikam/digikamfirstrun.cpp	Sun Sep  4 17:48:44 2005
+@@ -19,15 +19,6 @@
+  *
   * ============================================================ */
  
 -// C Ansi includes.
-- 
+-
 -extern "C"
 -{
 -#include <sys/types.h>
@@ -14,14 +14,15 @@
 -}
 -
  // C++ Includes.
-  
+ 
  #include <iostream>
-@@ -65,6 +56,15 @@
+@@ -64,6 +55,16 @@
  #include "firstrunUI.h"
  
  #include <iostream>
++
 +// C Ansi includes.
-+ 
++
 +extern "C"
 +{
 +#include <sys/types.h>
@@ -32,9 +33,9 @@
  using namespace std;
  
  DigikamFirstRun::DigikamFirstRun( KConfig* config,
---- digikam/utilities/imageeditor/imlibinterface.cpp.orig	Wed Jan  5 10:45:12 2005
-+++ digikam/utilities/imageeditor/imlibinterface.cpp	Wed Jan  5 10:45:29 2005
-@@ -22,13 +22,6 @@
+--- digikam/utilities/imageeditor/imlibinterface.cpp.orig	Sun Sep  4 17:49:22 2005
++++ digikam/utilities/imageeditor/imlibinterface.cpp	Sun Sep  4 17:50:00 2005
+@@ -21,13 +21,6 @@
  
  #define PI 3.14159265
   
@@ -49,16 +50,16 @@
  
  #include <cmath>
 @@ -59,6 +52,13 @@
- #include "albumsettings.h"
+ #include "undomanager.h"
+ #include "undoaction.h"
  #include "imlibinterface.h"
- 
++
 +// Lib Tiff includes.
 +
-+extern "C" 
++extern "C"
 +{
 +#include <tiffio.h>
 +}
-+ 
+ 
  namespace Digikam
  {
- 
diff --git a/graphics/digikam/pkg-plist b/graphics/digikam/pkg-plist
index c02e9d410401..1acd1b911edd 100644
--- a/graphics/digikam/pkg-plist
+++ b/graphics/digikam/pkg-plist
@@ -1,6 +1,7 @@
 bin/digikam
 bin/showfoto
 include/digikam/colorgradientwidget.h
+include/digikam/curveswidget.h
 include/digikam/histogramwidget.h
 include/digikam/imagecurves.h
 include/digikam/imagefilters.h
@@ -14,6 +15,8 @@ include/digikam/imagepreviewwidget.h
 include/digikam/imageregionwidget.h
 include/digikam/imageselectionwidget.h
 include/digikam/imagewidget.h
+include/digikam/thumbbar.h
+include/digikam_export.h
 lib/kde3/digikamimageplugin_core.la
 lib/kde3/digikamimageplugin_core.so
 lib/kde3/kio_digikamio.la
@@ -27,39 +30,44 @@ lib/libdigikam.so
 lib/libdigikam.so.0
 share/applications/kde/showfoto.desktop
 share/applnk/Graphics/digikam.desktop
+share/apps/digikam/data/browntone.png
+share/apps/digikam/data/bwgreen.png
+share/apps/digikam/data/bworange.png
+share/apps/digikam/data/bwred.png
+share/apps/digikam/data/bwyellow.png
+share/apps/digikam/data/coldtone.png
 share/apps/digikam/data/image_broken.png
+share/apps/digikam/data/neutralbw.png
+share/apps/digikam/data/platinum.png
+share/apps/digikam/data/selenium.png
+share/apps/digikam/data/sepia.png
 share/apps/digikam/digikam-splash.png
 share/apps/digikam/digikamimageplugin_core_ui.rc
 share/apps/digikam/digikamimagewindowui.rc
 share/apps/digikam/digikamui.rc
 share/apps/digikam/icons/hicolor/32x32/actions/addimagefolder.png
-share/apps/digikam/icons/hicolor/32x32/actions/adjustbcg.png
 share/apps/digikam/icons/hicolor/32x32/actions/adjusthsl.png
 share/apps/digikam/icons/hicolor/32x32/actions/adjustrgb.png
 share/apps/digikam/icons/hicolor/32x32/actions/albumfoldercomment.png
 share/apps/digikam/icons/hicolor/32x32/actions/albumfoldernew.png
 share/apps/digikam/icons/hicolor/32x32/actions/autolevels.png
 share/apps/digikam/icons/hicolor/32x32/actions/blurimage.png
-share/apps/digikam/icons/hicolor/32x32/actions/browntone.png
 share/apps/digikam/icons/hicolor/32x32/actions/bwtonal.png
 share/apps/digikam/icons/hicolor/32x32/actions/cameradownload.png
-share/apps/digikam/icons/hicolor/32x32/actions/coldtone.png
+share/apps/digikam/icons/hicolor/32x32/actions/contrast.png
 share/apps/digikam/icons/hicolor/32x32/actions/digitalcam.png
 share/apps/digikam/icons/hicolor/32x32/actions/editimage.png
 share/apps/digikam/icons/hicolor/32x32/actions/equalize.png
 share/apps/digikam/icons/hicolor/32x32/actions/exifinfo.png
-share/apps/digikam/icons/hicolor/32x32/actions/flip_image.png
+share/apps/digikam/icons/hicolor/32x32/actions/flip.png
+share/apps/digikam/icons/hicolor/32x32/actions/histogram.png
 share/apps/digikam/icons/hicolor/32x32/actions/imagecomment.png
 share/apps/digikam/icons/hicolor/32x32/actions/importfolders2albums.png
 share/apps/digikam/icons/hicolor/32x32/actions/invertimage.png
-share/apps/digikam/icons/hicolor/32x32/actions/neutralbw.png
 share/apps/digikam/icons/hicolor/32x32/actions/normalize.png
-share/apps/digikam/icons/hicolor/32x32/actions/platinium.png
 share/apps/digikam/icons/hicolor/32x32/actions/ratiocrop.png
 share/apps/digikam/icons/hicolor/32x32/actions/redeyes.png
 share/apps/digikam/icons/hicolor/32x32/actions/resize_image.png
-share/apps/digikam/icons/hicolor/32x32/actions/selenium.png
-share/apps/digikam/icons/hicolor/32x32/actions/sepia.png
 share/apps/digikam/icons/hicolor/32x32/actions/sharpenimage.png
 share/apps/digikam/icons/hicolor/32x32/actions/stretchcontrast.png
 share/apps/digikam/icons/hicolor/32x32/actions/tag-events.png
@@ -71,179 +79,20 @@ share/apps/digikam/themes/Clean
 share/apps/digikam/themes/Dreary
 share/apps/digikam/themes/Marine
 share/apps/digikam/tips
+share/apps/showfoto/showfoto-splash.png
 share/apps/showfoto/showfotoui.rc
-share/doc/HTML/da/digikam/common
-share/doc/HTML/da/digikam/index.cache.bz2
-share/doc/HTML/da/digikam/index.docbook
-share/doc/HTML/en/digikam/README
-share/doc/HTML/en/digikam/addcamera.png
-share/doc/HTML/en/digikam/albumproperties.png
-share/doc/HTML/en/digikam/assigntags.png
-share/doc/HTML/en/digikam/autolevelspreview.png
-share/doc/HTML/en/digikam/cameraclient.png
-share/doc/HTML/en/digikam/cameraclientadvanced.png
-share/doc/HTML/en/digikam/cameraclientdownload.png
-share/doc/HTML/en/digikam/commentstags.png
-share/doc/HTML/en/digikam/common
-share/doc/HTML/en/digikam/convert_brown.png
-share/doc/HTML/en/digikam/convert_bw.png
-share/doc/HTML/en/digikam/convert_cold.png
-share/doc/HTML/en/digikam/convert_platinium.png
-share/doc/HTML/en/digikam/convert_selenium.png
-share/doc/HTML/en/digikam/convert_sepia.png
-share/doc/HTML/en/digikam/digikamlogo.png
-share/doc/HTML/en/digikam/editoradjustcurves.png
-share/doc/HTML/en/digikam/editoradjustlevels.png
-share/doc/HTML/en/digikam/editorautosizebutton.png
-share/doc/HTML/en/digikam/editorbcgadjust.png
-share/doc/HTML/en/digikam/editorblurplugin.png
-share/doc/HTML/en/digikam/editorcolorbalance.png
-share/doc/HTML/en/digikam/editorcropbutton.png
-share/doc/HTML/en/digikam/editorhsladjust.png
-share/doc/HTML/en/digikam/editorimageselection.png
-share/doc/HTML/en/digikam/editornoisereductionplugin.png
-share/doc/HTML/en/digikam/editorraindropsplugin.png
-share/doc/HTML/en/digikam/editorratiocroptool.png
-share/doc/HTML/en/digikam/editorredeyescorrection.png
-share/doc/HTML/en/digikam/editorresizetool.png
-share/doc/HTML/en/digikam/editorsharpenplugin.png
-share/doc/HTML/en/digikam/editorunsharpedmaskplugin.png
-share/doc/HTML/en/digikam/equalizepreview.png
-share/doc/HTML/en/digikam/exifviewer.png
-share/doc/HTML/en/digikam/firstrundialog.png
-share/doc/HTML/en/digikam/foldericon.png
-share/doc/HTML/en/digikam/histogramdescription.png
-share/doc/HTML/en/digikam/histogramimageplugin.png
-share/doc/HTML/en/digikam/histogramsample1.png
-share/doc/HTML/en/digikam/histogramsample2.png
-share/doc/HTML/en/digikam/histogramsample3.png
-share/doc/HTML/en/digikam/imageeditor.png
-share/doc/HTML/en/digikam/imageeditortoolbar.png
-share/doc/HTML/en/digikam/imageproperties.png
-share/doc/HTML/en/digikam/imageproperties2.png
-share/doc/HTML/en/digikam/imageproperties3.png
-share/doc/HTML/en/digikam/index.cache.bz2
-share/doc/HTML/en/digikam/index.docbook
-share/doc/HTML/en/digikam/maintoolbar.png
-share/doc/HTML/en/digikam/mainwindow.png
-share/doc/HTML/en/digikam/normalizepreview.png
-share/doc/HTML/en/digikam/revertbutton.png
-share/doc/HTML/en/digikam/rulethirdlinesexample.png
-share/doc/HTML/en/digikam/setupalbum.png
-share/doc/HTML/en/digikam/setupcamera.png
-share/doc/HTML/en/digikam/setupcollections.png
-share/doc/HTML/en/digikam/setupembededinfo.png
-share/doc/HTML/en/digikam/setupimageeditor.png
-share/doc/HTML/en/digikam/setupkipi.png
-share/doc/HTML/en/digikam/setupmimetypes.png
-share/doc/HTML/en/digikam/setupmisc.png
-share/doc/HTML/en/digikam/stretchcontrastpreview.png
-share/doc/HTML/en/digikam/tagsview.png
-share/doc/HTML/en/digikam/targetalbumdialog.png
-share/doc/HTML/en/digikam/zoombuttons.png
-share/doc/HTML/et/digikam/common
-share/doc/HTML/et/digikam/index.cache.bz2
-share/doc/HTML/et/digikam/index.docbook
-share/doc/HTML/it/digikam/addcamera.png
-share/doc/HTML/it/digikam/common
-share/doc/HTML/it/digikam/imageeditor.png
-share/doc/HTML/it/digikam/index.cache.bz2
-share/doc/HTML/it/digikam/index.docbook
-share/doc/HTML/it/digikam/mainwindow.png
-share/doc/HTML/it/digikam/setupalbum.png
-share/doc/HTML/nl/digikam/common
-share/doc/HTML/nl/digikam/index.cache.bz2
-share/doc/HTML/nl/digikam/index.docbook
-share/doc/HTML/pt/digikam/common
-share/doc/HTML/pt/digikam/index.cache.bz2
-share/doc/HTML/pt/digikam/index.docbook
-share/doc/HTML/pt_BR/digikam/README
-share/doc/HTML/pt_BR/digikam/addcamera.png
-share/doc/HTML/pt_BR/digikam/albumproperties.png
-share/doc/HTML/pt_BR/digikam/assigntags.png
-share/doc/HTML/pt_BR/digikam/autolevelspreview.png
-share/doc/HTML/pt_BR/digikam/cameraclient.png
-share/doc/HTML/pt_BR/digikam/cameraclientadvanced.png
-share/doc/HTML/pt_BR/digikam/cameraclientdownload.png
-share/doc/HTML/pt_BR/digikam/commentstags.png
-share/doc/HTML/pt_BR/digikam/common
-share/doc/HTML/pt_BR/digikam/convert_brown.png
-share/doc/HTML/pt_BR/digikam/convert_bw.png
-share/doc/HTML/pt_BR/digikam/convert_cold.png
-share/doc/HTML/pt_BR/digikam/convert_platinium.png
-share/doc/HTML/pt_BR/digikam/convert_selenium.png
-share/doc/HTML/pt_BR/digikam/convert_sepia.png
-share/doc/HTML/pt_BR/digikam/digikamlogo.png
-share/doc/HTML/pt_BR/digikam/editoradjustcurves.png
-share/doc/HTML/pt_BR/digikam/editoradjustlevels.png
-share/doc/HTML/pt_BR/digikam/editorautosizebutton.png
-share/doc/HTML/pt_BR/digikam/editorbcgadjust.png
-share/doc/HTML/pt_BR/digikam/editorblurplugin.png
-share/doc/HTML/pt_BR/digikam/editorcolorbalance.png
-share/doc/HTML/pt_BR/digikam/editorcropbutton.png
-share/doc/HTML/pt_BR/digikam/editorhsladjust.png
-share/doc/HTML/pt_BR/digikam/editorimageselection.png
-share/doc/HTML/pt_BR/digikam/editornoisereductionplugin.png
-share/doc/HTML/pt_BR/digikam/editorraindropsplugin.png
-share/doc/HTML/pt_BR/digikam/editorratiocroptool.png
-share/doc/HTML/pt_BR/digikam/editorredeyescorrection.png
-share/doc/HTML/pt_BR/digikam/editorresizetool.png
-share/doc/HTML/pt_BR/digikam/editorsharpenplugin.png
-share/doc/HTML/pt_BR/digikam/editorunsharpedmaskplugin.png
-share/doc/HTML/pt_BR/digikam/equalizepreview.png
-share/doc/HTML/pt_BR/digikam/exifviewer.png
-share/doc/HTML/pt_BR/digikam/firstrundialog.png
-share/doc/HTML/pt_BR/digikam/foldericon.png
-share/doc/HTML/pt_BR/digikam/histogramdescription.png
-share/doc/HTML/pt_BR/digikam/histogramimageplugin.png
-share/doc/HTML/pt_BR/digikam/histogramsample1.png
-share/doc/HTML/pt_BR/digikam/histogramsample2.png
-share/doc/HTML/pt_BR/digikam/histogramsample3.png
-share/doc/HTML/pt_BR/digikam/imageeditor.png
-share/doc/HTML/pt_BR/digikam/imageeditortoolbar.png
-share/doc/HTML/pt_BR/digikam/imageproperties.png
-share/doc/HTML/pt_BR/digikam/imageproperties2.png
-share/doc/HTML/pt_BR/digikam/imageproperties3.png
-share/doc/HTML/pt_BR/digikam/index.cache.bz2
-share/doc/HTML/pt_BR/digikam/index.docbook
-share/doc/HTML/pt_BR/digikam/maintoolbar.png
-share/doc/HTML/pt_BR/digikam/mainwindow.png
-share/doc/HTML/pt_BR/digikam/normalizepreview.png
-share/doc/HTML/pt_BR/digikam/revertbutton.png
-share/doc/HTML/pt_BR/digikam/rulethirdlinesexample.png
-share/doc/HTML/pt_BR/digikam/setupalbum.png
-share/doc/HTML/pt_BR/digikam/setupcamera.png
-share/doc/HTML/pt_BR/digikam/setupcollections.png
-share/doc/HTML/pt_BR/digikam/setupembededinfo.png
-share/doc/HTML/pt_BR/digikam/setupimageeditor.png
-share/doc/HTML/pt_BR/digikam/setupkipi.png
-share/doc/HTML/pt_BR/digikam/setupmimetypes.png
-share/doc/HTML/pt_BR/digikam/setupmisc.png
-share/doc/HTML/pt_BR/digikam/stretchcontrastpreview.png
-share/doc/HTML/pt_BR/digikam/tagsview.png
-share/doc/HTML/pt_BR/digikam/targetalbumdialog.png
-share/doc/HTML/pt_BR/digikam/zoombuttons.png
-share/doc/HTML/sv/digikam/addcamera.png
-share/doc/HTML/sv/digikam/albumproperties.png
-share/doc/HTML/sv/digikam/commentstags.png
-share/doc/HTML/sv/digikam/common
-share/doc/HTML/sv/digikam/firstrundialog.png
-share/doc/HTML/sv/digikam/index.cache.bz2
-share/doc/HTML/sv/digikam/index.docbook
-share/doc/HTML/sv/digikam/setupalbum.png
-share/doc/HTML/sv/digikam/setupcamera.png
-share/doc/HTML/sv/digikam/setupcollections.png
-share/doc/HTML/sv/digikam/setupembededinfo.png
-share/doc/HTML/sv/digikam/setupimageeditor.png
-share/doc/HTML/sv/digikam/setupkipi.png
-share/doc/HTML/sv/digikam/setupmimetypes.png
-share/doc/HTML/sv/digikam/setupmisc.png
-share/icons/crystalsvg/128x128/apps/digikam.png
-share/icons/crystalsvg/16x16/apps/digikam.png
-share/icons/crystalsvg/22x22/apps/digikam.png
-share/icons/crystalsvg/32x32/apps/digikam.png
-share/icons/crystalsvg/48x48/apps/digikam.png
-share/icons/crystalsvg/64x64/apps/digikam.png
+share/icons/hicolor/128x128/apps/digikam.png
+share/icons/hicolor/128x128/apps/showfoto.png
+share/icons/hicolor/16x16/apps/digikam.png
+share/icons/hicolor/16x16/apps/showfoto.png
+share/icons/hicolor/22x22/apps/digikam.png
+share/icons/hicolor/22x22/apps/showfoto.png
+share/icons/hicolor/32x32/apps/digikam.png
+share/icons/hicolor/32x32/apps/showfoto.png
+share/icons/hicolor/48x48/apps/digikam.png
+share/icons/hicolor/48x48/apps/showfoto.png
+share/icons/hicolor/64x64/apps/digikam.png
+share/icons/hicolor/64x64/apps/showfoto.png
 share/locale/bg/LC_MESSAGES/digikam.mo
 share/locale/br/LC_MESSAGES/digikam.mo
 share/locale/ca/LC_MESSAGES/digikam.mo
@@ -251,6 +100,7 @@ share/locale/cs/LC_MESSAGES/digikam.mo
 share/locale/cy/LC_MESSAGES/digikam.mo
 share/locale/da/LC_MESSAGES/digikam.mo
 share/locale/de/LC_MESSAGES/digikam.mo
+share/locale/el/LC_MESSAGES/digikam.mo
 share/locale/en_GB/LC_MESSAGES/digikam.mo
 share/locale/es/LC_MESSAGES/digikam.mo
 share/locale/et/LC_MESSAGES/digikam.mo
@@ -265,30 +115,34 @@ share/locale/it/LC_MESSAGES/digikam.mo
 share/locale/lt/LC_MESSAGES/digikam.mo
 share/locale/mk/LC_MESSAGES/digikam.mo
 share/locale/mt/LC_MESSAGES/digikam.mo
+share/locale/nb/LC_MESSAGES/digikam.mo
 share/locale/nl/LC_MESSAGES/digikam.mo
 share/locale/nn/LC_MESSAGES/digikam.mo
+share/locale/pa/LC_MESSAGES/digikam.mo
 share/locale/pl/LC_MESSAGES/digikam.mo
 share/locale/pt/LC_MESSAGES/digikam.mo
 share/locale/pt_BR/LC_MESSAGES/digikam.mo
 share/locale/ro/LC_MESSAGES/digikam.mo
 share/locale/ru/LC_MESSAGES/digikam.mo
+share/locale/rw/LC_MESSAGES/digikam.mo
+share/locale/sl/LC_MESSAGES/digikam.mo
 share/locale/sr/LC_MESSAGES/digikam.mo
+share/locale/sr@Latn/LC_MESSAGES/digikam.mo
 share/locale/sv/LC_MESSAGES/digikam.mo
 share/locale/ta/LC_MESSAGES/digikam.mo
 share/locale/tr/LC_MESSAGES/digikam.mo
+share/locale/zh_CN/LC_MESSAGES/digikam.mo
 share/services/digikamimageplugin_core.desktop
 share/services/digikamio.protocol
 share/services/digikamtags.protocol
 share/services/digikamthumbnail.protocol
 share/servicetypes/digikamimageplugin.desktop
-@dirrm share/doc/HTML/sv/digikam
-@dirrm share/doc/HTML/pt_BR/digikam
-@dirrm share/doc/HTML/pt/digikam
-@dirrm share/doc/HTML/nl/digikam
-@dirrm share/doc/HTML/it/digikam
-@dirrm share/doc/HTML/et/digikam
-@dirrm share/doc/HTML/en/digikam
-@dirrm share/doc/HTML/da/digikam
+@dirrm share/doc/HTML/en/digikam-0.7.4-apidocs/digikam/html
+@dirrm share/doc/HTML/en/digikam-0.7.4-apidocs/digikam/digikam/html
+@dirrm share/doc/HTML/en/digikam-0.7.4-apidocs/digikam/digikam
+@dirrm share/doc/HTML/en/digikam-0.7.4-apidocs/digikam
+@dirrm share/doc/HTML/en/digikam-0.7.4-apidocs
+@dirrm share/apps/showfoto
 @dirrm share/apps/digikam/themes
 @dirrm share/apps/digikam/icons/hicolor/32x32/actions
 @dirrm share/apps/digikam/icons/hicolor/32x32
@@ -296,5 +150,4 @@ share/servicetypes/digikamimageplugin.desktop
 @dirrm share/apps/digikam/icons
 @dirrm share/apps/digikam/data
 @dirrm share/apps/digikam
-@dirrm share/apps/showfoto
 @dirrm include/digikam