4 files changed, 11 insertions, 48 deletions

diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 42b3d41907ac..1bc8500ce2a1 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	kde
-PORTVERSION=	2.2.2
+PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -14,14 +15,14 @@ EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kde@FreeBSD.org
 
-RUN_DEPENDS=	kjumpingcube:${PORTSDIR}/games/kdegames2 \
-		kdessh:${PORTSDIR}/misc/kdeutils2 \
-		kword:${PORTSDIR}/editors/koffice \
-		kppp:${PORTSDIR}/net/kdenetwork2 \
-		kview:${PORTSDIR}/graphics/kdegraphics2 \
-		kmidi:${PORTSDIR}/audio/kdemultimedia2
+RUN_DEPENDS=	kjumpingcube:${PORTSDIR}/games/kdegames3 \
+		kdessh:${PORTSDIR}/misc/kdeutils3 \
+		kword:${PORTSDIR}/editors/koffice-kde3 \
+		kppp:${PORTSDIR}/net/kdenetwork3 \
+		kview:${PORTSDIR}/graphics/kdegraphics3 \
+		kmidi:${PORTSDIR}/audio/kdemultimedia3
 
-USE_KDEBASE_VER=2
+USE_KDEBASE_VER=3
 NO_BUILD=	yes
 
 do-install:	# empty
diff --git a/x11/kde4/Makefile.kde b/x11/kde4/Makefile.kde
deleted file mode 100644
index 28a580ad43aa..000000000000
--- a/x11/kde4/Makefile.kde
+++ /dev/null
@@ -1,37 +0,0 @@
-# This is a simple set of Makefile macros which allow the core kde ports to
-# bring these in automatically since it's tiring to modify all of them to
-# add more of these.  These don't belong in bsd.kde.mk because they aren't
-# very likely to apply outside of KDE core modules.  Nonetheless, also
-# provide variables to remove one or more of these.
-#
-# $FreeBSD$
-
-CONFIGURE_ARGS?=
-
-.if !defined(_NO_KDE_OBJPRELINK)
-.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK)
-BUILD_DEPENDS+=	objprelink:${PORTSDIR}/devel/objprelink
-CONFIGURE_ARGS+=--enable-objprelink
-.endif
-.endif
-
-.if !defined(_NO_KDE_FINAL)
-.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
-CONFIGURE_ARGS+=--enable-final
-.endif
-.endif
-
-.if !defined(_NO_KDE_NDEBUG)
-.if defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG)
-CONFIGURE_ARGS+=--disable-debug
-.else
-CONFIGURE_ARGS+=--enable-debug
-STRIP=''
-.endif
-.endif
-
-.if !defined(_NO_KDE_NON_I386_OPTS)
-.if ${MACHINE_ARCH} == "alpha"
-CFLAGS=		-O0 ${KDE_CFLAGS}
-.endif
-.endif
diff --git a/x11/kde4/pkg-comment b/x11/kde4/pkg-comment
index 4d7b170ccb85..116b1bc848b5 100644
--- a/x11/kde4/pkg-comment
+++ b/x11/kde4/pkg-comment
@@ -1 +1 @@
-The "meta-port" for KDE 2
+The "meta-port" for KDE
diff --git a/x11/kde4/pkg-descr b/x11/kde4/pkg-descr
index 3fc0b789d994..28dded7e14d8 100644
--- a/x11/kde4/pkg-descr
+++ b/x11/kde4/pkg-descr
@@ -3,7 +3,6 @@ KDE provides an integrated X11 based environment, much like CDE.
 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.  This meta-port installs KDE version 2.
+have all the KDE stuff pulled in by the port/package dependency mechanism.
 
 WWW: http://www.kde.org/