6 files changed, 14 insertions, 41 deletions

diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index e551153728dc..8581d602bd18 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
@@ -71,6 +70,7 @@ pre-extract::
 post-extract:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
 	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
+	${REINPLACE_CMD} -e 's|-pedantic ||g' ${WRKSRC}/configure
 
 post-configure:
 	${REINPLACE_CMD} -e "s@genkdmconf --in@genkdmconf --no-old --in@" \
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 2c406b62b08c..8bd0f3797664 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,2 +1 @@
-MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
-
+MD5 (KDE/kdebase-3.1.3.tar.bz2) = d11514ebed619de18869d95e2d110951
diff --git a/x11/kdebase4-workspace/files/patch-kioslave-fish-fish.cpp b/x11/kdebase4-workspace/files/patch-kioslave-fish-fish.cpp
new file mode 100644
index 000000000000..6373fd0f3546
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-kioslave-fish-fish.cpp
@@ -0,0 +1,10 @@
+--- kioslave/fish/fish.cpp.orig
++++ kioslave/fish/fish.cpp  
+@@ -302,5 +302,5 @@
+ void fishProtocol::openConnection() {
+ static int open_pty_pair(int fd[2])
+ {
+-#if defined(HAVE_TERMIOS_H) && defined(HAVE_GRANTPT)
++#if defined(HAVE_TERMIOS_H) && defined(HAVE_GRANTPT) && !defined (HAVE_OPENPTY)
+ /** with kind regards to The GNU C Library
+ Reference Manual for Version 2.2.x of the GNU C Library */
diff --git a/x11/kdebase4-workspace/files/patch-startkde b/x11/kdebase4-workspace/files/patch-startkde
deleted file mode 100644
index bafce22839a0..000000000000
--- a/x11/kdebase4-workspace/files/patch-startkde
+++ /dev/null
@@ -1,35 +0,0 @@
---- startkde.orig	Sat Jan  4 18:26:07 2003
-+++ startkde	Sat Jan 11 18:10:35 2003
-@@ -34,7 +34,7 @@
- # people's heads. We use colours from the standard KDE palette for those with
- # palettised displays.
- 
--test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
-+test "$XDM_MANAGED" || bkg="-solid #0080C0"
- xsetroot -cursor_name left_ptr $bkg
- 
- # The user's personal KDE directory is usually ~/.kde, but this setting
-@@ -87,14 +87,11 @@
- kde_fontpaths=$kde_fontsdir/fontpaths
- 
- if test -r "$kde_fontpaths" ; then
--    savifs=$IFS
--    IFS=
-     for fpath in `grep -v '^[ 	]*#' < "$kde_fontpaths"` ; do
-         if test -s "$fpath"/fonts.dir ; then
-             xset fp+ "$fpath"
-         fi
-     done
--    IFS=$savifs
- fi
- 
- # Ask X11 to rebuild its font list.
-@@ -140,7 +140,7 @@
- fi
- 
- # the splashscreen and progress indicator
--ksplash
-+test -x /usr/local/bin/ksplashml && { ksplashml;true; } || ksplash
- 
- # We set LD_BIND_NOW to increase the efficiency of kdeinit.
- # kdeinit unsets this variable before loading applications.
diff --git a/x11/kdebase4-workspace/files/plist.base b/x11/kdebase4-workspace/files/plist.base
index 31f8e3f166f0..4f9df2e6d51a 100644
--- a/x11/kdebase4-workspace/files/plist.base
+++ b/x11/kdebase4-workspace/files/plist.base
@@ -1945,8 +1945,6 @@ share/doc/HTML/en/kwrite/index.docbook
 share/fonts/9x15.pcf.gz
 share/fonts/console8x16.pcf.gz
 share/fonts/console8x8.pcf.gz
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
 share/icons/crystalsvg/128x128/apps/access.png
 share/icons/crystalsvg/128x128/apps/acroread.png
 share/icons/crystalsvg/128x128/apps/applixware.png
@@ -2953,4 +2951,5 @@ share/wallpapers/kdm_bg.jpg
 share/wallpapers/only_k.jpg
 share/wallpapers/triplegears.jpg
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
+@exec /bin/mkdir -p %D/share/fonts/override
 @exec /bin/mkdir -p %D/share/templates/.source/emptydir
diff --git a/x11/kdebase4-workspace/files/plist.base.rm b/x11/kdebase4-workspace/files/plist.base.rm
index 11b2e7678783..83d6890a62f7 100644
--- a/x11/kdebase4-workspace/files/plist.base.rm
+++ b/x11/kdebase4-workspace/files/plist.base.rm
@@ -1,4 +1,5 @@
 @unexec /bin/rmdir %D/share/templates/.source/emptydir || true
+@unexec /bin/rmdir %D/share/fonts/override || true
 @unexec /bin/rmdir %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html || true
 @dirrm share/wallpapers
 @dirrm share/templates/.source
@@ -149,7 +150,6 @@
 @dirrm share/icons/crystalsvg/128x128
 @dirrm share/icons/crystalsvg
 @dirrm share/icons
-@dirrm share/fonts/override
 @dirrm share/fonts
 @dirrm share/doc/HTML/en/kwrite
 @dirrm share/doc/HTML/en/ksysguard