some fixes and cleanup:

-replace a struct member name "private" in a public header, it is
 reserved in C+, fixes build problems reported by joerg and wiz
-link against librt on Linux (needed for clock_gettime()), should
 fix build problem reported by dsainty
-don't even compile cooked_interface.c on NetBSD, and g/c patches
 which added NetBSD support code which was never used
bump PKGREVISION

6 files changed, 149 insertions, 201 deletions

diff --git a/audio/cdparanoia/patches/patch-aa b/audio/cdparanoia/patches/patch-aa
index 88954fd2a67..ce59ae491ce 100644
--- a/audio/cdparanoia/patches/patch-aa
+++ b/audio/cdparanoia/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-aa,v 1.6 2009/08/14 15:51:06 drochner Exp $
 
 --- configure.in.orig	2006-08-16 20:02:25.000000000 +0200
 +++ configure.in
-@@ -12,6 +12,17 @@ AC_PROG_RANLIB
+@@ -12,6 +12,25 @@ AC_PROG_RANLIB
  AC_CHECK_PROG(AR,ar,ar)
  AC_CHECK_PROG(INSTALL,install,install)
  
@@ -11,6 +11,14 @@ $NetBSD: patch-aa,v 1.5 2009/08/09 16:00:53 drochner Exp $
 +  EXTRA_OBJS=osx_interface.o
 +  EXTRA_LIBS=-framework CoreFoundation -framework IOKit
 +  ;;
++*-*-linux*)
++  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
++  EXTRA_LIBS=-lrt
++  ;;
++*-*-netbsd*)
++  EXTRA_OBJS=scsi_interface.o
++  EXTRA_LIBS=
++  ;;
 +*)
 +  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
 +  EXTRA_LIBS=
@@ -20,7 +28,7 @@ $NetBSD: patch-aa,v 1.5 2009/08/09 16:00:53 drochner Exp $
  if test -z "$GCC"; then
  	DEBUG="-g"
  	OPT="-O"
-@@ -20,6 +31,12 @@ else
+@@ -20,6 +39,12 @@ else
  	i?86-*-linux*)
  		DEBUG="-g -Wall -fsigned-char"
  		OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
@@ -33,7 +41,7 @@ $NetBSD: patch-aa,v 1.5 2009/08/09 16:00:53 drochner Exp $
  	*)
  		DEBUG="-g -Wall -fsigned-char"
  		OPT="-O2 -fsigned-char";;
-@@ -56,15 +73,27 @@ fi
+@@ -56,15 +81,27 @@ fi
  	
  AC_CHECK_HEADERS(linux/sbpcd.h, SBPCD_H="-DSBPCD_H='1' ")
  AC_CHECK_HEADERS(linux/ucdrom.h, UCDROM_H="-DUCDROM_H='1' ")
diff --git a/audio/cdparanoia/patches/patch-ac b/audio/cdparanoia/patches/patch-ac
index 7f36fba86b6..f28adcaedf6 100644
--- a/audio/cdparanoia/patches/patch-ac
+++ b/audio/cdparanoia/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ac,v 1.9 2009/08/14 15:51:06 drochner Exp $
 
 --- configure.orig	2006-08-16 20:02:25.000000000 +0200
 +++ configure
@@ -3493,7 +3493,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  else
    if test -n "$INSTALL"; then
    ac_cv_prog_INSTALL="$INSTALL" # Let the user override the test.
-@@ -2435,26 +2986,39 @@ do
+@@ -2435,26 +2986,47 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3530,6 +3530,14 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
 +  EXTRA_OBJS=osx_interface.o
 +  EXTRA_LIBS=-framework CoreFoundation -framework IOKit
 +  ;;
++*-*-linux*)
++  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
++  EXTRA_LIBS=-lrt
++  ;;
++*-*-netbsd*)
++  EXTRA_OBJS=scsi_interface.o
++  EXTRA_LIBS=
++  ;;
 +*)
 +  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
 +  EXTRA_LIBS=
@@ -3539,7 +3547,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  if test -z "$GCC"; then
  	DEBUG="-g"
  	OPT="-O"
-@@ -2463,6 +3027,12 @@ else
+@@ -2463,6 +3035,12 @@ else
  	i?86-*-linux*)
  		DEBUG="-g -Wall -fsigned-char"
  		OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
@@ -3552,7 +3560,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  	*)
  		DEBUG="-g -Wall -fsigned-char"
  		OPT="-O2 -fsigned-char";;
-@@ -2475,15 +3045,15 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -2475,15 +3053,15 @@ ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3571,7 +3579,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  else
        # Double quotes because CPP needs to be expanded
      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -2510,35 +3080,35 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -2510,35 +3088,35 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  		     Syntax error
  _ACEOF
@@ -3623,7 +3631,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2548,34 +3118,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -2548,34 +3126,34 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -3673,7 +3681,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -2593,8 +3163,8 @@ fi
+@@ -2593,8 +3171,8 @@ fi
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -3684,7 +3692,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -2617,35 +3187,35 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -2617,35 +3195,35 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  		     Syntax error
  _ACEOF
@@ -3736,7 +3744,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2655,34 +3225,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -2655,34 +3233,34 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -3786,7 +3794,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -2691,11 +3261,13 @@ rm -f conftest.err conftest.$ac_ext
+@@ -2691,11 +3269,13 @@ rm -f conftest.err conftest.$ac_ext
  if $ac_preproc_ok; then
    :
  else
@@ -3803,7 +3811,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  fi
  
  ac_ext=c
-@@ -2705,25 +3277,144 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -2705,25 +3285,144 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -3962,7 +3970,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2745,35 +3436,32 @@ main ()
+@@ -2745,35 +3444,32 @@ main ()
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4015,7 +4023,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -2829,6 +3517,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -2829,6 +3525,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -4023,7 +4031,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -2848,36 +3537,50 @@ main ()
+@@ -2848,36 +3545,50 @@ main ()
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -4087,7 +4095,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -2900,11 +3603,11 @@ fi
+@@ -2900,11 +3611,11 @@ fi
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
  		  inttypes.h stdint.h unistd.h
  do
@@ -4104,7 +4112,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2917,41 +3620,42 @@ $ac_includes_default
+@@ -2917,41 +3628,42 @@ $ac_includes_default
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4171,7 +4179,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  _ACEOF
  
  fi
-@@ -2959,73 +3663,15 @@ fi
+@@ -2959,73 +3671,15 @@ fi
  done
  
  
@@ -4252,7 +4260,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -3038,7 +3684,7 @@ $ac_includes_default
+@@ -3038,7 +3692,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -4261,7 +4269,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3046,27 +3692,23 @@ test_array [0] = 0
+@@ -3046,27 +3700,23 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4302,7 +4310,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -3079,7 +3721,7 @@ $ac_includes_default
+@@ -3079,7 +3729,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -4311,7 +4319,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3087,46 +3729,43 @@ test_array [0] = 0
+@@ -3087,46 +3737,43 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4382,7 +4390,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3136,7 +3775,7 @@ $ac_includes_default
+@@ -3136,7 +3783,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -4391,7 +4399,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3144,27 +3783,23 @@ test_array [0] = 0
+@@ -3144,27 +3791,23 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4432,7 +4440,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -3177,7 +3812,7 @@ $ac_includes_default
+@@ -3177,7 +3820,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -4441,7 +4449,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3185,50 +3820,49 @@ test_array [0] = 0
+@@ -3185,50 +3828,49 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4520,7 +4528,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -3242,7 +3876,7 @@ $ac_includes_default
+@@ -3242,7 +3884,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -4529,7 +4537,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3250,52 +3884,48 @@ test_array [0] = 0
+@@ -3250,52 +3892,48 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4608,7 +4616,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -3303,8 +3933,8 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -3303,8 +3941,8 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -4619,7 +4627,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -3313,133 +3943,94 @@ main ()
+@@ -3313,133 +3951,94 @@ main ()
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -4808,7 +4816,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -3452,7 +4043,7 @@ $ac_includes_default
+@@ -3452,7 +4051,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -4817,7 +4825,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3460,27 +4051,23 @@ test_array [0] = 0
+@@ -3460,27 +4059,23 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4858,7 +4866,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -3493,7 +4080,7 @@ $ac_includes_default
+@@ -3493,7 +4088,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -4867,7 +4875,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3501,46 +4088,43 @@ test_array [0] = 0
+@@ -3501,46 +4096,43 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4938,7 +4946,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3550,7 +4134,7 @@ $ac_includes_default
+@@ -3550,7 +4142,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -4947,7 +4955,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3558,27 +4142,23 @@ test_array [0] = 0
+@@ -3558,27 +4150,23 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4988,7 +4996,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -3591,7 +4171,7 @@ $ac_includes_default
+@@ -3591,7 +4179,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -4997,7 +5005,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3599,50 +4179,49 @@ test_array [0] = 0
+@@ -3599,50 +4187,49 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5076,7 +5084,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -3656,7 +4235,7 @@ $ac_includes_default
+@@ -3656,7 +4243,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -5085,7 +5093,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3664,52 +4243,48 @@ test_array [0] = 0
+@@ -3664,52 +4251,48 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5164,7 +5172,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -3717,8 +4292,8 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -3717,8 +4300,8 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -5175,7 +5183,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -3727,133 +4302,94 @@ main ()
+@@ -3727,133 +4310,94 @@ main ()
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -5364,7 +5372,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -3866,7 +4402,7 @@ $ac_includes_default
+@@ -3866,7 +4410,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -5373,7 +5381,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3874,27 +4410,23 @@ test_array [0] = 0
+@@ -3874,27 +4418,23 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5414,7 +5422,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -3907,7 +4439,7 @@ $ac_includes_default
+@@ -3907,7 +4447,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -5423,7 +5431,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3915,46 +4447,43 @@ test_array [0] = 0
+@@ -3915,46 +4455,43 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5494,7 +5502,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3964,7 +4493,7 @@ $ac_includes_default
+@@ -3964,7 +4501,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -5503,7 +5511,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -3972,27 +4501,23 @@ test_array [0] = 0
+@@ -3972,27 +4509,23 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5544,7 +5552,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -4005,7 +4530,7 @@ $ac_includes_default
+@@ -4005,7 +4538,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -5553,7 +5561,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -4013,50 +4538,49 @@ test_array [0] = 0
+@@ -4013,50 +4546,49 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5632,7 +5640,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -4070,7 +4594,7 @@ $ac_includes_default
+@@ -4070,7 +4602,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -5641,7 +5649,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -4078,52 +4602,48 @@ test_array [0] = 0
+@@ -4078,52 +4610,48 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5720,7 +5728,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4131,8 +4651,8 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -4131,8 +4659,8 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -5731,7 +5739,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -4141,133 +4661,94 @@ main ()
+@@ -4141,133 +4669,94 @@ main ()
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -5920,7 +5928,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -4280,7 +4761,7 @@ $ac_includes_default
+@@ -4280,7 +4769,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -5929,7 +5937,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -4288,27 +4769,23 @@ test_array [0] = 0
+@@ -4288,27 +4777,23 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5970,7 +5978,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -4321,7 +4798,7 @@ $ac_includes_default
+@@ -4321,7 +4806,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -5979,7 +5987,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -4329,46 +4806,43 @@ test_array [0] = 0
+@@ -4329,46 +4814,43 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6050,7 +6058,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4378,7 +4852,7 @@ $ac_includes_default
+@@ -4378,7 +4860,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -6059,7 +6067,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -4386,27 +4860,23 @@ test_array [0] = 0
+@@ -4386,27 +4868,23 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6100,7 +6108,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -4419,7 +4889,7 @@ $ac_includes_default
+@@ -4419,7 +4897,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -6109,7 +6117,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -4427,50 +4897,49 @@ test_array [0] = 0
+@@ -4427,50 +4905,49 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6188,7 +6196,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -4484,7 +4953,7 @@ $ac_includes_default
+@@ -4484,7 +4961,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -6197,7 +6205,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  test_array [0] = 0
  
    ;
-@@ -4492,52 +4961,48 @@ test_array [0] = 0
+@@ -4492,52 +4969,48 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6276,7 +6284,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4545,8 +5010,8 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -4545,8 +5018,8 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6287,7 +6295,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -4555,61 +5020,80 @@ main ()
+@@ -4555,61 +5028,80 @@ main ()
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -6397,7 +6405,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
  _ACEOF
-@@ -4627,12 +5111,13 @@ case 4 in
+@@ -4627,12 +5119,13 @@ case 4 in
  	$ac_cv_sizeof_long) SIZE32="long";;
  esac
  
@@ -6415,7 +6423,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4642,57 +5127,95 @@ $ac_includes_default
+@@ -4642,57 +5135,95 @@ $ac_includes_default
  int
  main ()
  {
@@ -6541,7 +6549,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4702,79 +5225,118 @@ $ac_includes_default
+@@ -4702,79 +5233,118 @@ $ac_includes_default
  int
  main ()
  {
@@ -6701,7 +6709,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4785,41 +5347,38 @@ $ac_includes_default
+@@ -4785,41 +5355,38 @@ $ac_includes_default
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6764,7 +6772,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4828,81 +5387,78 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -4828,81 +5395,78 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -6892,7 +6900,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  _ACEOF
   SBPCD_H="-DSBPCD_H='1' "
  fi
-@@ -4912,19 +5468,21 @@ done
+@@ -4912,19 +5476,21 @@ done
  
  for ac_header in linux/ucdrom.h
  do
@@ -6925,7 +6933,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4935,41 +5493,38 @@ $ac_includes_default
+@@ -4935,41 +5501,38 @@ $ac_includes_default
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6988,7 +6996,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4978,81 +5533,78 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -4978,81 +5541,78 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -7116,7 +7124,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  _ACEOF
   UCDROM_H="-DUCDROM_H='1' "
  fi
-@@ -5060,39 +5612,359 @@ fi
+@@ -5060,39 +5620,359 @@ fi
  done
  
  
@@ -7497,7 +7505,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5108,10 +5980,10 @@ main ()
+@@ -5108,10 +5988,10 @@ main ()
  #ifndef __cplusplus
    /* Ultrix mips cc rejects this.  */
    typedef int charset[2];
@@ -7511,7 +7519,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    /* NEC SVR4.0.2 mips cc rejects this.  */
    struct point {int x, y;};
    static struct point const zero = {0,0};
-@@ -5120,16 +5992,17 @@ main ()
+@@ -5120,16 +6000,17 @@ main ()
       an arm of an if-expression whose if-part is not a constant
       expression */
    const char *g = "string";
@@ -7533,7 +7541,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    }
    { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
      int x[] = {25, 17};
-@@ -5148,7 +6021,9 @@ main ()
+@@ -5148,7 +6029,9 @@ main ()
    }
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
@@ -7543,7 +7551,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  #endif
  
    ;
-@@ -5156,42 +6031,39 @@ main ()
+@@ -5156,42 +6039,39 @@ main ()
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7606,7 +7614,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  _ACEOF
  
  fi
-@@ -5204,7 +6076,13 @@ fi
+@@ -5204,7 +6084,13 @@ fi
  
  
  
@@ -7621,7 +7629,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
-@@ -5223,39 +6101,59 @@ _ACEOF
+@@ -5223,39 +6109,59 @@ _ACEOF
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -7697,7 +7705,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    fi
  fi
  rm -f confcache
-@@ -5264,63 +6162,54 @@ test "x$prefix" = xNONE && prefix=$ac_de
+@@ -5264,63 +6170,54 @@ test "x$prefix" = xNONE && prefix=$ac_de
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -7794,7 +7802,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  done
  LIBOBJS=$ac_libobjs
  
-@@ -5329,11 +6218,12 @@ LTLIBOBJS=$ac_ltlibobjs
+@@ -5329,11 +6226,12 @@ LTLIBOBJS=$ac_ltlibobjs
  
  
  : ${CONFIG_STATUS=./config.status}
@@ -7810,7 +7818,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -5346,22 +6236,78 @@ ac_cs_silent=false
+@@ -5346,22 +6244,78 @@ ac_cs_silent=false
  SHELL=\${CONFIG_SHELL-$SHELL}
  _ACEOF
  
@@ -7895,7 +7903,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -5371,33 +6317,60 @@ else
+@@ -5371,33 +6325,60 @@ else
  fi
  
  
@@ -7970,7 +7978,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
    as_basename=basename
  else
    as_basename=false
-@@ -5405,159 +6378,122 @@ fi
+@@ -5405,159 +6386,122 @@ fi
  
  
  # Name of the executable.
@@ -8208,7 +8216,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -5566,7 +6502,28 @@ else
+@@ -5566,7 +6510,28 @@ else
    as_mkdir_p=false
  fi
  
@@ -8238,7 +8246,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -5575,31 +6532,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -5575,31 +6540,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -8274,7 +8282,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -5607,124 +6547,106 @@ generated by GNU Autoconf 2.59.  Invocat
+@@ -5607,124 +6555,106 @@ generated by GNU Autoconf 2.59.  Invocat
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -8443,7 +8451,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  
    esac
    shift
-@@ -5738,32 +6660,48 @@ if $ac_cs_silent; then
+@@ -5738,32 +6668,48 @@ if $ac_cs_silent; then
  fi
  
  _ACEOF
@@ -8505,7 +8513,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -5773,344 +6711,464 @@ if $ac_need_defaults; then
+@@ -5773,344 +6719,464 @@ if $ac_need_defaults; then
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -9249,7 +9257,7 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-@@ -6132,4 +7190,8 @@ if test "$no_create" != yes; then
+@@ -6132,4 +7198,8 @@ if test "$no_create" != yes; then
    # would make configure fail if this is the last instruction.
    $ac_cs_success || { (exit 1); exit 1; }
  fi
diff --git a/audio/cdparanoia/patches/patch-ca b/audio/cdparanoia/patches/patch-ca
index 2bc3b49dd3a..29eacae34d6 100644
--- a/audio/cdparanoia/patches/patch-ca
+++ b/audio/cdparanoia/patches/patch-ca
@@ -1,9 +1,13 @@
-$NetBSD: patch-ca,v 1.8 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ca,v 1.9 2009/08/14 15:51:06 drochner Exp $
 
 --- interface/Makefile.in.orig	2008-08-21 18:08:54.000000000 +0200
 +++ interface/Makefile.in
-@@ -18,12 +18,10 @@ RANLIB=@RANLIB@
- LIBS = -lm -lrt
+@@ -15,15 +15,13 @@ LD=@CC@
+ LDFLAGS=@LDFLAGS@ $(FLAGS)
+ AR=@AR@
+ RANLIB=@RANLIB@
+-LIBS = -lm -lrt
++LIBS = -lm @EXTRA_LIBS@
  CPPFLAGS+=-D_REENTRANT
  
 -OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o\
@@ -37,7 +41,7 @@ $NetBSD: patch-ca,v 1.8 2009/08/09 16:00:53 drochner Exp $
 +
 +libcdda_interface.la: 	$(OFILES)
 +	$(LIBTOOL) --mode=link $(CC) -o libcdda_interface.la $(OFILES:.o=.lo) \
-+	    -version-info 1:0 -rpath $(PREFIX)/lib $(LDFLAGS)
++	    -version-info 1:0 -rpath $(PREFIX)/lib $(LDFLAGS) $(LIBS)
 +
 +libcdda_interface.a:	libcdda_interface.la
  
diff --git a/audio/cdparanoia/patches/patch-ce b/audio/cdparanoia/patches/patch-ce
index 389fa1b8a33..84801f53e02 100644
--- a/audio/cdparanoia/patches/patch-ce
+++ b/audio/cdparanoia/patches/patch-ce
@@ -1,4 +1,4 @@
-$NetBSD: patch-ce,v 1.6 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ce,v 1.7 2009/08/14 15:51:06 drochner Exp $
 
 --- interface/cooked_interface.c.orig	2008-08-26 11:55:22.000000000 +0200
 +++ interface/cooked_interface.c
@@ -11,7 +11,7 @@ $NetBSD: patch-ce,v 1.6 2009/08/09 16:00:53 drochner Exp $
   *
   * CDROM code specific to the cooked ioctl interface
   *
-@@ -24,9 +26,11 @@ static int timed_ioctl(cdrom_drive *d, i
+@@ -24,6 +26,7 @@ static int timed_ioctl(cdrom_drive *d, i
    return ret2;
  }
  
@@ -19,88 +19,9 @@ $NetBSD: patch-ce,v 1.6 2009/08/09 16:00:53 drochner Exp $
  static int cooked_readtoc (cdrom_drive *d){
    int i;
    int tracks;
-+#ifdef __linux__
-   struct cdrom_tochdr hdr;
-   struct cdrom_tocentry entry;
- 
-@@ -66,6 +70,45 @@ static int cooked_readtoc (cdrom_drive *
-   d->disc_toc[i].dwStartSector = entry.cdte_addr.lba;
- 
-   tracks=hdr.cdth_trk1+1;
-+#endif
-+
-+#ifdef __NetBSD__
-+  struct ioc_read_toc_entry hdr;
-+  struct cd_toc_entry entries[MAXTRK + 1];	/* + 1 for leadout */
-+
-+  hdr.address_format = CD_LBA_FORMAT;
-+  hdr.starting_track = 1;
-+  hdr.data_len = sizeof entries;
-+  hdr.data = entries;
-+  memset(entries, 0, sizeof entries);
-+
-+  /* get all TOC entries at once */
-+#ifndef CDIOREADTOCENTRIES
-+#define CDIOREADTOCENTRIES CDIOREADTOCENTRYS
-+#endif
-+  if(ioctl(d->ioctl_fd, CDIOREADTOCENTRIES, &hdr))
-+    switch(errno){
-+    case EPERM:
-+      cderror(d,"102: Permision denied on cdrom (ioctl) device\n");
-+      return(-102);
-+    default:
-+      cderror(d,"004: Unable to read table of contents header\n");
-+      return(-4);
-+    }
-+
-+  for(i = 0; i < MAXTRK + 1; i++) {
-+    d->disc_toc[i].bFlags = (entries[i].addr_type << 4) | (entries[i].control & 0x0f);
-+    d->disc_toc[i].bTrack = entries[i].track;
-+    d->disc_toc[i].dwStartSector = entries[i].addr.lba;
-+    if (entries[i].track == 0) {
-+      cderror(d,"005: Unable to read table of contents entry\n");
-+      return(-5);
-+    }
-+    if (entries[i].track >= 100)
-+      break;	/* leadout */
-+  }
-+  tracks = i;
-+#endif
-   d->cd_extra=FixupTOC(d,tracks);
-   return(--tracks);  /* without lead-out */
- }
-@@ -73,10 +116,15 @@ static int cooked_readtoc (cdrom_drive *
- /* Set operating speed */
- static int cooked_setspeed(cdrom_drive *d, int speed)
- {
-+#ifdef __linux__
-   if(d->ioctl_fd!=-1)
-     return ioctl(d->ioctl_fd, CDROM_SELECT_SPEED, speed);
-   else
-     return 0;
-+#endif
-+#ifdef __NetBSD__
-+  errx(1, "cooked_setspeed: not implemented");
-+#endif
- }
- 
- /* read 'SectorBurst' adjacent sectors of audio sectors 
-@@ -84,6 +132,7 @@ static int cooked_setspeed(cdrom_drive *
-  */
- 
- static long cooked_read (cdrom_drive *d, void *p, long begin, long sectors){
-+#ifdef __linux__
-   int retry_count,err,ret=0;
-   struct cdrom_read_audio arg;
-   char *buffer=(char *)p;
-@@ -155,7 +204,147 @@ static long cooked_read (cdrom_drive *d,
-  done:
+@@ -156,6 +159,141 @@ static long cooked_read (cdrom_drive *d,
    if(p==NULL && buffer)free(buffer);
    return ret;
-+#endif
-+#ifdef __NetBSD__
-+  errx(1, "cooked_read: not implemented");
-+#endif
  }
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static int
@@ -237,24 +158,18 @@ $NetBSD: patch-ce,v 1.6 2009/08/09 16:00:53 drochner Exp $
 +	return sectors;
 +}
 +#endif
-+
  
  /* hook */
  static int Dummy (cdrom_drive *d,int Switch){
-@@ -219,8 +408,11 @@ static void check_exceptions(cdrom_drive
- 
- /* set function pointers to use the ioctl routines */
+@@ -221,6 +359,7 @@ static void check_exceptions(cdrom_drive
  int cooked_init_drive (cdrom_drive *d){
-+#ifdef __NetBSD__
-+  errx(1, "cooked_init_drive: not implemented");
-+#else
    int ret;
--
+ 
 +#ifdef __linux__
    switch(d->drive_type){
    case MATSUSHITA_CDROM_MAJOR:	/* sbpcd 1 */
    case MATSUSHITA_CDROM2_MAJOR:	/* sbpcd 2 */
-@@ -271,6 +463,9 @@ int cooked_init_drive (cdrom_drive *d){
+@@ -271,6 +410,9 @@ int cooked_init_drive (cdrom_drive *d){
    default:
      d->nsectors=40; 
    }
@@ -264,10 +179,3 @@ $NetBSD: patch-ce,v 1.6 2009/08/09 16:00:53 drochner Exp $
    d->enable_cdda = Dummy;
    d->read_audio = cooked_read;
    d->read_toc = cooked_readtoc;
-@@ -283,5 +478,6 @@ int cooked_init_drive (cdrom_drive *d){
-   if((ret=verify_read_command(d)))return(ret);
-   d->error_retry=1;
-   return(0);
-+#endif
- }
- 
diff --git a/audio/cdparanoia/patches/patch-ch b/audio/cdparanoia/patches/patch-ch
index 30ab8b7ccfe..8285daa0c7c 100644
--- a/audio/cdparanoia/patches/patch-ch
+++ b/audio/cdparanoia/patches/patch-ch
@@ -1,4 +1,4 @@
-$NetBSD: patch-ch,v 1.4 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ch,v 1.5 2009/08/14 15:51:06 drochner Exp $
 
 --- interface/cdda_interface.h.orig	2008-09-11 12:43:52.000000000 +0200
 +++ interface/cdda_interface.h
@@ -64,3 +64,12 @@ $NetBSD: patch-ch,v 1.4 2009/08/09 16:00:53 drochner Exp $
    int interface;
    int bigendianp;
    int nsectors;
+@@ -84,7 +113,7 @@ typedef struct cdrom_drive{
+   int is_atapi;
+   int is_mmc;
+ 
+-  cdda_private_data_t *private;
++  cdda_private_data_t *private_data;
+   void         *reserved;
+   unsigned char inqbytes[4];
+ 
diff --git a/audio/cdparanoia/patches/patch-ci b/audio/cdparanoia/patches/patch-ci
index b81f5399691..d24853a6361 100644
--- a/audio/cdparanoia/patches/patch-ci
+++ b/audio/cdparanoia/patches/patch-ci
@@ -1,4 +1,4 @@
-$NetBSD: patch-ci,v 1.5 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ci,v 1.6 2009/08/14 15:51:06 drochner Exp $
 
 --- interface/interface.c.orig	2008-09-11 12:43:52.000000000 +0200
 +++ interface/interface.c
@@ -33,7 +33,7 @@ $NetBSD: patch-ci,v 1.5 2009/08/09 16:00:53 drochner Exp $
  
      free(d);
    }
-@@ -55,6 +72,12 @@ int cdda_open(cdrom_drive *d){
+@@ -55,22 +72,31 @@ int cdda_open(cdrom_drive *d){
    if(d->opened)return(0);
  
    switch(d->interface){
@@ -46,7 +46,18 @@ $NetBSD: patch-ci,v 1.5 2009/08/09 16:00:53 drochner Exp $
    case SGIO_SCSI_BUGGY1:  
    case SGIO_SCSI:  
    case GENERIC_SCSI:  
-@@ -71,6 +94,7 @@ int cdda_open(cdrom_drive *d){
+     if((ret=scsi_init_drive(d)))
+       return(ret);
+     break;
++#ifndef __NetBSD__
+   case COOKED_IOCTL:  
+     if((ret=cooked_init_drive(d)))
+       return(ret);
+     break;
++#endif
+ #ifdef CDDA_TEST
+   case TEST_INTERFACE:  
+     if((ret=test_init_drive(d)))
        return(ret);
      break;
  #endif