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>

3 files changed, 51 insertions, 36 deletions

diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index f94657ed1c16..56284511a39e 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdesdk
-PORTVERSION=	3.0
-PORTREVISION=	1
+PORTVERSION=	3.0.1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -19,19 +18,24 @@ LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
 
 USE_KDEBASE_VER=3
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_BZIP2=	yes
-.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
-CONFIGURE_ARGS+=--enable-final
-.endif
-.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
-CONFIGURE_ARGS+=--disable-debug
-.endif
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 MAN1=		cvs2pack.1 cvsversion.1 noncvslist.1 kde-build.1
 
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+
+.include <bsd.port.pre.mk>
+
+# Doesn't compile due to C++-unsafe header sys/wait.h.
+# XXX: Need to figure out when this actually happens.
+.if ${OSVERSION} > 500000
+CONFIGURE_ENV=	DO_NOT_COMPILE="cervisia"
+PLIST_SUB+=	CERVISIA="@comment "
+.else
+PLIST_SUB+=	CERVISIA=""
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index a22ffbf00ceb..abdb544a3598 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdesdk-3.0.tar.bz2) = 1c0c1329d5222ca26639370b62d4eabc
+MD5 (KDE/kdesdk-3.0.1.tar.bz2) = 4eeaef85f70c274e79e0300d054394a8
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index 2aef8f4e5d75..9594f7ad0d00 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -1,7 +1,6 @@
-@comment files/links
 bin/adddebug
 bin/catalogmanager
-bin/cervisia
+%%CERVISIA%%bin/cervisia
 bin/create_cvsignore
 bin/create_makefile
 bin/create_makefiles
@@ -63,9 +62,9 @@ lib/kde3/pothumbnail.so
 lib/libcatalogmanager.la
 lib/libcatalogmanager.so
 lib/libcatalogmanager.so.1
-lib/libcervisia.la
-lib/libcervisia.so
-lib/libcervisia.so.1
+%%CERVISIA%%lib/libcervisia.la
+%%CERVISIA%%lib/libcervisia.so
+%%CERVISIA%%lib/libcervisia.so.1
 lib/libkbabel.la
 lib/libkbabel.so
 lib/libkbabel.so.1
@@ -82,7 +81,7 @@ lib/libkspy.la
 lib/libkspy.so
 lib/libkspy.so.1
 share/applnk/Development/catalogmanager.desktop
-share/applnk/Development/cervisia.desktop
+%%CERVISIA%%share/applnk/Development/cervisia.desktop
 share/applnk/Development/kbabel.desktop
 share/applnk/Development/kbabeldict.desktop
 share/applnk/Development/kbugbuster.desktop
@@ -104,8 +103,8 @@ share/apps/catalogmanager/pics/broken.png
 share/apps/catalogmanager/pics/missing.png
 share/apps/catalogmanager/pics/needwork.png
 share/apps/catalogmanager/pics/ok.png
-share/apps/cervisia/cervisiashellui.rc
-share/apps/cervisia/cervisiaui.rc
+%%CERVISIA%%share/apps/cervisia/cervisiashellui.rc
+%%CERVISIA%%share/apps/cervisia/cervisiaui.rc
 share/apps/kapptemplate/admin/ChangeLog
 share/apps/kapptemplate/admin/Makefile
 share/apps/kapptemplate/admin/Makefile.am
@@ -230,6 +229,7 @@ share/apps/kbabel/icons/hicolor/16x16/actions/prevfuzzy.png
 share/apps/kbabel/icons/hicolor/16x16/actions/prevfuzzyuntrans.png
 share/apps/kbabel/icons/hicolor/16x16/actions/prevuntranslated.png
 share/apps/kbabel/icons/hicolor/16x16/actions/search2msgstr.png
+share/apps/kbabel/icons/hicolor/16x16/actions/togglefuzzy.png
 share/apps/kbabel/icons/hicolor/16x16/actions/transsearch.png
 share/apps/kbabel/icons/hicolor/22x22/actions/autodiff.png
 share/apps/kbabel/icons/hicolor/22x22/actions/catalogmanager.png
@@ -245,6 +245,7 @@ share/apps/kbabel/icons/hicolor/22x22/actions/prevfuzzy.png
 share/apps/kbabel/icons/hicolor/22x22/actions/prevfuzzyuntrans.png
 share/apps/kbabel/icons/hicolor/22x22/actions/prevuntranslated.png
 share/apps/kbabel/icons/hicolor/22x22/actions/search2msgstr.png
+share/apps/kbabel/icons/hicolor/22x22/actions/togglefuzzy.png
 share/apps/kbabel/icons/hicolor/22x22/actions/transsearch.png
 share/apps/kbabel/icons/hicolor/32x32/actions/autodiff.png
 share/apps/kbabel/icons/hicolor/32x32/actions/catalogmanager.png
@@ -260,6 +261,7 @@ share/apps/kbabel/icons/hicolor/32x32/actions/prevfuzzy.png
 share/apps/kbabel/icons/hicolor/32x32/actions/prevfuzzyuntrans.png
 share/apps/kbabel/icons/hicolor/32x32/actions/prevuntranslated.png
 share/apps/kbabel/icons/hicolor/32x32/actions/search2msgstr.png
+share/apps/kbabel/icons/hicolor/32x32/actions/togglefuzzy.png
 share/apps/kbabel/icons/hicolor/32x32/actions/transsearch.png
 share/apps/kbabel/icons/locolor/16x16/actions/autodiff.png
 share/apps/kbabel/icons/locolor/16x16/actions/catalogmanager.png
@@ -275,6 +277,7 @@ share/apps/kbabel/icons/locolor/16x16/actions/prevfuzzy.png
 share/apps/kbabel/icons/locolor/16x16/actions/prevfuzzyuntrans.png
 share/apps/kbabel/icons/locolor/16x16/actions/prevuntranslated.png
 share/apps/kbabel/icons/locolor/16x16/actions/search2msgstr.png
+share/apps/kbabel/icons/locolor/16x16/actions/togglefuzzy.png
 share/apps/kbabel/icons/locolor/16x16/actions/transsearch.png
 share/apps/kbabel/icons/locolor/32x32/actions/autodiff.png
 share/apps/kbabel/icons/locolor/32x32/actions/catalogmanager.png
@@ -290,6 +293,7 @@ share/apps/kbabel/icons/locolor/32x32/actions/prevfuzzy.png
 share/apps/kbabel/icons/locolor/32x32/actions/prevfuzzyuntrans.png
 share/apps/kbabel/icons/locolor/32x32/actions/prevuntranslated.png
 share/apps/kbabel/icons/locolor/32x32/actions/search2msgstr.png
+share/apps/kbabel/icons/locolor/32x32/actions/togglefuzzy.png
 share/apps/kbabel/icons/locolor/32x32/actions/transsearch.png
 share/apps/kbabel/kbabelui.rc
 share/apps/kbabel/pics/broken.png
@@ -310,18 +314,18 @@ share/apps/kompare/icons/locolor/16x16/apps/kompare.png
 share/apps/kompare/icons/locolor/32x32/apps/kompare.png
 share/apps/kompare/kompareui.rc
 share/apps/komparepart/komparepartui.rc
-share/doc/HTML/en/cervisia/checkout.png
-share/doc/HTML/en/cervisia/commit.png
-share/doc/HTML/en/cervisia/common
-share/doc/HTML/en/cervisia/diff.png
-share/doc/HTML/en/cervisia/history.png
-share/doc/HTML/en/cervisia/import.png
-share/doc/HTML/en/cervisia/index.cache.bz2
-share/doc/HTML/en/cervisia/index.docbook
-share/doc/HTML/en/cervisia/logtree.png
-share/doc/HTML/en/cervisia/mainview.png
-share/doc/HTML/en/cervisia/resolve.png
-share/doc/HTML/en/cervisia/updatetag.png
+%%CERVISIA%%share/doc/HTML/en/cervisia/checkout.png
+%%CERVISIA%%share/doc/HTML/en/cervisia/commit.png
+%%CERVISIA%%share/doc/HTML/en/cervisia/common
+%%CERVISIA%%share/doc/HTML/en/cervisia/diff.png
+%%CERVISIA%%share/doc/HTML/en/cervisia/history.png
+%%CERVISIA%%share/doc/HTML/en/cervisia/import.png
+%%CERVISIA%%share/doc/HTML/en/cervisia/index.cache.bz2
+%%CERVISIA%%share/doc/HTML/en/cervisia/index.docbook
+%%CERVISIA%%share/doc/HTML/en/cervisia/logtree.png
+%%CERVISIA%%share/doc/HTML/en/cervisia/mainview.png
+%%CERVISIA%%share/doc/HTML/en/cervisia/resolve.png
+%%CERVISIA%%share/doc/HTML/en/cervisia/updatetag.png
 share/doc/HTML/en/kbabel/back.png
 share/doc/HTML/en/kbabel/bottom.png
 share/doc/HTML/en/kbabel/catalogmanager.png
@@ -360,13 +364,13 @@ share/doc/HTML/en/kbabel/top.png
 share/doc/HTML/en/kbabel/transsearch.png
 share/doc/HTML/en/kbabel/undo.png
 share/icons/hicolor/16x16/apps/catalogmanager.png
-share/icons/hicolor/16x16/apps/cervisia.png
+%%CERVISIA%%share/icons/hicolor/16x16/apps/cervisia.png
 share/icons/hicolor/16x16/apps/kbabel.png
 share/icons/hicolor/16x16/apps/kbabeldict.png
 share/icons/hicolor/16x16/apps/kompare.png
 share/icons/hicolor/16x16/mimetypes/gettext.png
 share/icons/hicolor/32x32/apps/catalogmanager.png
-share/icons/hicolor/32x32/apps/cervisia.png
+%%CERVISIA%%share/icons/hicolor/32x32/apps/cervisia.png
 share/icons/hicolor/32x32/apps/kbabel.png
 share/icons/hicolor/32x32/apps/kbabeldict.png
 share/icons/hicolor/32x32/mimetypes/gettext.png
@@ -387,7 +391,9 @@ share/mimelnk/application/x-gettext.desktop
 share/services/kompare_part.desktop
 share/services/pothumbnail.desktop
 @comment directories
+@dirrm share/services
 @dirrm share/mimelnk/application
+@dirrm share/mimelnk
 @dirrm share/icons/locolor/32x32/mimetypes
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/32x32
@@ -405,10 +411,12 @@ share/services/pothumbnail.desktop
 @dirrm share/icons/hicolor/16x16/apps
 @dirrm share/icons/hicolor/16x16
 @dirrm share/icons/hicolor
+@dirrm share/icons
 @dirrm share/doc/HTML/en/kbabel
-@dirrm share/doc/HTML/en/cervisia
+%%CERVISIA%%@dirrm share/doc/HTML/en/cervisia
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
+@dirrm share/doc
 @dirrm share/apps/komparepart
 @dirrm share/apps/kompare/icons/locolor/32x32/apps
 @dirrm share/apps/kompare/icons/locolor/32x32
@@ -452,7 +460,7 @@ share/services/pothumbnail.desktop
 @dirrm share/apps/kapptemplate/appframework
 @dirrm share/apps/kapptemplate/admin
 @dirrm share/apps/kapptemplate
-@dirrm share/apps/cervisia
+%%CERVISIA%%@dirrm share/apps/cervisia
 @dirrm share/apps/catalogmanager/pics
 @dirrm share/apps/catalogmanager/icons/locolor/32x32/actions
 @dirrm share/apps/catalogmanager/icons/locolor/32x32
@@ -470,5 +478,8 @@ share/services/pothumbnail.desktop
 @dirrm share/apps/catalogmanager/icons/hicolor
 @dirrm share/apps/catalogmanager/icons
 @dirrm share/apps/catalogmanager
+@dirrm share/apps
 @dirrm share/applnk/Development
+@dirrm share/applnk
+@dirrm lib/kde3
 @dirrm include/kbabel