bl3ify and update to kde3.2.2.

audiocd/cdparanoia patches from Chris Gilbert.

Changes:
* KRec: Corrected calculation of position in KB.
* kio (audiocd): Fix kio-audiocd gives no error message when device
  permissions are wrong
* kio (audiocd): Fix kaudiocreator error "/By Track/Track 01.wav" should
  start with "audiocd:/"
* kmid: Fix KMid doesn't support international characters
* juk: Fix Not adding m3u, pls... lists when refreshing directory
* juk: Fix Show Total running time of selection/playlist
* juk: Fix extra option (random play) in popup-window
* juk: Fix TimeLeft widget listens to too many signals
* juk: Fix Juk crashed when I was retagging a bunch of songs and started
  to play with search
* Fix FLAC dependency isn't mentioned anywhere and can cause compilation
  errors
* Fix kdemultimedia build fails with parallel make
* configure: Fix Extraneous message in admin/Makefile.common using --prefix
* kmix: Fix the executable linking against the part, by adding a common
  library.

8 files changed, 139 insertions, 32 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index f9f8120dc15..544a8103a8e 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/20 13:13:42 markd Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	3
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
@@ -12,7 +11,7 @@ CONFLICTS=	timidity-[0-9]*
 DEPENDS+=	xine-arts>=1rc0a:../../audio/xine-arts
 DEPENDS+=	trm>=0.2.1:../../audio/trm
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 
 REPLACE_PERL=		kscd/workman2cddb.pl
@@ -26,7 +25,8 @@ BUILDLINK_DEPENDS.xine-lib=	xine-lib>=1rc0anb1
 CONFIGURE_ARGS+=	--enable-audio=oss
 .endif
 
-CONFIGURE_ARGS+=	--disable-cdparanoia
+CONFIGURE_ARGS+=	--enable-cdparanoia
+CONFIGURE_ARGS+=	--with-cdparanoia=${BUILDLINK_PREFIX.cdparanoia}
 CONFIGURE_ARGS+=	--with-vorbis=${BUILDLINK_PREFIX.libvorbis}
 
 # Ensure we export symbols in the linked shared object.
@@ -44,13 +44,15 @@ PLIST_SUBST+=		XV_WORKAROUND=""
 PLIST_SUBST+=		XV_SUFFIX="so"
 .endif
 
-.include "../../audio/musicbrainz/buildlink2.mk"
-.include "../../audio/taglib/buildlink2.mk"
-.include "../../audio/arts/buildlink2.mk"
-.include "../../meta-pkgs/kde3/buildlink2.mk"
-.include "../../multimedia/xine-lib/buildlink2.mk"
-.include "../../x11/kdebase3/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../audio/arts/buildlink3.mk"
+.include "../../audio/cdparanoia/buildlink3.mk"
+.include "../../audio/musicbrainz/buildlink3.mk"
+.include "../../audio/taglib/buildlink3.mk"
+.include "../../multimedia/xine-lib/buildlink3.mk"
+.include "../../x11/kdebase3/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/kdemultimedia3/PLIST b/multimedia/kdemultimedia3/PLIST
index 1dbf8805f46..801fc8831e7 100644
--- a/multimedia/kdemultimedia3/PLIST
+++ b/multimedia/kdemultimedia3/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2004/03/09 11:59:24 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/04/20 13:13:42 markd Exp $
 bin/artsbuilder
 bin/artscontrol
 bin/juk
 bin/kaboodle
+bin/kaudiocreator
 bin/kmid
 bin/kmix
 bin/kmixctrl
@@ -48,6 +49,7 @@ include/libkcddb/cddb.h
 include/libkcddb/cdinfo.h
 include/libkcddb/client.h
 include/libkcddb/config.h
+include/libkcddb/configbase.h
 include/libwm/wm_cdrom.h
 include/libwm/wm_cdtext.h
 include/mimetypetree.h
@@ -152,6 +154,8 @@ include/noatun/vequalizer.h
 include/noatun/video.h
 include/noatun/winskinvis.h
 include/plugin_deps.h
+lib/kde3/kcm_audiocd.la
+lib/kde3/kcm_audiocd.so
 lib/kde3/kcm_cddb.la
 lib/kde3/kcm_cddb.so
 lib/kde3/kcm_kmix.la
@@ -174,6 +178,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.la
 lib/kde3/kmix.so
 lib/kde3/kmix_panelapplet.la
@@ -475,8 +481,10 @@ lib/mcop/winskinvis.mcoptype
 lib/mcop/xinePlayObject.mcopclass
 share/applications/kde/artsbuilder.desktop
 share/applications/kde/artscontrol.desktop
+share/applications/kde/audiocd.desktop
 share/applications/kde/juk.desktop
 share/applications/kde/kaboodle.desktop
+share/applications/kde/kaudiocreator.desktop
 share/applications/kde/kmid.desktop
 share/applications/kde/kmix.desktop
 share/applications/kde/kmixcfg.desktop
@@ -690,6 +698,9 @@ share/kde/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png
 share/kde/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png
 share/kde/apps/kaboodle/kaboodlepartui.rc
 share/kde/apps/kaboodle/kaboodleui.rc
+share/kde/apps/kaudiocreator/kaudiocreatorui.rc
+share/kde/apps/kaudiocreator/pics/check.png
+share/kde/apps/kconf_update/kaudiocreator-libkcddb.upd
 share/kde/apps/kconf_update/noatun.upd
 share/kde/apps/kconf_update/noatun20update
 share/kde/apps/kicker/applets/artscontrolapplet.desktop
@@ -978,6 +989,8 @@ share/kde/apps/profiles/kscd.profile.xml
 share/kde/apps/videothumbnail/sprocket-large.png
 share/kde/apps/videothumbnail/sprocket-medium.png
 share/kde/apps/videothumbnail/sprocket-small.png
+share/kde/config.kcfg/kaudiocreator.kcfg
+share/kde/config.kcfg/kaudiocreator_encoders.kcfg
 share/kde/config.kcfg/libkcddb.kcfg
 share/kde/icons/crystalsvg/128x128/actions/artsaudiomanager.png
 share/kde/icons/crystalsvg/128x128/actions/artsenvironment.png
@@ -1002,6 +1015,7 @@ share/kde/icons/crystalsvg/16x16/apps/artsbuilder.png
 share/kde/icons/crystalsvg/16x16/apps/artscontrol.png
 share/kde/icons/crystalsvg/16x16/apps/juk.png
 share/kde/icons/crystalsvg/16x16/apps/kaboodle.png
+share/kde/icons/crystalsvg/16x16/apps/kaudiocreator.png
 share/kde/icons/crystalsvg/16x16/apps/kmid.png
 share/kde/icons/crystalsvg/16x16/apps/kmix.png
 share/kde/icons/crystalsvg/16x16/apps/krec.png
@@ -1026,6 +1040,7 @@ share/kde/icons/crystalsvg/32x32/actions/artsmidimanager.png
 share/kde/icons/crystalsvg/32x32/apps/artscontrol.png
 share/kde/icons/crystalsvg/32x32/apps/juk.png
 share/kde/icons/crystalsvg/32x32/apps/kaboodle.png
+share/kde/icons/crystalsvg/32x32/apps/kaudiocreator.png
 share/kde/icons/crystalsvg/32x32/apps/kmid.png
 share/kde/icons/crystalsvg/32x32/apps/kmix.png
 share/kde/icons/crystalsvg/32x32/apps/krec.png
@@ -1061,10 +1076,13 @@ share/kde/icons/crystalsvg/scalable/actions/artsfftscope.svg
 share/kde/icons/crystalsvg/scalable/actions/artsmediatypes.svg
 share/kde/icons/crystalsvg/scalable/actions/artsmidimanager.svg
 share/kde/icons/crystalsvg/scalable/apps/artscontrol.svg
+share/kde/icons/locolor/16x16/apps/kaudiocreator.png
+share/kde/icons/locolor/32x32/apps/kaudiocreator.png
 share/kde/mimelnk/application/x-artsbuilder.desktop
 share/kde/mimelnk/audio/x-karaoke.desktop
 share/kde/mimelnk/interface/x-winamp-skin.desktop
 share/kde/mimelnk/text/xmcd.desktop
+share/kde/services/audiocd.protocol
 share/kde/services/kaboodle_component.desktop
 share/kde/services/kaboodleengine.desktop
 share/kde/services/kcm_krec.desktop
@@ -1162,6 +1180,8 @@ share/kde/servicetypes/krec_exportitem.desktop
 @dirrm share/kde/apps/kmid
 @comment dirrm share/kde/apps/kicker/applets
 @comment dirrm share/kde/apps/kconf_update
+@dirrm share/kde/apps/kaudiocreator/pics
+@dirrm share/kde/apps/kaudiocreator
 @dirrm share/kde/apps/kaboodle/icons/crystalsvg/22x22/actions
 @dirrm share/kde/apps/kaboodle/icons/crystalsvg/22x22
 @dirrm share/kde/apps/kaboodle/icons/crystalsvg/16x16/actions
diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk
new file mode 100644
index 00000000000..a17b1da0cf3
--- /dev/null
+++ b/multimedia/kdemultimedia3/buildlink3.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/20 13:13:42 markd Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+KDEMULTIMEDIA_BUILDLINK3_MK:=	${KDEMULTIMEDIA_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	kdemultimedia
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdemultimedia}
+BUILDLINK_PACKAGES+=	kdemultimedia
+
+.if !empty(KDEMULTIMEDIA_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.kdemultimedia+=	kdemultimedia>=3.2.2
+BUILDLINK_PKGSRCDIR.kdemultimedia?=	../../multimedia/kdemultimedia3
+.endif	# KDEMULTIMEDIA_BUILDLINK3_MK
+
+.include "../../audio/musicbrainz/buildlink3.mk"
+.include "../../audio/taglib/buildlink3.mk"
+.include "../../audio/arts/buildlink3.mk"
+.include "../../multimedia/xine-lib/buildlink3.mk"
+.include "../../x11/kdebase3/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index f3855f1a403..83b5d30ea98 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.3 2004/03/09 11:59:24 markd Exp $
+$NetBSD: distinfo,v 1.4 2004/04/20 13:13:42 markd Exp $
 
-SHA1 (kdemultimedia-3.2.1.tar.bz2) = 1be8550a5535e44c632fbe926bc6516ab85d5399
-Size (kdemultimedia-3.2.1.tar.bz2) = 4926192 bytes
-SHA1 (patch-aa) = c289331c35656b8cac6b670f8007b27d2bbfe662
-SHA1 (patch-ar) = a0f31a40a2e671dacfe3c00706bc5068e648a472
+SHA1 (kdemultimedia-3.2.2.tar.bz2) = 2536393d2bc31f15448082218960b867315c1cf0
+Size (kdemultimedia-3.2.2.tar.bz2) = 4911246 bytes
+SHA1 (patch-aa) = 1e0694a956357d759a73a010e9a4700d5072ebf7
+SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70
+SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413
+SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
 SHA1 (patch-cx) = ea42ab342abf2c2cff4c13fa71ab6e01bab5736c
diff --git a/multimedia/kdemultimedia3/patches/patch-aa b/multimedia/kdemultimedia3/patches/patch-aa
index 904191371e2..f6254372431 100644
--- a/multimedia/kdemultimedia3/patches/patch-aa
+++ b/multimedia/kdemultimedia3/patches/patch-aa
@@ -1,17 +1,26 @@
-$NetBSD: patch-aa,v 1.3 2004/03/09 11:59:24 markd Exp $
+$NetBSD: patch-aa,v 1.4 2004/04/20 13:13:42 markd Exp $
 
---- configure.orig	2004-03-01 10:47:15.000000000 +1300
+--- configure.orig	2004-04-06 02:48:29.000000000 +1200
 +++ configure
-@@ -32634,7 +32634,7 @@ if test "${ac_cv_lib_FLAC_FLAC__seekable
+@@ -34640,7 +34640,7 @@ if test "${ac_cv_lib_FLAC_FLAC__seekable
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lFLAC  $LIBS"
 +LIBS="-lFLAC -lm $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- /* #line $LINENO "configure" */
  /* confdefs.h.  */
-@@ -33519,7 +33519,7 @@ fi
+ _ACEOF
+@@ -34865,7 +34865,7 @@ echo "${ECHO_T}incs=$para_incdir libs=$p
+ echo "${ECHO_T}$with_cdparanoia" >&6
+     CDPARANOIA_ROOT="$with_cdparanoia"
+     if test "x$CDPARANOIA_ROOT" != "x/usr" ; then
+-      CDPARANOIA_INCS="-I${CDPARANOIA_ROOT}/include"
++      CDPARANOIA_INCS="-I${CDPARANOIA_ROOT}/include/cdparanoia"
+       CDPARANOIA_LIBS="-L${CDPARANOIA_ROOT}/lib "
+       if test "$USE_RPATH" = "yes" ; then
+         CDPARANOIA_RPATH="-R ${CDPARANOIA_ROOT}/lib"
+@@ -35572,7 +35572,7 @@ fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5
  echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6
  if test $ac_cv_lib_ossaudio_main = yes; then
@@ -20,7 +29,7 @@ $NetBSD: patch-aa,v 1.3 2004/03/09 11:59:24 markd Exp $
  fi
  
  
-@@ -34785,8 +34785,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -36995,8 +36995,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -46,7 +55,7 @@ $NetBSD: patch-aa,v 1.3 2004/03/09 11:59:24 markd Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -34840,7 +34855,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -37059,7 +37074,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -69,7 +78,7 @@ $NetBSD: patch-aa,v 1.3 2004/03/09 11:59:24 markd Exp $
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -34895,7 +34925,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -37123,7 +37153,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -92,7 +101,27 @@ $NetBSD: patch-aa,v 1.3 2004/03/09 11:59:24 markd Exp $
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -35487,10 +35532,10 @@ _ACEOF
+@@ -37169,8 +37214,8 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 		#include <sys/types.h>
+ 		typedef int16_t size16;
+ 		typedef int32_t size32;
+-                #include <cdda_interface.h>
+-                #include <cdda_paranoia.h>
++                #include <cdparanoia/cdda_interface.h>
++                #include <cdparanoia/cdda_paranoia.h>
+ 
+ int
+ main ()
+@@ -37221,7 +37266,7 @@ if test "${ac_cv_lib_cdda_paranoia_paran
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcdda_paranoia -lcdda_paranoia -lcdda_interface $LIBS"
++LIBS="-lcdda_paranoia -lm -lcdda_interface $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37793,10 +37838,10 @@ _ACEOF
      ;;
  
    NetBSD)
diff --git a/multimedia/kdemultimedia3/patches/patch-ab b/multimedia/kdemultimedia3/patches/patch-ab
new file mode 100644
index 00000000000..38c7e55dcef
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.3 2004/04/20 13:13:42 markd Exp $
+
+--- mpeglib/lib/input/cddaInputStream.h.orig	2004-04-12 15:12:43.000000000 +0100
++++ mpeglib/lib/input/cddaInputStream.h	2004-04-12 15:13:01.000000000 +0100
+@@ -33,8 +33,8 @@
+ typedef int32_t size32;
+ 
+ extern "C" {
+-#include <cdda_interface.h>
+-#include <cdda_paranoia.h>
++#include <cdparanoia/cdda_interface.h>
++#include <cdparanoia/cdda_paranoia.h>
+ void paranoiaCallback(long, int);
+ }
+ //#define CDDA_INCLUDE
diff --git a/multimedia/kdemultimedia3/patches/patch-ac b/multimedia/kdemultimedia3/patches/patch-ac
new file mode 100644
index 00000000000..a6ad257237e
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.3 2004/04/20 13:13:42 markd Exp $
+
+--- mpeglib/lib/decoder/cddaPlugin.cpp.orig	2004-04-12 16:32:14.000000000 +0100
++++ mpeglib/lib/decoder/cddaPlugin.cpp	2004-04-12 16:32:31.000000000 +0100
+@@ -25,8 +25,8 @@
+ typedef int32_t size32;
+ 
+ extern "C" {
+-#include <cdda_interface.h>
+-#include <cdda_paranoia.h>
++#include <cdparanoia/cdda_interface.h>
++#include <cdparanoia/cdda_paranoia.h>
+ }
+ 
+ 
diff --git a/multimedia/kdemultimedia3/patches/patch-ar b/multimedia/kdemultimedia3/patches/patch-ar
index d9db381c46b..6d09a2282e7 100644
--- a/multimedia/kdemultimedia3/patches/patch-ar
+++ b/multimedia/kdemultimedia3/patches/patch-ar
@@ -1,12 +1,11 @@
-$NetBSD: patch-ar,v 1.1.1.1 2004/01/26 15:42:05 jmmv Exp $
+$NetBSD: patch-ar,v 1.2 2004/04/20 13:13:42 markd Exp $
 
---- mpeglib/lib/util/audio/Makefile.in.orig	Tue May 14 01:53:27 2002
+--- mpeglib/lib/util/audio/Makefile.in.orig	2004-04-06 02:48:26.000000000 +1200
 +++ mpeglib/lib/util/audio/Makefile.in
-@@ -311,7 +311,7 @@
+@@ -55,6 +55,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/a
+ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
- 
--libaudio_la_LDFLAGS =
 +libaudio_la_LDFLAGS = $(LIBOSSAUDIO)
  libaudio_la_LIBADD =
  am_libaudio_la_OBJECTS = audioIO.lo dspWrapper.lo