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>

10 files changed, 46 insertions, 36 deletions

diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index 2ae67993b6a7..0c37b577640c 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	kdegames2
+# New ports collection makefile for:	kdegames3
 # Date created:				Sun 14 May 2000 02:47:57
 # Whom:					Will Andrews <will@FreeBSD.org>
 #
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdegames
-PORTVERSION=	3.0
-PORTREVISION=	1
+PORTVERSION=	3.0.1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -18,17 +17,10 @@ MAINTAINER=	kde@FreeBSD.org
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--enable-objprelink
-.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
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+
 post-patch:
 	@${PERL} -pi -e 's@(defined\(__sgi\))$$@\1 || defined(__FreeBSD__)@' \
 		${WRKSRC}/ksirtet/lib/wizard.cpp
diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo
index f8b34cdfaf4a..64cc1ee00dd3 100644
--- a/games/kdegames3/distinfo
+++ b/games/kdegames3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdegames-3.0.tar.bz2) = e24b97b667212ccc2405aed8742ade16
+MD5 (KDE/kdegames-3.0.1.tar.bz2) = 1827591711ebadce4389a3d98ca5565d
diff --git a/games/kdegames3/files/patch-md5.h b/games/kdegames3/files/patch-md5.h
new file mode 100644
index 000000000000..f1b5e8d2d5bc
--- /dev/null
+++ b/games/kdegames3/files/patch-md5.h
@@ -0,0 +1,11 @@
+--- kpat/freecell-solver/md5.h	Thu Apr  5 14:50:56 2001
++++ kpat/freecell-solver/md5.h.new	Sat Jun  1 04:17:45 2002
+@@ -13,7 +13,7 @@
+ typedef unsigned __int32 u_int32_t;
+ #elif defined(__osf__)
+ typedef unsigned int u_int32_t;
+-#elif !defined(__linux__) && !defined(__NetBSD__)
++#elif !defined(__linux__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+ typedef uint32_t u_int32_t;
+ #endif  
+ 
diff --git a/games/kdegames3/pkg-descr b/games/kdegames3/pkg-descr
index 90ae45773bea..1551c9fcc550 100644
--- a/games/kdegames3/pkg-descr
+++ b/games/kdegames3/pkg-descr
@@ -1 +1,2 @@
 KDE provides an integrated X11 based environment, much like CDE.
+This port provides a set of games for your entertainment.
diff --git a/games/kdegames3/pkg-plist b/games/kdegames3/pkg-plist
index f31dc72bc3c0..5b8c8644656b 100644
--- a/games/kdegames3/pkg-plist
+++ b/games/kdegames3/pkg-plist
@@ -1,4 +1,3 @@
-@comment files/links
 bin/kasteroids
 bin/katomic
 bin/kbackgammon
@@ -28,9 +27,6 @@ bin/kwin4
 bin/kwin4proc
 bin/lskat
 bin/lskatproc
-include/ghighscores.h
-include/ghighscores_item.h
-include/gsettings.h
 include/kcarddialog.h
 include/kchat.h
 include/kchatbase.h
@@ -1116,7 +1112,7 @@ share/apps/kmahjongg/toolbar/pause.xpm
 share/apps/kmahjongg/toolbar/play.xpm
 share/apps/kmines/kminesui.rc
 share/apps/konquest/konquestui.rc
-share/apps/konquest/pics/konquest-splash.gif
+share/apps/konquest/pics/konquest-splash.png
 share/apps/konquest/pics/planet1.xpm
 share/apps/konquest/pics/planet2.xpm
 share/apps/konquest/pics/planet3.xpm
@@ -1823,6 +1819,7 @@ share/doc/HTML/en/kpat/diamonds.png
 share/doc/HTML/en/kpat/hearts.png
 share/doc/HTML/en/kpat/index.cache.bz2
 share/doc/HTML/en/kpat/index.docbook
+share/doc/HTML/en/kpat/man.docbook
 share/doc/HTML/en/kpat/playfield.png
 share/doc/HTML/en/kpat/spades.png
 share/doc/HTML/en/kpoker/common
@@ -1979,6 +1976,7 @@ share/icons/locolor/32x32/apps/lskat.png
 @dirrm share/icons/hicolor/16x16/actions
 @dirrm share/icons/hicolor/16x16
 @dirrm share/icons/hicolor
+@dirrm share/icons
 @dirrm share/doc/HTML/en/lskat
 @dirrm share/doc/HTML/en/kwin4
 @dirrm share/doc/HTML/en/ktuberling
@@ -2006,6 +2004,7 @@ share/icons/locolor/32x32/apps/lskat.png
 @dirrm share/doc/HTML/en/kasteroids
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
+@dirrm share/doc
 @dirrm share/apps/lskat/grafix
 @dirrm share/apps/lskat
 @dirrm share/apps/kwin4/grafix/default
@@ -2104,10 +2103,12 @@ share/icons/locolor/32x32/apps/lskat.png
 @dirrm share/apps/carddecks/cards-default
 @dirrm share/apps/carddecks/cards-aisleriot
 @dirrm share/apps/carddecks
+@dirrm share/apps
 @dirrm share/applnk/Toys
 @dirrm share/applnk/Games/TacticStrategy
 @dirrm share/applnk/Games/Card
 @dirrm share/applnk/Games/Board
 @dirrm share/applnk/Games/Arcade
 @dirrm share/applnk/Games
+@dirrm share/applnk
 @dirrm include/kgame
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index 2ae67993b6a7..0c37b577640c 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	kdegames2
+# New ports collection makefile for:	kdegames3
 # Date created:				Sun 14 May 2000 02:47:57
 # Whom:					Will Andrews <will@FreeBSD.org>
 #
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdegames
-PORTVERSION=	3.0
-PORTREVISION=	1
+PORTVERSION=	3.0.1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -18,17 +17,10 @@ MAINTAINER=	kde@FreeBSD.org
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--enable-objprelink
-.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
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+
 post-patch:
 	@${PERL} -pi -e 's@(defined\(__sgi\))$$@\1 || defined(__FreeBSD__)@' \
 		${WRKSRC}/ksirtet/lib/wizard.cpp
diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo
index f8b34cdfaf4a..64cc1ee00dd3 100644
--- a/games/kdegames4/distinfo
+++ b/games/kdegames4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdegames-3.0.tar.bz2) = e24b97b667212ccc2405aed8742ade16
+MD5 (KDE/kdegames-3.0.1.tar.bz2) = 1827591711ebadce4389a3d98ca5565d
diff --git a/games/kdegames4/files/patch-md5.h b/games/kdegames4/files/patch-md5.h
new file mode 100644
index 000000000000..f1b5e8d2d5bc
--- /dev/null
+++ b/games/kdegames4/files/patch-md5.h
@@ -0,0 +1,11 @@
+--- kpat/freecell-solver/md5.h	Thu Apr  5 14:50:56 2001
++++ kpat/freecell-solver/md5.h.new	Sat Jun  1 04:17:45 2002
+@@ -13,7 +13,7 @@
+ typedef unsigned __int32 u_int32_t;
+ #elif defined(__osf__)
+ typedef unsigned int u_int32_t;
+-#elif !defined(__linux__) && !defined(__NetBSD__)
++#elif !defined(__linux__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+ typedef uint32_t u_int32_t;
+ #endif  
+ 
diff --git a/games/kdegames4/pkg-descr b/games/kdegames4/pkg-descr
index 90ae45773bea..1551c9fcc550 100644
--- a/games/kdegames4/pkg-descr
+++ b/games/kdegames4/pkg-descr
@@ -1 +1,2 @@
 KDE provides an integrated X11 based environment, much like CDE.
+This port provides a set of games for your entertainment.
diff --git a/games/kdegames4/pkg-plist b/games/kdegames4/pkg-plist
index f31dc72bc3c0..5b8c8644656b 100644
--- a/games/kdegames4/pkg-plist
+++ b/games/kdegames4/pkg-plist
@@ -1,4 +1,3 @@
-@comment files/links
 bin/kasteroids
 bin/katomic
 bin/kbackgammon
@@ -28,9 +27,6 @@ bin/kwin4
 bin/kwin4proc
 bin/lskat
 bin/lskatproc
-include/ghighscores.h
-include/ghighscores_item.h
-include/gsettings.h
 include/kcarddialog.h
 include/kchat.h
 include/kchatbase.h
@@ -1116,7 +1112,7 @@ share/apps/kmahjongg/toolbar/pause.xpm
 share/apps/kmahjongg/toolbar/play.xpm
 share/apps/kmines/kminesui.rc
 share/apps/konquest/konquestui.rc
-share/apps/konquest/pics/konquest-splash.gif
+share/apps/konquest/pics/konquest-splash.png
 share/apps/konquest/pics/planet1.xpm
 share/apps/konquest/pics/planet2.xpm
 share/apps/konquest/pics/planet3.xpm
@@ -1823,6 +1819,7 @@ share/doc/HTML/en/kpat/diamonds.png
 share/doc/HTML/en/kpat/hearts.png
 share/doc/HTML/en/kpat/index.cache.bz2
 share/doc/HTML/en/kpat/index.docbook
+share/doc/HTML/en/kpat/man.docbook
 share/doc/HTML/en/kpat/playfield.png
 share/doc/HTML/en/kpat/spades.png
 share/doc/HTML/en/kpoker/common
@@ -1979,6 +1976,7 @@ share/icons/locolor/32x32/apps/lskat.png
 @dirrm share/icons/hicolor/16x16/actions
 @dirrm share/icons/hicolor/16x16
 @dirrm share/icons/hicolor
+@dirrm share/icons
 @dirrm share/doc/HTML/en/lskat
 @dirrm share/doc/HTML/en/kwin4
 @dirrm share/doc/HTML/en/ktuberling
@@ -2006,6 +2004,7 @@ share/icons/locolor/32x32/apps/lskat.png
 @dirrm share/doc/HTML/en/kasteroids
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
+@dirrm share/doc
 @dirrm share/apps/lskat/grafix
 @dirrm share/apps/lskat
 @dirrm share/apps/kwin4/grafix/default
@@ -2104,10 +2103,12 @@ share/icons/locolor/32x32/apps/lskat.png
 @dirrm share/apps/carddecks/cards-default
 @dirrm share/apps/carddecks/cards-aisleriot
 @dirrm share/apps/carddecks
+@dirrm share/apps
 @dirrm share/applnk/Toys
 @dirrm share/applnk/Games/TacticStrategy
 @dirrm share/applnk/Games/Card
 @dirrm share/applnk/Games/Board
 @dirrm share/applnk/Games/Arcade
 @dirrm share/applnk/Games
+@dirrm share/applnk
 @dirrm include/kgame