18 files changed, 564 insertions, 248 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 496951d7dc45..ad8af755bdba 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -5,62 +5,36 @@
 # $FreeBSD$
 #
 
-PORTNAME=	cdrdao
-PORTVERSION=	1.1.7
-PORTREVISION=	5
+PORTNAME?=	cdrdao
+PORTVERSION=	1.1.8
+PORTREVISION?=	0
 CATEGORIES=	sysutils audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-EXTRACT_SUFX=	.src.tar.gz
+DISTNAME=	cdrdao-${PORTVERSION}
 
 MAINTAINER=	marius@alchemy.franken.de
-COMMENT=	Record CD-R[W]s in disk-at-once mode
+COMMENT?=	Record CD-R[W]s in disk-at-once mode
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/antlr:${PORTSDIR}/devel/pccts \
+		${LOCALBASE}/bin/dlg:${PORTSDIR}/devel/pccts
 
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-#WANT_GNOME=	yes
-
-MAN1=		cdrdao.1
-
-MAKE_ENV=	CCOM=${CC} COPTX="-DBSD_SCSI_SENSE_BUG"
-
-.include <bsd.port.pre.mk>
 
+.if ${PORTNAME} == "gcdmaster"
+USE_GNOME=		gnomelibs pkgconfig
+LIB_DEPENDS=		gnomeuimm-2.0:${PORTSDIR}/x11-toolkits/libgnomeuimm
+RUN_DEPENDS=		${LOCALBASE}/bin/cdrdao:${PORTSDIR}/sysutils/cdrdao
+MAN1=			gcdmaster.1
+CONFIGURE_ARGS=		--without-lame
+.else
+MAN1=			cdrdao.1 cue2toc.1
+CONFIGURE_ARGS=		--without-xdao
+PLIST_SUB=		PORTVERSION=${PORTVERSION}
 .if defined(WITH_TOC2MP3)
 LIB_DEPENDS=		mp3lame.0:${PORTSDIR}/audio/lame
-.endif
-
-#.if ${HAVE_GNOME:Mgnomelibs} != ""
-#USE_GNOME=		gnomelibs
-#LIB_DEPENDS+=		gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
-#LIB_DEPENDS+=		gnomemm-1.2.10:${PORTSDIR}/x11-toolkits/gnome--
-#CONFIGURE_ARGS=		--with-gtkmm-prefix=${X11BASE}
-#PKGNAMESUFFIX?=		-gnome
-#PLIST_SUB=		GNOME=""
-#MAN1+=			gcdmaster.1
-#.else
-CONFIGURE_ARGS=		--with-gtkmm-prefix=${NONEXISTENT}
-PLIST_SUB=		GNOME="@comment "
-_WITHOUT_GNOME=		yes
-#.endif
-
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-
-.if exists(${LOCALBASE}/bin/antlr) && exists(${LOCALBASE}/bin/dlg)
-CONFIGURE_ARGS+=	--with-pcctsbin=${LOCALBASE}/bin \
-			--with-pcctsinc=${LOCALBASE}/include/pccts
-.endif
-
-.if defined(WITHOUT_SCGLIB) && ${OSVERSION} > 300000
-CONFIGURE_ARGS+=	--without-scglib
-.endif
-
-.if ${OSVERSION} <= 320000 || !defined(WITH_PTHREADS)
-CONFIGURE_ARGS+=	--without-posix-threads
-.endif
-
-.if defined(WITH_TOC2MP3)
 CONFIGURE_ARGS+=	--with-lame-include=${LOCALBASE}/include \
 			--with-lame-lib=${LOCALBASE}/lib
 PLIST_SUB+=		TOC2MP3=""
@@ -68,66 +42,74 @@ PLIST_SUB+=		TOC2MP3=""
 CONFIGURE_ARGS+=	--without-lame
 PLIST_SUB+=		TOC2MP3="@comment "
 .endif
+.endif
+
+CONFIGURE_ARGS+=	--with-pcctsbin=${LOCALBASE}/bin \
+			--with-pcctsinc=${LOCALBASE}/include/pccts \
+			--without-posix-threads
+#CONFIGURE_ARGS+=	--without-scglib
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+MAKE_ENV=		CCOM=${CC}
 
 pre-everything::
+.if ${PORTNAME} != "gcdmaster" && !defined(WITH_TOC2MP3)
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following build options:"
+	@${ECHO_MSG} "You may use the following build option(s):"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WITHOUT_SCGLIB=yes	builds without Joerg Schilling's SCSI library"
-	@${ECHO_MSG} "WITH_PTHREADS=yes	enables usage of POSIX threads for the ring buffers"
-	@${ECHO_MSG} "			(not recommended, increases risk of buffer-underruns)"
 	@${ECHO_MSG} "WITH_TOC2MP3=yes	builds toc2mp3 (requires audio/lame)"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "This port builds the gcdmaster frontend if x11/gnomelibs is installed (also"
-	@${ECHO_MSG} "requires x11-toolkits/gtk-- and x11-toolkits/gnome--)."
-	@${ECHO_MSG} ""
+.endif
 
 post-extract:
 .if ${MACHINE_ARCH} != "i386" || ${CC} != "cc"
-	@(cd ${WRKSRC}/scsilib/RULES; \
-	  ${LN} -sf i386-freebsd-cc.rul ${MACHINE_ARCH}-freebsd-${CC}.rul)
+	@${LN} -sf ${WRKSRC}/scsilib/RULES/i386-freebsd-cc.rul \
+		${WRKSRC}/scsilib/RULES/${MACHINE_ARCH}-freebsd-${CC}.rul
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g; \
-		s|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+.for i in 45libdeflt 45librscg 55rscsi
+	@${RM} ${WRKSRC}/scsilib/TARGETS/${i}
+.endfor
+.if ${PORTNAME} == "gcdmaster"
+	@${REINPLACE_CMD} -E -e 's|(^SUBDIRS.+) utils|\1|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -E -e \
+		's|(SET_CDRDAO_PATH.+path=)(cdrdao)|\1${LOCALBASE}\/bin\/\2|g' \
+		${WRKSRC}/xdao/Settings.cc
+.else
 .for i in cdrdao.man main.cc
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/dao/${i}
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/dao/${i}
 .endfor
+	@${REINPLACE_CMD} -E -e 's|(^CDRDAO_DATA_DIR.+=).+|\1 ${DATADIR}|' \
+		${WRKSRC}/dao/Makefile.in
+.endif
 
 do-install:
+.if ${PORTNAME} == "gcdmaster"
+	@${INSTALL_PROGRAM} ${WRKSRC}/xdao/gcdmaster ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/xdao/gcdmaster.man \
+		${PREFIX}/man/man1/gcdmaster.1
+	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.desktop \
+		${X11BASE}/share/gnome/apps/Applications
+	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.png \
+		${X11BASE}/share/gnome/pixmaps
+.else
 	@${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man ${PREFIX}/man/man1/cdrdao.1
+	@${INSTALL_PROGRAM} ${WRKSRC}/utils/cue2toc ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/utils/cue2toc.1 ${PREFIX}/man/man1
+	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cddb ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cue ${PREFIX}/bin
 	@${MKDIR} ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers ${DATADIR}/drivers
 .if defined(WITH_TOC2MP3)
 	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${PREFIX}/bin
 .endif
-.if !defined(_WITHOUT_GNOME)
-	@${INSTALL_PROGRAM} ${WRKSRC}/xdao/gcdmaster ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/xdao/xcdrdao.man \
-		${PREFIX}/man/man1/gcdmaster.1
-	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.desktop \
-		${X11BASE}/share/gnome/apps/Applications
-	@${MKDIR} ${X11BASE}/share/gnome/pixmaps/gcdmaster
-.for i in gcdmaster.png pixmap_audiocd.png pixmap_copycd.png \
-	pixmap_cursor-tool.xpm pixmap_datacd.png pixmap_dumpcd.png \
-	pixmap_help.png pixmap_mixedcd.png pixmap_open.png \
-	pixmap_play-pause.xpm pixmap_play-start.xpm pixmap_play-stop.xpm \
-	pixmap_zoom-fit.xpm pixmap_zoom-in.xpm pixmap_zoom-out.xpm \
-	pixmap_zoom-selection.xpm pixmap_zoom-tool.xpm
-	@${INSTALL_DATA} ${WRKSRC}/xdao/${i} \
-		${X11BASE}/share/gnome/pixmaps/gcdmaster
-.endfor
-.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for i in CREDITS INSTALL README README.PlexDAE \
-	Release-1.1.0 Release-1.1.2 Release-1.1.3 Release-1.1.4 \
-	Release-1.1.5 Release-1.1.6 Release-1.1.7
+.for i in CREDITS README README.PlexDAE Release-${PORTVERSION}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index 78550ab17ca1..7b9a22c8535f 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1 +1,2 @@
-MD5 (cdrdao-1.1.7.src.tar.gz) = 766a534137f2c6e99ab771e3178793f8
+MD5 (cdrdao-1.1.8.tar.gz) = 2f6a1c05c240b36f141bc06c47c50578
+SIZE (cdrdao-1.1.8.tar.gz) = 1535530
diff --git a/sysutils/cdrdao/files/patch-Makefile.in b/sysutils/cdrdao/files/patch-Makefile.in
new file mode 100644
index 000000000000..94662a9237f1
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-Makefile.in
@@ -0,0 +1,22 @@
+--- 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
index 92025f7e75ec..cdd7a35d0928 100644
--- a/sysutils/cdrdao/files/patch-configure
+++ b/sysutils/cdrdao/files/patch-configure
@@ -1,33 +1,277 @@
 --- configure.orig	Mon Oct  7 03:53:55 2002
 +++ configure	Sat Oct 12 18:06:18 2002
-@@ -5640,7 +5640,7 @@
- echo "${ECHO_T}no" >&6
+@@ -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
  
--  min_gtkmm_version=1.2.9
-+  min_gtkmm_version=1.2.8
+ utiltools="toc2cue cue2toc"
+@@ -8316,8 +8464,9 @@
  
-   echo "$as_me:5645: checking for GTK-- - version >= $min_gtkmm_version" >&5
- echo $ECHO_N "checking for GTK-- - version >= $min_gtkmm_version... $ECHO_C" >&6
-@@ -6107,7 +6107,7 @@
+ 
+ 
+-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*)
-+    *-freebsd3* | *-freebsd4* | *-freebsd5* )
++    *-freebsd2*)
++			       scsilib_libs="$scsilib_libs"
++			       ;;
++    *-freebsd[3456]*)
  			       scsilib_libs="$scsilib_libs -lcam"
  			       ;;
    esac
-@@ -6123,7 +6123,7 @@
+@@ -8558,7 +8712,7 @@
  	       scsi_if_src="ScsiIf-linux.cc sg_err.cc"
  	       ;;
  
 -    *-freebsd3* | *-freebsd4*)
-+    *-freebsd3* | *-freebsd4* | *-freebsd5* )
++    *-freebsd[3456]*)
  			       scsi_if_src="ScsiIf-freebsd-cam.cc"
  			       scsilib_libs="-lcam"
  			       ;;
-@@ -6149,7 +6149,6 @@
+@@ -8584,7 +8738,6 @@
  case "$host" in
    *-freebsd*)
  	      if test "$use_pthreads" = yes; then
@@ -35,12 +279,76 @@
  		LDFLAGS="-pthread $LDFLAGS"
  		thread_libs=""
  	      fi
-@@ -6164,7 +6163,7 @@
+@@ -8601,7 +8754,7 @@
  esac
  
  case "$host" in
 -  *-linux-*)
-+  *-linux-* | *-freebsd* )
- 	     sound_if_src=SoundIF-linux.cc
++  *-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::cdrdao.drivers b/sysutils/cdrdao/files/patch-dao::cdrdao.drivers
new file mode 100644
index 000000000000..3671ccdc15a2
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-dao::cdrdao.drivers
@@ -0,0 +1,26 @@
+--- 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::cdrdao.man b/sysutils/cdrdao/files/patch-dao::cdrdao.man
index 2dd0502635b0..c0d6f0a49029 100644
--- a/sysutils/cdrdao/files/patch-dao::cdrdao.man
+++ b/sysutils/cdrdao/files/patch-dao::cdrdao.man
@@ -1,11 +1,11 @@
 --- dao/cdrdao.man.orig	Sat Dec 28 03:05:59 2002
 +++ dao/cdrdao.man	Sat Dec 28 03:08:17 2002
-@@ -762,11 +762,9 @@
+@@ -764,11 +764,9 @@
  .I cdrdao
  in that order:
  
 -1. /etc/cdrdao.conf
-+1. %%LOCALBASE%%/etc/cdrdao.conf
++1. %%PREFIX%%/etc/cdrdao.conf
  
 -2. /etc/defaults/cdrdao
 -
@@ -14,3 +14,14 @@
  
  
  Command line options will overwrite the loaded settings.
+@@ -831,8 +829,8 @@
+ 
+ .SH BUGS
+ If the program is terminated during the write/simulation process used IPC
+-resources may not be released. Use ipcs(8) and ipcrm(8) to delete them.
++resources may not be released. Use ipcs(1) and ipcrm(1) to delete them.
+ .SH AUTHOR
+ Andreas Mueller mueller@daneb.ping.de
+ .SH SEE ALSO
+-.BR gcdmaster "(1), "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(8), " ipcrm (8) 
++.BR gcdmaster "(1), "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(1), " ipcrm (1) 
diff --git a/sysutils/cdrdao/files/patch-dao::main.cc b/sysutils/cdrdao/files/patch-dao::main.cc
index 8b15de0fc9c9..ab89bf6c6622 100644
--- a/sysutils/cdrdao/files/patch-dao::main.cc
+++ b/sysutils/cdrdao/files/patch-dao::main.cc
@@ -9,7 +9,7 @@
 -    message(3, "Read settings from \"%s\".", settingsPath);
 -
 -  settingsPath = "/etc/defaults/cdrdao";
-+  settingsPath = "%%LOCALBASE%%/etc/cdrdao.conf";
++  settingsPath = "%%PREFIX%%/etc/cdrdao.conf";
    if (SETTINGS->read(settingsPath) == 0)
      message(3, "Read settings from \"%s\".", settingsPath);
  
diff --git a/sysutils/cdrdao/files/patch-paranoia::configure b/sysutils/cdrdao/files/patch-paranoia::configure
deleted file mode 100644
index 6f997e17ef9e..000000000000
--- a/sysutils/cdrdao/files/patch-paranoia::configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- paranoia/configure.orig	Fri Dec 27 17:09:38 2002
-+++ paranoia/configure	Fri Dec 27 17:11:47 2002
-@@ -2052,16 +2052,16 @@
- 
- if test -z "$GCC"; then
- 	DEBUG="-g"
--	OPT="-O"
-+	OPT="${CFLAGS}"
- else
- 	case $host in
--	i?86-*-linux*)
-+	i?86-*-*)
- 		DEBUG="-g -Wall -fsigned-char"
--		OPT="-O20 -ffast-math -fsigned-char -finline-functions"
-+		OPT="${CFLAGS} -ffast-math -fsigned-char -finline-functions"
-                 ;;
- 	*)
- 		DEBUG="-g -Wall -fsigned-char"
--		OPT="-O20 -fsigned-char"
-+		OPT="${CFLAGS} -fsigned-char"
-                 ;;
-         esac
- fi
-@@ -2404,7 +2404,7 @@
- 
- fi
- 
--CFLAGS=""
-+#CFLAGS=""
- 
- TYPESIZES=""
- 
diff --git a/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul b/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
index 5df88f6d6c13..4f398a59d5bd 100644
--- a/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
+++ b/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
@@ -4,9 +4,9 @@
  ###########################################################################
  
  CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
--CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
+-CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
 +XCFLAGS:=	$(CFLAGS)
-+CFLAGS=		$(COPTS) $(CWARNOPTS) $(XCFLAGS) $(COPTX)
++CFLAGS=		$(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX)
  
  CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
  COPTS=
diff --git a/sysutils/cdrdao/files/patch-scsilib::TARGETS::Targetdirs b/sysutils/cdrdao/files/patch-scsilib::TARGETS::Targetdirs
deleted file mode 100644
index db8f407f14b1..000000000000
--- a/sysutils/cdrdao/files/patch-scsilib::TARGETS::Targetdirs
+++ /dev/null
@@ -1,8 +0,0 @@
---- scsilib/TARGETS/Targetdirs.orig	Tue Oct 29 00:45:24 2002
-+++ scsilib/TARGETS/Targetdirs	Tue Oct 29 00:45:59 2002
-@@ -1,4 +1,4 @@
- #ident %W% %E% %Q%
- ###########################################################################
--DIRS=		conf inc lib libscg libschily librscg libdeflt rscsi export
-+DIRS=		conf inc lib libscg libschily export
- ###########################################################################
diff --git a/sysutils/cdrdao/files/patch-scsilib::include::btorder.h b/sysutils/cdrdao/files/patch-scsilib::include::btorder.h
deleted file mode 100644
index 6a364364c719..000000000000
--- a/sysutils/cdrdao/files/patch-scsilib::include::btorder.h
+++ /dev/null
@@ -1,41 +0,0 @@
---- scsilib/include/btorder.h.orig	Mon Oct 28 10:15:12 2002
-+++ scsilib/include/btorder.h	Mon Oct 28 10:15:29 2002
-@@ -1,4 +1,4 @@
--/* @(#)btorder.h	1.14 01/10/09 Copyright 1996 J. Schilling */
-+/* @(#)btorder.h	1.15 01/12/09 Copyright 1996 J. Schilling */
- /*
-  *	Definitions for Bit and Byte ordering
-  *
-@@ -66,27 +66,20 @@
- /*
-  * Convert byte-order definitions from xconfig.h into our values
-  * and verify them.
-+ * Note that we cannot use the definitions _LITTLE_ENDIAN and _BIG_ENDIAN
-+ * because they are used on IRIX-6.5 with different meaning.
-  */
- #if defined(HAVE_C_BIGENDIAN)	&& \
-    !defined(WORDS_BIGENDIAN)
- #define	WORDS_LITTLEENDIAN
--#define	_LITTLE_ENDIAN
-+/*#define	_LITTLE_ENDIAN*/
- #endif
- 
- #if defined(HAVE_C_BIGENDIAN)	&& \
-     defined(WORDS_BIGENDIAN)
--#define	_BIG_ENDIAN
-+#undef	WORDS_LITTLEENDIAN
-+/*#define	_BIG_ENDIAN*/
- #endif
--
--#if	defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
--/*
-- * #error will not work for all compilers (e.g. sunos4)
-- * The following line will abort compilation on all compilers
-- * if none of the above is defines. And that's  what we want.
-- */
--error  Only one of _LITTLE_ENDIAN or _BIG_ENDIAN may be defined
--#endif
--
- 
- #if	defined(_BIT_FIELDS_LTOH) || defined(_BIT_FIELDS_HTOL)
- /*
diff --git a/sysutils/cdrdao/files/patch-scsilib::libscg::scsiopen.c b/sysutils/cdrdao/files/patch-scsilib::libscg::scsiopen.c
deleted file mode 100644
index e39ebd0e8f8c..000000000000
--- a/sysutils/cdrdao/files/patch-scsilib::libscg::scsiopen.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- scsilib/libscg/scsiopen.c.orig	Sun Nov 25 16:35:10 2001
-+++ scsilib/libscg/scsiopen.c	Tue May 20 23:01:01 2003
-@@ -239,7 +239,7 @@
- 	}
- 	if (scg__open(scgp, devname) <= 0) {
- 		if (errs && scgp->errstr)
--			js_snprintf(errs, slen, scgp->errstr);
-+			js_snprintf(errs, slen, "%s", scgp->errstr);
- 		scg_sfree(scgp);
- 		return ((SCSI *)0);
- 	}
diff --git a/sysutils/cdrdao/files/patch-scsilib::libscg::scsitransp.c b/sysutils/cdrdao/files/patch-scsilib::libscg::scsitransp.c
deleted file mode 100644
index b72e4cb6036b..000000000000
--- a/sysutils/cdrdao/files/patch-scsilib::libscg::scsitransp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- scsilib/libscg/scsitransp.c.orig	Sun Sep 15 17:02:18 2002
-+++ scsilib/libscg/scsitransp.c	Wed May 28 19:29:54 2003
-@@ -1016,7 +1016,7 @@
- 	register Uchar	*cp;
- 	register int	n;
- {
--	js_fprintf(f, s);
-+	js_fprintf(f, "%s", s);
- 	while (--n >= 0)
- 		js_fprintf(f, " %02X", *cp++);
- 	js_fprintf(f, "\n");
diff --git a/sysutils/cdrdao/files/patch-trackdb::lec.cc b/sysutils/cdrdao/files/patch-trackdb::lec.cc
new file mode 100644
index 000000000000..aea6107f93d7
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-trackdb::lec.cc
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..53653ef69abd
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-utils::Makefile.in
@@ -0,0 +1,92 @@
+--- 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::AudioCDView.cc b/sysutils/cdrdao/files/patch-xdao::AudioCDView.cc
deleted file mode 100644
index 757613b4122c..000000000000
--- a/sysutils/cdrdao/files/patch-xdao::AudioCDView.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdao/AudioCDView.cc.orig	Sat Nov 16 23:13:42 2002
-+++ xdao/AudioCDView.cc	Sat Nov 16 23:13:54 2002
-@@ -17,7 +17,7 @@
-  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
--#include <iostream.h>
-+#include <iostream>
- 
- #include "xcdrdao.h"
- #include "guiUpdate.h"
diff --git a/sysutils/cdrdao/pkg-descr b/sysutils/cdrdao/pkg-descr
index 7da1f0fe4578..7b47306067c5 100644
--- a/sysutils/cdrdao/pkg-descr
+++ b/sysutils/cdrdao/pkg-descr
@@ -1,4 +1,7 @@
 Cdrdao records audio or data CD-R[W]s in disc-at-once (DAO) mode based on
 textual description of the CD contents (toc-file).
 
+Among others, cdrdao can handle the bin/cue format commonly used for VCDs
+or disks with subchannel data.
+
 WWW: http://cdrdao.sourceforge.net/
diff --git a/sysutils/cdrdao/pkg-plist b/sysutils/cdrdao/pkg-plist
index 07b3847a8187..175bd9163eac 100644
--- a/sysutils/cdrdao/pkg-plist
+++ b/sysutils/cdrdao/pkg-plist
@@ -1,39 +1,13 @@
 bin/cdrdao
+bin/cue2toc
+bin/toc2cddb
 bin/toc2cue
 %%TOC2MP3%%bin/toc2mp3
-%%GNOME%%bin/gcdmaster
-share/cdrdao/drivers
-%%PORTDOCS%%share/doc/cdrdao/CREDITS
-%%PORTDOCS%%share/doc/cdrdao/INSTALL 
-%%PORTDOCS%%share/doc/cdrdao/README 
-%%PORTDOCS%%share/doc/cdrdao/README.PlexDAE 
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.0
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.2
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.3
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.4
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.5
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.6
-%%PORTDOCS%%share/doc/cdrdao/Release-1.1.7
-%%GNOME%%@cwd %%X11BASE%%
-%%GNOME%%share/gnome/pixmaps/gcdmaster/gcdmaster.png
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_audiocd.png
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_copycd.png
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_cursor-tool.xpm
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_datacd.png
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_dumpcd.png
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_help.png
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_mixedcd.png
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_open.png
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_play-pause.xpm
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_play-start.xpm
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_play-stop.xpm
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_zoom-fit.xpm
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_zoom-in.xpm
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_zoom-out.xpm
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_zoom-selection.xpm
-%%GNOME%%share/gnome/pixmaps/gcdmaster/pixmap_zoom-tool.xpm
-%%GNOME%%share/gnome/apps/Applications/gcdmaster.desktop
-%%GNOME%%@dirrm share/gnome/pixmaps/gcdmaster
-%%GNOME%%@cwd %%LOCALBASE%%
-%%PORTDOCS%%@dirrm share/doc/cdrdao
-@dirrm share/cdrdao
+@unexec if [ -f %D/etc/cdrdao.conf ]; then echo "If permanently deleting this package, %D/etc/cdrdao.conf must be removed manually."; fi
+%%DATADIR%%/drivers
+@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/README 
+%%PORTDOCS%%%%DOCSDIR%%/README.PlexDAE 
+%%PORTDOCS%%%%DOCSDIR%%/Release-%%PORTVERSION%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%