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, 129 insertions, 9 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 7b3c720a36b1..a36b5032c9b3 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdemultimedia
-PORTVERSION=	3.0
-PORTREVISION=	1
+PORTVERSION=	3.0.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -23,14 +22,11 @@ USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
-CONFIGURE_ARGS+=--disable-debug
-.endif
 USE_GMAKE=	yes
 MAKE_ENV=	${CONFIGURE_ENV}
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+
 # spurious, but i don't care
 .include <bsd.port.pre.mk>
 
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 9edf6240fbce..c339b8b1f6a5 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdemultimedia-3.0.tar.bz2) = a7b75d29dd29631e576537db22f19bec
+MD5 (KDE/kdemultimedia-3.0.1.tar.bz2) = a1aec32291ecab4d683d11bdad360874
diff --git a/multimedia/kdemultimedia3/files/patch-b_out.cpp b/multimedia/kdemultimedia3/files/patch-b_out.cpp
new file mode 100644
index 000000000000..603053a260a5
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-b_out.cpp
@@ -0,0 +1,11 @@
+--- kmidi/b_out.cpp	Wed Jun 12 22:26:03 2002
++++ kmidi/b_out.cpp.new	Wed Jun 12 22:27:40 2002
+@@ -17,7 +17,7 @@
+ #endif
+ 
+ #ifdef __FreeBSD__
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ #endif
+ 
+ #ifdef __bsdi__
diff --git a/multimedia/kdemultimedia3/files/patch-engine.cpp b/multimedia/kdemultimedia3/files/patch-engine.cpp
new file mode 100644
index 000000000000..bb1a61fdd2b4
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-engine.cpp
@@ -0,0 +1,11 @@
+--- noatun/library/engine.cpp	Sun Mar  3 01:36:38 2002
++++ noatun/library/engine.cpp.new	Wed Jun 12 22:30:55 2002
+@@ -40,7 +40,7 @@
+ #elif defined(__linux__)
+ #include <sys/soundcard.h>
+ #elif defined(__FreeBSD__)
+-#include "machine/soundcard.h"
++#include <sys/soundcard.h>
+ #elif defined(__NetBSD__)
+ #include <soundcard.h>
+ #elif defined(___SOMETHING_UNKNOWN__)
diff --git a/multimedia/kdemultimedia3/files/patch-linux_a.cpp b/multimedia/kdemultimedia3/files/patch-linux_a.cpp
new file mode 100644
index 000000000000..34a38459bb0f
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-linux_a.cpp
@@ -0,0 +1,11 @@
+--- kmidi/linux_a.cpp	Fri Jan 19 10:17:50 2001
++++ kmidi/linux_a.cpp.new	Wed Jun 12 22:31:51 2002
+@@ -38,7 +38,7 @@
+ 
+ #ifdef __FreeBSD__
+ #include <stdio.h>
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ #endif
+ 
+ #ifdef __bsdi__
diff --git a/multimedia/kdemultimedia3/files/patch-mixer_oss.cpp b/multimedia/kdemultimedia3/files/patch-mixer_oss.cpp
new file mode 100644
index 000000000000..090e42e76328
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-mixer_oss.cpp
@@ -0,0 +1,11 @@
+--- kmix/mixer_oss.cpp	Wed May  8 20:29:20 2002
++++ kmix/mixer_oss.cpp.new	Wed Jun 12 22:35:44 2002
+@@ -32,7 +32,7 @@
+ #include <sys/soundcard.h>
+ // FreeBSD section, according to Sebestyen Zoltan
+ #elif defined(__FreeBSD__)
+-#include "machine/soundcard.h"
++#include <sys/soundcard.h>
+ // NetBSD section, according to  Lennart Augustsson <augustss@cs.chalmers.se>
+ #elif defined(__NetBSD__)
+ #include <soundcard.h>
diff --git a/multimedia/kdemultimedia3/files/patch-sndcard.h b/multimedia/kdemultimedia3/files/patch-sndcard.h
new file mode 100644
index 000000000000..271483e0b669
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-sndcard.h
@@ -0,0 +1,14 @@
+--- kmid/player/sndcard.h	Tue Jul 14 07:49:07 1998
++++ kmid/player/sndcard.h.new	Wed Jun 12 22:38:48 2002
+@@ -1,11 +1,7 @@
+ #ifndef _SNDCARD_H
+ #define _SNDCARD_H
+ 
+-#ifndef __FreeBSD__
+ #include <sys/soundcard.h>
+-#else
+-#include <machine/soundcard.h>
+-#endif
+ 
+ 
+ #ifndef HZ
diff --git a/multimedia/kdemultimedia3/files/patch-sound.cpp b/multimedia/kdemultimedia3/files/patch-sound.cpp
new file mode 100644
index 000000000000..baa968000804
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-sound.cpp
@@ -0,0 +1,11 @@
+--- kscd/kscdmagic/sound.cpp	Fri Aug 11 17:44:48 2000
++++ kscd/kscdmagic/sound.cpp.new	Wed Jun 12 22:40:59 2002
+@@ -49,7 +49,7 @@
+ 
+ // who knows when we'll need that...
+ #if defined (FreeBSD)
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ #include <sys/cdio.h>
+ #define CDROM_LEADOUT 0xAA
+ #define CD_FRAMES 75 /* frames per second */
diff --git a/multimedia/kdemultimedia3/pkg-descr b/multimedia/kdemultimedia3/pkg-descr
index 90ae45773bea..4ca62b278095 100644
--- a/multimedia/kdemultimedia3/pkg-descr
+++ b/multimedia/kdemultimedia3/pkg-descr
@@ -1 +1,2 @@
 KDE provides an integrated X11 based environment, much like CDE.
+This package provides audio and video utilities for KDE.
diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist
index b15ee0c89c9d..81bf47d8e9fc 100644
--- a/multimedia/kdemultimedia3/pkg-plist
+++ b/multimedia/kdemultimedia3/pkg-plist
@@ -1,4 +1,3 @@
-@comment files/links
 bin/aktion
 bin/artsbuilder
 bin/artscontrol
@@ -504,6 +503,49 @@ share/apps/kmidi/Mission_Impossible.mid
 share/apps/kmidi/Mr_Postman.mid
 share/apps/kmidi/Take_The_A_Train-Seq_by_Dianne_Lewandowski.mid
 share/apps/kmidi/Vangelis-Chung_Kuo.mid
+share/apps/kmidi/config/BITMAPS/arrow.xbm
+share/apps/kmidi/config/BITMAPS/back.xbm
+share/apps/kmidi/config/BITMAPS/check.xbm
+share/apps/kmidi/config/BITMAPS/fwd.xbm
+share/apps/kmidi/config/BITMAPS/fwrd.xbm
+share/apps/kmidi/config/BITMAPS/next.xbm
+share/apps/kmidi/config/BITMAPS/off.xbm
+share/apps/kmidi/config/BITMAPS/on.xbm
+share/apps/kmidi/config/BITMAPS/pause.xbm
+share/apps/kmidi/config/BITMAPS/play.xbm
+share/apps/kmidi/config/BITMAPS/prev.xbm
+share/apps/kmidi/config/BITMAPS/quit.xbm
+share/apps/kmidi/config/BITMAPS/restart.xbm
+share/apps/kmidi/config/BITMAPS/stop.xbm
+share/apps/kmidi/config/BITMAPS/tback.xbm
+share/apps/kmidi/config/BITMAPS/timidity.xbm
+share/apps/kmidi/config/BITMAPS/tnext.xbm
+share/apps/kmidi/config/BITMAPS/tpause.xbm
+share/apps/kmidi/config/BITMAPS/tprev.xbm
+share/apps/kmidi/config/BITMAPS/tquit.xbm
+share/apps/kmidi/config/chaos12-voices
+share/apps/kmidi/config/chaos8-voices
+share/apps/kmidi/config/drums
+share/apps/kmidi/config/gravis.cfg
+share/apps/kmidi/config/gsdrum.cfg
+share/apps/kmidi/config/guitar
+share/apps/kmidi/config/megadrum
+share/apps/kmidi/config/megainst
+share/apps/kmidi/config/midia.cfg
+share/apps/kmidi/config/mt32.cfg
+share/apps/kmidi/config/patch/acbass.pat
+share/apps/kmidi/config/patch/cymride1.pat
+share/apps/kmidi/config/patch/hihatcl.pat
+share/apps/kmidi/config/patch/kick1.pat
+share/apps/kmidi/config/patch/kick2.pat
+share/apps/kmidi/config/patch/nylongt2.pat
+share/apps/kmidi/config/patch/sologrnd.pat
+share/apps/kmidi/config/piano
+share/apps/kmidi/config/piano+guitar
+share/apps/kmidi/config/pila-voices
+share/apps/kmidi/config/sound-canvas-drums
+share/apps/kmidi/config/timidity.cfg
+share/apps/kmidi/config/wowpats.cfg
 share/apps/kmidi/pics/kmidilogo.png
 share/apps/kmix/kmixui.rc
 share/apps/kmix/pics/kmixdocked.png
@@ -894,6 +936,18 @@ share/services/kfile_ogg.desktop
 share/services/kfile_wav.desktop
 share/services/kmixctrl_restore.desktop
 share/servicetypes/audiomidi.desktop
+@comment empty dirs
+@exec /bin/mkdir -p %D/share/apps/kscd/cddb/blues
+@exec /bin/mkdir -p %D/share/apps/kscd/cddb/classical
+@exec /bin/mkdir -p %D/share/apps/kscd/cddb/country
+@exec /bin/mkdir -p %D/share/apps/kscd/cddb/data
+@exec /bin/mkdir -p %D/share/apps/kscd/cddb/folk
+@exec /bin/mkdir -p %D/share/apps/kscd/cddb/jazz
+@exec /bin/mkdir -p %D/share/apps/kscd/cddb/misc
+@exec /bin/mkdir -p %D/share/apps/kscd/cddb/newage
+@exec /bin/mkdir -p %D/share/apps/kscd/cddb/reggae
+@exec /bin/mkdir -p %D/share/apps/kscd/cddb/rock
+@exec /bin/mkdir -p %D/share/apps/kscd/cddb/soundtrack
 @comment directories
 @dirrm share/servicetypes
 @dirrm share/services