4 files changed, 214 insertions, 81 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index a3c5f3acc742..2134fe2096e3 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -5,18 +5,18 @@
 # $FreeBSD$
 #
 
-PORTNAME=		cdrdao
-PORTVERSION=		1.1.3
-CATEGORIES=		audio
-MASTER_SITES=		http://www.ping.de/sites/daneb/
-EXTRACT_SUFX=		.src.tar.gz
+PORTNAME=	cdrdao
+PORTVERSION=	1.1.4
+CATEGORIES=	audio
+MASTER_SITES=	http://www.ping.de/sites/daneb/
+EXTRACT_SUFX=	.src.tar.gz
 
-MAINTAINER=		futatuki@debug.gr.jp
+MAINTAINER=	futatuki@debug.gr.jp
 
-BUILD_DEPENDS=		antlr:${PORTSDIR}/devel/pccts\
-			dlg:${PORTSDIR}/devel/pccts
+BUILD_DEPENDS=	antlr:${PORTSDIR}/devel/pccts\
+		dlg:${PORTSDIR}/devel/pccts
 
-WRKSRC=         	${WRKDIR}/cdrdao-1.1.3
+WRKSRC=		${WRKDIR}/cdrdao-1.1.4
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -24,10 +24,10 @@ MAN1=		cdrdao.1
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ARGS= 	--disable-gtkmmtest
+CONFIGURE_ARGS=	--disable-gtkmmtest
 
 .if defined(WITHOUT_SCGLIB) && ${OSVERSION} > 300000
-CONFIGURE_ARGS+= 	--without-scglib
+CONFIGURE_ARGS+=	--without-scglib
 .endif
 
 .if !defined(WITH_PTHREADS) && ${OSVERSION} > 320000
@@ -42,14 +42,14 @@ pre-fetch:
 .if ${MACHINE_ARCH} == "alpha"
 post-extract:
 	@(cd ${WRKSRC}/scsilib/RULES; \
-	  ln -sf i386-freebsd-cc.rul alpha-freebsd-cc.rul)
+	  ${LN} -sf i386-freebsd-cc.rul alpha-freebsd-cc.rul)
 .endif
 
 post-install:
-	strip $(PREFIX)/bin/cdrdao
+	strip ${PREFIX}/bin/cdrdao
 	@${MKDIR} ${PREFIX}/share/doc/cdrdao
 .for i in COPYING CREDITS INSTALL README README.FreeBSD README.PlexDAE \
-	Release-1.1.0 Release-1.1.2 Release-1.1.3
+	Release-1.1.0 Release-1.1.2 Release-1.1.3 Release-1.1.4
 	@${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/cdrdao/
 .endfor
 	@${CAT} ${PKGMESSAGE}
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index f31823b2f68d..81f329c3a4ad 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1 +1 @@
-MD5 (cdrdao-1.1.3.src.tar.gz) = 9a6bfcc70fda8a6a4aee693a6a407b8e
+MD5 (cdrdao-1.1.4.src.tar.gz) = b6e00b9b93f0406e76fedf421eae44ad
diff --git a/sysutils/cdrdao/files/patch-ac b/sysutils/cdrdao/files/patch-ac
index 9fc888409e77..e1c5b9d17f29 100644
--- a/sysutils/cdrdao/files/patch-ac
+++ b/sysutils/cdrdao/files/patch-ac
@@ -1,66 +1,198 @@
---- configure.orig	Wed Oct 27 01:13:45 1999
-+++ configure	Fri Jun 23 08:40:42 2000
-@@ -2592,6 +2592,8 @@
-   { echo "configure: error: No PCCTS installation detected." 1>&2; exit 1; }
- fi
- 
-+# Disable xcdrdao feature (temporary)
-+if false ; then
- # Check whether --with-gtkmm-prefix or --without-gtkmm-prefix was given.
- if test "${with_gtkmm_prefix+set}" = set; then
-   withval="$with_gtkmm_prefix"
-@@ -2869,8 +2871,8 @@
-   
-   
-   rm -f conf.gtkmmtest
--
--
-+# End Disable xcdrdao feature (temporary)
-+fi
- 
- 
- if test "$use_scglib" = default; then
-@@ -2897,7 +2899,7 @@
-   scsi_if_src=ScsiIf-lib.cc
-   
-   case "$host" in
--    *-freebsd3* | *-freebsd4*)
-+    *-freebsd3* | *-freebsd4* | *-freebsd5*)
- 			       scsilib_libs="$scsilib_libs -lcam"
- 			       ;;
-   esac
-@@ -2913,7 +2915,7 @@
- 	       scsi_if_src="ScsiIf-linux.cc sg_err.cc"
- 	       ;;
-     
--    *-freebsd3* | *-freebsd4*)
-+    *-freebsd3* | *-freebsd4* | *-freebsd5*)
- 			       scsi_if_src="ScsiIf-freebsd-cam.cc"
- 			       scsilib_libs="-lcam"
- 			       ;;
-@@ -2945,7 +2947,7 @@
- esac
- 
- case "$host" in
--  *-linux-*)
-+  *-linux-* | *-freebsd*)
- 	     sound_if_src=SoundIF-linux.cc
- 	     ;;
- 
---- xdao/SoundIF-linux.cc.orig	Wed Oct 27 01:13:46 1999
-+++ xdao/SoundIF-linux.cc	Wed Oct 27 03:37:23 1999
-@@ -31,7 +31,14 @@
-  *
-  */
- 
-+# if defined(__FreeBSD__)
-+#include <machine/soundcard.h>
-+# if !defined(SNDCTL_DSP_CHANNELS)
-+#   define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO
-+# endif
-+# else 
- #include <linux/soundcard.h>
-+# endif
- 
- #include <stdio.h>
- #include <assert.h>
+diff -rc ../old/cdrdao-1.1.4/configure ./configure
+*** ../old/cdrdao-1.1.4/configure	Sun Aug 27 13:37:08 2000
+--- ./configure	Fri Oct 20 10:32:47 2000
+***************
+*** 3234,3239 ****
+--- 3234,3240 ----
+    
+    
+  
++ xdao=no
+  
+  if test $xdao != xdao; then
+    xdao=
+***************
+*** 3263,3269 ****
+    scsi_if_src=ScsiIf-lib.cc
+    
+    case "$host" in
+!     *-freebsd3* | *-freebsd4*)
+  			       scsilib_libs="$scsilib_libs -lcam"
+  			       ;;
+    esac
+--- 3264,3270 ----
+    scsi_if_src=ScsiIf-lib.cc
+    
+    case "$host" in
+!     *-freebsd3* | *-freebsd4* | *-freebsd5*)
+  			       scsilib_libs="$scsilib_libs -lcam"
+  			       ;;
+    esac
+***************
+*** 3279,3285 ****
+  	       scsi_if_src="ScsiIf-linux.cc sg_err.cc"
+  	       ;;
+      
+!     *-freebsd3* | *-freebsd4*)
+  			       scsi_if_src="ScsiIf-freebsd-cam.cc"
+  			       scsilib_libs="-lcam"
+  			       ;;
+--- 3280,3286 ----
+  	       scsi_if_src="ScsiIf-linux.cc sg_err.cc"
+  	       ;;
+      
+!     *-freebsd3* | *-freebsd4* | *-freebsd5*)
+  			       scsi_if_src="ScsiIf-freebsd-cam.cc"
+  			       scsilib_libs="-lcam"
+  			       ;;
+***************
+*** 3311,3317 ****
+  esac
+  
+  case "$host" in
+!   *-linux-*)
+  	     sound_if_src=SoundIF-linux.cc
+  	     ;;
+  
+--- 3312,3318 ----
+  esac
+  
+  case "$host" in
+!   *-linux-* | *-freebsd*)
+  	     sound_if_src=SoundIF-linux.cc
+  	     ;;
+  
+diff -rc ../old/cdrdao-1.1.4/scsilib/include/scg/scsireg.h ./scsilib/include/scg/scsireg.h
+*** ../old/cdrdao-1.1.4/scsilib/include/scg/scsireg.h	Sat Apr 15 02:54:35 2000
+--- ./scsilib/include/scg/scsireg.h	Fri Oct 20 10:32:22 2000
+***************
+*** 244,255 ****
+  
+  #if	defined(_BIT_FIELDS_LTOH)	/* Intel byteorder */
+  
+! struct scsi_mode_page_header {
+  	Ucbit	p_code		: 6;
+  	Ucbit	res		: 1;
+  	Ucbit	parsave		: 1;
+  	u_char	p_len;
+! };
+  
+  /*
+   * This is a hack that allows mode pages without
+--- 244,255 ----
+  
+  #if	defined(_BIT_FIELDS_LTOH)	/* Intel byteorder */
+  
+! /*struct scsi_mode_page_header {
+  	Ucbit	p_code		: 6;
+  	Ucbit	res		: 1;
+  	Ucbit	parsave		: 1;
+  	u_char	p_len;
+! };*/
+  
+  /*
+   * This is a hack that allows mode pages without
+***************
+*** 262,273 ****
+  
+  #else					/* Motorola byteorder */
+  
+! struct scsi_mode_page_header {
+  	Ucbit	parsave		: 1;
+  	Ucbit	res		: 1;
+  	Ucbit	p_code		: 6;
+  	u_char	p_len;
+! };
+  
+  /*
+   * This is a hack that allows mode pages without
+--- 262,273 ----
+  
+  #else					/* Motorola byteorder */
+  
+! /*struct scsi_mode_page_header {
+  	Ucbit	parsave		: 1;
+  	Ucbit	res		: 1;
+  	Ucbit	p_code		: 6;
+  	u_char	p_len;
+! };*/
+  
+  /*
+   * This is a hack that allows mode pages without
+diff -rc ../old/cdrdao-1.1.4/scsilib/libscg/scg/scsireg.h ./scsilib/libscg/scg/scsireg.h
+*** ../old/cdrdao-1.1.4/scsilib/libscg/scg/scsireg.h	Sat Apr 15 02:54:50 2000
+--- ./scsilib/libscg/scg/scsireg.h	Fri Oct 20 10:32:22 2000
+***************
+*** 244,255 ****
+  
+  #if	defined(_BIT_FIELDS_LTOH)	/* Intel byteorder */
+  
+! struct scsi_mode_page_header {
+  	Ucbit	p_code		: 6;
+  	Ucbit	res		: 1;
+  	Ucbit	parsave		: 1;
+  	u_char	p_len;
+! };
+  
+  /*
+   * This is a hack that allows mode pages without
+--- 244,255 ----
+  
+  #if	defined(_BIT_FIELDS_LTOH)	/* Intel byteorder */
+  
+! /*struct scsi_mode_page_header {
+  	Ucbit	p_code		: 6;
+  	Ucbit	res		: 1;
+  	Ucbit	parsave		: 1;
+  	u_char	p_len;
+! };*/
+  
+  /*
+   * This is a hack that allows mode pages without
+***************
+*** 262,273 ****
+  
+  #else					/* Motorola byteorder */
+  
+! struct scsi_mode_page_header {
+  	Ucbit	parsave		: 1;
+  	Ucbit	res		: 1;
+  	Ucbit	p_code		: 6;
+  	u_char	p_len;
+! };
+  
+  /*
+   * This is a hack that allows mode pages without
+--- 262,273 ----
+  
+  #else					/* Motorola byteorder */
+  
+! /*struct scsi_mode_page_header {
+  	Ucbit	parsave		: 1;
+  	Ucbit	res		: 1;
+  	Ucbit	p_code		: 6;
+  	u_char	p_len;
+! };*/
+  
+  /*
+   * This is a hack that allows mode pages without
+diff -rc ../old/cdrdao-1.1.4/xdao/SoundIF-linux.cc ./xdao/SoundIF-linux.cc
+*** ../old/cdrdao-1.1.4/xdao/SoundIF-linux.cc	Sun Aug 27 13:37:11 2000
+--- ./xdao/SoundIF-linux.cc	Fri Oct 20 10:32:22 2000
+***************
+*** 34,40 ****
+--- 34,47 ----
+   *
+   */
+  
++ # if defined(__FreeBSD__)
++ #include <machine/soundcard.h>
++ # if !defined(SNDCTL_DSP_CHANNELS)
++ #   define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO
++ # endif
++ # else 
+  #include <linux/soundcard.h>
++ # endif
+  
+  #include <stdio.h>
+  #include <assert.h>
diff --git a/sysutils/cdrdao/pkg-plist b/sysutils/cdrdao/pkg-plist
index 67cead0ab33c..36d31600554a 100644
--- a/sysutils/cdrdao/pkg-plist
+++ b/sysutils/cdrdao/pkg-plist
@@ -8,4 +8,5 @@ share/doc/cdrdao/README.PlexDAE
 share/doc/cdrdao/Release-1.1.0
 share/doc/cdrdao/Release-1.1.2
 share/doc/cdrdao/Release-1.1.3
+share/doc/cdrdao/Release-1.1.4
 @dirrm share/doc/cdrdao