Update to KDE Beta3

20 files changed, 485 insertions, 175 deletions

diff --git a/audio/kdemultimedia11/Makefile b/audio/kdemultimedia11/Makefile
index 44588bb0ec27..a351fb31c4d9 100644
--- a/audio/kdemultimedia11/Makefile
+++ b/audio/kdemultimedia11/Makefile
@@ -3,34 +3,35 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/12/24 13:58:20 se Exp $
+# $Id:$
 #
 
-DISTNAME=	kdemultimedia-Beta2-1
-PKGNAME=	kdemultimedia-2.1b
+DISTNAME=	kdemultimedia-Beta3-1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta2/distribution/tgz/source/
-EXTRACT_SUFX=	.src.tgz
+MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \
+ 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \
+ 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/
+EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
+LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
-		kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \
-		jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
-		khtmlw\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kfm\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		jscript\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		khtmlw\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
 		mediatool\\.0\\.[6-9]:${PORTSDIR}/x11/kdelibs
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
-		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib"
+		"--with-extra-includes=$(PREFIX)/include/giflib"
+
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
+		INSTALL_SCRIPT="install -c -m 555"
 
 WRKSRC=		${WRKDIR}/kdemultimedia
 
diff --git a/audio/kdemultimedia11/distinfo b/audio/kdemultimedia11/distinfo
index 6b61fac2ccf3..855082831eac 100644
--- a/audio/kdemultimedia11/distinfo
+++ b/audio/kdemultimedia11/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-Beta2-1.src.tgz) = 620b994489cbd73902cd5a5827d29ded
+MD5 (kdemultimedia-Beta3-1.src.tar.gz) = 2c8699f4faa8a6dbd1c014b855af4208
diff --git a/audio/kdemultimedia11/pkg-comment b/audio/kdemultimedia11/pkg-comment
index 25ffd559aaf7..d1fea6c5f03d 100644
--- a/audio/kdemultimedia11/pkg-comment
+++ b/audio/kdemultimedia11/pkg-comment
@@ -1 +1 @@
-The KDE CD player, Mixer and MIDI applications.
+KDE audio tools.
diff --git a/audio/kdemultimedia11/pkg-plist b/audio/kdemultimedia11/pkg-plist
index f148c16f52bb..58ee82e66ba6 100644
--- a/audio/kdemultimedia11/pkg-plist
+++ b/audio/kdemultimedia11/pkg-plist
@@ -1,22 +1,26 @@
 bin/cddaslave
 bin/kmedia
-bin/kmid
+bin/kmidi
 bin/kmix
 bin/kscd
 share/applnk/Multimedia/KMedia.kdelnk
+share/applnk/Multimedia/KMidi.kdelnk
 share/applnk/Multimedia/KMix.kdelnk
 share/applnk/Multimedia/kscd.kdelnk
 share/apps/kmedia/pics/media.xpm
 share/apps/kmedia/pics/playpause.xbm
 share/apps/kmedia/pics/playpause_both.xpm
 share/apps/kmedia/pics/playpause_play.xpm
-share/apps/kmid/toolbar/kmid_fforward.xpm
-share/apps/kmid/toolbar/kmid_frewind.xpm
-share/apps/kmid/toolbar/kmid_next.xpm
-share/apps/kmid/toolbar/kmid_pause.xpm
-share/apps/kmid/toolbar/kmid_play.xpm
-share/apps/kmid/toolbar/kmid_prev.xpm
-share/apps/kmid/toolbar/kmid_stop.xpm
+share/apps/kmidi/config/gravis.cfg
+share/apps/kmidi/config/gsdrum.cfg
+share/apps/kmidi/config/midia.cfg
+share/apps/kmidi/config/mt32.cfg
+share/apps/kmidi/config/patch/acpiano.pat
+share/apps/kmidi/config/patch/nylongt2.pat
+share/apps/kmidi/config/sndfont.cfg
+share/apps/kmidi/config/timidity.cfg
+share/apps/kmidi/config/wowpats.cfg
+share/apps/kmidi/pics/kmidilogo.xpm
 share/apps/kmix/pics/mix_audio.xpm
 share/apps/kmix/pics/mix_bass.xpm
 share/apps/kmix/pics/mix_cd.xpm
@@ -28,42 +32,99 @@ share/apps/kmix/pics/mix_treble.xpm
 share/apps/kmix/pics/mix_unknown.xpm
 share/apps/kmix/pics/mix_volume.xpm
 share/apps/kscd/pics/kscdlogo.xpm
+share/doc/HTML/de/kmidi/kmidi-1.html
+share/doc/HTML/de/kmidi/kmidi-2.html
+share/doc/HTML/de/kmidi/kmidi-3.html
+share/doc/HTML/de/kmidi/kmidi-4.html
+share/doc/HTML/de/kmidi/kmidi-5.html
+share/doc/HTML/de/kmidi/kmidi.html
+share/doc/HTML/de/kmidi/kmidi.sgml
+share/doc/HTML/de/kmidi/logotp3.gif
 share/doc/HTML/en/kmedia/kmedia.html
-share/doc/HTML/en/kmedia/kmix.html
-share/doc/HTML/en/kmid/kmid.html
+share/doc/HTML/en/kmidi/kmidi-1.html
+share/doc/HTML/en/kmidi/kmidi-2.html
+share/doc/HTML/en/kmidi/kmidi-3.html
+share/doc/HTML/en/kmidi/kmidi-4.html
+share/doc/HTML/en/kmidi/kmidi-5.html
+share/doc/HTML/en/kmidi/kmidi.html
+share/doc/HTML/en/kmidi/kmidi.nif
+share/doc/HTML/en/kmidi/kmidi.sgml
+share/doc/HTML/en/kmidi/logotp3.gif
 share/doc/HTML/en/kscd/kscd-1.html
 share/doc/HTML/en/kscd/kscd-2.html
 share/doc/HTML/en/kscd/kscd-3.html
 share/doc/HTML/en/kscd/kscd-4.html
 share/doc/HTML/en/kscd/kscd.html
+share/doc/HTML/en/kscd/logotp3.gif
+share/icons/cd.xpm
 share/icons/kmedia.xpm
-share/icons/kmid.xpm
+share/icons/kmidi.xpm
 share/icons/kmix.xpm
 share/icons/kscd.xpm
-share/icons/mini/kmedia_mini.xpm
+share/icons/mini/kmedia.xpm
 share/icons/mini/kmix.xpm
-share/icons/mini/mini-kscd.xpm
+share/icons/mini/kscd.xpm
 share/locale/cs/LC_MESSAGES/kmedia.mo
+share/locale/cs/LC_MESSAGES/kmix.mo
 share/locale/de/LC_MESSAGES/kmedia.mo
+share/locale/de/LC_MESSAGES/kmix.mo
+share/locale/de/LC_MESSAGES/kscd.mo
+share/locale/es/LC_MESSAGES/kmedia.mo
+share/locale/fi/LC_MESSAGES/kmedia.mo
+share/locale/fi/LC_MESSAGES/kmix.mo
 share/locale/fr/LC_MESSAGES/kmedia.mo
+share/locale/pl/LC_MESSAGES/kmedia.mo
+share/locale/pt/LC_MESSAGES/kmedia.mo
+share/locale/pt/LC_MESSAGES/kmix.mo
+share/locale/ro/LC_MESSAGES/kmedia.mo
+share/mimelnk/text/xmcd.kdelnk
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk
+@dirrm share/locale/ro/LC_MESSAGES
+@dirrm share/locale/ro
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
+@dirrm share/locale/fi/LC_MESSAGES
+@dirrm share/locale/fi
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
 @dirrm share/locale/cs/LC_MESSAGES
 @dirrm share/locale/cs
 @dirrm share/doc/HTML/en/kscd
-@dirrm share/doc/HTML/en/kmid
+@dirrm share/doc/HTML/en/kmidi
 @dirrm share/doc/HTML/en/kmedia
 @dirrm share/doc/HTML/en
+@dirrm share/doc/HTML/de/kmidi
+@dirrm share/doc/HTML/de
 @dirrm share/doc/HTML
 @dirrm share/apps/kscd/pics
+@dirrm share/apps/kscd/cddb/soundtrack
+@dirrm share/apps/kscd/cddb/rock
+@dirrm share/apps/kscd/cddb/reggae
+@dirrm share/apps/kscd/cddb/newage
+@dirrm share/apps/kscd/cddb/misc
+@dirrm share/apps/kscd/cddb/jazz
+@dirrm share/apps/kscd/cddb/folk
+@dirrm share/apps/kscd/cddb/data
+@dirrm share/apps/kscd/cddb/country
+@dirrm share/apps/kscd/cddb/classical
+@dirrm share/apps/kscd/cddb/blues
+@dirrm share/apps/kscd/cddb
 @dirrm share/apps/kscd
 @dirrm share/apps/kmix/pics
 @dirrm share/apps/kmix
-@dirrm share/apps/kmid/toolbar
-@dirrm share/apps/kmid
+@dirrm share/apps/kmidi/pics
+@dirrm share/apps/kmidi/config/patch
+@dirrm share/apps/kmidi/config
+@dirrm share/apps/kmidi
 @dirrm share/apps/kmedia/pics
 @dirrm share/apps/kmedia
-@dirrm share/applnk/Multimediawxit
+@dirrm share/apps
 @dirrm share/applnk/Multimedia
+@dirrm share/applnk
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index 44588bb0ec27..a351fb31c4d9 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -3,34 +3,35 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/12/24 13:58:20 se Exp $
+# $Id:$
 #
 
-DISTNAME=	kdemultimedia-Beta2-1
-PKGNAME=	kdemultimedia-2.1b
+DISTNAME=	kdemultimedia-Beta3-1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta2/distribution/tgz/source/
-EXTRACT_SUFX=	.src.tgz
+MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \
+ 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \
+ 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/
+EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
+LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
-		kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \
-		jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
-		khtmlw\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kfm\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		jscript\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		khtmlw\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
 		mediatool\\.0\\.[6-9]:${PORTSDIR}/x11/kdelibs
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
-		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib"
+		"--with-extra-includes=$(PREFIX)/include/giflib"
+
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
+		INSTALL_SCRIPT="install -c -m 555"
 
 WRKSRC=		${WRKDIR}/kdemultimedia
 
diff --git a/audio/kdemultimedia2/distinfo b/audio/kdemultimedia2/distinfo
index 6b61fac2ccf3..855082831eac 100644
--- a/audio/kdemultimedia2/distinfo
+++ b/audio/kdemultimedia2/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-Beta2-1.src.tgz) = 620b994489cbd73902cd5a5827d29ded
+MD5 (kdemultimedia-Beta3-1.src.tar.gz) = 2c8699f4faa8a6dbd1c014b855af4208
diff --git a/audio/kdemultimedia2/pkg-comment b/audio/kdemultimedia2/pkg-comment
index 25ffd559aaf7..d1fea6c5f03d 100644
--- a/audio/kdemultimedia2/pkg-comment
+++ b/audio/kdemultimedia2/pkg-comment
@@ -1 +1 @@
-The KDE CD player, Mixer and MIDI applications.
+KDE audio tools.
diff --git a/audio/kdemultimedia2/pkg-plist b/audio/kdemultimedia2/pkg-plist
index f148c16f52bb..58ee82e66ba6 100644
--- a/audio/kdemultimedia2/pkg-plist
+++ b/audio/kdemultimedia2/pkg-plist
@@ -1,22 +1,26 @@
 bin/cddaslave
 bin/kmedia
-bin/kmid
+bin/kmidi
 bin/kmix
 bin/kscd
 share/applnk/Multimedia/KMedia.kdelnk
+share/applnk/Multimedia/KMidi.kdelnk
 share/applnk/Multimedia/KMix.kdelnk
 share/applnk/Multimedia/kscd.kdelnk
 share/apps/kmedia/pics/media.xpm
 share/apps/kmedia/pics/playpause.xbm
 share/apps/kmedia/pics/playpause_both.xpm
 share/apps/kmedia/pics/playpause_play.xpm
-share/apps/kmid/toolbar/kmid_fforward.xpm
-share/apps/kmid/toolbar/kmid_frewind.xpm
-share/apps/kmid/toolbar/kmid_next.xpm
-share/apps/kmid/toolbar/kmid_pause.xpm
-share/apps/kmid/toolbar/kmid_play.xpm
-share/apps/kmid/toolbar/kmid_prev.xpm
-share/apps/kmid/toolbar/kmid_stop.xpm
+share/apps/kmidi/config/gravis.cfg
+share/apps/kmidi/config/gsdrum.cfg
+share/apps/kmidi/config/midia.cfg
+share/apps/kmidi/config/mt32.cfg
+share/apps/kmidi/config/patch/acpiano.pat
+share/apps/kmidi/config/patch/nylongt2.pat
+share/apps/kmidi/config/sndfont.cfg
+share/apps/kmidi/config/timidity.cfg
+share/apps/kmidi/config/wowpats.cfg
+share/apps/kmidi/pics/kmidilogo.xpm
 share/apps/kmix/pics/mix_audio.xpm
 share/apps/kmix/pics/mix_bass.xpm
 share/apps/kmix/pics/mix_cd.xpm
@@ -28,42 +32,99 @@ share/apps/kmix/pics/mix_treble.xpm
 share/apps/kmix/pics/mix_unknown.xpm
 share/apps/kmix/pics/mix_volume.xpm
 share/apps/kscd/pics/kscdlogo.xpm
+share/doc/HTML/de/kmidi/kmidi-1.html
+share/doc/HTML/de/kmidi/kmidi-2.html
+share/doc/HTML/de/kmidi/kmidi-3.html
+share/doc/HTML/de/kmidi/kmidi-4.html
+share/doc/HTML/de/kmidi/kmidi-5.html
+share/doc/HTML/de/kmidi/kmidi.html
+share/doc/HTML/de/kmidi/kmidi.sgml
+share/doc/HTML/de/kmidi/logotp3.gif
 share/doc/HTML/en/kmedia/kmedia.html
-share/doc/HTML/en/kmedia/kmix.html
-share/doc/HTML/en/kmid/kmid.html
+share/doc/HTML/en/kmidi/kmidi-1.html
+share/doc/HTML/en/kmidi/kmidi-2.html
+share/doc/HTML/en/kmidi/kmidi-3.html
+share/doc/HTML/en/kmidi/kmidi-4.html
+share/doc/HTML/en/kmidi/kmidi-5.html
+share/doc/HTML/en/kmidi/kmidi.html
+share/doc/HTML/en/kmidi/kmidi.nif
+share/doc/HTML/en/kmidi/kmidi.sgml
+share/doc/HTML/en/kmidi/logotp3.gif
 share/doc/HTML/en/kscd/kscd-1.html
 share/doc/HTML/en/kscd/kscd-2.html
 share/doc/HTML/en/kscd/kscd-3.html
 share/doc/HTML/en/kscd/kscd-4.html
 share/doc/HTML/en/kscd/kscd.html
+share/doc/HTML/en/kscd/logotp3.gif
+share/icons/cd.xpm
 share/icons/kmedia.xpm
-share/icons/kmid.xpm
+share/icons/kmidi.xpm
 share/icons/kmix.xpm
 share/icons/kscd.xpm
-share/icons/mini/kmedia_mini.xpm
+share/icons/mini/kmedia.xpm
 share/icons/mini/kmix.xpm
-share/icons/mini/mini-kscd.xpm
+share/icons/mini/kscd.xpm
 share/locale/cs/LC_MESSAGES/kmedia.mo
+share/locale/cs/LC_MESSAGES/kmix.mo
 share/locale/de/LC_MESSAGES/kmedia.mo
+share/locale/de/LC_MESSAGES/kmix.mo
+share/locale/de/LC_MESSAGES/kscd.mo
+share/locale/es/LC_MESSAGES/kmedia.mo
+share/locale/fi/LC_MESSAGES/kmedia.mo
+share/locale/fi/LC_MESSAGES/kmix.mo
 share/locale/fr/LC_MESSAGES/kmedia.mo
+share/locale/pl/LC_MESSAGES/kmedia.mo
+share/locale/pt/LC_MESSAGES/kmedia.mo
+share/locale/pt/LC_MESSAGES/kmix.mo
+share/locale/ro/LC_MESSAGES/kmedia.mo
+share/mimelnk/text/xmcd.kdelnk
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk
+@dirrm share/locale/ro/LC_MESSAGES
+@dirrm share/locale/ro
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
+@dirrm share/locale/fi/LC_MESSAGES
+@dirrm share/locale/fi
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
 @dirrm share/locale/cs/LC_MESSAGES
 @dirrm share/locale/cs
 @dirrm share/doc/HTML/en/kscd
-@dirrm share/doc/HTML/en/kmid
+@dirrm share/doc/HTML/en/kmidi
 @dirrm share/doc/HTML/en/kmedia
 @dirrm share/doc/HTML/en
+@dirrm share/doc/HTML/de/kmidi
+@dirrm share/doc/HTML/de
 @dirrm share/doc/HTML
 @dirrm share/apps/kscd/pics
+@dirrm share/apps/kscd/cddb/soundtrack
+@dirrm share/apps/kscd/cddb/rock
+@dirrm share/apps/kscd/cddb/reggae
+@dirrm share/apps/kscd/cddb/newage
+@dirrm share/apps/kscd/cddb/misc
+@dirrm share/apps/kscd/cddb/jazz
+@dirrm share/apps/kscd/cddb/folk
+@dirrm share/apps/kscd/cddb/data
+@dirrm share/apps/kscd/cddb/country
+@dirrm share/apps/kscd/cddb/classical
+@dirrm share/apps/kscd/cddb/blues
+@dirrm share/apps/kscd/cddb
 @dirrm share/apps/kscd
 @dirrm share/apps/kmix/pics
 @dirrm share/apps/kmix
-@dirrm share/apps/kmid/toolbar
-@dirrm share/apps/kmid
+@dirrm share/apps/kmidi/pics
+@dirrm share/apps/kmidi/config/patch
+@dirrm share/apps/kmidi/config
+@dirrm share/apps/kmidi
 @dirrm share/apps/kmedia/pics
 @dirrm share/apps/kmedia
-@dirrm share/applnk/Multimediawxit
+@dirrm share/apps
 @dirrm share/applnk/Multimedia
+@dirrm share/applnk
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 44588bb0ec27..a351fb31c4d9 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -3,34 +3,35 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/12/24 13:58:20 se Exp $
+# $Id:$
 #
 
-DISTNAME=	kdemultimedia-Beta2-1
-PKGNAME=	kdemultimedia-2.1b
+DISTNAME=	kdemultimedia-Beta3-1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta2/distribution/tgz/source/
-EXTRACT_SUFX=	.src.tgz
+MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \
+ 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \
+ 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/
+EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
+LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
-		kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \
-		jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
-		khtmlw\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kfm\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		jscript\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		khtmlw\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
 		mediatool\\.0\\.[6-9]:${PORTSDIR}/x11/kdelibs
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
-		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib"
+		"--with-extra-includes=$(PREFIX)/include/giflib"
+
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
+		INSTALL_SCRIPT="install -c -m 555"
 
 WRKSRC=		${WRKDIR}/kdemultimedia
 
diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo
index 6b61fac2ccf3..855082831eac 100644
--- a/audio/kdemultimedia3/distinfo
+++ b/audio/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-Beta2-1.src.tgz) = 620b994489cbd73902cd5a5827d29ded
+MD5 (kdemultimedia-Beta3-1.src.tar.gz) = 2c8699f4faa8a6dbd1c014b855af4208
diff --git a/audio/kdemultimedia3/pkg-comment b/audio/kdemultimedia3/pkg-comment
index 25ffd559aaf7..d1fea6c5f03d 100644
--- a/audio/kdemultimedia3/pkg-comment
+++ b/audio/kdemultimedia3/pkg-comment
@@ -1 +1 @@
-The KDE CD player, Mixer and MIDI applications.
+KDE audio tools.
diff --git a/audio/kdemultimedia3/pkg-plist b/audio/kdemultimedia3/pkg-plist
index f148c16f52bb..58ee82e66ba6 100644
--- a/audio/kdemultimedia3/pkg-plist
+++ b/audio/kdemultimedia3/pkg-plist
@@ -1,22 +1,26 @@
 bin/cddaslave
 bin/kmedia
-bin/kmid
+bin/kmidi
 bin/kmix
 bin/kscd
 share/applnk/Multimedia/KMedia.kdelnk
+share/applnk/Multimedia/KMidi.kdelnk
 share/applnk/Multimedia/KMix.kdelnk
 share/applnk/Multimedia/kscd.kdelnk
 share/apps/kmedia/pics/media.xpm
 share/apps/kmedia/pics/playpause.xbm
 share/apps/kmedia/pics/playpause_both.xpm
 share/apps/kmedia/pics/playpause_play.xpm
-share/apps/kmid/toolbar/kmid_fforward.xpm
-share/apps/kmid/toolbar/kmid_frewind.xpm
-share/apps/kmid/toolbar/kmid_next.xpm
-share/apps/kmid/toolbar/kmid_pause.xpm
-share/apps/kmid/toolbar/kmid_play.xpm
-share/apps/kmid/toolbar/kmid_prev.xpm
-share/apps/kmid/toolbar/kmid_stop.xpm
+share/apps/kmidi/config/gravis.cfg
+share/apps/kmidi/config/gsdrum.cfg
+share/apps/kmidi/config/midia.cfg
+share/apps/kmidi/config/mt32.cfg
+share/apps/kmidi/config/patch/acpiano.pat
+share/apps/kmidi/config/patch/nylongt2.pat
+share/apps/kmidi/config/sndfont.cfg
+share/apps/kmidi/config/timidity.cfg
+share/apps/kmidi/config/wowpats.cfg
+share/apps/kmidi/pics/kmidilogo.xpm
 share/apps/kmix/pics/mix_audio.xpm
 share/apps/kmix/pics/mix_bass.xpm
 share/apps/kmix/pics/mix_cd.xpm
@@ -28,42 +32,99 @@ share/apps/kmix/pics/mix_treble.xpm
 share/apps/kmix/pics/mix_unknown.xpm
 share/apps/kmix/pics/mix_volume.xpm
 share/apps/kscd/pics/kscdlogo.xpm
+share/doc/HTML/de/kmidi/kmidi-1.html
+share/doc/HTML/de/kmidi/kmidi-2.html
+share/doc/HTML/de/kmidi/kmidi-3.html
+share/doc/HTML/de/kmidi/kmidi-4.html
+share/doc/HTML/de/kmidi/kmidi-5.html
+share/doc/HTML/de/kmidi/kmidi.html
+share/doc/HTML/de/kmidi/kmidi.sgml
+share/doc/HTML/de/kmidi/logotp3.gif
 share/doc/HTML/en/kmedia/kmedia.html
-share/doc/HTML/en/kmedia/kmix.html
-share/doc/HTML/en/kmid/kmid.html
+share/doc/HTML/en/kmidi/kmidi-1.html
+share/doc/HTML/en/kmidi/kmidi-2.html
+share/doc/HTML/en/kmidi/kmidi-3.html
+share/doc/HTML/en/kmidi/kmidi-4.html
+share/doc/HTML/en/kmidi/kmidi-5.html
+share/doc/HTML/en/kmidi/kmidi.html
+share/doc/HTML/en/kmidi/kmidi.nif
+share/doc/HTML/en/kmidi/kmidi.sgml
+share/doc/HTML/en/kmidi/logotp3.gif
 share/doc/HTML/en/kscd/kscd-1.html
 share/doc/HTML/en/kscd/kscd-2.html
 share/doc/HTML/en/kscd/kscd-3.html
 share/doc/HTML/en/kscd/kscd-4.html
 share/doc/HTML/en/kscd/kscd.html
+share/doc/HTML/en/kscd/logotp3.gif
+share/icons/cd.xpm
 share/icons/kmedia.xpm
-share/icons/kmid.xpm
+share/icons/kmidi.xpm
 share/icons/kmix.xpm
 share/icons/kscd.xpm
-share/icons/mini/kmedia_mini.xpm
+share/icons/mini/kmedia.xpm
 share/icons/mini/kmix.xpm
-share/icons/mini/mini-kscd.xpm
+share/icons/mini/kscd.xpm
 share/locale/cs/LC_MESSAGES/kmedia.mo
+share/locale/cs/LC_MESSAGES/kmix.mo
 share/locale/de/LC_MESSAGES/kmedia.mo
+share/locale/de/LC_MESSAGES/kmix.mo
+share/locale/de/LC_MESSAGES/kscd.mo
+share/locale/es/LC_MESSAGES/kmedia.mo
+share/locale/fi/LC_MESSAGES/kmedia.mo
+share/locale/fi/LC_MESSAGES/kmix.mo
 share/locale/fr/LC_MESSAGES/kmedia.mo
+share/locale/pl/LC_MESSAGES/kmedia.mo
+share/locale/pt/LC_MESSAGES/kmedia.mo
+share/locale/pt/LC_MESSAGES/kmix.mo
+share/locale/ro/LC_MESSAGES/kmedia.mo
+share/mimelnk/text/xmcd.kdelnk
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk
+@dirrm share/locale/ro/LC_MESSAGES
+@dirrm share/locale/ro
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
+@dirrm share/locale/fi/LC_MESSAGES
+@dirrm share/locale/fi
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
 @dirrm share/locale/cs/LC_MESSAGES
 @dirrm share/locale/cs
 @dirrm share/doc/HTML/en/kscd
-@dirrm share/doc/HTML/en/kmid
+@dirrm share/doc/HTML/en/kmidi
 @dirrm share/doc/HTML/en/kmedia
 @dirrm share/doc/HTML/en
+@dirrm share/doc/HTML/de/kmidi
+@dirrm share/doc/HTML/de
 @dirrm share/doc/HTML
 @dirrm share/apps/kscd/pics
+@dirrm share/apps/kscd/cddb/soundtrack
+@dirrm share/apps/kscd/cddb/rock
+@dirrm share/apps/kscd/cddb/reggae
+@dirrm share/apps/kscd/cddb/newage
+@dirrm share/apps/kscd/cddb/misc
+@dirrm share/apps/kscd/cddb/jazz
+@dirrm share/apps/kscd/cddb/folk
+@dirrm share/apps/kscd/cddb/data
+@dirrm share/apps/kscd/cddb/country
+@dirrm share/apps/kscd/cddb/classical
+@dirrm share/apps/kscd/cddb/blues
+@dirrm share/apps/kscd/cddb
 @dirrm share/apps/kscd
 @dirrm share/apps/kmix/pics
 @dirrm share/apps/kmix
-@dirrm share/apps/kmid/toolbar
-@dirrm share/apps/kmid
+@dirrm share/apps/kmidi/pics
+@dirrm share/apps/kmidi/config/patch
+@dirrm share/apps/kmidi/config
+@dirrm share/apps/kmidi
 @dirrm share/apps/kmedia/pics
 @dirrm share/apps/kmedia
-@dirrm share/applnk/Multimediawxit
+@dirrm share/apps
 @dirrm share/applnk/Multimedia
+@dirrm share/applnk
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 44588bb0ec27..a351fb31c4d9 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -3,34 +3,35 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/12/24 13:58:20 se Exp $
+# $Id:$
 #
 
-DISTNAME=	kdemultimedia-Beta2-1
-PKGNAME=	kdemultimedia-2.1b
+DISTNAME=	kdemultimedia-Beta3-1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta2/distribution/tgz/source/
-EXTRACT_SUFX=	.src.tgz
+MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \
+ 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \
+ 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/
+EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
+LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
-		kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \
-		jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
-		khtmlw\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kfm\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		jscript\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		khtmlw\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
 		mediatool\\.0\\.[6-9]:${PORTSDIR}/x11/kdelibs
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
-		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib"
+		"--with-extra-includes=$(PREFIX)/include/giflib"
+
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
+		INSTALL_SCRIPT="install -c -m 555"
 
 WRKSRC=		${WRKDIR}/kdemultimedia
 
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 6b61fac2ccf3..855082831eac 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-Beta2-1.src.tgz) = 620b994489cbd73902cd5a5827d29ded
+MD5 (kdemultimedia-Beta3-1.src.tar.gz) = 2c8699f4faa8a6dbd1c014b855af4208
diff --git a/multimedia/kdemultimedia3/pkg-comment b/multimedia/kdemultimedia3/pkg-comment
index 25ffd559aaf7..d1fea6c5f03d 100644
--- a/multimedia/kdemultimedia3/pkg-comment
+++ b/multimedia/kdemultimedia3/pkg-comment
@@ -1 +1 @@
-The KDE CD player, Mixer and MIDI applications.
+KDE audio tools.
diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist
index f148c16f52bb..58ee82e66ba6 100644
--- a/multimedia/kdemultimedia3/pkg-plist
+++ b/multimedia/kdemultimedia3/pkg-plist
@@ -1,22 +1,26 @@
 bin/cddaslave
 bin/kmedia
-bin/kmid
+bin/kmidi
 bin/kmix
 bin/kscd
 share/applnk/Multimedia/KMedia.kdelnk
+share/applnk/Multimedia/KMidi.kdelnk
 share/applnk/Multimedia/KMix.kdelnk
 share/applnk/Multimedia/kscd.kdelnk
 share/apps/kmedia/pics/media.xpm
 share/apps/kmedia/pics/playpause.xbm
 share/apps/kmedia/pics/playpause_both.xpm
 share/apps/kmedia/pics/playpause_play.xpm
-share/apps/kmid/toolbar/kmid_fforward.xpm
-share/apps/kmid/toolbar/kmid_frewind.xpm
-share/apps/kmid/toolbar/kmid_next.xpm
-share/apps/kmid/toolbar/kmid_pause.xpm
-share/apps/kmid/toolbar/kmid_play.xpm
-share/apps/kmid/toolbar/kmid_prev.xpm
-share/apps/kmid/toolbar/kmid_stop.xpm
+share/apps/kmidi/config/gravis.cfg
+share/apps/kmidi/config/gsdrum.cfg
+share/apps/kmidi/config/midia.cfg
+share/apps/kmidi/config/mt32.cfg
+share/apps/kmidi/config/patch/acpiano.pat
+share/apps/kmidi/config/patch/nylongt2.pat
+share/apps/kmidi/config/sndfont.cfg
+share/apps/kmidi/config/timidity.cfg
+share/apps/kmidi/config/wowpats.cfg
+share/apps/kmidi/pics/kmidilogo.xpm
 share/apps/kmix/pics/mix_audio.xpm
 share/apps/kmix/pics/mix_bass.xpm
 share/apps/kmix/pics/mix_cd.xpm
@@ -28,42 +32,99 @@ share/apps/kmix/pics/mix_treble.xpm
 share/apps/kmix/pics/mix_unknown.xpm
 share/apps/kmix/pics/mix_volume.xpm
 share/apps/kscd/pics/kscdlogo.xpm
+share/doc/HTML/de/kmidi/kmidi-1.html
+share/doc/HTML/de/kmidi/kmidi-2.html
+share/doc/HTML/de/kmidi/kmidi-3.html
+share/doc/HTML/de/kmidi/kmidi-4.html
+share/doc/HTML/de/kmidi/kmidi-5.html
+share/doc/HTML/de/kmidi/kmidi.html
+share/doc/HTML/de/kmidi/kmidi.sgml
+share/doc/HTML/de/kmidi/logotp3.gif
 share/doc/HTML/en/kmedia/kmedia.html
-share/doc/HTML/en/kmedia/kmix.html
-share/doc/HTML/en/kmid/kmid.html
+share/doc/HTML/en/kmidi/kmidi-1.html
+share/doc/HTML/en/kmidi/kmidi-2.html
+share/doc/HTML/en/kmidi/kmidi-3.html
+share/doc/HTML/en/kmidi/kmidi-4.html
+share/doc/HTML/en/kmidi/kmidi-5.html
+share/doc/HTML/en/kmidi/kmidi.html
+share/doc/HTML/en/kmidi/kmidi.nif
+share/doc/HTML/en/kmidi/kmidi.sgml
+share/doc/HTML/en/kmidi/logotp3.gif
 share/doc/HTML/en/kscd/kscd-1.html
 share/doc/HTML/en/kscd/kscd-2.html
 share/doc/HTML/en/kscd/kscd-3.html
 share/doc/HTML/en/kscd/kscd-4.html
 share/doc/HTML/en/kscd/kscd.html
+share/doc/HTML/en/kscd/logotp3.gif
+share/icons/cd.xpm
 share/icons/kmedia.xpm
-share/icons/kmid.xpm
+share/icons/kmidi.xpm
 share/icons/kmix.xpm
 share/icons/kscd.xpm
-share/icons/mini/kmedia_mini.xpm
+share/icons/mini/kmedia.xpm
 share/icons/mini/kmix.xpm
-share/icons/mini/mini-kscd.xpm
+share/icons/mini/kscd.xpm
 share/locale/cs/LC_MESSAGES/kmedia.mo
+share/locale/cs/LC_MESSAGES/kmix.mo
 share/locale/de/LC_MESSAGES/kmedia.mo
+share/locale/de/LC_MESSAGES/kmix.mo
+share/locale/de/LC_MESSAGES/kscd.mo
+share/locale/es/LC_MESSAGES/kmedia.mo
+share/locale/fi/LC_MESSAGES/kmedia.mo
+share/locale/fi/LC_MESSAGES/kmix.mo
 share/locale/fr/LC_MESSAGES/kmedia.mo
+share/locale/pl/LC_MESSAGES/kmedia.mo
+share/locale/pt/LC_MESSAGES/kmedia.mo
+share/locale/pt/LC_MESSAGES/kmix.mo
+share/locale/ro/LC_MESSAGES/kmedia.mo
+share/mimelnk/text/xmcd.kdelnk
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk
+@dirrm share/locale/ro/LC_MESSAGES
+@dirrm share/locale/ro
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
+@dirrm share/locale/fi/LC_MESSAGES
+@dirrm share/locale/fi
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
 @dirrm share/locale/cs/LC_MESSAGES
 @dirrm share/locale/cs
 @dirrm share/doc/HTML/en/kscd
-@dirrm share/doc/HTML/en/kmid
+@dirrm share/doc/HTML/en/kmidi
 @dirrm share/doc/HTML/en/kmedia
 @dirrm share/doc/HTML/en
+@dirrm share/doc/HTML/de/kmidi
+@dirrm share/doc/HTML/de
 @dirrm share/doc/HTML
 @dirrm share/apps/kscd/pics
+@dirrm share/apps/kscd/cddb/soundtrack
+@dirrm share/apps/kscd/cddb/rock
+@dirrm share/apps/kscd/cddb/reggae
+@dirrm share/apps/kscd/cddb/newage
+@dirrm share/apps/kscd/cddb/misc
+@dirrm share/apps/kscd/cddb/jazz
+@dirrm share/apps/kscd/cddb/folk
+@dirrm share/apps/kscd/cddb/data
+@dirrm share/apps/kscd/cddb/country
+@dirrm share/apps/kscd/cddb/classical
+@dirrm share/apps/kscd/cddb/blues
+@dirrm share/apps/kscd/cddb
 @dirrm share/apps/kscd
 @dirrm share/apps/kmix/pics
 @dirrm share/apps/kmix
-@dirrm share/apps/kmid/toolbar
-@dirrm share/apps/kmid
+@dirrm share/apps/kmidi/pics
+@dirrm share/apps/kmidi/config/patch
+@dirrm share/apps/kmidi/config
+@dirrm share/apps/kmidi
 @dirrm share/apps/kmedia/pics
 @dirrm share/apps/kmedia
-@dirrm share/applnk/Multimediawxit
+@dirrm share/apps
 @dirrm share/applnk/Multimedia
+@dirrm share/applnk
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 44588bb0ec27..a351fb31c4d9 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -3,34 +3,35 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/12/24 13:58:20 se Exp $
+# $Id:$
 #
 
-DISTNAME=	kdemultimedia-Beta2-1
-PKGNAME=	kdemultimedia-2.1b
+DISTNAME=	kdemultimedia-Beta3-1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta2/distribution/tgz/source/
-EXTRACT_SUFX=	.src.tgz
+MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \
+ 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \
+ 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/
+EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	${X11BASE}/bin/moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
+LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
-		kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \
-		jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
-		khtmlw\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kfm\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		jscript\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		khtmlw\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
 		mediatool\\.0\\.[6-9]:${PORTSDIR}/x11/kdelibs
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
-		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib"
+		"--with-extra-includes=$(PREFIX)/include/giflib"
+
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
+		INSTALL_SCRIPT="install -c -m 555"
 
 WRKSRC=		${WRKDIR}/kdemultimedia
 
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 6b61fac2ccf3..855082831eac 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-Beta2-1.src.tgz) = 620b994489cbd73902cd5a5827d29ded
+MD5 (kdemultimedia-Beta3-1.src.tar.gz) = 2c8699f4faa8a6dbd1c014b855af4208
diff --git a/multimedia/kdemultimedia4/pkg-comment b/multimedia/kdemultimedia4/pkg-comment
index 25ffd559aaf7..d1fea6c5f03d 100644
--- a/multimedia/kdemultimedia4/pkg-comment
+++ b/multimedia/kdemultimedia4/pkg-comment
@@ -1 +1 @@
-The KDE CD player, Mixer and MIDI applications.
+KDE audio tools.
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index f148c16f52bb..58ee82e66ba6 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/pkg-plist
@@ -1,22 +1,26 @@
 bin/cddaslave
 bin/kmedia
-bin/kmid
+bin/kmidi
 bin/kmix
 bin/kscd
 share/applnk/Multimedia/KMedia.kdelnk
+share/applnk/Multimedia/KMidi.kdelnk
 share/applnk/Multimedia/KMix.kdelnk
 share/applnk/Multimedia/kscd.kdelnk
 share/apps/kmedia/pics/media.xpm
 share/apps/kmedia/pics/playpause.xbm
 share/apps/kmedia/pics/playpause_both.xpm
 share/apps/kmedia/pics/playpause_play.xpm
-share/apps/kmid/toolbar/kmid_fforward.xpm
-share/apps/kmid/toolbar/kmid_frewind.xpm
-share/apps/kmid/toolbar/kmid_next.xpm
-share/apps/kmid/toolbar/kmid_pause.xpm
-share/apps/kmid/toolbar/kmid_play.xpm
-share/apps/kmid/toolbar/kmid_prev.xpm
-share/apps/kmid/toolbar/kmid_stop.xpm
+share/apps/kmidi/config/gravis.cfg
+share/apps/kmidi/config/gsdrum.cfg
+share/apps/kmidi/config/midia.cfg
+share/apps/kmidi/config/mt32.cfg
+share/apps/kmidi/config/patch/acpiano.pat
+share/apps/kmidi/config/patch/nylongt2.pat
+share/apps/kmidi/config/sndfont.cfg
+share/apps/kmidi/config/timidity.cfg
+share/apps/kmidi/config/wowpats.cfg
+share/apps/kmidi/pics/kmidilogo.xpm
 share/apps/kmix/pics/mix_audio.xpm
 share/apps/kmix/pics/mix_bass.xpm
 share/apps/kmix/pics/mix_cd.xpm
@@ -28,42 +32,99 @@ share/apps/kmix/pics/mix_treble.xpm
 share/apps/kmix/pics/mix_unknown.xpm
 share/apps/kmix/pics/mix_volume.xpm
 share/apps/kscd/pics/kscdlogo.xpm
+share/doc/HTML/de/kmidi/kmidi-1.html
+share/doc/HTML/de/kmidi/kmidi-2.html
+share/doc/HTML/de/kmidi/kmidi-3.html
+share/doc/HTML/de/kmidi/kmidi-4.html
+share/doc/HTML/de/kmidi/kmidi-5.html
+share/doc/HTML/de/kmidi/kmidi.html
+share/doc/HTML/de/kmidi/kmidi.sgml
+share/doc/HTML/de/kmidi/logotp3.gif
 share/doc/HTML/en/kmedia/kmedia.html
-share/doc/HTML/en/kmedia/kmix.html
-share/doc/HTML/en/kmid/kmid.html
+share/doc/HTML/en/kmidi/kmidi-1.html
+share/doc/HTML/en/kmidi/kmidi-2.html
+share/doc/HTML/en/kmidi/kmidi-3.html
+share/doc/HTML/en/kmidi/kmidi-4.html
+share/doc/HTML/en/kmidi/kmidi-5.html
+share/doc/HTML/en/kmidi/kmidi.html
+share/doc/HTML/en/kmidi/kmidi.nif
+share/doc/HTML/en/kmidi/kmidi.sgml
+share/doc/HTML/en/kmidi/logotp3.gif
 share/doc/HTML/en/kscd/kscd-1.html
 share/doc/HTML/en/kscd/kscd-2.html
 share/doc/HTML/en/kscd/kscd-3.html
 share/doc/HTML/en/kscd/kscd-4.html
 share/doc/HTML/en/kscd/kscd.html
+share/doc/HTML/en/kscd/logotp3.gif
+share/icons/cd.xpm
 share/icons/kmedia.xpm
-share/icons/kmid.xpm
+share/icons/kmidi.xpm
 share/icons/kmix.xpm
 share/icons/kscd.xpm
-share/icons/mini/kmedia_mini.xpm
+share/icons/mini/kmedia.xpm
 share/icons/mini/kmix.xpm
-share/icons/mini/mini-kscd.xpm
+share/icons/mini/kscd.xpm
 share/locale/cs/LC_MESSAGES/kmedia.mo
+share/locale/cs/LC_MESSAGES/kmix.mo
 share/locale/de/LC_MESSAGES/kmedia.mo
+share/locale/de/LC_MESSAGES/kmix.mo
+share/locale/de/LC_MESSAGES/kscd.mo
+share/locale/es/LC_MESSAGES/kmedia.mo
+share/locale/fi/LC_MESSAGES/kmedia.mo
+share/locale/fi/LC_MESSAGES/kmix.mo
 share/locale/fr/LC_MESSAGES/kmedia.mo
+share/locale/pl/LC_MESSAGES/kmedia.mo
+share/locale/pt/LC_MESSAGES/kmedia.mo
+share/locale/pt/LC_MESSAGES/kmix.mo
+share/locale/ro/LC_MESSAGES/kmedia.mo
+share/mimelnk/text/xmcd.kdelnk
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk
+@dirrm share/locale/ro/LC_MESSAGES
+@dirrm share/locale/ro
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
+@dirrm share/locale/fi/LC_MESSAGES
+@dirrm share/locale/fi
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
 @dirrm share/locale/cs/LC_MESSAGES
 @dirrm share/locale/cs
 @dirrm share/doc/HTML/en/kscd
-@dirrm share/doc/HTML/en/kmid
+@dirrm share/doc/HTML/en/kmidi
 @dirrm share/doc/HTML/en/kmedia
 @dirrm share/doc/HTML/en
+@dirrm share/doc/HTML/de/kmidi
+@dirrm share/doc/HTML/de
 @dirrm share/doc/HTML
 @dirrm share/apps/kscd/pics
+@dirrm share/apps/kscd/cddb/soundtrack
+@dirrm share/apps/kscd/cddb/rock
+@dirrm share/apps/kscd/cddb/reggae
+@dirrm share/apps/kscd/cddb/newage
+@dirrm share/apps/kscd/cddb/misc
+@dirrm share/apps/kscd/cddb/jazz
+@dirrm share/apps/kscd/cddb/folk
+@dirrm share/apps/kscd/cddb/data
+@dirrm share/apps/kscd/cddb/country
+@dirrm share/apps/kscd/cddb/classical
+@dirrm share/apps/kscd/cddb/blues
+@dirrm share/apps/kscd/cddb
 @dirrm share/apps/kscd
 @dirrm share/apps/kmix/pics
 @dirrm share/apps/kmix
-@dirrm share/apps/kmid/toolbar
-@dirrm share/apps/kmid
+@dirrm share/apps/kmidi/pics
+@dirrm share/apps/kmidi/config/patch
+@dirrm share/apps/kmidi/config
+@dirrm share/apps/kmidi
 @dirrm share/apps/kmedia/pics
 @dirrm share/apps/kmedia
-@dirrm share/applnk/Multimediawxit
+@dirrm share/apps
 @dirrm share/applnk/Multimedia
+@dirrm share/applnk