Date: Fri, 20 Oct 2000 18:03:00 +0000 From: David Lebel <lebel@lebel.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/22155: Update cdrdao to 1.1.4. Message-ID: <20001020180300.37930.qmail@frodo.lebel.org>
next in thread | raw e-mail | index | archive | help
>Number: 22155 >Category: ports >Synopsis: Update to version 1.1.4 of cdrdao >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 20 11:10:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: David Lebel <lebel@lebel.org> >Release: FreeBSD 4.1.1-STABLE i386 >Organization: None whatsoever. >Environment: >Description: Upgraded to version 1.1.4. >How-To-Repeat: >Fix: diff -ru cdrdao/Makefile cdrdao114/Makefile --- cdrdao/Makefile Fri Jun 30 11:43:37 2000 +++ cdrdao114/Makefile Fri Oct 20 10:51:31 2000 @@ -6,7 +6,7 @@ # PORTNAME= cdrdao -PORTVERSION= 1.1.3 +PORTVERSION= 1.1.4 CATEGORIES= audio MASTER_SITES= http://www.ping.de/sites/daneb/ EXTRACT_SUFX= .src.tar.gz @@ -16,7 +16,7 @@ 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 @@ -49,7 +49,7 @@ 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 -ru cdrdao/distinfo cdrdao114/distinfo --- cdrdao/distinfo Sun Oct 31 21:04:31 1999 +++ cdrdao114/distinfo Fri Oct 20 10:00:30 2000 @@ -1 +1 @@ -MD5 (cdrdao-1.1.3.src.tar.gz) = 9a6bfcc70fda8a6a4aee693a6a407b8e +MD5 (cdrdao-1.1.4.src.tar.gz) = b6e00b9b93f0406e76fedf421eae44ad diff -ru cdrdao/files/patch-ac cdrdao114/files/patch-ac --- cdrdao/files/patch-ac Fri Jun 30 11:43:38 2000 +++ cdrdao114/files/patch-ac Fri Oct 20 10:32:59 2000 @@ -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 -ru cdrdao/pkg-plist cdrdao114/pkg-plist --- cdrdao/pkg-plist Sun Oct 31 21:04:33 1999 +++ cdrdao114/pkg-plist Fri Oct 20 10:51:19 2000 @@ -8,4 +8,5 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001020180300.37930.qmail>