4 files changed, 17 insertions, 42 deletions

diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 26085e020744..9b3e4fe73467 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -6,45 +6,33 @@
 #
 
 PORTNAME=	kdevelop
-PORTVERSION=	2.0.2
-PORTREVISION?=	1
+PORTVERSION=	2.1.1
 CATEGORIES?=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/2.2.2/src
+MASTER_SITE_SUBDIR=	stable/3.0.1/src
 DIST_SUBDIR=	KDE
+DISTNAME=	${PORTNAME}-${PORTVERSION}_for_KDE_3.0
 
 MAINTAINER?=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
 RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
 .if defined(WITH_OPTIONAL_DEPENDS)
 RUN_DEPENDS+=	autoconf:${PORTSDIR}/devel/autoconf \
 		automake:${PORTSDIR}/devel/automake \
-		kdoc:${PORTSDIR}/textproc/kdoc \
-		kiconedit:${PORTSDIR}/graphics/kdegraphics2 \
-		ark:${PORTSDIR}/misc/kdeutils2 \
+		kiconedit:${PORTSDIR}/graphics/kdegraphics3 \
+		ark:${PORTSDIR}/misc/kdeutils3 \
 		glimpse:${PORTSDIR}/textproc/glimpse \
-		designer:${PORTSDIR}/devel/qt-designer \
-		linguist:${PORTSDIR}/devel/linguist \
-		kdbg:${PORTSDIR}/devel/kdbg \
-		kbabel:${PORTSDIR}/devel/kdesdk \
+		kbabel:${PORTSDIR}/devel/kdesdk3 \
 		a2ps:${PORTSDIR}/print/a2ps-letter
 .endif
 
-USE_KDELIBS_VER=2
+USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-qtdoc-dir=${X11BASE}/share/doc/qt2/html
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500029
-_NO_KDE_OBJPRELINK=yes
-.endif
-
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
+CONFIGURE_ARGS+= --with-qtdoc-dir=${X11BASE}/share/doc/qt/html
+CONFIGURE_TARGET=
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 pre-everything::
 .if !defined(WITH_OPTIONAL_DEPENDS)
@@ -54,18 +42,4 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-pre-configure:
-	${MKDIR} ${WRKSRC}/auto-bin
-.for AC in autoconf autoheader
-	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
-.endfor
-.for AM in automake aclocal
-	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
-.endfor
-	cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
-		${GMAKE} -f Makefile.cvs
-
-pre-build:
-	${PERL} -pi -e "s@libkdeui.so.3@libkdeui.so@g" ${WRKSRC}/kdevelop/main.cpp
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo
index 7e3a9f5448f1..847d15619bdf 100644
--- a/devel/kdevelop/distinfo
+++ b/devel/kdevelop/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdevelop-2.0.2.tar.bz2) = ba97e043cd6819c8bd77e342ee0af6fc
+MD5 (KDE/kdevelop-2.1.1_for_KDE_3.0.tar.bz2) = eea8e3b3b3d3bb88933185b3bdf29d75
diff --git a/devel/kdevelop/pkg-message b/devel/kdevelop/pkg-message
index 92723a3642e9..9fdf1fe57ca4 100644
--- a/devel/kdevelop/pkg-message
+++ b/devel/kdevelop/pkg-message
@@ -6,10 +6,7 @@
 
   - devel/automake
   - devel/c_c++_reference
-  - devel/kdbg
-  - devel/kdelibdocs
-  - devel/ktranslator
-  - graphics/kdegraphics2
+  - graphics/kdegraphics3
   - textproc/glimpse
   - print/a2ps-*
   - print/enscript-*
diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist
index 489dd3fdd5cf..21875a8de88f 100644
--- a/devel/kdevelop/pkg-plist
+++ b/devel/kdevelop/pkg-plist
@@ -182,6 +182,7 @@ share/doc/HTML/en/kdevelop/index-15.html
 share/doc/HTML/en/kdevelop/index-16.html
 share/doc/HTML/en/kdevelop/index-17.html
 share/doc/HTML/en/kdevelop/index-18.html
+share/doc/HTML/en/kdevelop/index-19.html
 share/doc/HTML/en/kdevelop/index-2.html
 share/doc/HTML/en/kdevelop/index-3.html
 share/doc/HTML/en/kdevelop/index-4.html
@@ -242,12 +243,15 @@ share/doc/HTML/en/kdevelop/tutorial/index-8.html
 share/doc/HTML/en/kdevelop/tutorial/index-9.html
 share/doc/HTML/en/kdevelop/tutorial/index.html
 share/doc/HTML/en/kdevelop/tutorial/logotp3.png
+share/doc/HTML/en/kdevelop/welcome/index.html
+share/doc/HTML/en/kdevelop/welcome/logotp3.png
 share/icons/hicolor/16x16/apps/kdevelop.png
 share/icons/hicolor/32x32/apps/kdevelop.png
 share/icons/hicolor/48x48/apps/kdevelop.png
 share/mimelnk/application/x-kdevelop-project.desktop
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/32x32/apps
+@dirrm share/doc/HTML/en/kdevelop/welcome
 @dirrm share/doc/HTML/en/kdevelop/tutorial
 @dirrm share/doc/HTML/en/kdevelop/reference/C
 @dirrm share/doc/HTML/en/kdevelop/reference