Update to KDE SC 4.8.0

5 files changed, 28 insertions, 77 deletions

diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index 8dc843f299d..b5d62db8a72 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -1,36 +1,16 @@
-# $NetBSD: Makefile,v 1.26 2012/03/03 00:12:34 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.27 2012/03/19 22:43:15 markd Exp $
 
-DISTNAME=	libkdcraw-0.1.9
-PKGREVISION=	11
+DISTNAME=	libkdcraw-${_KDE_VERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kipi/}
-EXTRACT_SUFX=	.tar.bz2
+COMMENT=	KDE digital camera raw image library wrapper
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.kipi-plugins.org/
-COMMENT=	C++ interface around dcraw
-LICENSE=	gnu-gpl-v2
+.include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+PKGCONFIG_OVERRIDE+=    libkdcraw.pc.cmake
 
-GNU_CONFIGURE=	yes
-SET_LIBDIR=	yes
-USE_TOOLS+=	pkg-config msgfmt
-USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
+.include "../../meta-pkgs/kde4/kde4.mk"
 
-# needed by **** libjpeg detection
-CONFIGURE_ARGS+=	--includedir=${JPEGBASE:Q}/include
-
-PKGCONFIG_OVERRIDE+=	libkdcraw/libkdcraw.pc.in
-
-BUILDLINK_API_DEPENDS.qt3-libs+=	qt3-libs>=3.3
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-BUILDLINK_API_DEPENDS.lcms+=		lcms>=1.14
 .include "../../graphics/lcms/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libkdcraw/PLIST b/graphics/libkdcraw/PLIST
index ab77a65dd8c..d5234463b53 100644
--- a/graphics/libkdcraw/PLIST
+++ b/graphics/libkdcraw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:59:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/03/19 22:43:15 markd Exp $
 include/libkdcraw/dcrawinfocontainer.h
 include/libkdcraw/dcrawsettingswidget.h
 include/libkdcraw/kdcraw.h
@@ -6,32 +6,21 @@ include/libkdcraw/libkdcraw_export.h
 include/libkdcraw/rawdecodingsettings.h
 include/libkdcraw/rawfiles.h
 include/libkdcraw/rcombobox.h
+include/libkdcraw/rexpanderbox.h
 include/libkdcraw/rnuminput.h
+include/libkdcraw/squeezedcombobox.h
 include/libkdcraw/version.h
-lib/libkdcraw.la
+lib/libkdcraw.so
+lib/libkdcraw.so.20
+lib/libkdcraw.so.20.0.1
 lib/pkgconfig/libkdcraw.pc
 share/icons/hicolor/128x128/apps/kdcraw.png
 share/icons/hicolor/32x32/apps/kdcraw.png
 share/icons/hicolor/48x48/apps/kdcraw.png
 share/icons/hicolor/64x64/apps/kdcraw.png
-share/locale/ca/LC_MESSAGES/libkdcraw.mo
-share/locale/da/LC_MESSAGES/libkdcraw.mo
-share/locale/de/LC_MESSAGES/libkdcraw.mo
-share/locale/el/LC_MESSAGES/libkdcraw.mo
-share/locale/es/LC_MESSAGES/libkdcraw.mo
-share/locale/et/LC_MESSAGES/libkdcraw.mo
-share/locale/is/LC_MESSAGES/libkdcraw.mo
-share/locale/it/LC_MESSAGES/libkdcraw.mo
-share/locale/ja/LC_MESSAGES/libkdcraw.mo
-share/locale/ms/LC_MESSAGES/libkdcraw.mo
-share/locale/nds/LC_MESSAGES/libkdcraw.mo
-share/locale/nl/LC_MESSAGES/libkdcraw.mo
-share/locale/pa/LC_MESSAGES/libkdcraw.mo
-share/locale/pt/LC_MESSAGES/libkdcraw.mo
-share/locale/pt_BR/LC_MESSAGES/libkdcraw.mo
-share/locale/sk/LC_MESSAGES/libkdcraw.mo
-share/locale/sr/LC_MESSAGES/libkdcraw.mo
-share/locale/sr@Latn/LC_MESSAGES/libkdcraw.mo
-share/locale/sv/LC_MESSAGES/libkdcraw.mo
-share/locale/th/LC_MESSAGES/libkdcraw.mo
-share/locale/uk/LC_MESSAGES/libkdcraw.mo
+share/kde/apps/libkdcraw/profiles/adobergb.icm
+share/kde/apps/libkdcraw/profiles/applergb.icm
+share/kde/apps/libkdcraw/profiles/prophoto.icm
+share/kde/apps/libkdcraw/profiles/srgb-d65.icm
+share/kde/apps/libkdcraw/profiles/srgb.icm
+share/kde/apps/libkdcraw/profiles/widegamut.icm
diff --git a/graphics/libkdcraw/buildlink3.mk b/graphics/libkdcraw/buildlink3.mk
index 8420040887e..91d3bc924f5 100644
--- a/graphics/libkdcraw/buildlink3.mk
+++ b/graphics/libkdcraw/buildlink3.mk
@@ -1,16 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.16 2012/03/03 00:12:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2012/03/19 22:43:15 markd Exp $
 
 BUILDLINK_TREE+=	libkdcraw
 
 .if !defined(LIBKDCRAW_BUILDLINK3_MK)
 LIBKDCRAW_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libkdcraw+=	libkdcraw>=0.1.1
-BUILDLINK_ABI_DEPENDS.libkdcraw?=	libkdcraw>=0.1.9nb11
+BUILDLINK_API_DEPENDS.libkdcraw+=	libkdcraw>=4.8.0
 BUILDLINK_PKGSRCDIR.libkdcraw?=	../../graphics/libkdcraw
 
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.endif # LIBKDCRAW_BUILDLINK3_MK
+.include "../../x11/kdelibs4/buildlink3.mk"
+.endif	# LIBKDCRAW_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libkdcraw
diff --git a/graphics/libkdcraw/distinfo b/graphics/libkdcraw/distinfo
index 881be55f700..4f303f0d9b1 100644
--- a/graphics/libkdcraw/distinfo
+++ b/graphics/libkdcraw/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2011/01/29 22:06:50 markd Exp $
+$NetBSD: distinfo,v 1.9 2012/03/19 22:43:15 markd Exp $
 
-SHA1 (libkdcraw-0.1.9.tar.bz2) = 85a892e1b3368da9329efce1c0588500d3fe45bc
-RMD160 (libkdcraw-0.1.9.tar.bz2) = 489a5a872fcfb24943d0a1cb39cf05ff545f0062
-Size (libkdcraw-0.1.9.tar.bz2) = 708121 bytes
-SHA1 (patch-aa) = 5e0d9aa6c58ec9e81f262c7d6c473e6048d601d5
+SHA1 (libkdcraw-4.8.0.tar.bz2) = 4c613177ec8cfe1436e5fb7f3b61bbb306d13f71
+RMD160 (libkdcraw-4.8.0.tar.bz2) = 07129d7e76bfc16478b04428031afa637abdfad4
+Size (libkdcraw-4.8.0.tar.bz2) = 304200 bytes
diff --git a/graphics/libkdcraw/patches/patch-aa b/graphics/libkdcraw/patches/patch-aa
deleted file mode 100644
index aabb17a7108..00000000000
--- a/graphics/libkdcraw/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2011/01/29 22:06:50 markd Exp $
-
-Dont insist on 1990 standard or fails to handle // comments in lcms.h
-
---- configure.orig	2011-01-29 02:35:31.561424350 +0000
-+++ configure
-@@ -5266,7 +5266,7 @@ fi
-         CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"
-         case $host in
-           *-*-linux-gnu)
--            CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-+            CFLAGS="-W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
- 
- { echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5