20 files changed, 258 insertions, 18 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
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 7b3c720a36b1..a36b5032c9b3 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/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/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 9edf6240fbce..c339b8b1f6a5 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdemultimedia-3.0.tar.bz2) = a7b75d29dd29631e576537db22f19bec
+MD5 (KDE/kdemultimedia-3.0.1.tar.bz2) = a1aec32291ecab4d683d11bdad360874
diff --git a/multimedia/kdemultimedia4/files/patch-b_out.cpp b/multimedia/kdemultimedia4/files/patch-b_out.cpp
new file mode 100644
index 000000000000..603053a260a5
--- /dev/null
+++ b/multimedia/kdemultimedia4/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/kdemultimedia4/files/patch-engine.cpp b/multimedia/kdemultimedia4/files/patch-engine.cpp
new file mode 100644
index 000000000000..bb1a61fdd2b4
--- /dev/null
+++ b/multimedia/kdemultimedia4/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/kdemultimedia4/files/patch-linux_a.cpp b/multimedia/kdemultimedia4/files/patch-linux_a.cpp
new file mode 100644
index 000000000000..34a38459bb0f
--- /dev/null
+++ b/multimedia/kdemultimedia4/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/kdemultimedia4/files/patch-mixer_oss.cpp b/multimedia/kdemultimedia4/files/patch-mixer_oss.cpp
new file mode 100644
index 000000000000..090e42e76328
--- /dev/null
+++ b/multimedia/kdemultimedia4/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/kdemultimedia4/files/patch-sndcard.h b/multimedia/kdemultimedia4/files/patch-sndcard.h
new file mode 100644
index 000000000000..271483e0b669
--- /dev/null
+++ b/multimedia/kdemultimedia4/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/kdemultimedia4/files/patch-sound.cpp b/multimedia/kdemultimedia4/files/patch-sound.cpp
new file mode 100644
index 000000000000..baa968000804
--- /dev/null
+++ b/multimedia/kdemultimedia4/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/kdemultimedia4/pkg-descr b/multimedia/kdemultimedia4/pkg-descr
index 90ae45773bea..4ca62b278095 100644
--- a/multimedia/kdemultimedia4/pkg-descr
+++ b/multimedia/kdemultimedia4/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/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index b15ee0c89c9d..81bf47d8e9fc 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/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