6 files changed, 76 insertions, 22 deletions

diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 8df2209f0425..2dfc67927524 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,10 +8,14 @@
 
 PORTNAME=	kdebase-workspace
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	${MASTER_SITE_KDE} \
+		${MASTER_SITE_LOCAL:S/$/:stripes/} \
+		http://people.FreeBSD.org/~avilla/distfiles/:stripes
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src \
+			avilla:stripes
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		stripes-freebsd-1.0${EXTRACT_SUFX}:stripes
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -35,7 +39,7 @@ RUN_DEPENDS=	${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
 		xset:${PORTSDIR}/x11/xset \
 		setxkbmap:${PORTSDIR}/x11/setxkbmap
 
-SUB_FILES=	kdm
+SUB_FILES=	kdm layout.js
 USE_RC_SUBR=	kdm4
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4 oxygen
 KDE4_BUILDENV=	yes
@@ -112,10 +116,15 @@ pre-configure:
 post-install:
 	${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \
 		${CHMOD} g+s ${PREFIX}/bin/ksysguardd
-	@${LN} -sf ${PREFIX}/bin/startkde ${PREFIX}/bin/startkde4
-	@${MV} ${PREFIX}/bin/kdm ${PREFIX}/bin/kdm-bin
-	@${MV} ${PREFIX}/lib/kde4/libexec/kdm_config ${PREFIX}/lib/kde4/libexec/kdm-bin_config
-	@${MV} ${PREFIX}/lib/kde4/libexec/kdm_greet ${PREFIX}/lib/kde4/libexec/kdm-bin_greet
-	@${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin
+	${LN} -sf ${PREFIX}/bin/startkde ${PREFIX}/bin/startkde4
+	${MV} ${PREFIX}/bin/kdm ${PREFIX}/bin/kdm-bin
+	${MV} ${PREFIX}/lib/kde4/libexec/kdm_config ${PREFIX}/lib/kde4/libexec/kdm-bin_config
+	${MV} ${PREFIX}/lib/kde4/libexec/kdm_greet ${PREFIX}/lib/kde4/libexec/kdm-bin_greet
+	${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin
+	${MKDIR} ${PREFIX}/share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents
+	${INSTALL_DATA} ${FILESDIR}/metadata.desktop ${PREFIX}/share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper
+	${INSTALL_DATA} ${WRKDIR}/layout.js ${PREFIX}/share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents
+	cd ${WRKDIR}/stripes-freebsd-1.0 && \
+		${COPYTREE_SHARE} . ${PREFIX}/share/wallpapers
 
 .include <bsd.port.mk>
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 7b1d0873a93b..a24efa3a959c 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,3 +1,6 @@
-MD5 (KDE/kdebase-workspace-4.5.1.tar.bz2) = c030fa3530c3675636778d1561b012bd
-SHA256 (KDE/kdebase-workspace-4.5.1.tar.bz2) = cd0da0b493b9aeabc986bae10c3cf0f350c41e1298000a263a12a7a5d7003d57
-SIZE (KDE/kdebase-workspace-4.5.1.tar.bz2) = 65680180
+MD5 (KDE/kdebase-workspace-4.5.2.tar.bz2) = 0174c22b75e9a2b477ee166da2ca7319
+SHA256 (KDE/kdebase-workspace-4.5.2.tar.bz2) = c8deb0639c3639d9eefcd48306104b437dd7b452b2ea09c6072e4dbd7b144d9e
+SIZE (KDE/kdebase-workspace-4.5.2.tar.bz2) = 65674764
+MD5 (KDE/stripes-freebsd-1.0.tar.bz2) = 126add6a05a22dfcd67f73e7f5260b10
+SHA256 (KDE/stripes-freebsd-1.0.tar.bz2) = 6ac543c0be09df2ef89061740f4e6f8d5b807462d030dbbc3bcfd58056431127
+SIZE (KDE/stripes-freebsd-1.0.tar.bz2) = 4258348
diff --git a/x11/kde4-workspace/files/layout.js.in b/x11/kde4-workspace/files/layout.js.in
new file mode 100644
index 000000000000..6373257213ef
--- /dev/null
+++ b/x11/kde4-workspace/files/layout.js.in
@@ -0,0 +1,7 @@
+for (var i = 0; i < activityIds.length; ++i) {
+  var desktop = activityById(activityIds[i]);
+  desktop.wallpaperPlugin = "image";
+  desktop.wallpaperMode = "SingleImage";
+  desktop.currentConfigGroup = new Array("Wallpaper", "image");
+  desktop.writeConfig("wallpaper", "%%PREFIX%%/share/wallpapers/stripes-freebsd-blue/");
+}
diff --git a/x11/kde4-workspace/files/metadata.desktop b/x11/kde4-workspace/files/metadata.desktop
new file mode 100644
index 000000000000..80ab4a657791
--- /dev/null
+++ b/x11/kde4-workspace/files/metadata.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Default Panel
+
+Type=Service
+ServiceTypes=Plasma/LayoutTemplate
+X-KDE-PluginInfo-Author=Alberto Villa
+X-KDE-PluginInfo-Email=kde@FreeBSD.org
+X-KDE-PluginInfo-Name=org.kde.freebsd.defaultWallpaper
+X-KDE-PluginInfo-Version=1.0
+X-KDE-PluginInfo-Website=http://FreeBSD.kde.org/
+X-KDE-PluginInfo-Category=
+X-KDE-PluginInfo-Depends=
+X-KDE-PluginInfo-License=BSD
+X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/x11/kde4-workspace/files/patch-1173503 b/x11/kde4-workspace/files/patch-1173503
deleted file mode 100644
index fa5331841fc6..000000000000
--- a/x11/kde4-workspace/files/patch-1173503
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./plasma/desktop/applets/kickoff/core/recentapplications.cpp	2010/09/09 15:15:03	1173502
-+++ ./plasma/desktop/applets/kickoff/core/recentapplications.cpp	2010/09/09 15:15:22	1173503
-@@ -73,6 +73,7 @@
-         }
- 
-         recentGroup.writeEntry("Applications", recentApplications);
-+        recentGroup.config()->sync();
-     }
-     void addEntry(const QString& id, ServiceInfo& info) {
-         // if this service is already in the list then remove the existing
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 38068c3876a4..44abd0f3d548 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -816,6 +816,8 @@ share/apps/plasma/dashboard/AppleClasses/AppleScrollArea.js
 share/apps/plasma/dashboard/AppleClasses/AppleScrollbar.js
 share/apps/plasma/dashboard/AppleClasses/AppleSlider.js
 share/apps/plasma/dashboard/button/genericButton.js
+share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents/layout.js
+share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/metadata.desktop
 share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js
 share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/metadata.desktop
 share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/contents/layout.js
@@ -2237,8 +2239,34 @@ share/wallpapers/Red_Leaf/contents/images/1600x1200.jpg
 share/wallpapers/Red_Leaf/contents/images/1920x1200.jpg
 share/wallpapers/Red_Leaf/contents/screenshot.png
 share/wallpapers/Red_Leaf/metadata.desktop
+share/wallpapers/stripes-freebsd-blue/contents/images/1024x768.jpg
+share/wallpapers/stripes-freebsd-blue/contents/images/1280x1024.jpg
+share/wallpapers/stripes-freebsd-blue/contents/images/1280x800.jpg
+share/wallpapers/stripes-freebsd-blue/contents/images/1440x900.jpg
+share/wallpapers/stripes-freebsd-blue/contents/images/1600x1200.jpg
+share/wallpapers/stripes-freebsd-blue/contents/images/1920x1080.jpg
+share/wallpapers/stripes-freebsd-blue/contents/images/1920x1200.jpg
+share/wallpapers/stripes-freebsd-blue/contents/images/800x600.jpg
+share/wallpapers/stripes-freebsd-blue/contents/screenshot.jpg
+share/wallpapers/stripes-freebsd-blue/metadata.desktop
+share/wallpapers/stripes-freebsd-red/contents/images/1024x768.jpg
+share/wallpapers/stripes-freebsd-red/contents/images/1280x1024.jpg
+share/wallpapers/stripes-freebsd-red/contents/images/1280x800.jpg
+share/wallpapers/stripes-freebsd-red/contents/images/1440x900.jpg
+share/wallpapers/stripes-freebsd-red/contents/images/1600x1200.jpg
+share/wallpapers/stripes-freebsd-red/contents/images/1920x1080.jpg
+share/wallpapers/stripes-freebsd-red/contents/images/1920x1200.jpg
+share/wallpapers/stripes-freebsd-red/contents/images/800x600.jpg
+share/wallpapers/stripes-freebsd-red/contents/screenshot.jpg
+share/wallpapers/stripes-freebsd-red/metadata.desktop
 share/wallpapers/stripes.png
 share/wallpapers/stripes.png.desktop
+@dirrm share/wallpapers/stripes-freebsd-red/contents/images
+@dirrm share/wallpapers/stripes-freebsd-red/contents
+@dirrm share/wallpapers/stripes-freebsd-red
+@dirrm share/wallpapers/stripes-freebsd-blue/contents/images
+@dirrm share/wallpapers/stripes-freebsd-blue/contents
+@dirrm share/wallpapers/stripes-freebsd-blue
 @dirrm share/wallpapers/Red_Leaf/contents/images
 @dirrm share/wallpapers/Red_Leaf/contents
 @dirrm share/wallpapers/Red_Leaf
@@ -2356,6 +2384,8 @@ share/wallpapers/stripes.png.desktop
 @dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage
 @dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents
 @dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel
+@dirrm share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents
+@dirrm share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper
 @dirrm share/apps/plasma/layout-templates
 @dirrm share/apps/plasma/dashboard/button
 @dirrm share/apps/plasma/dashboard/AppleClasses