5 files changed, 31 insertions, 30 deletions

diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 6fc3cb77a445..9d9bc563c1db 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -43,7 +42,7 @@ USE_BZIP2=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	opengl gui svg iconengines pixeltool \
 		moc_build rcc_build uic_build qmake_build
-MAKE_JOBS_UNSAFE=	yes
+MAKE_JOBS_SAFE=	yes
 
 post-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index 20df2d904734..7b596b6cfbde 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdegraphics-4.2.4.tar.bz2) = 34d7cf506dea9ab4dc78e9901c96391e
-SHA256 (KDE/kdegraphics-4.2.4.tar.bz2) = 06f882691f557fb3da47f8441d976b9808a896dec611ef4a4fb4b82eedb91b52
-SIZE (KDE/kdegraphics-4.2.4.tar.bz2) = 3583697
+MD5 (KDE/kdegraphics-4.3.0.tar.bz2) = 5d3838a2575a82777f00ced90332c41a
+SHA256 (KDE/kdegraphics-4.3.0.tar.bz2) = 48c1cb44f20732b6d674df9b8f3d96590208f6168ec4a85a17379b79fe9a8741
+SIZE (KDE/kdegraphics-4.3.0.tar.bz2) = 3616635
diff --git a/graphics/kdegraphics4/files/patch-kamera-config-kamera.h b/graphics/kdegraphics4/files/patch-kamera-config-kamera.h
deleted file mode 100644
index 46e75402b13d..000000000000
--- a/graphics/kdegraphics4/files/patch-kamera-config-kamera.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../kamera/config-kamera.h.cmake.orig	2008-02-10 12:38:09.000000000 +0100
-+++ ../kamera/config-kamera.h.cmake	2008-02-10 12:38:35.000000000 +0100
-@@ -1,6 +1,6 @@
- /* Define if we have va_copy */
--/* #undef HAVE_VA_COPY */
-+#define HAVE_VA_COPY
- 
- /* Define if we have __va_copy */
--#define HAVE___VA_COPY 1
-+/* #define HAVE___VA_COPY 1 */
- 
diff --git a/graphics/kdegraphics4/files/patch-libs__libkdcraw__CMakeLists.txt b/graphics/kdegraphics4/files/patch-libs__libkdcraw__CMakeLists.txt
index a0a6c1a82c31..5d3df95751ba 100644
--- a/graphics/kdegraphics4/files/patch-libs__libkdcraw__CMakeLists.txt
+++ b/graphics/kdegraphics4/files/patch-libs__libkdcraw__CMakeLists.txt
@@ -1,12 +1,14 @@
---- ../libs/libkdcraw/CMakeLists.txt.orig	2008-06-03 17:48:03.000000000 +0400
-+++ ../libs/libkdcraw/CMakeLists.txt	2008-08-18 20:05:56.000000000 +0400
-@@ -62,7 +62,7 @@
- SUBDIRS(profiles)
+--- ../libs/libkdcraw/CMakeLists.txt.orig	2009-05-06 12:13:22.000000000 +0200
++++ ../libs/libkdcraw/CMakeLists.txt	2009-06-07 01:15:33.000000000 +0200
+@@ -114,9 +114,9 @@
+ # =======================================================
  
  IF(NOT WIN32)
--  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc)
-+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw-kde4.pc)
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.lsm)
--  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw-kde4.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+-    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc)
++    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw-kde4.pc)
+     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.lsm)
+-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
++    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw-kde4.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
  ENDIF(NOT WIN32)
+ 
+ SUBDIRS(icons)
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index 95a31ce166dc..1582a0ba9c67 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -62,6 +62,7 @@ lib/kde4/kcm_kgamma.so
 lib/kde4/kio_kamera.so
 lib/kde4/kio_msits.so
 lib/kde4/ksaneplugin.so
+lib/kde4/mobithumbnail.so
 lib/kde4/okularGenerator_chmlib.so
 lib/kde4/okularGenerator_comicbook.so
 lib/kde4/okularGenerator_djvu.so
@@ -71,35 +72,38 @@ lib/kde4/okularGenerator_fax.so
 lib/kde4/okularGenerator_fb.so
 lib/kde4/okularGenerator_ghostview.so
 lib/kde4/okularGenerator_kimgio.so
+lib/kde4/okularGenerator_mobi.so
 lib/kde4/okularGenerator_ooo.so
 lib/kde4/okularGenerator_plucker.so
 lib/kde4/okularGenerator_poppler.so
 lib/kde4/okularGenerator_tiff.so
 lib/kde4/okularGenerator_xps.so
 lib/kde4/okularpart.so
+lib/kde4/rawthumbnail.so
 lib/kde4/svgpart.so
 lib/libgwenviewlib.so
 lib/libgwenviewlib.so.5
 lib/libgwenviewlib.so.5.0.1
 lib/libkdcraw.so
 lib/libkdcraw.so.7
-lib/libkdcraw.so.7.0.0
+lib/libkdcraw.so.7.1.0
 lib/libkexiv2.so
 lib/libkexiv2.so.7
-lib/libkexiv2.so.7.2.0
+lib/libkexiv2.so.7.3.0
 lib/libkipi.so
 lib/libkipi.so.6
-lib/libkipi.so.6.0.0
+lib/libkipi.so.6.1.0
 lib/libkolourpaint_lgpl.so
 lib/libkolourpaint_lgpl.so.5
 lib/libkolourpaint_lgpl.so.5.0.1
 lib/libksane.so
 lib/libksane.so.0
-lib/libksane.so.0.1.2
+lib/libksane.so.0.2.0
 lib/libokularcore.so
 lib/libokularcore.so.1
-lib/libokularcore.so.1.2.0
+lib/libokularcore.so.1.3.0
 lib/strigi/strigita_dvi.so
+lib/strigi/strigila_mobi.so
 libdata/pkgconfig/libkdcraw-kde4.pc
 libdata/pkgconfig/libkexiv2-kde4.pc
 libdata/pkgconfig/libkipi-kde4.pc
@@ -119,6 +123,7 @@ share/applications/kde4/okularApplication_fax.desktop
 share/applications/kde4/okularApplication_fb.desktop
 share/applications/kde4/okularApplication_ghostview.desktop
 share/applications/kde4/okularApplication_kimgio.desktop
+share/applications/kde4/okularApplication_mobi.desktop
 share/applications/kde4/okularApplication_ooo.desktop
 share/applications/kde4/okularApplication_pdf.desktop
 share/applications/kde4/okularApplication_plucker.desktop
@@ -443,12 +448,14 @@ share/kde4/services/libokularGenerator_fax.desktop
 share/kde4/services/libokularGenerator_fb.desktop
 share/kde4/services/libokularGenerator_ghostview.desktop
 share/kde4/services/libokularGenerator_kimgio.desktop
+share/kde4/services/libokularGenerator_mobi.desktop
 share/kde4/services/libokularGenerator_ooo.desktop
 share/kde4/services/libokularGenerator_plucker.desktop
 share/kde4/services/libokularGenerator_poppler.desktop
 share/kde4/services/libokularGenerator_tiff.desktop
 share/kde4/services/libokularGenerator_xps.desktop
 share/kde4/services/msits.protocol
+share/kde4/services/mobithumbnail.desktop
 share/kde4/services/okularChm.desktop
 share/kde4/services/okularComicbook.desktop
 share/kde4/services/okularDjvu.desktop
@@ -458,12 +465,14 @@ share/kde4/services/okularFax.desktop
 share/kde4/services/okularFb.desktop
 share/kde4/services/okularGhostview.desktop
 share/kde4/services/okularKimgio.desktop
+share/kde4/services/okularMobi.desktop
 share/kde4/services/okularOoo.desktop
 share/kde4/services/okularPlucker.desktop
 share/kde4/services/okularPoppler.desktop
 share/kde4/services/okularTiff.desktop
 share/kde4/services/okularXps.desktop
 share/kde4/services/okular_part.desktop
+share/kde4/services/rawthumbnail.desktop
 share/kde4/services/svgpart.desktop
 share/kde4/servicetypes/kipiplugin.desktop
 share/kde4/servicetypes/okularGenerator.desktop
@@ -511,6 +520,8 @@ share/kde4/servicetypes/okularGenerator.desktop
 @dirrm share/apps/gwenview/cursors
 @dirrm share/apps/gwenview
 @dirrm share/apps/gvpart
+@dirrmtry share/apps/cmake/modules
+@dirrmtry share/apps/cmake
 @dirrm include/okular/interfaces
 @dirrm include/okular/core
 @dirrm include/okular