Update the KDE meta-port to KDE 1.90 (aka KDE2 beta) so people can use

it to install the basic KDE2 stuff.  Also update kdetoys to finally
remove ImageMagick dependency and allow non-i18n people to use it.

And now, KDE2 is fully imported into the tree.

Repo-copies by:	asami

9 files changed, 42 insertions, 42 deletions

diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index 083b9200fee8..8bd405dfe70d 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -1,26 +1,24 @@
-# New ports collection makefile for:   kde
-# Date created:        4 November 1997
-# Whom:                Satoshi Asami <asami@FreeBSD.org>
+# New ports collection makefile for:	KDE2
+# Date created:				Sun May 14 2000 00:50:02
+# Whom:					Will Andrews <will@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kde
-PORTVERSION=	1.1.2
+PORTVERSION=	1.90
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	se@freebsd.org
+MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11 \
-		kcalc:${PORTSDIR}/misc/kdeutils11 \
-		kmahjongg:${PORTSDIR}/games/kdegames11 \
-		kghostview:${PORTSDIR}/graphics/kdegraphics11 \
-		kmail:${PORTSDIR}/net/kdenetwork11 \
-		kmedia:${PORTSDIR}/audio/kdemultimedia11
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
+RUN_DEPENDS=	konqueror:${PORTSDIR}/x11/kdebase2 \
+		kcalc:${PORTSDIR}/misc/kdeutils2 \
+		kmahjongg:${PORTSDIR}/games/kdegames2 \
+		kmail:${PORTSDIR}/net/kdenetwork2
 
 NO_BUILD=	yes
 
diff --git a/x11/kde2/pkg-comment b/x11/kde2/pkg-comment
index 82c382714d8e..4d7b170ccb85 100644
--- a/x11/kde2/pkg-comment
+++ b/x11/kde2/pkg-comment
@@ -1 +1 @@
-The "meta-port" for the KDE integrated X11 desktop
+The "meta-port" for KDE 2
diff --git a/x11/kde2/pkg-descr b/x11/kde2/pkg-descr
index 3947b85acf58..3fc0b789d994 100644
--- a/x11/kde2/pkg-descr
+++ b/x11/kde2/pkg-descr
@@ -4,4 +4,6 @@ This package does not contain anything by itself -- it is a
 "meta-port" that depends on other KDE packages.  Its sole purpose is
 to require dependencies so users can install this package only and
 have all the KDE stuff pulled in by the port/package dependency
-mechanism.
+mechanism.  This meta-port installs KDE version 2.
+
+WWW: http://www.kde.org/
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index 083b9200fee8..8bd405dfe70d 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -1,26 +1,24 @@
-# New ports collection makefile for:   kde
-# Date created:        4 November 1997
-# Whom:                Satoshi Asami <asami@FreeBSD.org>
+# New ports collection makefile for:	KDE2
+# Date created:				Sun May 14 2000 00:50:02
+# Whom:					Will Andrews <will@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kde
-PORTVERSION=	1.1.2
+PORTVERSION=	1.90
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	se@freebsd.org
+MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11 \
-		kcalc:${PORTSDIR}/misc/kdeutils11 \
-		kmahjongg:${PORTSDIR}/games/kdegames11 \
-		kghostview:${PORTSDIR}/graphics/kdegraphics11 \
-		kmail:${PORTSDIR}/net/kdenetwork11 \
-		kmedia:${PORTSDIR}/audio/kdemultimedia11
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
+RUN_DEPENDS=	konqueror:${PORTSDIR}/x11/kdebase2 \
+		kcalc:${PORTSDIR}/misc/kdeutils2 \
+		kmahjongg:${PORTSDIR}/games/kdegames2 \
+		kmail:${PORTSDIR}/net/kdenetwork2
 
 NO_BUILD=	yes
 
diff --git a/x11/kde3/pkg-comment b/x11/kde3/pkg-comment
index 82c382714d8e..4d7b170ccb85 100644
--- a/x11/kde3/pkg-comment
+++ b/x11/kde3/pkg-comment
@@ -1 +1 @@
-The "meta-port" for the KDE integrated X11 desktop
+The "meta-port" for KDE 2
diff --git a/x11/kde3/pkg-descr b/x11/kde3/pkg-descr
index 3947b85acf58..3fc0b789d994 100644
--- a/x11/kde3/pkg-descr
+++ b/x11/kde3/pkg-descr
@@ -4,4 +4,6 @@ This package does not contain anything by itself -- it is a
 "meta-port" that depends on other KDE packages.  Its sole purpose is
 to require dependencies so users can install this package only and
 have all the KDE stuff pulled in by the port/package dependency
-mechanism.
+mechanism.  This meta-port installs KDE version 2.
+
+WWW: http://www.kde.org/
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 083b9200fee8..8bd405dfe70d 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -1,26 +1,24 @@
-# New ports collection makefile for:   kde
-# Date created:        4 November 1997
-# Whom:                Satoshi Asami <asami@FreeBSD.org>
+# New ports collection makefile for:	KDE2
+# Date created:				Sun May 14 2000 00:50:02
+# Whom:					Will Andrews <will@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kde
-PORTVERSION=	1.1.2
+PORTVERSION=	1.90
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	se@freebsd.org
+MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11 \
-		kcalc:${PORTSDIR}/misc/kdeutils11 \
-		kmahjongg:${PORTSDIR}/games/kdegames11 \
-		kghostview:${PORTSDIR}/graphics/kdegraphics11 \
-		kmail:${PORTSDIR}/net/kdenetwork11 \
-		kmedia:${PORTSDIR}/audio/kdemultimedia11
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
+RUN_DEPENDS=	konqueror:${PORTSDIR}/x11/kdebase2 \
+		kcalc:${PORTSDIR}/misc/kdeutils2 \
+		kmahjongg:${PORTSDIR}/games/kdegames2 \
+		kmail:${PORTSDIR}/net/kdenetwork2
 
 NO_BUILD=	yes
 
diff --git a/x11/kde4/pkg-comment b/x11/kde4/pkg-comment
index 82c382714d8e..4d7b170ccb85 100644
--- a/x11/kde4/pkg-comment
+++ b/x11/kde4/pkg-comment
@@ -1 +1 @@
-The "meta-port" for the KDE integrated X11 desktop
+The "meta-port" for KDE 2
diff --git a/x11/kde4/pkg-descr b/x11/kde4/pkg-descr
index 3947b85acf58..3fc0b789d994 100644
--- a/x11/kde4/pkg-descr
+++ b/x11/kde4/pkg-descr
@@ -4,4 +4,6 @@ This package does not contain anything by itself -- it is a
 "meta-port" that depends on other KDE packages.  Its sole purpose is
 to require dependencies so users can install this package only and
 have all the KDE stuff pulled in by the port/package dependency
-mechanism.
+mechanism.  This meta-port installs KDE version 2.
+
+WWW: http://www.kde.org/