4 files changed, 112 insertions, 56 deletions

diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 90054227a7bc..e432243fb4d9 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	digikam
-DISTVERSION=	2.6.0
+PORTVERSION=	2.7.0
 PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	SF
@@ -23,12 +23,14 @@ LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
 		lensfun:${PORTSDIR}/graphics/lensfun \
 		lqr-1:${PORTSDIR}/graphics/liblqr-1 \
 		kface:${PORTSDIR}/graphics/libkface \
+		pgf:${PORTSDIR}/graphics/libpgf \
 		kgeomap:${PORTSDIR}/astro/libkgeomap
 
 LATEST_LINK=	${PORTNAME}-kde4
 
 OPTIONS_DEFINE=		NLS GPHOTO2 PIMLIBS MYSQL
 OPTIONS_DEFAULT=	GPHOTO2 PIMLIBS
+NO_OPTIONS_SORT=	yes
 
 GPHOTO2_DESC=		Enable gphoto2 camera support
 PIMLIBS_DESC=		Enable address book support
diff --git a/graphics/digikam-kde4/distinfo b/graphics/digikam-kde4/distinfo
index afb200f08f48..f52060d5d477 100644
--- a/graphics/digikam-kde4/distinfo
+++ b/graphics/digikam-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (digikam-2.6.0.tar.bz2) = 411ceaa3a489d9c9a5566d43c167927a07fb08fb4f613b0dbf1dec65b95736df
-SIZE (digikam-2.6.0.tar.bz2) = 55362029
+SHA256 (digikam-2.7.0.tar.bz2) = 2782b0f047cd0ae58af04095e2d03ea4a9d621fbef9d385f1465851fb62f5bab
+SIZE (digikam-2.7.0.tar.bz2) = 55696444
diff --git a/graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake b/graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake
new file mode 100644
index 000000000000..f3de1430b4d1
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake
@@ -0,0 +1,53 @@
+--- ./cmake/modules/FindPGF.cmake.orig	2012-07-07 19:25:02.000000000 -0400
++++ ./cmake/modules/FindPGF.cmake	2012-07-14 10:17:02.000000000 -0400
+@@ -4,27 +4,34 @@
+ #  PGF_FOUND            - system has libgf
+ #  PGF_INCLUDE_DIRS     - the libpgf include directory
+ #  PGF_LIBRARIES        - Link these to use libpgf
+-#  PGF_CODEC_VERSION_ID - PGF codec version ID.
+ 
+-# PKG-CONFIG is required.
+-INCLUDE(FindPkgConfig REQUIRED)
++INCLUDE(FindPkgConfig)
+ 
+ IF(PKG_CONFIG_FOUND)
+ 
+-    INCLUDE(FindPkgConfig)
++    PKG_CHECK_MODULES(PC_LIBPGF libpgf)
+ 
+-    PKG_CHECK_MODULES(PGF libpgf)
++ENDIF(PKG_CONFIG_FOUND)
+ 
+-    IF(PGF_FOUND)
+-        MESSAGE(STATUS "PGF_INCLUDE_DIRS     = ${PGF_INCLUDE_DIRS}")
+-        MESSAGE(STATUS "PGF_INCLUDEDIR       = ${PGF_INCLUDEDIR}")
+-        MESSAGE(STATUS "PGF_LIBRARIES        = ${PGF_LIBRARIES}")
+-        MESSAGE(STATUS "PGF_LDFLAGS          = ${PGF_LDFLAGS}")
+-        MESSAGE(STATUS "PGF_CFLAGS           = ${PGF_CFLAGS}")
+-        MESSAGE(STATUS "PGF_VERSION          = ${PGF_VERSION}")
++FIND_LIBRARY (PGF_LIBRARIES
++  NAMES
++  pgf
++  HINTS
++  ${PC_LIBPGF_LIBDIR}
++  ${PC_LIBPGF_LIBRARY_DIRS}
++  ${LIB_INSTALL_DIR}
++)
+ 
+-        STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}")
+-        MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}")
+-    ENDIF(PGF_FOUND)
++FIND_PATH (PGF_INCLUDE_DIRS
++  NAMES
++  PGFtypes.h
++  PATH_SUFFIXES
++  libpgf
++  HINTS
++  ${PC_LIBPGF_INCLUDEDIR}
++  ${PC_LIBPGF_INCLUDE_DIRS}
++  ${INCLUDE_INSTALL_DIR}
++)
+ 
+-ENDIF(PKG_CONFIG_FOUND)
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(PGF DEFAULT_MSG PGF_LIBRARIES PGF_INCLUDE_DIRS)
diff --git a/graphics/digikam-kde4/pkg-plist b/graphics/digikam-kde4/pkg-plist
index e81bfe2436f7..12c3c76fedeb 100644
--- a/graphics/digikam-kde4/pkg-plist
+++ b/graphics/digikam-kde4/pkg-plist
@@ -517,6 +517,7 @@ share/apps/digikam/lensfun/generic.xml
 share/apps/digikam/lensfun/mil-olympus.xml
 share/apps/digikam/lensfun/mil-panasonic.xml
 share/apps/digikam/lensfun/mil-samsung.xml
+share/apps/digikam/lensfun/mil-sony.xml
 share/apps/digikam/lensfun/rf-leica.xml
 share/apps/digikam/lensfun/slr-canon.xml
 share/apps/digikam/lensfun/slr-contax.xml
@@ -824,59 +825,59 @@ share/kde4/services/digikamnepomukservice.desktop
 share/kde4/services/digikamsearch.protocol
 share/kde4/services/digikamtags.protocol
 share/kde4/servicetypes/digikamimageplugin.desktop
-share/locale/ar/LC_MESSAGES/digikam.mo
-share/locale/be/LC_MESSAGES/digikam.mo
-share/locale/bg/LC_MESSAGES/digikam.mo
-share/locale/bs/LC_MESSAGES/digikam.mo
-share/locale/ca/LC_MESSAGES/digikam.mo
-share/locale/cs/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/eo/LC_MESSAGES/digikam.mo
-share/locale/es/LC_MESSAGES/digikam.mo
-share/locale/et/LC_MESSAGES/digikam.mo
-share/locale/eu/LC_MESSAGES/digikam.mo
-share/locale/fa/LC_MESSAGES/digikam.mo
-share/locale/fi/LC_MESSAGES/digikam.mo
-share/locale/fr/LC_MESSAGES/digikam.mo
-share/locale/ga/LC_MESSAGES/digikam.mo
-share/locale/gl/LC_MESSAGES/digikam.mo
-share/locale/he/LC_MESSAGES/digikam.mo
-share/locale/hi/LC_MESSAGES/digikam.mo
-share/locale/hr/LC_MESSAGES/digikam.mo
-share/locale/hu/LC_MESSAGES/digikam.mo
-share/locale/is/LC_MESSAGES/digikam.mo
-share/locale/it/LC_MESSAGES/digikam.mo
-share/locale/ja/LC_MESSAGES/digikam.mo
-share/locale/km/LC_MESSAGES/digikam.mo
-share/locale/ko/LC_MESSAGES/digikam.mo
-share/locale/lt/LC_MESSAGES/digikam.mo
-share/locale/lv/LC_MESSAGES/digikam.mo
-share/locale/ms/LC_MESSAGES/digikam.mo
-share/locale/nb/LC_MESSAGES/digikam.mo
-share/locale/nds/LC_MESSAGES/digikam.mo
-share/locale/ne/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/se/LC_MESSAGES/digikam.mo
-share/locale/sk/LC_MESSAGES/digikam.mo
-share/locale/sl/LC_MESSAGES/digikam.mo
-share/locale/sq/LC_MESSAGES/digikam.mo
-share/locale/sv/LC_MESSAGES/digikam.mo
-share/locale/th/LC_MESSAGES/digikam.mo
-share/locale/tr/LC_MESSAGES/digikam.mo
-share/locale/uk/LC_MESSAGES/digikam.mo
-share/locale/vi/LC_MESSAGES/digikam.mo
-share/locale/zh_CN/LC_MESSAGES/digikam.mo
-share/locale/zh_TW/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/be/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/da/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/de/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/el/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/es/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/et/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/he/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/is/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/it/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/km/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/nds/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/ne/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/se/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/th/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/digikam.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/digikam.mo
 @dirrmtry share/icons/hicolor/256x256/apps
 @dirrmtry share/icons/hicolor/256x256
 @dirrm share/doc/HTML/en/showfoto