14 files changed, 116 insertions, 16 deletions

diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 0b6f1641a2b4..074906b04d53 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	digikam
 PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,20 +22,16 @@ LIB_DEPENDS=	kexif.1:${PORTSDIR}/graphics/libkexif \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3
 RUN_DEPENDS=	dcraw:${PORTSDIR}/graphics/dcraw
 
-BROKEN=		Incorrect pkg-plist
-
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
-USE_REINPLACE=	yes
+USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--program-prefix=''
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamalbums.cpp b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamalbums.cpp
new file mode 100644
index 000000000000..4132b8c5c529
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamalbums.cpp
@@ -0,0 +1,11 @@
+--- digikam/kioslave/digikamalbums.cpp.orig	Mon Apr 24 17:00:12 2006
++++ digikam/kioslave/digikamalbums.cpp	Mon Apr 24 17:01:13 2006
+@@ -206,7 +206,7 @@ void kio_digikamalbums::special(const QB
+         os << albumid;
+         os << name;
+         os << date;
+-        os << stbuf.st_size;
++        os << static_cast<size_t>(stbuf.st_size);
+         os << dims;
+     }
+ 
diff --git a/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamdates.cpp b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamdates.cpp
new file mode 100644
index 000000000000..6699137d6384
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamdates.cpp
@@ -0,0 +1,11 @@
+--- digikam/kioslave/digikamdates.cpp.orig	Mon Apr 24 17:00:27 2006
++++ digikam/kioslave/digikamdates.cpp	Mon Apr 24 17:01:39 2006
+@@ -248,7 +248,7 @@ void kio_digikamdates::special(const QBy
+                 *os << dirid;
+                 *os << name;
+                 *os << date;
+-                *os << stbuf.st_size;
++                *os << static_cast<size_t>(stbuf.st_size);
+                 *os << dims;
+ 
+                 count++;
diff --git a/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamsearch.cpp b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamsearch.cpp
new file mode 100644
index 000000000000..767c5bf40c66
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamsearch.cpp
@@ -0,0 +1,11 @@
+--- digikam/kioslave/digikamsearch.cpp.orig	Mon Apr 24 17:00:37 2006
++++ digikam/kioslave/digikamsearch.cpp	Mon Apr 24 17:01:58 2006
+@@ -214,7 +214,7 @@ void kio_digikamsearch::special(const QB
+             *os << dirid;
+             *os << name;
+             *os << date;
+-            *os << stbuf.st_size;
++            *os << static_cast<size_t>(stbuf.st_size);
+             *os << dims;
+ 
+             count++;
diff --git a/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamtags.cpp b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamtags.cpp
new file mode 100644
index 000000000000..65bf51013ad6
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_kioslave_digikamtags.cpp
@@ -0,0 +1,11 @@
+--- digikam/kioslave/digikamtags.cpp.orig	Mon Apr 24 17:00:47 2006
++++ digikam/kioslave/digikamtags.cpp	Mon Apr 24 17:02:11 2006
+@@ -193,7 +193,7 @@ void kio_digikamtagsProtocol::special(co
+         *os << dirid;
+         *os << name;
+         *os << date;
+-        *os << stbuf.st_size;
++        *os << static_cast<size_t>(stbuf.st_size);
+         *os << dims;
+ 
+         count++;
diff --git a/graphics/digikam-kde4/files/patch-digikam_showfoto_Makefile.in b/graphics/digikam-kde4/files/patch-digikam_showfoto_Makefile.in
new file mode 100644
index 000000000000..fc9d49d38574
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-digikam_showfoto_Makefile.in
@@ -0,0 +1,11 @@
+--- digikam/showfoto/Makefile.in.orig	Mon Apr 24 17:10:55 2006
++++ digikam/showfoto/Makefile.in	Mon Apr 24 17:11:14 2006
+@@ -403,7 +403,7 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-SUBDIRS = pics mimetypes
++SUBDIRS = pics
+ #>- METASOURCES = AUTO  
+ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor \
+ 	   -I$(top_srcdir)/digikam/libs/thumbbar/ \
diff --git a/graphics/digikam-kde4/pkg-plist b/graphics/digikam-kde4/pkg-plist
index da573a8b4500..9431f3ddef18 100644
--- a/graphics/digikam-kde4/pkg-plist
+++ b/graphics/digikam-kde4/pkg-plist
@@ -359,7 +359,6 @@ 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/mimelnk/image/x-raw.desktop
 share/services/digikamalbums.protocol
 share/services/digikamdates.protocol
 share/services/digikamimageplugin_core.desktop
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 0b6f1641a2b4..074906b04d53 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	digikam
 PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,20 +22,16 @@ LIB_DEPENDS=	kexif.1:${PORTSDIR}/graphics/libkexif \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3
 RUN_DEPENDS=	dcraw:${PORTSDIR}/graphics/dcraw
 
-BROKEN=		Incorrect pkg-plist
-
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
-USE_REINPLACE=	yes
+USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--program-prefix=''
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/digikam/files/patch-digikam_kioslave_digikamalbums.cpp b/graphics/digikam/files/patch-digikam_kioslave_digikamalbums.cpp
new file mode 100644
index 000000000000..4132b8c5c529
--- /dev/null
+++ b/graphics/digikam/files/patch-digikam_kioslave_digikamalbums.cpp
@@ -0,0 +1,11 @@
+--- digikam/kioslave/digikamalbums.cpp.orig	Mon Apr 24 17:00:12 2006
++++ digikam/kioslave/digikamalbums.cpp	Mon Apr 24 17:01:13 2006
+@@ -206,7 +206,7 @@ void kio_digikamalbums::special(const QB
+         os << albumid;
+         os << name;
+         os << date;
+-        os << stbuf.st_size;
++        os << static_cast<size_t>(stbuf.st_size);
+         os << dims;
+     }
+ 
diff --git a/graphics/digikam/files/patch-digikam_kioslave_digikamdates.cpp b/graphics/digikam/files/patch-digikam_kioslave_digikamdates.cpp
new file mode 100644
index 000000000000..6699137d6384
--- /dev/null
+++ b/graphics/digikam/files/patch-digikam_kioslave_digikamdates.cpp
@@ -0,0 +1,11 @@
+--- digikam/kioslave/digikamdates.cpp.orig	Mon Apr 24 17:00:27 2006
++++ digikam/kioslave/digikamdates.cpp	Mon Apr 24 17:01:39 2006
+@@ -248,7 +248,7 @@ void kio_digikamdates::special(const QBy
+                 *os << dirid;
+                 *os << name;
+                 *os << date;
+-                *os << stbuf.st_size;
++                *os << static_cast<size_t>(stbuf.st_size);
+                 *os << dims;
+ 
+                 count++;
diff --git a/graphics/digikam/files/patch-digikam_kioslave_digikamsearch.cpp b/graphics/digikam/files/patch-digikam_kioslave_digikamsearch.cpp
new file mode 100644
index 000000000000..767c5bf40c66
--- /dev/null
+++ b/graphics/digikam/files/patch-digikam_kioslave_digikamsearch.cpp
@@ -0,0 +1,11 @@
+--- digikam/kioslave/digikamsearch.cpp.orig	Mon Apr 24 17:00:37 2006
++++ digikam/kioslave/digikamsearch.cpp	Mon Apr 24 17:01:58 2006
+@@ -214,7 +214,7 @@ void kio_digikamsearch::special(const QB
+             *os << dirid;
+             *os << name;
+             *os << date;
+-            *os << stbuf.st_size;
++            *os << static_cast<size_t>(stbuf.st_size);
+             *os << dims;
+ 
+             count++;
diff --git a/graphics/digikam/files/patch-digikam_kioslave_digikamtags.cpp b/graphics/digikam/files/patch-digikam_kioslave_digikamtags.cpp
new file mode 100644
index 000000000000..65bf51013ad6
--- /dev/null
+++ b/graphics/digikam/files/patch-digikam_kioslave_digikamtags.cpp
@@ -0,0 +1,11 @@
+--- digikam/kioslave/digikamtags.cpp.orig	Mon Apr 24 17:00:47 2006
++++ digikam/kioslave/digikamtags.cpp	Mon Apr 24 17:02:11 2006
+@@ -193,7 +193,7 @@ void kio_digikamtagsProtocol::special(co
+         *os << dirid;
+         *os << name;
+         *os << date;
+-        *os << stbuf.st_size;
++        *os << static_cast<size_t>(stbuf.st_size);
+         *os << dims;
+ 
+         count++;
diff --git a/graphics/digikam/files/patch-digikam_showfoto_Makefile.in b/graphics/digikam/files/patch-digikam_showfoto_Makefile.in
new file mode 100644
index 000000000000..fc9d49d38574
--- /dev/null
+++ b/graphics/digikam/files/patch-digikam_showfoto_Makefile.in
@@ -0,0 +1,11 @@
+--- digikam/showfoto/Makefile.in.orig	Mon Apr 24 17:10:55 2006
++++ digikam/showfoto/Makefile.in	Mon Apr 24 17:11:14 2006
+@@ -403,7 +403,7 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-SUBDIRS = pics mimetypes
++SUBDIRS = pics
+ #>- METASOURCES = AUTO  
+ INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor \
+ 	   -I$(top_srcdir)/digikam/libs/thumbbar/ \
diff --git a/graphics/digikam/pkg-plist b/graphics/digikam/pkg-plist
index da573a8b4500..9431f3ddef18 100644
--- a/graphics/digikam/pkg-plist
+++ b/graphics/digikam/pkg-plist
@@ -359,7 +359,6 @@ 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/mimelnk/image/x-raw.desktop
 share/services/digikamalbums.protocol
 share/services/digikamdates.protocol
 share/services/digikamimageplugin_core.desktop