- Work around KDE bug 128757.

- Finally support GNOME/XFCE icons/menus by default by depending on
  kde-xdg-env.

16 files changed, 260 insertions, 4 deletions

diff --git a/misc/kde-xdg-env/Makefile b/misc/kde-xdg-env/Makefile
index 4d1b56901273..b1632afb23f7 100644
--- a/misc/kde-xdg-env/Makefile
+++ b/misc/kde-xdg-env/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	xdg
-PORTVERSION=	${KDE_VERSION}
+PORTVERSION=	1.0
+PORTEPOCH=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	kde-
@@ -17,8 +18,9 @@ EXTRACT_SUFX=	# none
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Script which hooks into startkde and helps KDE pick up XDG apps/menus
 
-USE_KDEBASE_VER=3
+.if defined(KDE_PREFIX)
 PREFIX=		${KDE_PREFIX}
+.endif
 
 NO_BUILD=	yes
 
diff --git a/misc/kde4-xdg-env/Makefile b/misc/kde4-xdg-env/Makefile
index 4d1b56901273..b1632afb23f7 100644
--- a/misc/kde4-xdg-env/Makefile
+++ b/misc/kde4-xdg-env/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	xdg
-PORTVERSION=	${KDE_VERSION}
+PORTVERSION=	1.0
+PORTEPOCH=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	kde-
@@ -17,8 +18,9 @@ EXTRACT_SUFX=	# none
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Script which hooks into startkde and helps KDE pick up XDG apps/menus
 
-USE_KDEBASE_VER=3
+.if defined(KDE_PREFIX)
 PREFIX=		${KDE_PREFIX}
+.endif
 
 NO_BUILD=	yes
 
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index f98901d8194d..f37bba3afaa2 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -16,6 +17,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
+RUN_DEPENDS=	${LOCALBASE}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
diff --git a/x11/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
new file mode 100644
index 000000000000..210698a0b31a
--- /dev/null
+++ b/x11/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
@@ -0,0 +1,34 @@
+--- kioslave/media/mediamanager/fstabbackend.cpp	Mon May 22 20:12:42 2006
++++ kioslave/media/mediamanager/fstabbackend.cpp	Fri Mar 17 11:17:33 2006
+@@ -144,7 +144,7 @@
+ 
+ void FstabBackend::handleMtabChange(bool allowNotification)
+ {
+-	QStringList new_mtabIds, new_mtabEntries;
++	QStringList new_mtabIds;
+ 	KMountPoint::List mtab = KMountPoint::currentMountPoints();
+ 
+ 	KMountPoint::List::iterator it = mtab.begin();
+@@ -158,14 +158,6 @@
+ 
+ 		if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue;
+ 
+-		/* Did we know this already before ? If yes, then
+-		   nothing has changed, do not stat the mount point. Avoids
+-		   hang if network shares are stalling */
+-		QString mtabEntry = dev + "*" + mp + "*" + fs;
+-		bool isOldEntry = m_mtabEntries.contains(mtabEntry);
+-		new_mtabEntries+=mtabEntry;
+-		if (isOldEntry) continue;
+-
+ 		QString id = generateId(dev, mp);
+ 		new_mtabIds+=id;
+ 
+@@ -226,7 +218,6 @@
+ 	}
+ 
+ 	m_mtabIds = new_mtabIds;
+-        m_mtabEntries = new_mtabEntries;
+ }
+ 
+ void FstabBackend::handleFstabChange(bool allowNotification)
\ No newline at end of file
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index f98901d8194d..f37bba3afaa2 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -16,6 +17,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
+RUN_DEPENDS=	${LOCALBASE}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
diff --git a/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
new file mode 100644
index 000000000000..210698a0b31a
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
@@ -0,0 +1,34 @@
+--- kioslave/media/mediamanager/fstabbackend.cpp	Mon May 22 20:12:42 2006
++++ kioslave/media/mediamanager/fstabbackend.cpp	Fri Mar 17 11:17:33 2006
+@@ -144,7 +144,7 @@
+ 
+ void FstabBackend::handleMtabChange(bool allowNotification)
+ {
+-	QStringList new_mtabIds, new_mtabEntries;
++	QStringList new_mtabIds;
+ 	KMountPoint::List mtab = KMountPoint::currentMountPoints();
+ 
+ 	KMountPoint::List::iterator it = mtab.begin();
+@@ -158,14 +158,6 @@
+ 
+ 		if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue;
+ 
+-		/* Did we know this already before ? If yes, then
+-		   nothing has changed, do not stat the mount point. Avoids
+-		   hang if network shares are stalling */
+-		QString mtabEntry = dev + "*" + mp + "*" + fs;
+-		bool isOldEntry = m_mtabEntries.contains(mtabEntry);
+-		new_mtabEntries+=mtabEntry;
+-		if (isOldEntry) continue;
+-
+ 		QString id = generateId(dev, mp);
+ 		new_mtabIds+=id;
+ 
+@@ -226,7 +218,6 @@
+ 	}
+ 
+ 	m_mtabIds = new_mtabIds;
+-        m_mtabEntries = new_mtabEntries;
+ }
+ 
+ void FstabBackend::handleFstabChange(bool allowNotification)
\ No newline at end of file
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index f98901d8194d..f37bba3afaa2 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -16,6 +17,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
+RUN_DEPENDS=	${LOCALBASE}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
diff --git a/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
new file mode 100644
index 000000000000..210698a0b31a
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
@@ -0,0 +1,34 @@
+--- kioslave/media/mediamanager/fstabbackend.cpp	Mon May 22 20:12:42 2006
++++ kioslave/media/mediamanager/fstabbackend.cpp	Fri Mar 17 11:17:33 2006
+@@ -144,7 +144,7 @@
+ 
+ void FstabBackend::handleMtabChange(bool allowNotification)
+ {
+-	QStringList new_mtabIds, new_mtabEntries;
++	QStringList new_mtabIds;
+ 	KMountPoint::List mtab = KMountPoint::currentMountPoints();
+ 
+ 	KMountPoint::List::iterator it = mtab.begin();
+@@ -158,14 +158,6 @@
+ 
+ 		if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue;
+ 
+-		/* Did we know this already before ? If yes, then
+-		   nothing has changed, do not stat the mount point. Avoids
+-		   hang if network shares are stalling */
+-		QString mtabEntry = dev + "*" + mp + "*" + fs;
+-		bool isOldEntry = m_mtabEntries.contains(mtabEntry);
+-		new_mtabEntries+=mtabEntry;
+-		if (isOldEntry) continue;
+-
+ 		QString id = generateId(dev, mp);
+ 		new_mtabIds+=id;
+ 
+@@ -226,7 +218,6 @@
+ 	}
+ 
+ 	m_mtabIds = new_mtabIds;
+-        m_mtabEntries = new_mtabEntries;
+ }
+ 
+ void FstabBackend::handleFstabChange(bool allowNotification)
\ No newline at end of file
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index f98901d8194d..f37bba3afaa2 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -16,6 +17,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
+RUN_DEPENDS=	${LOCALBASE}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
diff --git a/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
new file mode 100644
index 000000000000..210698a0b31a
--- /dev/null
+++ b/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
@@ -0,0 +1,34 @@
+--- kioslave/media/mediamanager/fstabbackend.cpp	Mon May 22 20:12:42 2006
++++ kioslave/media/mediamanager/fstabbackend.cpp	Fri Mar 17 11:17:33 2006
+@@ -144,7 +144,7 @@
+ 
+ void FstabBackend::handleMtabChange(bool allowNotification)
+ {
+-	QStringList new_mtabIds, new_mtabEntries;
++	QStringList new_mtabIds;
+ 	KMountPoint::List mtab = KMountPoint::currentMountPoints();
+ 
+ 	KMountPoint::List::iterator it = mtab.begin();
+@@ -158,14 +158,6 @@
+ 
+ 		if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue;
+ 
+-		/* Did we know this already before ? If yes, then
+-		   nothing has changed, do not stat the mount point. Avoids
+-		   hang if network shares are stalling */
+-		QString mtabEntry = dev + "*" + mp + "*" + fs;
+-		bool isOldEntry = m_mtabEntries.contains(mtabEntry);
+-		new_mtabEntries+=mtabEntry;
+-		if (isOldEntry) continue;
+-
+ 		QString id = generateId(dev, mp);
+ 		new_mtabIds+=id;
+ 
+@@ -226,7 +218,6 @@
+ 	}
+ 
+ 	m_mtabIds = new_mtabIds;
+-        m_mtabEntries = new_mtabEntries;
+ }
+ 
+ void FstabBackend::handleFstabChange(bool allowNotification)
\ No newline at end of file
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index f98901d8194d..f37bba3afaa2 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -16,6 +17,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
+RUN_DEPENDS=	${LOCALBASE}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
diff --git a/x11/kdebase4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
new file mode 100644
index 000000000000..210698a0b31a
--- /dev/null
+++ b/x11/kdebase4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
@@ -0,0 +1,34 @@
+--- kioslave/media/mediamanager/fstabbackend.cpp	Mon May 22 20:12:42 2006
++++ kioslave/media/mediamanager/fstabbackend.cpp	Fri Mar 17 11:17:33 2006
+@@ -144,7 +144,7 @@
+ 
+ void FstabBackend::handleMtabChange(bool allowNotification)
+ {
+-	QStringList new_mtabIds, new_mtabEntries;
++	QStringList new_mtabIds;
+ 	KMountPoint::List mtab = KMountPoint::currentMountPoints();
+ 
+ 	KMountPoint::List::iterator it = mtab.begin();
+@@ -158,14 +158,6 @@
+ 
+ 		if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue;
+ 
+-		/* Did we know this already before ? If yes, then
+-		   nothing has changed, do not stat the mount point. Avoids
+-		   hang if network shares are stalling */
+-		QString mtabEntry = dev + "*" + mp + "*" + fs;
+-		bool isOldEntry = m_mtabEntries.contains(mtabEntry);
+-		new_mtabEntries+=mtabEntry;
+-		if (isOldEntry) continue;
+-
+ 		QString id = generateId(dev, mp);
+ 		new_mtabIds+=id;
+ 
+@@ -226,7 +218,6 @@
+ 	}
+ 
+ 	m_mtabIds = new_mtabIds;
+-        m_mtabEntries = new_mtabEntries;
+ }
+ 
+ void FstabBackend::handleFstabChange(bool allowNotification)
\ No newline at end of file
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index f98901d8194d..f37bba3afaa2 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -16,6 +17,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
+RUN_DEPENDS=	${LOCALBASE}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
diff --git a/x11/kdebase4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
new file mode 100644
index 000000000000..210698a0b31a
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
@@ -0,0 +1,34 @@
+--- kioslave/media/mediamanager/fstabbackend.cpp	Mon May 22 20:12:42 2006
++++ kioslave/media/mediamanager/fstabbackend.cpp	Fri Mar 17 11:17:33 2006
+@@ -144,7 +144,7 @@
+ 
+ void FstabBackend::handleMtabChange(bool allowNotification)
+ {
+-	QStringList new_mtabIds, new_mtabEntries;
++	QStringList new_mtabIds;
+ 	KMountPoint::List mtab = KMountPoint::currentMountPoints();
+ 
+ 	KMountPoint::List::iterator it = mtab.begin();
+@@ -158,14 +158,6 @@
+ 
+ 		if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue;
+ 
+-		/* Did we know this already before ? If yes, then
+-		   nothing has changed, do not stat the mount point. Avoids
+-		   hang if network shares are stalling */
+-		QString mtabEntry = dev + "*" + mp + "*" + fs;
+-		bool isOldEntry = m_mtabEntries.contains(mtabEntry);
+-		new_mtabEntries+=mtabEntry;
+-		if (isOldEntry) continue;
+-
+ 		QString id = generateId(dev, mp);
+ 		new_mtabIds+=id;
+ 
+@@ -226,7 +218,6 @@
+ 	}
+ 
+ 	m_mtabIds = new_mtabIds;
+-        m_mtabEntries = new_mtabEntries;
+ }
+ 
+ void FstabBackend::handleFstabChange(bool allowNotification)
\ No newline at end of file
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index f98901d8194d..f37bba3afaa2 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -16,6 +17,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
+RUN_DEPENDS=	${LOCALBASE}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
diff --git a/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
new file mode 100644
index 000000000000..210698a0b31a
--- /dev/null
+++ b/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp
@@ -0,0 +1,34 @@
+--- kioslave/media/mediamanager/fstabbackend.cpp	Mon May 22 20:12:42 2006
++++ kioslave/media/mediamanager/fstabbackend.cpp	Fri Mar 17 11:17:33 2006
+@@ -144,7 +144,7 @@
+ 
+ void FstabBackend::handleMtabChange(bool allowNotification)
+ {
+-	QStringList new_mtabIds, new_mtabEntries;
++	QStringList new_mtabIds;
+ 	KMountPoint::List mtab = KMountPoint::currentMountPoints();
+ 
+ 	KMountPoint::List::iterator it = mtab.begin();
+@@ -158,14 +158,6 @@
+ 
+ 		if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue;
+ 
+-		/* Did we know this already before ? If yes, then
+-		   nothing has changed, do not stat the mount point. Avoids
+-		   hang if network shares are stalling */
+-		QString mtabEntry = dev + "*" + mp + "*" + fs;
+-		bool isOldEntry = m_mtabEntries.contains(mtabEntry);
+-		new_mtabEntries+=mtabEntry;
+-		if (isOldEntry) continue;
+-
+ 		QString id = generateId(dev, mp);
+ 		new_mtabIds+=id;
+ 
+@@ -226,7 +218,6 @@
+ 	}
+ 
+ 	m_mtabIds = new_mtabIds;
+-        m_mtabEntries = new_mtabEntries;
+ }
+ 
+ void FstabBackend::handleFstabChange(bool allowNotification)
\ No newline at end of file