Build and install kscd. Doesn't let me play CDs on my laptop, but I think

that's a problem elsewhere.

7 files changed, 150 insertions, 20 deletions

diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index 37f8b852c98..a2260d06c6e 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/04/06 17:56:03 tron Exp $
+# $NetBSD: Makefile,v 1.3 2001/04/17 16:03:18 skrll Exp $
 
 DISTNAME=	kdemultimedia-2.1
 CATEGORIES=	audio kde
@@ -12,4 +12,7 @@ DEPENDS+=	pth>=1.3.7:../../devel/pth
 
 CONFIGURE_ENV+=	LIBS="-Wl,--export-dynamic"
 
+post-patch:
+	${CP} ${WRKSRC}/kscd/config.h.std ${WRKSRC}/kscd/config.h
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/kdemultimedia2/distinfo b/audio/kdemultimedia2/distinfo
index 6d036da7f50..81e0125d180 100644
--- a/audio/kdemultimedia2/distinfo
+++ b/audio/kdemultimedia2/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.1 2001/04/17 10:40:28 skrll Exp $
+$NetBSD: distinfo,v 1.2 2001/04/17 16:03:18 skrll Exp $
 
 SHA1 (kdemultimedia-2.1.tar.bz2) = e21c9ceac48d1469839a97aa9193895cd120a9ff
 Size (kdemultimedia-2.1.tar.bz2) = 4509946 bytes
-SHA1 (patch-aa) = 2bfbac804f2170546163ad56cedb3e6501f9f841
+SHA1 (patch-aa) = c6e61ef25770163d301cd85a88c340cc007e9d9f
 SHA1 (patch-ab) = 364d905ff5379535285d3c5d462607c0020451d3
 SHA1 (patch-ac) = 9981b9eae552aead074cee46bd0c065dca2e1fca
 SHA1 (patch-ad) = d32a98772d5367d7230f69b8984913e9c6ab1267
 SHA1 (patch-ae) = b3c54f8b9f332e63e76be934b60e7525e5f7afec
-SHA1 (patch-af) = 4e25ac0e3d25ffb3ed3d22da69214d12b75eff0c
+SHA1 (patch-af) = 19fa27731738e23440cf15bfbba918bb910afa25
 SHA1 (patch-ag) = 7852ecc3e2181f3589f1f2703ae1737a670b9d13
 SHA1 (patch-ah) = 496488b19584f3b22d757cd1a56928499015ae31
 SHA1 (patch-ai) = 6779000b313b0b36e5da3f13f534a726195f332f
@@ -17,3 +17,5 @@ SHA1 (patch-al) = 394d82451e0a320bfa7ea610305b24b53cb0218d
 SHA1 (patch-am) = 4c747c33548057543ecd28cc8aea05f5093af6ce
 SHA1 (patch-an) = b6a16911a05d713062b3366ae43e685e6084f259
 SHA1 (patch-ao) = 7c909e0d4029087534ab3085c5522ac6929a3502
+SHA1 (patch-ap) = 5343622175b97c0cf129b9524e10297cb0ba4296
+SHA1 (patch-aq) = 8821eeb981948a3054cce0a0777b4d205001b99d
diff --git a/audio/kdemultimedia2/patches/patch-aa b/audio/kdemultimedia2/patches/patch-aa
index 6fa6dc685ab..834ceaa9365 100644
--- a/audio/kdemultimedia2/patches/patch-aa
+++ b/audio/kdemultimedia2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
+$NetBSD: patch-aa,v 1.3 2001/04/17 16:03:19 skrll Exp $
 
 --- configure.orig	Wed Feb 21 11:01:31 2001
 +++ configure
@@ -11,7 +11,15 @@ $NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
        ;;
      *)
        echo "configure: warning: No --enable-audio=default audio for $target" 1>&2
-@@ -11339,7 +11339,7 @@
+@@ -11216,6 +11216,7 @@
+ case "$host" in
+   *-*-linux*) kscd_compile=yes;;
+   *-*-*bsdi*) kscd_compile=yes;; 
++  *-*-*netbsd*) kscd_compile=yes;; 
+   *-*-*bsd*) kscd_compile=no;;
+   *) kscd_compile=yes;;
+ esac
+@@ -11339,7 +11340,7 @@
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
@@ -20,7 +28,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
  { (eval echo configure:11344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
-@@ -11366,7 +11366,7 @@
+@@ -11366,7 +11367,7 @@
  fi
  done
  
@@ -29,7 +37,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -11879,13 +11879,16 @@
+@@ -11879,13 +11880,16 @@
  
  
  case "$ARCH_TYPE" in
@@ -53,7 +61,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
  
    *)
      echo "$ac_t""Non Intel." 1>&6
-@@ -11897,6 +11900,9 @@
+@@ -11897,6 +11901,9 @@
  kde_mpeglib_compiles=no
  
  case "$OS_TYPE" in
@@ -63,7 +71,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
    Linux)
      kde_mpeglib_compiles=yes
      ;;
-@@ -12105,6 +12111,7 @@
+@@ -12105,6 +12112,7 @@
    NetBSD)
      echo "$ac_t""NetBSD :Unknown hardware. You will have problems!!" 1>&6
      OS_TYPE="BSD"
diff --git a/audio/kdemultimedia2/patches/patch-af b/audio/kdemultimedia2/patches/patch-af
index 39ba3459422..2f2104eb53d 100644
--- a/audio/kdemultimedia2/patches/patch-af
+++ b/audio/kdemultimedia2/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/03/14 16:14:08 skrll Exp $
+$NetBSD: patch-af,v 1.2 2001/04/17 16:03:19 skrll Exp $
 
 --- kscd/libwm/plat_freebsd.c.orig	Sun Feb 18 15:30:03 2001
 +++ kscd/libwm/plat_freebsd.c
@@ -12,11 +12,13 @@ $NetBSD: patch-af,v 1.1.1.1 2001/03/14 16:14:08 skrll Exp $
 -#if defined(__NetBSD__) || defined(__OpenBSD__) 
 +#if defined(__OpenBSD__) 
  # define MSF_MINUTES 1
-@@ -65,3 +65,2 @@
- # endif
--#endif
- 
-@@ -232,7 +231,2 @@
+@@ -59,2 +59,5 @@
+ # include "/sys/scsi/scsi_cd.h"
++#elif defined(__NetBSD__)
++#include <sys/scsiio.h>
++#include <dev/scsipi/scsipi_cd.h>
+ #else
+@@ -232,7 +235,2 @@
      dopos:
 -#ifdef __NetBSD__
 -      *pos = scd.what.position.absaddr[MSF_MINUTES] * 60 * 75 +
@@ -24,11 +26,11 @@ $NetBSD: patch-af,v 1.1.1.1 2001/03/14 16:14:08 skrll Exp $
 -	scd.what.position.absaddr[MSF_FRAMES];
 -#else
        *pos = scd.what.position.absaddr.msf.minute * 60 * 75 +
-@@ -240,3 +234,2 @@
+@@ -240,3 +238,2 @@
  	scd.what.position.absaddr.msf.frame;
 -#endif
        *track = scd.what.position.track_number;
-@@ -307,7 +300,2 @@
+@@ -307,7 +304,2 @@
    
 -#ifdef __NetBSD__
 -  *startframe = toc_buffer.addr[MSF_MINUTES]*60*75 +
@@ -36,7 +38,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/03/14 16:14:08 skrll Exp $
 -    toc_buffer.addr[MSF_FRAMES];
 -#else
    *startframe = toc_buffer.addr.msf.minute*60*75 +
-@@ -315,3 +303,2 @@
+@@ -315,3 +307,2 @@
      toc_buffer.addr.msf.frame;
 -#endif
    
diff --git a/audio/kdemultimedia2/patches/patch-ap b/audio/kdemultimedia2/patches/patch-ap
new file mode 100644
index 00000000000..5f82fb7cb6d
--- /dev/null
+++ b/audio/kdemultimedia2/patches/patch-ap
@@ -0,0 +1,32 @@
+$NetBSD: patch-ap,v 1.1 2001/04/17 16:03:20 skrll Exp $
+
+--- kscd/libwm/include/wm_config.h.orig	Mon Jan 22 12:14:45 2001
++++ kscd/libwm/include/wm_config.h
+@@ -128,9 +128,26 @@
+  ***  ******  **  **  ******  ******  **  ******  **  *  **********
+  ***  ******  **  **      **      **     ****    ***    ***********
+  ******************************************************************/
+-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined(__NetBSD)
++#if defined(__FreeBSD__) || defined(__FreeBSD)
+ 
+ #define DEFAULT_CD_DEVICE	"/dev/rmatcd0c"
++
++
++#endif /* freebsd */
++
++/******************************************************************
++ * NetBSD
++ ******************************************************************
++ ***   ***  **      **      **     ****    ***    *****************
++ ***    **  **  ********  ****  **  **  ******  *  ****************
++ ***  *  *  **    ******  ****    ******  ****  **  ***************
++ ***  **    **  ********  ****  **  ******  **  *  ****************
++ ***  ***   **      ****  ****     ****    ***    *****************
++ ******************************************************************/
++*******************************/
++#if defined(__NetBSD__) || defined(__NetBSD)
++
++#define DEFAULT_CD_DEVICE	"/dev/rcd0d"
+ 
+ #endif /* freebsd */
+ 
diff --git a/audio/kdemultimedia2/patches/patch-aq b/audio/kdemultimedia2/patches/patch-aq
new file mode 100644
index 00000000000..d5752d39fd7
--- /dev/null
+++ b/audio/kdemultimedia2/patches/patch-aq
@@ -0,0 +1,43 @@
+$NetBSD: patch-aq,v 1.1 2001/04/17 16:03:20 skrll Exp $
+
+--- kscd/config.h.std.orig	Wed Aug 23 06:31:58 2000
++++ kscd/config.h.std
+@@ -120,18 +120,24 @@
+ 
+ /*************************************************************************
+  *
+- *	FreeBSD/NetBSD
++ *	NetBSD
+  *
+  *************************************************************************/
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
+-
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__)
+ 
+ /* Is this the most commonly used cd device on FreeBSD ? */
+ #define DEFAULT_CD_DEVICE       "/dev/rmatcd0c"
+ 
+-#else /* __NetBSD__ */
++#endif
++
++/*************************************************************************
++ *
++ *	NetBSD
++ *
++ *************************************************************************/
++
++#if defined(__NetBSD__)
+ 
+ /* The raw partition on disk device is *d on i386, *c on everything else */
+ #ifdef __i386__
+@@ -140,7 +146,7 @@
+ #define DEFAULT_CD_DEVICE       "/dev/rcd0c"
+ #endif
+ 
+-#endif /* __FreeBSD__ */
++#endif /* __NetBSD__ */
+ 
+ /* Please have a look at void KSCD::playClicked() in kscd.cpp. You will find
+    there the following code:
diff --git a/audio/kdemultimedia2/pkg/PLIST b/audio/kdemultimedia2/pkg/PLIST
index 87109ecc73a..8b992020e4c 100644
--- a/audio/kdemultimedia2/pkg/PLIST
+++ b/audio/kdemultimedia2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/03/16 15:16:34 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/04/17 16:03:21 skrll Exp $
 bin/aktion
 bin/artsbuilder
 bin/artscontrol
@@ -6,11 +6,13 @@ bin/artstestgui
 bin/kmidi
 bin/kmix
 bin/kmixctrl
+bin/kscd
 bin/midisend
 bin/mpeglibartsplay
 bin/noatun
 bin/sf2cfg
 bin/timidity
+bin/workman2cddb.pl
 bin/yaf-cdda
 bin/yaf-mpgplay
 bin/yaf-splay
@@ -219,6 +221,11 @@ lib/libnoatunvoiceprint.so
 lib/libsplitplaylist.a
 lib/libsplitplaylist.la
 lib/libsplitplaylist.so
+lib/libworkman.a
+lib/libworkman.la
+lib/libworkman.so
+lib/libworkman.so.5
+lib/libworkman.so.5.3
 lib/libyafcore.a
 lib/libyafcore.la
 lib/libyafcore.so
@@ -562,6 +569,7 @@ share/kde/applnk/Multimedia/artsbuilder.desktop
 share/kde/applnk/Multimedia/artscontrol.desktop
 share/kde/applnk/Multimedia/kmidi.desktop
 share/kde/applnk/Multimedia/kmix.desktop
+share/kde/applnk/Multimedia/kscd.desktop
 share/kde/applnk/Multimedia/noatun.desktop
 share/kde/applnk/Multimedia/timidity.desktop
 share/kde/applnk/Settings/Sound/kmix.desktop
@@ -734,6 +742,8 @@ share/kde/apps/kmix/pics/mix_treble.png
 share/kde/apps/kmix/pics/mix_unknown.png
 share/kde/apps/kmix/pics/mix_video.png
 share/kde/apps/kmix/pics/mix_volume.png
+share/kde/apps/kscd/pics/cdsmall.xpm
+share/kde/apps/kscd/pics/kscdlogo.xpm
 share/kde/apps/noatun/dcopiface.plugin
 share/kde/apps/noatun/excellent.plugin
 share/kde/apps/noatun/excellentui.rc
@@ -937,19 +947,24 @@ share/kde/config/aktionrc
 share/kde/icons/hicolor/22x22/apps/noatun.png
 share/kde/icons/hicolor/32x32/apps/kmidi.png
 share/kde/icons/hicolor/32x32/apps/kmix.png
+share/kde/icons/hicolor/32x32/apps/kscd.png
 share/kde/icons/hicolor/32x32/apps/noatun.png
 share/kde/icons/hicolor/48x48/apps/kmidi.png
 share/kde/icons/hicolor/48x48/apps/kmix.png
+share/kde/icons/hicolor/48x48/apps/kscd.png
 share/kde/icons/hicolor/48x48/apps/noatun.png
 share/kde/icons/locolor/16x16/apps/aktion.png
 share/kde/icons/locolor/16x16/apps/kmidi.png
 share/kde/icons/locolor/16x16/apps/kmix.png
+share/kde/icons/locolor/16x16/apps/kscd.png
 share/kde/icons/locolor/16x16/apps/noatun.png
 share/kde/icons/locolor/32x32/apps/aktion.png
 share/kde/icons/locolor/32x32/apps/kmidi.png
 share/kde/icons/locolor/32x32/apps/kmix.png
+share/kde/icons/locolor/32x32/apps/kscd.png
 share/kde/icons/locolor/32x32/apps/noatun.png
 share/kde/mimelnk/application/x-artsbuilder.desktop
+share/kde/mimelnk/text/xmcd.desktop
 share/kde/services/kmixctrl_restore.desktop
 @comment kdelibs:dirrm share/kde/services
 @comment kdelibs:dirrm share/kde/mimelnk/application
@@ -982,6 +997,31 @@ share/kde/services/kmixctrl_restore.desktop
 @dirrm share/kde/apps/noatun/icons/hicolor
 @dirrm share/kde/apps/noatun/icons
 @dirrm share/kde/apps/noatun
+@dirrm share/kde/apps/kscd/pics
+@exec /bin/mkdir -p /usr/X11R6/share/kde/apps/kscd/cddb/soundtrack
+@dirrm share/kde/apps/kscd/cddb/soundtrack
+@exec /bin/mkdir -p /usr/X11R6/share/kde/apps/kscd/cddb/rock
+@dirrm share/kde/apps/kscd/cddb/rock
+@exec /bin/mkdir -p /usr/X11R6/share/kde/apps/kscd/cddb/reggae
+@dirrm share/kde/apps/kscd/cddb/reggae
+@exec /bin/mkdir -p /usr/X11R6/share/kde/apps/kscd/cddb/newage
+@dirrm share/kde/apps/kscd/cddb/newage
+@exec /bin/mkdir -p /usr/X11R6/share/kde/apps/kscd/cddb/misc
+@dirrm share/kde/apps/kscd/cddb/misc
+@exec /bin/mkdir -p /usr/X11R6/share/kde/apps/kscd/cddb/jazz
+@dirrm share/kde/apps/kscd/cddb/jazz
+@exec /bin/mkdir -p /usr/X11R6/share/kde/apps/kscd/cddb/folk
+@dirrm share/kde/apps/kscd/cddb/folk
+@exec /bin/mkdir -p /usr/X11R6/share/kde/apps/kscd/cddb/data
+@dirrm share/kde/apps/kscd/cddb/data
+@exec /bin/mkdir -p /usr/X11R6/share/kde/apps/kscd/cddb/country
+@dirrm share/kde/apps/kscd/cddb/country
+@exec /bin/mkdir -p /usr/X11R6/share/kde/apps/kscd/cddb/classical
+@dirrm share/kde/apps/kscd/cddb/classical
+@exec /bin/mkdir -p /usr/X11R6/share/kde/apps/kscd/cddb/blues
+@dirrm share/kde/apps/kscd/cddb/blues
+@dirrm share/kde/apps/kscd/cddb
+@dirrm share/kde/apps/kscd
 @dirrm share/kde/apps/kmix/pics
 @dirrm share/kde/apps/kmix
 @dirrm share/kde/apps/kmidi/pics