Update to KDE 3.1.2

10 files changed, 42 insertions, 10 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 2f178e3a28a3..64953c58296e 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Multimedia utilities for the KDE integrated X11 desktop
 
 RUN_DEPENDS+=	xanim:${PORTSDIR}/multimedia/xanim
-LIB_DEPENDS+=	ogg.4:${PORTSDIR}/audio/libogg \
+LIB_DEPENDS+=	cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
+		ogg.4:${PORTSDIR}/audio/libogg \
 		vorbis.2:${PORTSDIR}/audio/libvorbis
 
 USE_KDELIBS_VER=3
@@ -33,11 +34,9 @@ MAKE_ENV=	${CONFIGURE_ENV}
 
 CONFIGURE_ARGS+=	--without-lame \
 			--with-vorbis="${LOCALBASE}" \
-			--disable-cdparanoia \
 			--enable-audio=oss,esd
 
-#.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include "/usr/ports/x11/kde3/Makefile.kde"
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MIDI) || defined(WITH_KMIDI)
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 3cdc3cfb2f32..00febe86a632 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdemultimedia-3.1.1.tar.bz2) = bdd53d23d13adf2419554e995417178e
+MD5 (KDE/kdemultimedia-3.1.2.tar.bz2) = 63ffa8b3c6b3151acdaaa22afd7e55ea
diff --git a/multimedia/kdemultimedia3/files/plist.base b/multimedia/kdemultimedia3/files/plist.base
index 248cf8b6fe4b..f4c98b77d631 100644
--- a/multimedia/kdemultimedia3/files/plist.base
+++ b/multimedia/kdemultimedia3/files/plist.base
@@ -133,6 +133,8 @@ include/noatun/winskinvis.h
 include/plugin_deps.h
 lib/kaboodle.la
 lib/kaboodle.so
+lib/kde3/kcm_audiocd.la
+lib/kde3/kcm_audiocd.so
 lib/kde3/kcm_kmix.la
 lib/kde3/kcm_kmix.so
 lib/kde3/kfile_au.la
@@ -147,6 +149,8 @@ lib/kde3/kfile_ogg.la
 lib/kde3/kfile_ogg.so
 lib/kde3/kfile_wav.la
 lib/kde3/kfile_wav.so
+lib/kde3/kio_audiocd.la
+lib/kde3/kio_audiocd.so
 lib/kde3/kmix_panelapplet.la
 lib/kde3/kmix_panelapplet.so
 lib/kde3/libkaboodlepart.la
@@ -374,6 +378,7 @@ share/applnk/Multimedia/kmix.desktop
 share/applnk/Multimedia/krec.desktop
 share/applnk/Multimedia/kscd.desktop
 share/applnk/Multimedia/noatun.desktop
+share/applnk/Settings/Sound/audiocd.desktop
 share/apps/aktion/aktion_part.rc
 share/apps/aktion/toolbar/ak_maximize.png
 share/apps/aktion/toolbar/ak_setup.png
@@ -917,6 +922,7 @@ share/mimelnk/application/x-artsbuilder.desktop
 share/mimelnk/audio/x-karaoke.desktop
 share/mimelnk/interface/x-winamp-skin.desktop
 share/mimelnk/text/xmcd.desktop
+share/services/audiocd.protocol
 share/services/kaboodle_component.desktop
 share/services/kfile_au.desktop
 share/services/kfile_avi.desktop
diff --git a/multimedia/kdemultimedia3/files/plist.base.rm b/multimedia/kdemultimedia3/files/plist.base.rm
index d3dc3d66c794..efcb40656fbc 100644
--- a/multimedia/kdemultimedia3/files/plist.base.rm
+++ b/multimedia/kdemultimedia3/files/plist.base.rm
@@ -103,6 +103,8 @@
 @dirrm share/apps/aktion/toolbar
 @dirrm share/apps/aktion
 @dirrm share/apps
+@dirrm share/applnk/Settings/Sound
+@dirrm share/applnk/Settings
 @dirrm share/applnk/Multimedia/More
 @dirrm share/applnk/Multimedia
 @dirrm share/applnk/.hidden
diff --git a/multimedia/kdemultimedia3/pkg-message b/multimedia/kdemultimedia3/pkg-message
index 26efb2200342..9c314ca92c65 100644
--- a/multimedia/kdemultimedia3/pkg-message
+++ b/multimedia/kdemultimedia3/pkg-message
@@ -11,4 +11,13 @@ For example, if you have an IDE/ATAPI CD-ROM device:
 
 	ln -sf /dev/racd0c /dev/cdrom
 	chmod 666 /dev/racd0c
+
+Additional instructions for using the audiocd:/ kioslave:
+
+If you have an SCSI CD-ROM or if you have an IDE/ATAPI drive AND 
+you have activated ATAPICAM in your kernel, change the permissions for
+the CAM transport layer and CAM passthrough layer devices to 666, i.e.: 
+
+	chmod 666 /dev/xpt0 /dev/pass0
+ 
 ======================================================================
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 2f178e3a28a3..64953c58296e 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Multimedia utilities for the KDE integrated X11 desktop
 
 RUN_DEPENDS+=	xanim:${PORTSDIR}/multimedia/xanim
-LIB_DEPENDS+=	ogg.4:${PORTSDIR}/audio/libogg \
+LIB_DEPENDS+=	cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
+		ogg.4:${PORTSDIR}/audio/libogg \
 		vorbis.2:${PORTSDIR}/audio/libvorbis
 
 USE_KDELIBS_VER=3
@@ -33,11 +34,9 @@ MAKE_ENV=	${CONFIGURE_ENV}
 
 CONFIGURE_ARGS+=	--without-lame \
 			--with-vorbis="${LOCALBASE}" \
-			--disable-cdparanoia \
 			--enable-audio=oss,esd
 
-#.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include "/usr/ports/x11/kde3/Makefile.kde"
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MIDI) || defined(WITH_KMIDI)
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 3cdc3cfb2f32..00febe86a632 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdemultimedia-3.1.1.tar.bz2) = bdd53d23d13adf2419554e995417178e
+MD5 (KDE/kdemultimedia-3.1.2.tar.bz2) = 63ffa8b3c6b3151acdaaa22afd7e55ea
diff --git a/multimedia/kdemultimedia4/files/plist.base b/multimedia/kdemultimedia4/files/plist.base
index 248cf8b6fe4b..f4c98b77d631 100644
--- a/multimedia/kdemultimedia4/files/plist.base
+++ b/multimedia/kdemultimedia4/files/plist.base
@@ -133,6 +133,8 @@ include/noatun/winskinvis.h
 include/plugin_deps.h
 lib/kaboodle.la
 lib/kaboodle.so
+lib/kde3/kcm_audiocd.la
+lib/kde3/kcm_audiocd.so
 lib/kde3/kcm_kmix.la
 lib/kde3/kcm_kmix.so
 lib/kde3/kfile_au.la
@@ -147,6 +149,8 @@ lib/kde3/kfile_ogg.la
 lib/kde3/kfile_ogg.so
 lib/kde3/kfile_wav.la
 lib/kde3/kfile_wav.so
+lib/kde3/kio_audiocd.la
+lib/kde3/kio_audiocd.so
 lib/kde3/kmix_panelapplet.la
 lib/kde3/kmix_panelapplet.so
 lib/kde3/libkaboodlepart.la
@@ -374,6 +378,7 @@ share/applnk/Multimedia/kmix.desktop
 share/applnk/Multimedia/krec.desktop
 share/applnk/Multimedia/kscd.desktop
 share/applnk/Multimedia/noatun.desktop
+share/applnk/Settings/Sound/audiocd.desktop
 share/apps/aktion/aktion_part.rc
 share/apps/aktion/toolbar/ak_maximize.png
 share/apps/aktion/toolbar/ak_setup.png
@@ -917,6 +922,7 @@ share/mimelnk/application/x-artsbuilder.desktop
 share/mimelnk/audio/x-karaoke.desktop
 share/mimelnk/interface/x-winamp-skin.desktop
 share/mimelnk/text/xmcd.desktop
+share/services/audiocd.protocol
 share/services/kaboodle_component.desktop
 share/services/kfile_au.desktop
 share/services/kfile_avi.desktop
diff --git a/multimedia/kdemultimedia4/files/plist.base.rm b/multimedia/kdemultimedia4/files/plist.base.rm
index d3dc3d66c794..efcb40656fbc 100644
--- a/multimedia/kdemultimedia4/files/plist.base.rm
+++ b/multimedia/kdemultimedia4/files/plist.base.rm
@@ -103,6 +103,8 @@
 @dirrm share/apps/aktion/toolbar
 @dirrm share/apps/aktion
 @dirrm share/apps
+@dirrm share/applnk/Settings/Sound
+@dirrm share/applnk/Settings
 @dirrm share/applnk/Multimedia/More
 @dirrm share/applnk/Multimedia
 @dirrm share/applnk/.hidden
diff --git a/multimedia/kdemultimedia4/pkg-message b/multimedia/kdemultimedia4/pkg-message
index 26efb2200342..9c314ca92c65 100644
--- a/multimedia/kdemultimedia4/pkg-message
+++ b/multimedia/kdemultimedia4/pkg-message
@@ -11,4 +11,13 @@ For example, if you have an IDE/ATAPI CD-ROM device:
 
 	ln -sf /dev/racd0c /dev/cdrom
 	chmod 666 /dev/racd0c
+
+Additional instructions for using the audiocd:/ kioslave:
+
+If you have an SCSI CD-ROM or if you have an IDE/ATAPI drive AND 
+you have activated ATAPICAM in your kernel, change the permissions for
+the CAM transport layer and CAM passthrough layer devices to 666, i.e.: 
+
+	chmod 666 /dev/xpt0 /dev/pass0
+ 
 ======================================================================