Upgrade to KDE 3.0.1. The delay in this upgrade is mainly due to the

rigorous testing performed on the part of the KDE/FreeBSD Project
over the last three weeks.  Thanks to everyone who helped test!

General changes:
	[1] Follow KDE2 style by moving KDE core specific macros and
	    the like to x11/kde3/Makefile.kde.
	[2] Fix a variety of comments or miscellaneous data to reflect
	    that this is KDE3 and not KDE2.
	[3] Account for more empty directories in the PLISTs.

deskutils/kdepim3:
	[4] More #include <malloc.h> -> #include <stdlib.h>.

audio/arts:
	[5] Upgrade to 1.0.1.
	[6] Point at MASTER_SITE_KDE not my own mirror.

audio/kdemultimedia3:
	[7] Account for the removal of the <machine/soundcard.h> symlink.
	    Simply point all such includes at <sys/soundcard.h>.

editors/koffice-kde3:
	[8] Get rid of #include <values.h> preemptively.

devel/kdesdk3:
	[9] Remove cervisia from build if building on -CURRENT due to
	    C++-unsafe sys/wait.h.  The header is believed to have been
	    fixed in newer -CURRENT (>= Jun 5) but we have not tested that.

devel/kdevelop:
	[10] Upgrade to 2.1.1 and use KDE 3 version.
	[11] Remove a number of suggested dependencies that no longer fit.
	[12] Account for where the docs for Qt went since they got moved
	     to fit in hier(7) better.

graphics/kdegraphics3:
	[13] Turn off kuickshow by default because it depends on imlib,
	     which in turn depends on gtk/glib.  This will be revisited
	     when we split up the KDE ports a bit.

games/kdegames3:
	[14] Fix compile error on -CURRENT where kpat/freecell-solver/md5.h
	     tried to define uint32_t after sys/types.h already had.

sysutils/kdeadmin3:
	No particular changes.

misc/kdeaddons3:
	No particular changes.

misc/kdeedu3:
	[15] Re-add the huge number of missing @dirrm's.

misc/kdeutils3:
	No particular changes.

misc/kde3-i18n-* and */kde3-i18n:
	For the most part, no particular changes.  A huge number of I18N
	message updates went into this release, though.

french/kde3-i18n:
	[16] Fix build Makefile error due to tarball builder's env.

net/kdenetwork3:
	No particular changes.

x11-clocks/kdetoys3:
	No particular changes.

x11/kdebase3:
	[17] Account for mkfontdir "soft" build-time dependency.  If
	     mkfontdir is available, use it to build fonts.dir where
	     kdebase installs fonts.  Otherwise, don't bother.
	[18] Patch ElectricEyes.desktop to use the name of the program
	     that FreeBSD uses when you install the port for it.
	[19] Patches for KDM merged into KDE 3.0.1.
	[20] Properly fix kdm/backend/xdmcp.c string format error.

x11/kdelibs3:
	[21] Support the KDE3 version check to make sure no one
	     tries to install KDE2 then KDE3.  The 'kde-version-check'
	     target is centralized in x11/kde3/Makefile.kde.
	[22] Remove patch for kdeprint/configure.in.in.
	[23] Add patch to fix critical icon loader bug.

x11/kde3:
	[24] Add Makefile.kde for centralizing KDE core-specific macros
	     that don't belong in bsd.kde.mk.

x11-toolkits/qt30:
	[25] Mark broken on any XFree86 version < 4 due to packing list
	     related problems if we tried to support XFree86 3.
	[26] Error out if the user has Qt2 installed already.

x11-wm/kdeartwork3:
	[27] Add USE_MESA to explicitly support the 3D screensavers.
	[28] Re-add a large number of missing @dirrm's.

Credits:

[1] [4] [5] [6] [7]
[9] [10] [14] [16]
[21] [22] [24] [26]:	will

[2] [3] [8] [15] [17]
[19] [25] [27] [28]:	alane

[11] [12]
Submitted by:		Lauri Watts <lauri@kde.org>

[13] Found by:		mi
     Removed by:	will

[18] [23]
Submitted by:		Andy Fawcett <andy@athame.co.uk>

Tested by:		[in addition to the above, in no particular order]
			knu
			Mattias Douhan <matt@athame.co.uk>
			Bradley T. Hughes <bhughes@trolltech.com>
			Erik H. Bakke <ebakke@trolltech.com>
			David Johnson <david@usermode.org>
			JJ Behrens <jj@nttmcl.com>
			Michael W. Collette <metrol@metrol.net>
			Adriaan de Groot <adridg@sci.kun.nl>
			Mark Rowlands <mark.rowlands@minmail.net>
			Mark Stosberg <mark@summersault.com>
			Dave Cantrell <phaedrus@alltel.net>
			Mark Miller <joup@bigfoot.com>
			Wesley Morgan <morganw@chemikals.org>
			Arjan van Leeuwen <avl@operamail.com>

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