Update to KDE SC 4.8.0

5 files changed, 25 insertions, 93 deletions

diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index 75e31a61dad..a1c3e3bd8e3 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -1,28 +1,15 @@
-# $NetBSD: Makefile,v 1.38 2012/03/03 00:12:35 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2012/03/19 22:57:09 markd Exp $
 
-DISTNAME=	libkipi-0.1.6
-PKGREVISION=	12
+DISTNAME=	libkipi-${_KDE_VERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kipi/}
-EXTRACT_SUFX=	.tar.bz2
+COMMENT=	KDE image plugin interface
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.kipi-plugins.org/drupal/
-COMMENT=	KDE Image Plugin Interface
+.include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+PKGCONFIG_OVERRIDE+=    libkipi.pc.cmake
 
-USE_TOOLS+=		gmake msgfmt
-USE_LANGUAGES=		c c++
-GNU_CONFIGURE=		YES
-SET_LIBDIR=		YES
-USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE=	# empty
+.include "../../meta-pkgs/kde4/kde4.mk"
+
+.include "../../x11/kdelibs4/buildlink3.mk"
 
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libkipi/PLIST b/graphics/libkipi/PLIST
index c56dd5e5480..6bd890d23d2 100644
--- a/graphics/libkipi/PLIST
+++ b/graphics/libkipi/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 20:05:43 joerg Exp $
-include/libkipi/batchprogressdialog.h
+@comment $NetBSD: PLIST,v 1.13 2012/03/19 22:57:09 markd Exp $
+include/libkipi/exportinterface.h
+include/libkipi/extension.h
 include/libkipi/imagecollection.h
 include/libkipi/imagecollectionselector.h
 include/libkipi/imagecollectionshared.h
-include/libkipi/imagedialog.h
 include/libkipi/imageinfo.h
 include/libkipi/imageinfoshared.h
 include/libkipi/interface.h
@@ -12,54 +12,16 @@ include/libkipi/plugin.h
 include/libkipi/pluginloader.h
 include/libkipi/uploadwidget.h
 include/libkipi/version.h
-lib/libkipi.la
+lib/libkipi.so
+lib/libkipi.so.8
+lib/libkipi.so.8.0.1
 lib/pkgconfig/libkipi.pc
 share/icons/hicolor/128x128/apps/kipi.png
 share/icons/hicolor/16x16/apps/kipi.png
 share/icons/hicolor/22x22/apps/kipi.png
 share/icons/hicolor/32x32/apps/kipi.png
 share/icons/hicolor/48x48/apps/kipi.png
+share/kde/apps/kipi/data/kipi-icon.svg
+share/kde/apps/kipi/data/kipi-logo.svg
 share/kde/apps/kipi/data/kipi-plugins_logo.png
-share/kde/servicetypes/kipiplugin.desktop
-share/locale/ar/LC_MESSAGES/libkipi.mo
-share/locale/br/LC_MESSAGES/libkipi.mo
-share/locale/ca/LC_MESSAGES/libkipi.mo
-share/locale/cs/LC_MESSAGES/libkipi.mo
-share/locale/cy/LC_MESSAGES/libkipi.mo
-share/locale/da/LC_MESSAGES/libkipi.mo
-share/locale/de/LC_MESSAGES/libkipi.mo
-share/locale/el/LC_MESSAGES/libkipi.mo
-share/locale/en_GB/LC_MESSAGES/libkipi.mo
-share/locale/es/LC_MESSAGES/libkipi.mo
-share/locale/et/LC_MESSAGES/libkipi.mo
-share/locale/fi/LC_MESSAGES/libkipi.mo
-share/locale/fr/LC_MESSAGES/libkipi.mo
-share/locale/ga/LC_MESSAGES/libkipi.mo
-share/locale/gl/LC_MESSAGES/libkipi.mo
-share/locale/is/LC_MESSAGES/libkipi.mo
-share/locale/it/LC_MESSAGES/libkipi.mo
-share/locale/ja/LC_MESSAGES/libkipi.mo
-share/locale/ka/LC_MESSAGES/libkipi.mo
-share/locale/lt/LC_MESSAGES/libkipi.mo
-share/locale/ms/LC_MESSAGES/libkipi.mo
-share/locale/mt/LC_MESSAGES/libkipi.mo
-share/locale/nb/LC_MESSAGES/libkipi.mo
-share/locale/nds/LC_MESSAGES/libkipi.mo
-share/locale/nl/LC_MESSAGES/libkipi.mo
-share/locale/pa/LC_MESSAGES/libkipi.mo
-share/locale/pl/LC_MESSAGES/libkipi.mo
-share/locale/pt/LC_MESSAGES/libkipi.mo
-share/locale/pt_BR/LC_MESSAGES/libkipi.mo
-share/locale/ru/LC_MESSAGES/libkipi.mo
-share/locale/rw/LC_MESSAGES/libkipi.mo
-share/locale/sk/LC_MESSAGES/libkipi.mo
-share/locale/sl/LC_MESSAGES/libkipi.mo
-share/locale/sr/LC_MESSAGES/libkipi.mo
-share/locale/sr@Latn/LC_MESSAGES/libkipi.mo
-share/locale/sv/LC_MESSAGES/libkipi.mo
-share/locale/ta/LC_MESSAGES/libkipi.mo
-share/locale/th/LC_MESSAGES/libkipi.mo
-share/locale/tr/LC_MESSAGES/libkipi.mo
-share/locale/uk/LC_MESSAGES/libkipi.mo
-share/locale/zh_CN/LC_MESSAGES/libkipi.mo
-@pkgdir share/doc/kde/HTML/en/${PKGNAME}-apidocs/libkipi/html
+share/kde4/servicetypes/kipiplugin.desktop
diff --git a/graphics/libkipi/buildlink3.mk b/graphics/libkipi/buildlink3.mk
index 21777955299..feb31698bfd 100644
--- a/graphics/libkipi/buildlink3.mk
+++ b/graphics/libkipi/buildlink3.mk
@@ -1,17 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.26 2012/03/03 00:12:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2012/03/19 22:57:09 markd Exp $
 
 BUILDLINK_TREE+=	libkipi
 
 .if !defined(LIBKIPI_BUILDLINK3_MK)
 LIBKIPI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libkipi+=	libkipi>=0.1.5
-BUILDLINK_ABI_DEPENDS.libkipi?=	libkipi>=0.1.6nb12
+BUILDLINK_API_DEPENDS.libkipi+=	libkipi>=4.8.0
 BUILDLINK_PKGSRCDIR.libkipi?=	../../graphics/libkipi
 
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.endif # LIBKIPI_BUILDLINK3_MK
+.include "../../x11/kdelibs4/buildlink3.mk"
+.endif	# LIBKIPI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libkipi
diff --git a/graphics/libkipi/distinfo b/graphics/libkipi/distinfo
index 6ab46ed38b7..f31dcf3bd17 100644
--- a/graphics/libkipi/distinfo
+++ b/graphics/libkipi/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2009/01/06 18:51:02 drochner Exp $
+$NetBSD: distinfo,v 1.9 2012/03/19 22:57:09 markd Exp $
 
-SHA1 (libkipi-0.1.6.tar.bz2) = 273d4592dbb366e3a009b82808816b07bea1bfe9
-RMD160 (libkipi-0.1.6.tar.bz2) = 433215f09a803fe15e664ac531cebe52dc29c479
-Size (libkipi-0.1.6.tar.bz2) = 556980 bytes
-SHA1 (patch-aa) = e40903b2e7685950aca99fb3cd0cfe8805e4028e
+SHA1 (libkipi-4.8.0.tar.bz2) = 1eccc5b6dda059eee10b2ae3e0ef6a47953eb084
+RMD160 (libkipi-4.8.0.tar.bz2) = 15ca699f05b2df9a404c5069a46504b3b7dfd329
+Size (libkipi-4.8.0.tar.bz2) = 78624 bytes
diff --git a/graphics/libkipi/patches/patch-aa b/graphics/libkipi/patches/patch-aa
deleted file mode 100644
index aa52b005e34..00000000000
--- a/graphics/libkipi/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/10/25 21:41:52 tonio Exp $
-
---- po/is/Makefile.in.orig	2005-09-17 18:09:57.000000000 +0200
-+++ po/is/Makefile.in
-@@ -663,7 +663,7 @@ KDE_DIST=libkipi.po Makefile.in Makefile
- #>+ 4
- libkipi.gmo: libkipi.po
- 	rm -f libkipi.gmo; $(GMSGFMT) -o libkipi.gmo $(srcdir)/libkipi.po
--	test ! -f libkipi.gmo || touch libkipi.gmo
-+	test -f libkipi.gmo || touch libkipi.gmo
- 
- #>+ 3
- clean-nls: