Date: Wed, 9 May 2001 10:50:40 -0400 (EDT) From: lebel@lebel.org To: FreeBSD-gnats-submit@freebsd.org Subject: ports/27228: Update cdrdao to 1.1.5. FROM MAINTAINER. Message-ID: <20010509145040.379BFB810A@merlin.microcelli5.com>
next in thread | raw e-mail | index | archive | help
>Number: 27228
>Category: ports
>Synopsis: Update cdrdao to 1.1.5. From maintainer.
>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: Wed May 09 08:00:15 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: David Lebel <lebel@lebel.org>
>Release: FreeBSD 4.2-STABLE i386
>Organization:
None whatsoever.
>Environment:
>Description:
>How-To-Repeat:
>Fix:
diff -urN cdrdao/Makefile cdrdao-1.1.5/Makefile
--- cdrdao/Makefile Tue Jan 16 12:30:04 2001
+++ cdrdao-1.1.5/Makefile Wed May 9 10:45:45 2001
@@ -6,7 +6,7 @@
#
PORTNAME= cdrdao
-PORTVERSION= 1.1.4
+PORTVERSION= 1.1.5
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= cdrdao
@@ -42,14 +42,16 @@
@${ECHO_MSG} "set WITHOUT_SCGLIB=yes."
@${ECHO_MSG} "If you want to use pthreads, set WITH_PTHREADS=yes."
-.if ${MACHINE_ARCH} == "alpha"
post-extract:
+.if ${MACHINE_ARCH} == "alpha"
@(cd ${WRKSRC}/scsilib/RULES; \
${LN} -sf i386-freebsd-cc.rul alpha-freebsd-cc.rul)
.endif
+ @${CP} ${FILESDIR}/getopt.h ${WRKSRC}/utils
post-install:
strip ${PREFIX}/bin/cdrdao
+ @${INSTALL_PROGRAM} -s ${WRKSRC}/utils/toc2cue ${PREFIX}/bin
@${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.4
diff -urN cdrdao/distinfo cdrdao-1.1.5/distinfo
--- cdrdao/distinfo Tue Oct 31 21:45:38 2000
+++ cdrdao-1.1.5/distinfo Wed May 9 10:26:28 2001
@@ -1 +1 @@
-MD5 (cdrdao-1.1.4.src.tar.gz) = b6e00b9b93f0406e76fedf421eae44ad
+MD5 (cdrdao-1.1.5.src.tar.gz) = 482da7ab61ae29f98072e3c3e1e012aa
diff -urN cdrdao/files/getopt.h cdrdao-1.1.5/files/getopt.h
--- cdrdao/files/getopt.h Wed Dec 31 19:00:00 1969
+++ cdrdao-1.1.5/files/getopt.h Wed May 9 10:36:50 2001
@@ -0,0 +1,129 @@
+/* Declarations for getopt.
+ Copyright (C) 1989, 90, 91, 92, 93, 94 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+#ifndef _GETOPT_H
+#define _GETOPT_H 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+ When `getopt' finds an option that takes an argument,
+ the argument value is returned here.
+ Also, when `ordering' is RETURN_IN_ORDER,
+ each non-option ARGV-element is returned here. */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+ This is used for communication to and from the caller
+ and for communication between successive calls to `getopt'.
+
+ On entry to `getopt', zero means this is the first call; initialize.
+
+ When `getopt' returns EOF, this is the index of the first of the
+ non-option elements that the caller should itself scan.
+
+ Otherwise, `optind' communicates from one call to the next
+ how much of ARGV has been scanned so far. */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+ for unrecognized options. */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized. */
+
+extern int optopt;
+
+/* Describe the long-named options requested by the application.
+ The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+ of `struct option' terminated by an element containing a name which is
+ zero.
+
+ The field `has_arg' is:
+ no_argument (or 0) if the option does not take an argument,
+ required_argument (or 1) if the option requires an argument,
+ optional_argument (or 2) if the option takes an optional argument.
+
+ If the field `flag' is not NULL, it points to a variable that is set
+ to the value given in the field `val' when the option is found, but
+ left unchanged if the option is not found.
+
+ To have a long-named option do something other than set an `int' to
+ a compiled-in constant, such as set a value from `optarg', set the
+ option's `flag' field to zero and its `val' field to a nonzero
+ value (the equivalent single-letter option character, if there is
+ one). For long options that have a zero `flag' field, `getopt'
+ returns the contents of the `val' field. */
+
+struct option
+{
+#if defined (__STDC__) && __STDC__
+ const char *name;
+#else
+ char *name;
+#endif
+ /* has_arg can't be an enum because some compilers complain about
+ type mismatches in all the code that assumes it is an int. */
+ int has_arg;
+ int *flag;
+ int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'. */
+
+#define no_argument 0
+#define required_argument 1
+#define optional_argument 2
+
+#if defined (__STDC__) && __STDC__
+#ifdef __GNU_LIBRARY__
+/* Many other libraries have conflicting prototypes for getopt, with
+ differences in the consts, in stdlib.h. To avoid compilation
+ errors, only prototype getopt for the GNU C library. */
+extern int getopt (int argc, char *const *argv, const char *shortopts);
+#else /* not __GNU_LIBRARY__ */
+extern int getopt ();
+#endif /* __GNU_LIBRARY__ */
+extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+ const struct option *longopts, int *longind);
+extern int getopt_long_only (int argc, char *const *argv,
+ const char *shortopts,
+ const struct option *longopts, int *longind);
+
+/* Internal only. Users should not call this directly. */
+extern int _getopt_internal (int argc, char *const *argv,
+ const char *shortopts,
+ const struct option *longopts, int *longind,
+ int long_only);
+#else /* not __STDC__ */
+extern int getopt ();
+extern int getopt_long ();
+extern int getopt_long_only ();
+
+extern int _getopt_internal ();
+#endif /* __STDC__ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GETOPT_H */
diff -urN cdrdao/files/patch-ac cdrdao-1.1.5/files/patch-ac
--- cdrdao/files/patch-ac Tue Oct 31 21:45:38 2000
+++ cdrdao-1.1.5/files/patch-ac Wed May 9 10:34:42 2001
@@ -62,120 +62,6 @@
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
diff -urN cdrdao/pkg-plist cdrdao-1.1.5/pkg-plist
--- cdrdao/pkg-plist Sat Mar 10 01:02:19 2001
+++ cdrdao-1.1.5/pkg-plist Wed May 9 10:40:23 2001
@@ -1,4 +1,5 @@
bin/cdrdao
+bin/toc2cue
share/cdrdao/drivers
share/doc/cdrdao/COPYING
share/doc/cdrdao/CREDITS
>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?20010509145040.379BFB810A>