11 files changed, 25 insertions, 71 deletions

diff --git a/x11-themes/kde4-base-artwork/Makefile b/x11-themes/kde4-base-artwork/Makefile
index 1b01dc25c0b7..643645d47ccb 100644
--- a/x11-themes/kde4-base-artwork/Makefile
+++ b/x11-themes/kde4-base-artwork/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	kde-base-artwork
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	x11-themes kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -13,13 +12,10 @@ COMMENT=	Base artwork for the KDE Plasma Desktop
 
 LICENSE=	GPLv2
 
-CONFLICTS_INSTALL=	kde-workspace-4.[7-8].*
-
 USES=		cmake:outsource
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-themes/kde4-base-artwork/distinfo b/x11-themes/kde4-base-artwork/distinfo
index 53f04ae383bc..8bd22e47aeb6 100644
--- a/x11-themes/kde4-base-artwork/distinfo
+++ b/x11-themes/kde4-base-artwork/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kde-base-artwork-4.10.5.tar.xz) = 3cf73686015d23783dfe582ea16cda55dd6eb64b777353d35b530d5e512c03c3
-SIZE (KDE/4.10.5/kde-base-artwork-4.10.5.tar.xz) = 7422420
+SHA256 (KDE/4.12.2/kde-base-artwork-4.12.2.tar.xz) = dfb3de6261d1c5f595f68bea982b2744e54cd543e021afc64a05614ecd7b628b
+SIZE (KDE/4.12.2/kde-base-artwork-4.12.2.tar.xz) = 7420488
diff --git a/x11-themes/kde4-icons-oxygen/Makefile b/x11-themes/kde4-icons-oxygen/Makefile
index c67c93e46614..1bdc6374a531 100644
--- a/x11-themes/kde4-icons-oxygen/Makefile
+++ b/x11-themes/kde4-icons-oxygen/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	oxygen
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	x11-themes kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 PKGNAMEPREFIX=	kde4-icons-
 DISTNAME=	${PORTNAME}-icons-${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -18,5 +17,4 @@ USES=		cmake:outsource
 INSTALL_TARGET=	install
 EXTRACT_AFTER_ARGS=	--exclude '${DISTNAME}/scalable'
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-themes/kde4-icons-oxygen/distinfo b/x11-themes/kde4-icons-oxygen/distinfo
index 3c569ecf5521..047b0abf1a8f 100644
--- a/x11-themes/kde4-icons-oxygen/distinfo
+++ b/x11-themes/kde4-icons-oxygen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/oxygen-icons-4.10.5.tar.xz) = cae327568f5382eebc3257326776fb4a2b0ab5cdd7b78e9cacd347efcec1f1f8
-SIZE (KDE/4.10.5/oxygen-icons-4.10.5.tar.xz) = 275566404
+SHA256 (KDE/4.12.2/oxygen-icons-4.12.2.tar.xz) = 798c48a7b9d6eff3669f1d47c66171e60cfa14be0a6678727cd23420732661ec
+SIZE (KDE/4.12.2/oxygen-icons-4.12.2.tar.xz) = 229825532
diff --git a/x11-themes/kde4-icons-oxygen/pkg-plist b/x11-themes/kde4-icons-oxygen/pkg-plist
index 611c5851e288..bd99e0096161 100644
--- a/x11-themes/kde4-icons-oxygen/pkg-plist
+++ b/x11-themes/kde4-icons-oxygen/pkg-plist
@@ -1316,6 +1316,7 @@ share/icons/oxygen/16x16/apps/kjournal.png
 share/icons/oxygen/16x16/apps/klipper.png
 share/icons/oxygen/16x16/apps/kmag.png
 share/icons/oxygen/16x16/apps/kmplayer.png
+share/icons/oxygen/16x16/apps/knetattach.png
 share/icons/oxygen/16x16/apps/knewsticker.png
 share/icons/oxygen/16x16/apps/knotes.png
 share/icons/oxygen/16x16/apps/kolf.png
@@ -2452,7 +2453,6 @@ share/icons/oxygen/22x22/actions/view-calendar-wedding-anniversary.png
 share/icons/oxygen/22x22/actions/view-calendar-week.png
 share/icons/oxygen/22x22/actions/view-calendar-whatsnext.png
 share/icons/oxygen/22x22/actions/view-calendar-workweek.png
-share/icons/oxygen/22x22/actions/view-calendar.png
 share/icons/oxygen/22x22/actions/view-certificate-add.png
 share/icons/oxygen/22x22/actions/view-certificate-export-secret.png
 share/icons/oxygen/22x22/actions/view-certificate-export-server.png
@@ -2589,6 +2589,7 @@ share/icons/oxygen/22x22/apps/kjournal.png
 share/icons/oxygen/22x22/apps/klipper.png
 share/icons/oxygen/22x22/apps/kmag.png
 share/icons/oxygen/22x22/apps/kmplayer.png
+share/icons/oxygen/22x22/apps/knetattach.png
 share/icons/oxygen/22x22/apps/knotes.png
 share/icons/oxygen/22x22/apps/kolf.png
 share/icons/oxygen/22x22/apps/konqueror.png
@@ -3253,7 +3254,6 @@ share/icons/oxygen/256x256/actions/tools-media-optical-copy.png
 share/icons/oxygen/256x256/actions/tools-media-optical-erase.png
 share/icons/oxygen/256x256/actions/tools-media-optical-format.png
 share/icons/oxygen/256x256/actions/tools-rip-audio-cd.png
-share/icons/oxygen/256x256/actions/tools-rip-video-cd.png
 share/icons/oxygen/256x256/actions/tools-rip-video-dvd.png
 share/icons/oxygen/256x256/apps/Charm.png
 share/icons/oxygen/256x256/apps/accessories-calculator.png
@@ -3275,6 +3275,7 @@ share/icons/oxygen/256x256/apps/kig.png
 share/icons/oxygen/256x256/apps/kivio.png
 share/icons/oxygen/256x256/apps/kmag.png
 share/icons/oxygen/256x256/apps/kmail2.png
+share/icons/oxygen/256x256/apps/knetattach.png
 share/icons/oxygen/256x256/apps/konqueror.png
 share/icons/oxygen/256x256/apps/kontact-import-wizard.png
 share/icons/oxygen/256x256/apps/korgac.png
@@ -4312,6 +4313,7 @@ share/icons/oxygen/32x32/apps/kjournal.png
 share/icons/oxygen/32x32/apps/klipper.png
 share/icons/oxygen/32x32/apps/kmag.png
 share/icons/oxygen/32x32/apps/kmplayer.png
+share/icons/oxygen/32x32/apps/knetattach.png
 share/icons/oxygen/32x32/apps/knewsticker.png
 share/icons/oxygen/32x32/apps/knotes.png
 share/icons/oxygen/32x32/apps/kolf.png
@@ -4410,7 +4412,6 @@ share/icons/oxygen/32x32/apps/utilities-terminal.png
 share/icons/oxygen/32x32/apps/wine.png
 share/icons/oxygen/32x32/apps/xorg.png
 share/icons/oxygen/32x32/apps/yakuake.png
-share/icons/oxygen/32x32/apps/zanshin.png
 share/icons/oxygen/32x32/categories/applications-accessories.png
 share/icons/oxygen/32x32/categories/applications-development-translation.png
 share/icons/oxygen/32x32/categories/applications-development-web.png
@@ -5552,6 +5553,7 @@ share/icons/oxygen/48x48/apps/kjournal.png
 share/icons/oxygen/48x48/apps/klipper.png
 share/icons/oxygen/48x48/apps/kmag.png
 share/icons/oxygen/48x48/apps/kmplayer.png
+share/icons/oxygen/48x48/apps/knetattach.png
 share/icons/oxygen/48x48/apps/knewsticker.png
 share/icons/oxygen/48x48/apps/knotes.png
 share/icons/oxygen/48x48/apps/kolf.png
@@ -5650,6 +5652,7 @@ share/icons/oxygen/48x48/apps/utilities-terminal.png
 share/icons/oxygen/48x48/apps/wine.png
 share/icons/oxygen/48x48/apps/xorg.png
 share/icons/oxygen/48x48/apps/yakuake.png
+share/icons/oxygen/48x48/apps/zanshin.png
 share/icons/oxygen/48x48/categories/applications-accessories.png
 share/icons/oxygen/48x48/categories/applications-development-translation.png
 share/icons/oxygen/48x48/categories/applications-development-web.png
@@ -6734,7 +6737,6 @@ share/icons/oxygen/64x64/places/bookmarks.png
 share/icons/oxygen/64x64/places/certificate-server.png
 share/icons/oxygen/64x64/places/document-multiple.png
 share/icons/oxygen/64x64/places/favorites.png
-share/icons/oxygen/64x64/places/folder-activities.png
 share/icons/oxygen/64x64/places/folder-black.png
 share/icons/oxygen/64x64/places/folder-blue.png
 share/icons/oxygen/64x64/places/folder-bookmark.png
@@ -6842,4 +6844,5 @@ share/icons/oxygen/8x8/emblems/vcs-locally-modified.png
 share/icons/oxygen/8x8/emblems/vcs-normal.png
 share/icons/oxygen/8x8/emblems/vcs-removed.png
 share/icons/oxygen/8x8/emblems/vcs-update-required.png
+share/icons/oxygen/8x8/places/folder-activities.png
 share/icons/oxygen/index.theme
diff --git a/x11-themes/kde4-wallpapers-freebsd/Makefile b/x11-themes/kde4-wallpapers-freebsd/Makefile
index 78d2a2cff1fb..e84d15f03b1f 100644
--- a/x11-themes/kde4-wallpapers-freebsd/Makefile
+++ b/x11-themes/kde4-wallpapers-freebsd/Makefile
@@ -10,19 +10,17 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	FreeBSD wallpapers designed by KDE artwork team
 
-CONFLICTS_INSTALL=	kde-workspace-4.[6-9].*
-
 USE_BZIP2=	yes
 USE_KDE4=	kdehier kdeprefix
 
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${PREFIX}/share/apps/plasma-desktop/init
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/apps/plasma-desktop/init
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/wallpapers
 	${INSTALL_DATA} ${FILESDIR}/05-freebsdWallpaper.js \
-		${PREFIX}/share/apps/plasma-desktop/init
+		${STAGEDIR}${PREFIX}/share/apps/plasma-desktop/init
 	cd ${WRKSRC} && \
-		${COPYTREE_SHARE} . ${PREFIX}/share/wallpapers
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/wallpapers
 
 .include <bsd.port.mk>
diff --git a/x11-themes/kde4-wallpapers/Makefile b/x11-themes/kde4-wallpapers/Makefile
index 50354b986566..c1aeeaeff363 100644
--- a/x11-themes/kde4-wallpapers/Makefile
+++ b/x11-themes/kde4-wallpapers/Makefile
@@ -3,15 +3,12 @@
 PORTNAME=	kde-wallpapers
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	x11-themes kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Set of wallpapers for the KDE Plasma workspace
 
-CONFLICTS=	kdebase-workspace-4.[0-6].*
-
 USE_XZ=		yes
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 USES=		cmake:outsource
@@ -19,5 +16,4 @@ USE_QT4=	moc_build qmake_build rcc_build uic_build
 
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-themes/kde4-wallpapers/distinfo b/x11-themes/kde4-wallpapers/distinfo
index 6b18d907ae84..440882f555fb 100644
--- a/x11-themes/kde4-wallpapers/distinfo
+++ b/x11-themes/kde4-wallpapers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kde-wallpapers-4.10.5.tar.xz) = fbbaaebe6f8b4d69f02f81b97fb95691728cda193a5ab13ecf08591b965626b5
-SIZE (KDE/4.10.5/kde-wallpapers-4.10.5.tar.xz) = 90653776
+SHA256 (KDE/4.12.2/kde-wallpapers-4.12.2.tar.xz) = 168c42273c21f35c61b756bdc187d3d585260c1d4c24c2586d93009aadb5f846
+SIZE (KDE/4.12.2/kde-wallpapers-4.12.2.tar.xz) = 90372736
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index f72a49542af7..b38455cba8b9 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -3,10 +3,8 @@
 
 PORTNAME=	kdeartwork
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11-themes kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -14,12 +12,6 @@ COMMENT=	KDE Artworks Themes
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2
 
-CONFLICTS_INSTALL=	kdeaccessibility-4.[0-6].* \
-			kdebase-workspace-4.5.[0-5] \
-			kde-wallpapers-4.[79].*
-
-LATEST_LINK=	${PORTNAME}4
-
 USE_XZ=		yes
 USE_KDE4=	kdehier kdelibs kdeprefix libkexiv2 workspace automoc4
 USES=		cmake:outsource
@@ -30,7 +22,6 @@ USE_XORG=	x11 xt
 OPTIONS_DEFINE=	GNOME
 GNOME_DESC=	Use Gnome screensavers
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNOME}
@@ -45,32 +36,5 @@ post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}|g' \
 			-e 's|/usr/share|${LOCALBASE}/share|g' \
 		${PATCH_WRKSRC}/cmake/modules/FindXscreensaver.cmake
-.for item in kscreensaver/kdesavers/banner.cpp
-	${REINPLACE_CMD} -e 's|<qlabel.h>|<QLabel>|'\
-			 -e 's|<qlineedit.h>|<QLineEdit>|'\
-			 -e 's|<qcombobox.h>|<QComboBox>|'\
-			 -e 's|<qcheckbox.h>|<QCheckBox>|'\
-			 -e 's|<qslider.h>|<QSlider>|'\
-			 -e 's|<qlayout.h>|<QLayout>|'\
-			 -e 's|<qdatetime.h>|<QDateEdit>|'\
-			 -e 's|<qfontdatabase.h>|<QFontDatabase>|'\
-			 -e 's|<qpainter.h>|<QPainter>|'\
-			 -e 's|<qfontcombobox.h>|<QFontComboBox>|' \
-	    ${PATCH_WRKSRC}/${item}
-.endfor
-.for item in kscreensaver/kdesavers/banner.h kscreensaver/kdesavers/blob.h\
-	     kscreensaver/kdesavers/Euphoria.cpp
-	${REINPLACE_CMD} -e 's|<qtimer.h>|<QTimer>|'\
-	    ${PATCH_WRKSRC}/${item}
-.endfor
-.for item in kscreensaver/kdesavers/blob.cpp
-	${REINPLACE_CMD} -e 's|<qcolor.h>|<QColor>|'\
-			 -e 's|<qlabel.h>|<QLabel>|'\
-			 -e 's|<qlayout.h>|<QLayout>|'\
-			 -e 's|<qpainter.h>|<QPainter>|'\
-			 -e 's|<qpixmap.h>|<QPixmap>|'\
-			 -e 's|<qimage.h>|<QImage>|' \
-	    ${PATCH_WRKSRC}/${item}
-.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-themes/kdeartwork4/distinfo b/x11-themes/kdeartwork4/distinfo
index 7be5c9e27779..b5653cfca0e2 100644
--- a/x11-themes/kdeartwork4/distinfo
+++ b/x11-themes/kdeartwork4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kdeartwork-4.10.5.tar.xz) = c6c573a6e3cd00cd4c1055708d9661bffbbb9220ba97382c54f5d3a225b53dfc
-SIZE (KDE/4.10.5/kdeartwork-4.10.5.tar.xz) = 143785684
+SHA256 (KDE/4.12.2/kdeartwork-4.12.2.tar.xz) = 576500bae274c2475109d5156258579384281c9416da3e1b8394546f82253386
+SIZE (KDE/4.12.2/kdeartwork-4.12.2.tar.xz) = 140842956
diff --git a/x11-themes/kdeartwork4/pkg-plist b/x11-themes/kdeartwork4/pkg-plist
index 3ada05435a38..1390c1686f4c 100644
--- a/x11-themes/kdeartwork4/pkg-plist
+++ b/x11-themes/kdeartwork4/pkg-plist
@@ -2508,7 +2508,6 @@ share/icons/nuvola/128x128/apps/kivio.png
 share/icons/nuvola/128x128/apps/kjobviewer.png
 share/icons/nuvola/128x128/apps/kjots.png
 share/icons/nuvola/128x128/apps/klettres.png
-share/icons/nuvola/128x128/apps/klipper.png
 share/icons/nuvola/128x128/apps/klpq.png
 share/icons/nuvola/128x128/apps/kmag.png
 share/icons/nuvola/128x128/apps/kmahjong.png
@@ -4217,6 +4216,7 @@ share/icons/nuvola/22x22/status/mail-attachment.png
 share/icons/nuvola/22x22/status/media-playlist-repeat.png
 share/icons/nuvola/22x22/status/media-playlist-shuffle.png
 share/icons/nuvola/22x22/status/user-trash-full.png
+share/icons/nuvola/256x256/apps/klipper.png
 share/icons/nuvola/256x256/mimetypes/inode-directory.png
 share/icons/nuvola/256x256/mimetypes/text-html.png
 share/icons/nuvola/32x32/actions/about_kde.png
@@ -6371,8 +6371,6 @@ share/kde4/services/ScreenSavers/xmatrix.desktop
 share/kde4/services/ScreenSavers/xrayswarm.desktop
 share/kde4/services/ScreenSavers/xspirograph.desktop
 share/kde4/services/ScreenSavers/zoom.desktop
-share/sounds/KDE_Logout_new.wav
-share/sounds/KDE_Startup_new.wav
 share/wallpapers/Aghi/contents/images/1024x768.jpg
 share/wallpapers/Aghi/contents/images/1280x1024.jpg
 share/wallpapers/Aghi/contents/images/1280x800.jpg
@@ -6801,6 +6799,7 @@ share/wallpapers/Yellow_Flowers/metadata.desktop
 @dirrm share/icons/nuvola/32x32/actions
 @dirrm share/icons/nuvola/32x32
 @dirrm share/icons/nuvola/256x256/mimetypes
+@dirrm share/icons/nuvola/256x256/apps
 @dirrm share/icons/nuvola/256x256
 @dirrm share/icons/nuvola/22x22/status
 @dirrm share/icons/nuvola/22x22/places