aboutsummaryrefslogtreecommitdiff
path: root/x11/kdebase4
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2006-06-16 07:19:46 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2006-06-16 07:19:46 +0000
commitff37c611b5ee3e92fb0e331796edad1cdf3649c9 (patch)
treef97a1e712518c97b79f25b992d07a24c944fde9d /x11/kdebase4
parent187045daf6225ead6097bf6cdb5912c37d2efbe6 (diff)
downloadports-ff37c611b5ee3e92fb0e331796edad1cdf3649c9.tar.gz
ports-ff37c611b5ee3e92fb0e331796edad1cdf3649c9.zip
Notes
Diffstat (limited to 'x11/kdebase4')
-rw-r--r--x11/kdebase4/Makefile2
-rw-r--r--x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp20
-rw-r--r--x11/kdebase4/files/pkg-message.in8
3 files changed, 19 insertions, 11 deletions
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 04eb6f152145..5683a15f3238 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
index 5861ae9e7bff..5fb2c123a6c2 100644
--- a/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
+++ b/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
@@ -1,6 +1,14 @@
---- kioslave/media/mediamanager/fstabbackend.cpp 2006/03/23 09:19:38 521680
-+++ kioslave/media/mediamanager/fstabbackend.cpp 2006/06/14 09:11:46 551306
-@@ -144,7 +144,7 @@
+--- kioslave/media/mediamanager/fstabbackend.cpp.orig Mon May 22 20:12:42 2006
++++ kioslave/media/mediamanager/fstabbackend.cpp Fri Jun 16 08:56:20 2006
+@@ -111,6 +111,7 @@
+ if ( mount->mountType() == "swap"
+ || mount->mountType() == "tmpfs"
+ || mount->mountType() == "sysfs"
++ || mount->mountType() == "fdescfs"
+ || mount->mountType() == "kernfs"
+ || mount->mountType() == "usbfs"
+ || mount->mountType().contains( "proc" )
+@@ -144,7 +145,7 @@
void FstabBackend::handleMtabChange(bool allowNotification)
{
@@ -9,7 +17,7 @@
KMountPoint::List mtab = KMountPoint::currentMountPoints();
KMountPoint::List::iterator it = mtab.begin();
-@@ -162,18 +162,19 @@
+@@ -162,18 +163,19 @@
nothing has changed, do not stat the mount point. Avoids
hang if network shares are stalling */
QString mtabEntry = dev + "*" + mp + "*" + fs;
@@ -33,7 +41,7 @@
m_mediaList.changeMediumState(id, true, false,
mime, icon, label);
}
-@@ -211,6 +212,10 @@
+@@ -211,6 +213,10 @@
QString mp = medium->mountPoint();
QString fs = medium->fsType();
@@ -44,7 +52,7 @@
QString mime, icon, label;
guess(dev, mp, fs, false, mime, icon, label);
-@@ -226,7 +231,6 @@
+@@ -226,7 +232,6 @@
}
m_mtabIds = new_mtabIds;
diff --git a/x11/kdebase4/files/pkg-message.in b/x11/kdebase4/files/pkg-message.in
index 4c4756fe4617..1cacd3158de2 100644
--- a/x11/kdebase4/files/pkg-message.in
+++ b/x11/kdebase4/files/pkg-message.in
@@ -1,9 +1,9 @@
-This port has installed fonts into %%PREFIX%%/share/fonts
+This port has installed fonts into %%PREFIX%%/share/apps/konsole/fonts
-You'll have to add %%PREFIX%%/share/fonts
+You may want to add %%PREFIX%%/share/apps/konsole/fonts
to your X font path by either:
-$ xset fp+ %%PREFIX%%/share/fonts
+$ xset fp+ %%PREFIX%%/share/apps/konsole/fonts
$ xset fp rehash
or by adding it to your X-server configuration file (usually
@@ -13,7 +13,7 @@ restarting the X-server.
You also have to make the new path known to fontconfig by
adding a
-<dir>%%PREFIX%%/share/fonts</dir> line to either
+<dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either
%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running