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>

2 files changed, 55 insertions, 20 deletions

diff --git a/x11/kdelibs4/files/patch-configure b/x11/kdelibs4/files/patch-configure
deleted file mode 100644
index 088311a730e5..000000000000
--- a/x11/kdelibs4/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdeprint/configure.in.in	2001/10/15 08:28:25	1.10
-+++ kdeprint/configure.in.in.new	2002/04/11 16:14:37
-@@ -5,7 +5,8 @@ kde_save_libs="$LIBS"
- LIBS="$all_libraries $USER_LDFLAGS -lcups $LIBDL $LIBSOCKET"
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
- AC_MSG_CHECKING(CUPS version >= $1)
--ac_link='${CC} $CFLAGS -o conftest conftest.c $LIBS 1>&5'
-+AC_LANG_SAVE
-+AC_LANG_C
- cat > conftest.c <<EOF
- #include <cups/cups.h>
- #include <stdio.h>
-@@ -30,6 +31,7 @@ else
-   ac_have_new_cups="no"
- fi
- rm -f conftest*
-+AC_LANG_RESTORE
- CFLAGS="$kde_save_cflags"
- LIBS="$kde_save_libs"
- AC_MSG_RESULT("$ac_have_new_cups")
diff --git a/x11/kdelibs4/files/patch-kdecore-kiconloader.cpp b/x11/kdelibs4/files/patch-kdecore-kiconloader.cpp
new file mode 100644
index 000000000000..0fc6507298c4
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kdecore-kiconloader.cpp
@@ -0,0 +1,55 @@
+--- kdecore/kiconloader.cpp	Wed May  8 14:27:24 2002
++++ /home/alane/kiconloader-3.0.cpp	Sat Jun  8 12:05:25 2002
+@@ -1,6 +1,6 @@
+ /* vi: ts=8 sts=4 sw=4
+  *
+- * $Id: kiconloader.cpp,v 1.186 2002/03/18 00:27:25 carewolf Exp $
++ * $Id: kiconloader.cpp,v 1.186.2.2 2002/06/03 11:14:08 faure Exp $
+  *
+  * This file is part of the KDE project, module kdecore.
+  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
+@@ -220,7 +220,7 @@
+ 	d->mpGroups[i].size = config->readNumEntry("Size", 0);
+ 	d->mpGroups[i].dblPixels = config->readBoolEntry("DoublePixels", false);
+ 	if (QPixmap::defaultDepth()>8)
+-	    d->mpGroups[i].alphaBlending = config->readBoolEntry("AlphaBlending", false);
++	    d->mpGroups[i].alphaBlending = config->readBoolEntry("AlphaBlending", true);
+ 	else
+ 	    d->mpGroups[i].alphaBlending = false;
+ 
+@@ -266,21 +266,23 @@
+ 
+ void KIconLoader::addAppThemes(const QString& appname)
+ {
+-    KIconThemeNode *node = 0L;
+-    KIconTheme *theme = 0L;
+-
+-    theme = new KIconTheme("hicolor", appname);
+-    if (theme->isValid())
+-	node = new KIconThemeNode(theme);
+-    else
+-	delete theme;
+-
+-    if (node)
++    if ( KIconTheme::current() != "hicolor" )
+     {
+-	node->links.append(d->mpThemeRoot);
+-	d->mpThemeRoot = node;
++        KIconTheme *def = new KIconTheme(KIconTheme::current(), appname);
++        if (def->isValid())
++        {
++            KIconThemeNode* node = new KIconThemeNode(def);
++            d->mpThemeRoot->links.append(node);
++            addBaseThemes(node, appname);
++        }
++        else
++            delete def;
+     }
+ 
++    KIconTheme *def = new KIconTheme(QString::fromLatin1("hicolor"), appname);
++    KIconThemeNode* node = new KIconThemeNode(def);
++    d->mpThemeRoot->links.append(node);
++    addBaseThemes(node, appname);
+ }
+ 
+ void KIconLoader::addBaseThemes(KIconThemeNode *node, const QString &appname)