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

  Cdrdao changes:
  o Man page cleanup (Andrew Suffield)
  GCDMaster changes:

  o Fixed GCC 4.1 compilation issues
  o Fixed hang when inserting WAV file

- Ensure that the libraries built by the port are linked in and not
  already installed ones. For example in case of libcdda_paranoia
  installed by audio/cdparanoia can't be used to build cddao. Such
  problems only happen when using non-standard compiler and/or linker
  flags are used but it doesn't hurt to add some anti-footshooting
  measurements to the port. [1]

PR:		115616 [1]
Approved by:	netchild

7 files changed, 69 insertions, 16 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 6a96eae9fd3..8c1bea2c1a8 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	cdrdao
-PORTVERSION=	1.2.1
-PORTREVISION?=	1
+PORTVERSION=	1.2.2
+PORTREVISION?=	0
 CATEGORIES=	sysutils audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	cdrdao
@@ -19,6 +19,7 @@ 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_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
@@ -27,7 +28,6 @@ MP3OGG_LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
 			vorbis.4:${PORTSDIR}/audio/libvorbis
 
 .if ${PORTNAME} == "gcdmaster"
-USE_GCC=		3.4
 USE_GNOME=		gnomehier pkgconfig
 LIB_DEPENDS=		${MP3OGG_LIB_DEPENDS} \
 			gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index bcd190a2414..2a9793dc6c8 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1,3 +1,3 @@
-MD5 (cdrdao-1.2.1.tar.gz) = d959c98e08105b5b8380de275bac1413
-SHA256 (cdrdao-1.2.1.tar.gz) = 740dda4c4e88754d4a5997cd5130b4569dfcb0c9123ba6acaed3c266ac998162
-SIZE (cdrdao-1.2.1.tar.gz) = 1728003
+MD5 (cdrdao-1.2.2.tar.bz2) = f0cbf36907406cb4f4c568f9e6669a34
+SHA256 (cdrdao-1.2.2.tar.bz2) = de180041e57f8e1c88c9b6f9b6c51b0abf0dc2744c4fa37a0248d48f40e58038
+SIZE (cdrdao-1.2.2.tar.bz2) = 1408344
diff --git a/sysutils/cdrdao/files/patch-dao::Makefile.in b/sysutils/cdrdao/files/patch-dao::Makefile.in
new file mode 100644
index 00000000000..9825c488840
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-dao::Makefile.in
@@ -0,0 +1,13 @@
+--- dao/Makefile.in.orig	2006-09-20 10:51:30.000000000 +0000
++++ dao/Makefile.in	2007-08-31 22:31:51.000000000 +0000
+@@ -315,8 +315,8 @@
+ libdao_a_DEPENDENCIES = \
+ 	@scsilib_objs@
+ 
+-cdrdao_LDADD = -L. -ldao -L$(top_builddir)/paranoia -lcdda_paranoia \
+-	-L$(top_builddir)/trackdb -ltrackdb @thread_libs@ \
++cdrdao_LDADD = ./libdao.a $(top_builddir)/paranoia/libcdda_paranoia.a \
++	$(top_builddir)/trackdb/libtrackdb.a @thread_libs@ \
+ 	@scsilib_libs@ $(am__append_1) $(am__append_2) @AO_LIBS@
+ cdrdao_DEPENDENCIES = \
+ 	$(top_builddir)/paranoia/libcdda_paranoia.a	\
diff --git a/sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc b/sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc
new file mode 100644
index 00000000000..4314414c0b1
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc
@@ -0,0 +1,11 @@
+--- dao/ScsiIf-lib.cc.orig	Tue Oct 29 19:40:39 2002
++++ dao/ScsiIf-lib.cc	Tue Oct 29 20:14:24 2002
+@@ -430,7 +430,7 @@
+ #include "ScsiIf-common.cc"
+ //<<<<<<< ScsiIf-lib.cc
+ 
+-#ifndef linux
++#ifdef linux
+ 
+ /* Function for mapping any SCSI device to the corresponding SG device.
+  * Taken from D. Gilbert's example code.
diff --git a/sysutils/cdrdao/files/patch-dao::cdrdao.man b/sysutils/cdrdao/files/patch-dao::cdrdao.man
index c0d6f0a4902..3fccc147cc3 100644
--- a/sysutils/cdrdao/files/patch-dao::cdrdao.man
+++ b/sysutils/cdrdao/files/patch-dao::cdrdao.man
@@ -1,6 +1,6 @@
 --- dao/cdrdao.man.orig	Sat Dec 28 03:05:59 2002
 +++ dao/cdrdao.man	Sat Dec 28 03:08:17 2002
-@@ -764,11 +764,9 @@
+@@ -783,13 +783,9 @@
  .I cdrdao
  in that order:
  
@@ -9,19 +9,16 @@
  
 -2. /etc/defaults/cdrdao
 -
--3. $HOME/.cdrdao
+-3. /etc/default/cdrdao
+-
+-4. $HOME/.cdrdao
 +2. $HOME/.cdrdao
  
  
  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
+@@ -869,4 +865,4 @@
+ .ft R
+ .fi
  .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-utils::Makefile.in b/sysutils/cdrdao/files/patch-utils::Makefile.in
new file mode 100644
index 00000000000..ca4b959011d
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-utils::Makefile.in
@@ -0,0 +1,17 @@
+--- utils/Makefile.in.orig	Sun Feb 15 04:04:35 2004
++++ utils/Makefile.in	Mon Feb 16 00:50:20 2004
+@@ -237,11 +237,11 @@
+ 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 $(am__append_1) \
++toc2cddb_LDADD = $(top_builddir)/trackdb/libtrackdb.a $(am__append_1) \
+ 	$(am__append_4) @AO_LIBS@
+-toc2cue_LDADD = -L$(top_builddir)/trackdb -ltrackdb $(am__append_2) \
++toc2cue_LDADD = $(top_builddir)/trackdb/libtrackdb.a $(am__append_2) \
+ 	$(am__append_5) @AO_LIBS@
+-toc2mp3_LDADD = -L$(top_builddir)/trackdb -ltrackdb @LAME_LIBS@ \
++toc2mp3_LDADD = $(top_builddir)/trackdb/libtrackdb.a @LAME_LIBS@ \
+ 	$(am__append_3) $(am__append_6) @AO_LIBS@
+ toc2mp3_CXXFLAGS = @LAME_CFLAGS@
+ INCLUDES = -I$(top_builddir)/trackdb
diff --git a/sysutils/cdrdao/files/patch-xdao::Makefile.in b/sysutils/cdrdao/files/patch-xdao::Makefile.in
new file mode 100644
index 00000000000..9f261df68d2
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-xdao::Makefile.in
@@ -0,0 +1,15 @@
+--- xdao/Makefile.in.orig	2006-09-20 10:51:34.000000000 +0000
++++ xdao/Makefile.in	2007-08-31 22:33:12.000000000 +0000
+@@ -341,9 +341,9 @@
+ glade_DATA = \
+ 	glade/ProjectChooser.glade
+ 
+-gcdmaster_LDADD = @sound_if_obj@ -L$(top_builddir)/dao -ldao \
+-	-L$(top_builddir)/paranoia -lcdda_paranoia \
+-	-L$(top_builddir)/trackdb -ltrackdb @scsilib_libs@ \
++gcdmaster_LDADD = @sound_if_obj@ $(top_builddir)/dao/libdao.a \
++	$(top_builddir)/paranoia/libcdda_paranoia.a \
++	$(top_builddir)/trackdb/libtrackdb.a @scsilib_libs@ \
+ 	@LIBGUIMM2_LIBS@ @GTKMM2_LIBS@ $(am__append_1) $(am__append_3) \
+ 	@AO_LIBS@ $(am__empty)
+ AM_CXXFLAGS = @GTKMM2_CFLAGS@ @LIBGUIMM2_CFLAGS@ @AO_CFLAGS@ \