- Update to 1.1.9. Relevant parts from the release notes:

  <snip>
  Cdrdao changes:
  - MMC-driver auto-detection. If no --driver option is specified,
    cdrdao will try to autodetect an MMC-compliant device and use the
    generic-mmc driver by default. (Denis Leroy)
  - Included scsilib upgraded from cdrtools 2.01a31 (Denis Leroy)
  - Added --eject option to the unlock command to eject the cd after
    unlocking. (Eric Benson)
  - New 'discid' command to display CDDB information. (Eric Benson,
    Denis Leroy).
  - Added --full-burn and --capacity options to extend lead-out to entire
    disc, beyond 80 mins limit. (Vladimir Petrov)
  GCDMaster changes (Denis Leroy) :
  - Some bug fixes (manual driver configurations were not being saved
    correctly).
  cue2toc changes:
  - Version 0.2 released. Complete rewrite, should now handle most of all
    CUE files. (Matthias Czapla)
  <snip>
- Disable the use of mlockall(2) on FreeBSD 5, even after the last round
  of fixes there are still issues.
- Add a workaround for problems with gmake and certain locales on FreeBSD 5.
- Use MASTER_SITE_SOURCEFORGE_EXTENDED.
- Use ARCH instead of MACHINE_ARCH to please portlint >= 2.5.9.

Submitted by:		marius
On my TODO list since:	June 7 :-(

13 files changed, 42 insertions, 611 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 2202c99e3c1f..d4a11ed552f9 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME?=	cdrdao
-PORTVERSION=	1.1.8
-PORTREVISION?=	1
+PORTVERSION=	1.1.9
+PORTREVISION?=	0
 CATEGORIES=	sysutils audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	cdrdao
 DISTNAME=	cdrdao-${PORTVERSION}
 
@@ -49,25 +49,29 @@ CONFIGURE_ARGS+=	--with-pcctsbin=${LOCALBASE}/bin \
 			--without-posix-threads
 #CONFIGURE_ARGS+=	--without-scglib
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-MAKE_ENV=		CCOM=${CC}
+MAKE_ENV=		CCOM=${CC} LANG=C
+
+.include <bsd.port.pre.mk>
 
 pre-everything::
 .if ${PORTNAME} != "gcdmaster" && !defined(WITH_TOC2MP3)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may use the following build option(s):"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WITH_TOC2MP3=yes	builds toc2mp3 (requires audio/lame)"
+	@${ECHO_MSG} "WITH_TOC2MP3=yes	builds with toc2mp3 (requires audio/lame)"
 	@${ECHO_MSG} ""
 .endif
 
 post-extract:
-.if ${MACHINE_ARCH} != "i386" || ${CC} != "cc"
+.if ${ARCH} != "i386" || ${CC} != "cc"
 	@${LN} -sf ${WRKSRC}/scsilib/RULES/i386-freebsd-cc.rul \
-		${WRKSRC}/scsilib/RULES/${MACHINE_ARCH}-freebsd-${CC}.rul
+		${WRKSRC}/scsilib/RULES/${ARCH}-freebsd-${CC}.rul
 .endif
 
 post-patch:
-.for i in 45libdeflt 45librscg 55rscsi
+.for i in 45libdeflt 45libedc 45libfile 45libhfs_iso 45libparanoia 45libunls \
+	45librscg 55cdda2wav 55cdrecord 55cmd 55mkisofs 55mkisofs!@!diag \
+	55readcd 55scgcheck 55scgskeleton 55rscsi 85man
 	@${RM} ${WRKSRC}/scsilib/TARGETS/${i}
 .endfor
 .if ${PORTNAME} == "gcdmaster"
@@ -112,4 +116,4 @@ do-install:
 .endif
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index 7b9a22c8535f..802efd1f984c 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1,2 +1,2 @@
-MD5 (cdrdao-1.1.8.tar.gz) = 2f6a1c05c240b36f141bc06c47c50578
-SIZE (cdrdao-1.1.8.tar.gz) = 1535530
+MD5 (cdrdao-1.1.9.tar.gz) = dd7df809fca7db8e212a6522688c166b
+SIZE (cdrdao-1.1.9.tar.gz) = 1581717
diff --git a/sysutils/cdrdao/files/patch-Makefile.in b/sysutils/cdrdao/files/patch-Makefile.in
deleted file mode 100644
index 94662a9237f1..000000000000
--- a/sysutils/cdrdao/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	Fri Feb 13 03:03:55 2004
-+++ Makefile.in	Fri Feb 13 16:19:23 2004
-@@ -98,7 +98,6 @@
- en_xdao = @en_xdao@
- install_sh = @install_sh@
- mydefs = @mydefs@
--pccts_target = @pccts_target@
- pcctsinc = @pcctsinc@
- scsi_if_src = @scsi_if_src@
- scsilib_dir = @scsilib_dir@
-@@ -112,7 +111,10 @@
- @COND_SCSILIB_TRUE@MAYBE_SCSILIB = scsilib
- @COND_SCSILIB_FALSE@MAYBE_SCSILIB = 
- 
--SUBDIRS = $(MAYBE_SCSILIB) pccts trackdb utils paranoia dao $(MAYBE_XDAO)
-+@COND_PCCTS_TRUE@MAYBE_PCCTS = pccts
-+@COND_PCCTS_FALSE@MAYBE_PCCTS = 
-+
-+SUBDIRS = $(MAYBE_SCSILIB) $(MAYBE_PCCTS) trackdb utils paranoia dao $(MAYBE_XDAO)
- 
- DIST_SUBDIRS = trackdb utils paranoia dao xdao
- 
diff --git a/sysutils/cdrdao/files/patch-configure b/sysutils/cdrdao/files/patch-configure
deleted file mode 100644
index cdd7a35d0928..000000000000
--- a/sysutils/cdrdao/files/patch-configure
+++ /dev/null
@@ -1,354 +0,0 @@
---- configure.orig	Mon Oct  7 03:53:55 2002
-+++ configure	Sat Oct 12 18:06:18 2002
-@@ -309,7 +309,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CPP RANLIB ac_ct_RANLIB AR EGREP antlr_path dlg_path LAME_CFLAGS LAME_LIBS PKG_CONFIG GTKMM2_CFLAGS GTKMM2_LIBS LIBGUIMM2_CFLAGS LIBGUIMM2_LIBS scsi_if_src en_xdao en_toc2mp3 en_toc2cue en_cue2toc en_cdrdao scsilib_dir scsilib_incl scsilib_libs pccts_target pcctsinc dao_src sound_if_obj thread_libs mydefs COND_XDAO_TRUE COND_XDAO_FALSE COND_TOC2MP3_TRUE COND_TOC2MP3_FALSE COND_SCSILIB_TRUE COND_SCSILIB_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CPP RANLIB ac_ct_RANLIB AR EGREP antlr_path dlg_path LAME_CFLAGS LAME_LIBS PKG_CONFIG GTKMM2_CFLAGS GTKMM2_LIBS LIBGUIMM2_CFLAGS LIBGUIMM2_LIBS scsi_if_src en_xdao en_toc2mp3 en_toc2cue en_cue2toc en_cdrdao scsilib_dir scsilib_incl scsilib_libs pcctsinc dao_src sound_if_obj thread_libs mydefs COND_XDAO_TRUE COND_XDAO_FALSE COND_TOC2MP3_TRUE COND_TOC2MP3_FALSE COND_SCSILIB_TRUE COND_SCSILIB_FALSE COND_PCCTS_TRUE COND_PCCTS_FALSE LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -873,6 +873,7 @@
-   --with-scglib           use Joerg Schillings SCSI library (default: on)
-   --with-scglib-inc=dir   set directory for SCSI library include files
-   --with-scglib-lib=dir   set directory that contains the SCSI library
-+  --without-xdao          disable building of gcdmaster
-   --without-lame          disable building of toc2mp3
-   --with-lame-lib=dir     set directory containing libmp3lame
-   --with-lame-include=dir set directory containing lame include files
-@@ -1806,6 +1807,14 @@
-   scglib_lib=default
- fi;
- 
-+# Check whether --with-xdao or --without-xdao was given.
-+if test "${with_xdao+set}" = set; then
-+  withval="$with_xdao"
-+  xdao=$withval
-+else
-+  xdao=default
-+fi;
-+
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -8016,15 +8025,13 @@
- fi
- 
- 
-+en_pccts="no"
- if test "$pcctsbin" = default; then
-   antlr_path='$(srcdir)/../pccts/bin/antlr'
-   dlg_path='$(srcdir)/../pccts/bin/dlg'
- 
- 
--
--
--  pccts_target="pccts"
--
-+  en_pccts="yes"
- else
-   # Extract the first word of "antlr", so it can be a program name with args.
- set dummy antlr; ac_word=$2
-@@ -8107,25 +8114,166 @@
- fi
- 
- 
--  if test $antlr_path = "no"; then
--    { { echo "$as_me:$LINENO: error: PCCTS: antlr not found in path." >&5
--echo "$as_me: error: PCCTS: antlr not found in path." >&2;}
--   { (exit 1); exit 1; }; }
-+  if test $antlr_path = "no" || test $dlg_path = "no"; then
-+    { echo "$as_me:$LINENO: WARNING: PCCTS: antlr or dlg not found in path, using own." >&5
-+echo "$as_me: WARNING: PCCTS: antlr or dlg not found in path, using own." >&2;}
-+    antlr_path='$(srcdir)/../pccts/bin/antlr'
-+    dlg_path='$(srcdir)/../pccts/bin/dlg'
-+    en_pccts="yes"
-   fi
-+fi
- 
--  if test $dlg_path = "no" ; then
--    { { echo "$as_me:$LINENO: error: PCCTS: dlg not found in path." >&5
--echo "$as_me: error: PCCTS: dlg not found in path." >&2;}
--   { (exit 1); exit 1; }; }
-+
-+if test "$pcctsinc" = default; then
-+  pcctsinc='$(srcdir)/../pccts/h'
-+  antlr_path='$(srcdir)/../pccts/bin/antlr'
-+  dlg_path='$(srcdir)/../pccts/bin/dlg'
-+  en_pccts="yes"
-+else
-+  ac_save_CPPFLAGS="$CPPFLAGS"
-+  CPPFLAGS="$CPPFLAGS -I$pcctsinc"
-+  if test "${ac_cv_header_pcctscfg_h+set}" = set; then
-+  echo "$as_me:$LINENO: checking for pcctscfg.h" >&5
-+echo $ECHO_N "checking for pcctscfg.h... $ECHO_C" >&6
-+if test "${ac_cv_header_pcctscfg_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_pcctscfg_h" >&5
-+echo "${ECHO_T}$ac_cv_header_pcctscfg_h" >&6
-+else
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking pcctscfg.h usability" >&5
-+echo $ECHO_N "checking pcctscfg.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <pcctscfg.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking pcctscfg.h presence" >&5
-+echo $ECHO_N "checking pcctscfg.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <pcctscfg.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+  else
-+    ac_cpp_err=
-   fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: pcctscfg.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: pcctscfg.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pcctscfg.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: pcctscfg.h: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: pcctscfg.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: pcctscfg.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pcctscfg.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: pcctscfg.h: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: pcctscfg.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: pcctscfg.h: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+echo "$as_me:$LINENO: checking for pcctscfg.h" >&5
-+echo $ECHO_N "checking for pcctscfg.h... $ECHO_C" >&6
-+if test "${ac_cv_header_pcctscfg_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_pcctscfg_h=$ac_header_preproc
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_pcctscfg_h" >&5
-+echo "${ECHO_T}$ac_cv_header_pcctscfg_h" >&6
- 
--  pccts_target=""
-+fi
-+if test $ac_cv_header_pcctscfg_h = yes; then
-+  :
-+else
- 
-+    { echo "$as_me:$LINENO: WARNING: PCCTS: headers not found in path, using own." >&5
-+echo "$as_me: WARNING: PCCTS: headers not found in path, using own." >&2;}
-+    pcctsinc='$(srcdir)/../pccts/h'
-+    antlr_path='$(srcdir)/../pccts/bin/antlr'
-+    en_pccts="yes"
- fi
- 
- 
--if test "$pcctsinc" = default; then
--  pcctsinc='$(srcdir)/../pccts/h'
-+  CPPFLAGS="$ac_save_CPPFLAGS"
- fi
- 
- utiltools="toc2cue cue2toc"
-@@ -8316,8 +8464,9 @@
- 
- 
- 
--en_xdao=yes
--en_scsilib=yes
-+en_xdao=no
-+if test "$xdao" = default; then
-+  en_xdao=yes
- 
-   succeeded=no
- 
-@@ -8510,7 +8659,9 @@
-      en_xdao=no
-   fi
- 
-+fi
- 
-+en_scsilib=yes
- if test "$use_scglib" = default; then
-   use_scglib=yes
- fi
-@@ -8542,7 +8693,10 @@
-   scsi_if_src=ScsiIf-lib.cc
- 
-   case "$host" in
--    *-freebsd3* | *-freebsd4*)
-+    *-freebsd2*)
-+			       scsilib_libs="$scsilib_libs"
-+			       ;;
-+    *-freebsd[3456]*)
- 			       scsilib_libs="$scsilib_libs -lcam"
- 			       ;;
-   esac
-@@ -8558,7 +8712,7 @@
- 	       scsi_if_src="ScsiIf-linux.cc sg_err.cc"
- 	       ;;
- 
--    *-freebsd3* | *-freebsd4*)
-+    *-freebsd[3456]*)
- 			       scsi_if_src="ScsiIf-freebsd-cam.cc"
- 			       scsilib_libs="-lcam"
- 			       ;;
-@@ -8584,7 +8738,6 @@
- case "$host" in
-   *-freebsd*)
- 	      if test "$use_pthreads" = yes; then
--		mydefs="-pthread $mydefs"
- 		LDFLAGS="-pthread $LDFLAGS"
- 		thread_libs=""
- 	      fi
-@@ -8601,7 +8754,7 @@
- esac
- 
- case "$host" in
--  *-linux-*)
-+  *-linux-* | *-freebsd[456]*)
- 	     sound_if_obj=SoundIF-linux.o
- 	     ;;
- 
-@@ -8642,6 +8795,7 @@
- 
- 
- 
-+
- if test "$en_xdao" = yes; then
-   COND_XDAO_TRUE=
-   COND_XDAO_FALSE='#'
-@@ -8671,6 +8825,16 @@
- fi
- 
- 
-+
-+if test "$en_pccts" = yes; then
-+  COND_PCCTS_TRUE=
-+  COND_PCCTS_FALSE='#'
-+else
-+  COND_PCCTS_TRUE='#'
-+  COND_PCCTS_FALSE=
-+fi
-+
-+
-                                                                                           ac_config_files="$ac_config_files trackdb/Makefile dao/Makefile utils/Makefile xdao/Makefile xdao/stock/Makefile paranoia/Makefile Makefile specs/cdrdao.rh9.spec specs/cdrdao.fedora1.spec"
- 
- 
-@@ -8793,6 +8957,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-+if test -z "${COND_PCCTS_TRUE}" && test -z "${COND_PCCTS_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"COND_PCCTS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"COND_PCCTS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- 
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
-@@ -9398,7 +9569,6 @@
- s,@scsilib_dir@,$scsilib_dir,;t t
- s,@scsilib_incl@,$scsilib_incl,;t t
- s,@scsilib_libs@,$scsilib_libs,;t t
--s,@pccts_target@,$pccts_target,;t t
- s,@pcctsinc@,$pcctsinc,;t t
- s,@dao_src@,$dao_src,;t t
- s,@sound_if_obj@,$sound_if_obj,;t t
-@@ -9410,6 +9580,8 @@
- s,@COND_TOC2MP3_FALSE@,$COND_TOC2MP3_FALSE,;t t
- s,@COND_SCSILIB_TRUE@,$COND_SCSILIB_TRUE,;t t
- s,@COND_SCSILIB_FALSE@,$COND_SCSILIB_FALSE,;t t
-+s,@COND_PCCTS_TRUE@,$COND_PCCTS_TRUE,;t t
-+s,@COND_PCCTS_FALSE@,$COND_PCCTS_FALSE,;t t
- s,@LIBOBJS@,$LIBOBJS,;t t
- s,@LTLIBOBJS@,$LTLIBOBJS,;t t
- CEOF
-@@ -10029,6 +10201,7 @@
- echo
- echo "------------------------------------------------------"
- echo "  Building scsilib   : $en_scsilib"
-+echo "  Building pccts     : $en_pccts"
- echo "  Building cdrdao    : $en_cdrdao"
- echo "  Building toc2cue   : $en_toc2cue"
- echo "  Building cue2toc   : $en_cue2toc"
diff --git a/sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc b/sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc
deleted file mode 100644
index 99922ca57a51..000000000000
--- a/sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- dao/ScsiIf-lib.cc.orig	Tue Oct 29 19:40:39 2002
-+++ dao/ScsiIf-lib.cc	Tue Oct 29 20:14:24 2002
-@@ -204,7 +204,7 @@
-   scmd->cdb_len = cmdLen;
- 
-   if (dataOutLen > 0) {
--    if (((unsigned)dataOut % impl_->pageSize_) != 0) {
-+    if (((size_t)dataOut % impl_->pageSize_) != 0) {
-       //message(0, "Use SCSI buffer for data out.");
-       memcpy(impl_->pageAlignedBuffer_, dataOut, dataOutLen);
-       scmd->addr = impl_->pageAlignedBuffer_;
-@@ -217,7 +217,7 @@
-     scmd->size = dataOutLen;
-   }
-   else if (dataInLen > 0) {
--    if (((unsigned)dataIn % impl_->pageSize_) != 0) {
-+    if (((size_t)dataIn % impl_->pageSize_) != 0) {
-       //message(0, "Use SCSI buffer for data in.");
-       scmd->addr = impl_->pageAlignedBuffer_;
-       usedPageAlignedBuffer = 1;
diff --git a/sysutils/cdrdao/files/patch-dao::cdrdao.drivers b/sysutils/cdrdao/files/patch-dao::cdrdao.drivers
deleted file mode 100644
index 3671ccdc15a2..000000000000
--- a/sysutils/cdrdao/files/patch-dao::cdrdao.drivers
+++ /dev/null
@@ -1,26 +0,0 @@
---- dao/cdrdao.drivers.orig	Sat Feb 14 21:39:08 2004
-+++ dao/cdrdao.drivers	Sun Feb 15 00:28:11 2004
-@@ -79,6 +79,7 @@
- R|TOSHIBA|DVD-ROM SD-2102|toshiba
- 
- # Drivers for write operations
-+W|CDWRITER|IDE5224|generic-mmc|OPT_MMC_CD_TEXT
- W|GRUNDIG|CDR100IPW|cdd2600
- W|HP|CD-Writer 4020|cdd2600
- W|HP|CD-Writer 6020|cdd2600
-@@ -157,6 +158,7 @@
- W|PLEXTOR|CD-R   PX-W1210|generic-mmc|OPT_MMC_CD_TEXT
- W|PLEXTOR|CD-R   PX-W124|generic-mmc
- W|PLEXTOR|CD-R   PX-W1610|generic-mmc|OPT_MMC_CD_TEXT
-+W|PLEXTOR|CD-R   PX-W2410|generic-mmc|OPT_MMC_CD_TEXT
- W|PLEXTOR|CD-R   PX-W4220|generic-mmc|OPT_MMC_CD_TEXT
- W|PLEXTOR|CD-R   PX-W8220|generic-mmc|OPT_MMC_CD_TEXT
- W|PLEXTOR|CD-R   PX-W8432|generic-mmc|OPT_MMC_CD_TEXT
-@@ -285,6 +287,7 @@
- W|SAMSUNG|CD-R/RW SW-224|generic-mmc-raw
- W|SAMSUNG|SW-232|generic-mmc-raw
- W|SONY|CRX195E1|generic-mmc-raw
-+W|TEAC|CD-W512E|generic-mmc|OPT_MMC_CD_TEXT
- W|TEAC|CD-W58E|generic-mmc-raw|OPT_MMC_USE_PQ|OPT_MMC_PQ_BCD
- W|TOSHIBA|R/RW 4x4x24|generic-mmc-raw
- W|TRAXDATA|2832|generic-mmc-raw
diff --git a/sysutils/cdrdao/files/patch-dao::dao.cc b/sysutils/cdrdao/files/patch-dao::dao.cc
index c0ff14ae54c8..a96d0e6251b3 100644
--- a/sysutils/cdrdao/files/patch-dao::dao.cc
+++ b/sysutils/cdrdao/files/patch-dao::dao.cc
@@ -1,15 +1,29 @@
 --- dao/dao.cc.orig	Thu Feb 12 02:13:31 2004
 +++ dao/dao.cc	Tue Mar  2 17:22:11 2004
-@@ -388,10 +388,10 @@
-         if (cdr->readBufferCapacity(&totalcap, &availcap)) {
-           writerFill = (int)((1.0 - ((double)availcap / (double)totalcap))
-                              * 100.0);
--          message(1, "Wrote %ld of %ld MB (Buffers %3d%% %3d%%).\n",
-+          message(1, "Wrote %ld of %ld MB (Buffers %3d%% %3d%%).\r",
-                   cnt >> 20, total >> 20, buffFill, writerFill);
-         } else {
--          message(1, "Wrote %ld of %ld MB (Buffer %3d%%).\n",
-+          message(1, "Wrote %ld of %ld MB (Buffer %3d%%).\r",
-                   cnt >> 20, total >> 20, buffFill);
-         }
-         lastMb = cntMb;
+@@ -703,7 +703,7 @@
+ 
+     setsid(); // detach from controlling terminal
+ 
+-#ifdef HAVE_MLOCKALL
++#if defined(HAVE_MLOCKALL) && !defined(__FreeBSD__)
+     if (geteuid() == 0) {
+       if (mlockall(MCL_CURRENT|MCL_FUTURE) != 0) {
+ 	message(-1, "Cannot lock memory pages: %s", strerror(errno));
+@@ -737,7 +737,7 @@
+     break;
+   }
+ 
+-#ifdef HAVE_MLOCKALL
++#if defined(HAVE_MLOCKALL) && !defined(__FreeBSD__)
+   if (geteuid() == 0) {
+     if (mlockall(MCL_CURRENT|MCL_FUTURE) != 0) {
+       message(-1, "Cannot lock memory pages: %s", strerror(errno));
+@@ -762,7 +762,7 @@
+     cdr->abortDao(); // abort writing process
+ 
+  fail:
+-#ifdef HAVE_MUNLOCKALL
++#if defined(HAVE_MUNLOCKALL) && !defined(__FreeBSD__)
+   munlockall();
+ #endif
+ 
diff --git a/sysutils/cdrdao/files/patch-paranoia::isort.c b/sysutils/cdrdao/files/patch-paranoia::isort.c
deleted file mode 100644
index c7f82b720b56..000000000000
--- a/sysutils/cdrdao/files/patch-paranoia::isort.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- paranoia/isort.c.orig	Sun Oct  6 20:53:56 2002
-+++ paranoia/isort.c	Fri Dec 27 18:54:38 2002
-@@ -22,9 +22,9 @@
-   ret->size=-1;
-   ret->maxsize=size;
- 
--  ret->head=calloc(65536,sizeof(sort_link **));
-+  ret->head=calloc(65536,sizeof(sort_link *));
-   ret->bucketusage=malloc(65536*sizeof(long));
--  ret->revindex=calloc(size,sizeof(sort_link *));
-+  ret->revindex=calloc(size,sizeof(sort_link));
-   ret->lastbucket=0;
- 
-   return(ret);
diff --git a/sysutils/cdrdao/files/patch-trackdb::Track.cc b/sysutils/cdrdao/files/patch-trackdb::Track.cc
deleted file mode 100644
index 663a61f66207..000000000000
--- a/sysutils/cdrdao/files/patch-trackdb::Track.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- trackdb/Track.cc.orig	Sun Nov 17 02:32:03 2002
-+++ trackdb/Track.cc	Sun Nov 17 02:32:26 2002
-@@ -41,7 +41,7 @@
-   subTracks_ = lastSubTrack_ = NULL;
- 
-   nofIndices_ = 0;
--  index_ = new Msf[98](0);
-+  index_ = new Msf[98];
- 
-   isrcValid_ = 0;
- 
-@@ -75,7 +75,7 @@
-   }
- 
-   nofIndices_ = obj.nofIndices_;
--  index_ = new Msf[98](0);
-+  index_ = new Msf[98];
-   for (i = 0; i < nofIndices_; i++) {
-     index_[i] = obj.index_[i];
-   }
diff --git a/sysutils/cdrdao/files/patch-trackdb::lec.cc b/sysutils/cdrdao/files/patch-trackdb::lec.cc
deleted file mode 100644
index aea6107f93d7..000000000000
--- a/sysutils/cdrdao/files/patch-trackdb::lec.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- trackdb/lec.cc.orig	Sun Nov 24 16:28:30 2002
-+++ trackdb/lec.cc	Sun Feb 15 03:54:23 2004
-@@ -278,7 +278,7 @@
-   u_int32_t crc = 0;
- 
-   while (len--) {
--    crc = CRCTABLE[(crc ^ *data++) & 0xffL] ^ (crc >> 8);
-+    crc = CRCTABLE[(crc ^ *data++) & 0xff] ^ (crc >> 8);
-   }
- 
-   return crc;
diff --git a/sysutils/cdrdao/files/patch-utils::Makefile.in b/sysutils/cdrdao/files/patch-utils::Makefile.in
deleted file mode 100644
index 53653ef69abd..000000000000
--- a/sysutils/cdrdao/files/patch-utils::Makefile.in
+++ /dev/null
@@ -1,92 +0,0 @@
---- utils/Makefile.in.orig	Sun Feb 15 04:04:35 2004
-+++ utils/Makefile.in	Mon Feb 16 00:50:20 2004
-@@ -109,12 +109,14 @@
- @COND_TOC2MP3_TRUE@MAYBE_TOC2MP3 = toc2mp3
- @COND_TOC2MP3_FALSE@MAYBE_TOC2MP3 = 
- 
--bin_PROGRAMS = toc2cue cue2toc $(MAYBE_TOC2MP3)
-+bin_PROGRAMS = toc2cue cue2toc toc2cddb $(MAYBE_TOC2MP3)
- 
-+toc2cddb_SOURCES = toc2cddb.cc
- toc2cue_SOURCES = toc2cue.cc
- cue2toc_SOURCES = main.c cue2toc.c cue2toc.h timecode.c timecode.h
- toc2mp3_SOURCES = toc2mp3.cc
- 
-+toc2cddb_LDADD = -L$(top_builddir)/trackdb -ltrackdb
- toc2cue_LDADD = -L$(top_builddir)/trackdb -ltrackdb
- toc2mp3_LDADD = -L$(top_builddir)/trackdb -ltrackdb @LAME_LIBS@
- 
-@@ -123,14 +125,15 @@
- INCLUDES = -I$(top_builddir)/trackdb
- 
- man1_MANS = cue2toc.1
--EXTRA_DIST = $(man1_MANS) toc2cddb.cc
-+EXTRA_DIST = $(man1_MANS)
- subdir = utils
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- @COND_TOC2MP3_TRUE@bin_PROGRAMS = toc2cue$(EXEEXT) cue2toc$(EXEEXT) \
--@COND_TOC2MP3_TRUE@	toc2mp3$(EXEEXT)
--@COND_TOC2MP3_FALSE@bin_PROGRAMS = toc2cue$(EXEEXT) cue2toc$(EXEEXT)
-+@COND_TOC2MP3_TRUE@	toc2cddb$(EXEEXT) toc2mp3$(EXEEXT)
-+@COND_TOC2MP3_FALSE@bin_PROGRAMS = toc2cue$(EXEEXT) cue2toc$(EXEEXT) \
-+@COND_TOC2MP3_FALSE@	toc2cddb$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
- 
- am_cue2toc_OBJECTS = main.$(OBJEXT) cue2toc.$(OBJEXT) timecode.$(OBJEXT)
-@@ -138,6 +141,10 @@
- cue2toc_LDADD = $(LDADD)
- cue2toc_DEPENDENCIES =
- cue2toc_LDFLAGS =
-+am_toc2cddb_OBJECTS = toc2cddb.$(OBJEXT)
-+toc2cddb_OBJECTS = $(am_toc2cddb_OBJECTS)
-+toc2cddb_DEPENDENCIES =
-+toc2cddb_LDFLAGS =
- am_toc2cue_OBJECTS = toc2cue.$(OBJEXT)
- toc2cue_OBJECTS = $(am_toc2cue_OBJECTS)
- toc2cue_DEPENDENCIES =
-@@ -155,7 +162,8 @@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cue2toc.Po ./$(DEPDIR)/main.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/timecode.Po ./$(DEPDIR)/toc2cue.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/timecode.Po ./$(DEPDIR)/toc2cddb.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/toc2cue.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/toc2mp3-toc2mp3.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -168,12 +176,13 @@
- CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
- 	-o $@
- CXXFLAGS = @CXXFLAGS@
--DIST_SOURCES = $(cue2toc_SOURCES) $(toc2cue_SOURCES) $(toc2mp3_SOURCES)
-+DIST_SOURCES = $(cue2toc_SOURCES) $(toc2cddb_SOURCES) $(toc2cue_SOURCES) \
-+	$(toc2mp3_SOURCES)
- 
- NROFF = nroff
- MANS = $(man1_MANS)
- DIST_COMMON = Makefile.am Makefile.in
--SOURCES = $(cue2toc_SOURCES) $(toc2cue_SOURCES) $(toc2mp3_SOURCES)
-+SOURCES = $(cue2toc_SOURCES) $(toc2cddb_SOURCES) $(toc2cue_SOURCES) $(toc2mp3_SOURCES)
- 
- all: all-am
- 
-@@ -211,6 +220,9 @@
- cue2toc$(EXEEXT): $(cue2toc_OBJECTS) $(cue2toc_DEPENDENCIES) 
- 	@rm -f cue2toc$(EXEEXT)
- 	$(LINK) $(cue2toc_LDFLAGS) $(cue2toc_OBJECTS) $(cue2toc_LDADD) $(LIBS)
-+toc2cddb$(EXEEXT): $(toc2cddb_OBJECTS) $(toc2cddb_DEPENDENCIES) 
-+	@rm -f toc2cddb$(EXEEXT)
-+	$(CXXLINK) $(toc2cddb_LDFLAGS) $(toc2cddb_OBJECTS) $(toc2cddb_LDADD) $(LIBS)
- toc2cue$(EXEEXT): $(toc2cue_OBJECTS) $(toc2cue_DEPENDENCIES) 
- 	@rm -f toc2cue$(EXEEXT)
- 	$(CXXLINK) $(toc2cue_LDFLAGS) $(toc2cue_OBJECTS) $(toc2cue_LDADD) $(LIBS)
-@@ -228,6 +240,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cue2toc.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timecode.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toc2cddb.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toc2cue.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toc2mp3-toc2mp3.Po@am__quote@
- 
diff --git a/sysutils/cdrdao/files/patch-xdao::CdDevice.cc b/sysutils/cdrdao/files/patch-xdao::CdDevice.cc
deleted file mode 100644
index 287bbe7c9856..000000000000
--- a/sysutils/cdrdao/files/patch-xdao::CdDevice.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdao/CdDevice.cc.orig	Sat Nov 16 23:14:19 2002
-+++ xdao/CdDevice.cc	Sat Nov 16 23:14:54 2002
-@@ -22,7 +22,7 @@
- #include <stddef.h>
- #include <stdio.h>
- #include <unistd.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <errno.h>
- #include <ctype.h>
- #include <assert.h>
diff --git a/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc b/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc
deleted file mode 100644
index f73ba39b38d6..000000000000
--- a/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- xdao/SoundIF-linux.cc.orig	Mon Oct  7 03:53:56 2002
-+++ xdao/SoundIF-linux.cc	Sat Oct 12 17:32:10 2002
-@@ -34,7 +34,14 @@
-  *
-  */
- 
-+# if defined(__FreeBSD__)
-+#include <sys/soundcard.h>
-+# if !defined(SNDCTL_DSP_CHANNELS)
-+#   define	SNDCTL_DSP_CHANNELS SOUND_PCM_WRITE_CHANNELS
-+# endif
-+# else 
- #include <linux/soundcard.h>
-+# endif
- 
- #include <stdio.h>
- #include <assert.h>