Update to cdrdao 1.1.5; thanks to David Lebel <lebel@lebel.org> for

letting me know.
Remove ONLY_FOR_ARCH; this should work with other archs now.
Test requiered.
This commit is contained in:
fgsch 2001-05-10 03:21:59 +00:00
parent 193fdc93aa
commit 91c8878e06
7 changed files with 55 additions and 37 deletions

View File

@ -1,21 +1,18 @@
# $OpenBSD: Makefile,v 1.10 2001/05/05 22:28:51 fgsch Exp $
# $OpenBSD: Makefile,v 1.11 2001/05/10 03:21:59 fgsch Exp $
COMMENT= write audio/data CD-Rs in disk-at-once mode
COMMENT= "write audio/data CD-Rs in disk-at-once mode"
DISTNAME= cdrdao-1.1.4
DISTNAME= cdrdao-1.1.5
CATEGORIES= audio misc
NEED_VERSION= 1.406
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= cdrdao
DISTFILES= ${DISTNAME}.src${EXTRACT_SUFX}
HOMEPAGE= http://www.ping.de/sites/daneb/
HOMEPAGE= http://cdrdao.sourceforge.net/
MAINTAINER= Federico Schwindt <fgsch@openbsd.org>
# Only tested on i386
ONLY_FOR_ARCHS= i386
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -24,7 +21,7 @@ PERMIT_DISTFILES_FTP= Yes
BUILD_DEPENDS= ${PREFIX}/bin/antlr::devel/pccts
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu dest
CONFIGURE_STYLE= autoconf dest
CONFIGURE_ARGS+= --with-posix-threads=no
post-install:

View File

@ -1,3 +1,3 @@
MD5 (cdrdao-1.1.4.src.tar.gz) = b6e00b9b93f0406e76fedf421eae44ad
RMD160 (cdrdao-1.1.4.src.tar.gz) = ceab557c49824b2e783f9da546bfac2f01b0e76a
SHA1 (cdrdao-1.1.4.src.tar.gz) = c509d2b239ea54db8b31ca1ac77cbc4cc02e117b
MD5 (cdrdao-1.1.5.src.tar.gz) = 482da7ab61ae29f98072e3c3e1e012aa
RMD160 (cdrdao-1.1.5.src.tar.gz) = 4aab2ca27fcd2e6933dadb8e908ebcc69de0a91a
SHA1 (cdrdao-1.1.5.src.tar.gz) = f766277957b8d4eeaa7ec1162ded9b0bf04c4c79

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-config_h_in,v 1.1 2001/05/10 03:22:00 fgsch Exp $
--- config.h.in.orig Sun Apr 29 10:42:08 2001
+++ config.h.in Wed May 9 23:55:19 2001
@@ -26,6 +26,9 @@
/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define if you have the <getopt.h> header file. */
+#undef HAVE_GETOPT_H
+
/* real time scheduling defines */
#undef HAVE_SCHED_H
#undef LINUX_QNX_SCHEDULING

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure_in,v 1.1 2001/05/10 03:22:00 fgsch Exp $
--- configure.in.orig Sun Apr 29 10:42:08 2001
+++ configure.in Wed May 9 23:55:56 2001
@@ -29,7 +29,7 @@ AC_PROG_MAKE_SET
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h malloc.h unistd.h sys/mman.h sched.h)
+AC_CHECK_HEADERS(fcntl.h getopt.h malloc.h unistd.h sys/mman.h sched.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-scsilib_include_btorder_h,v 1.1 2001/03/05 08:12:04 fgsch Exp $
--- scsilib/include/btorder.h.orig Sat Apr 15 03:54:31 2000
+++ scsilib/include/btorder.h Mon Mar 5 04:46:35 2001
@@ -57,7 +57,7 @@
# define _BIT_FIELDS_HTOL
# endif
-# if defined(__i386) || defined(i386) || \
+# if defined(__i386) || defined(i386) || defined(__i386__) || \
defined(__alpha) || defined(alpha) || \
defined(__arm) || defined(arm)
# define _BIT_FIELDS_LTOH

View File

@ -1,16 +1,11 @@
$OpenBSD: patch-scsilib_libscg_scsi-bsd_c,v 1.1 2001/03/05 08:12:04 fgsch Exp $
--- scsilib/libscg/scsi-bsd.c.orig Sat Apr 15 03:54:42 2000
+++ scsilib/libscg/scsi-bsd.c Mon Mar 5 04:46:35 2001
@@ -59,7 +59,12 @@ struct scg_local {
#define SADDR_TARGET(a) (SADDR_ISSCSI(a)?(a).addr.scsi.target:(a).addr.atapi.atbus*2+(a).addr.atapi.drive)
#define SADDR_LUN(a) (SADDR_ISSCSI(a)?(a).addr.scsi.lun:0)
$OpenBSD: patch-scsilib_libscg_scsi-bsd_c,v 1.2 2001/05/10 03:22:01 fgsch Exp $
--- scsilib/libscg/scsi-bsd.c.orig Sun Apr 29 05:44:46 2001
+++ scsilib/libscg/scsi-bsd.c Wed May 9 23:42:32 2001
@@ -76,6 +76,7 @@ struct scg_local {
#else
+#if defined(__OpenBSD__) && defined(TYPE_ATAPI)
+#define MAYBE_ATAPI
+#define SADDR_ISSCSI(a) ((a).type == TYPE_SCSI)
+#else
#define SADDR_ISSCSI(a) (1)
+#endif
#define SADDR_BUS(a) (a).scbus
#define SADDR_TARGET(a) (a).target
#if defined(__OpenBSD__) && defined(TYPE_ATAPI)
+#define MAYBE_ATAPI
#define SADDR_ISSCSI(a) ((a).type == TYPE_SCSI)
#else
#define SADDR_ISSCSI(a) (1)

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-utils_toc2cue_cc,v 1.1 2001/05/10 03:22:01 fgsch Exp $
--- utils/toc2cue.cc.orig Sun Apr 29 10:42:09 2001
+++ utils/toc2cue.cc Wed May 9 23:59:27 2001
@@ -25,7 +25,9 @@
#include <unistd.h>
#include <errno.h>
#include <stdarg.h>
+#ifdef HAVE_GETOPT_H
#include <getopt.h>
+#endif
#include <fstream.h>
#include "util.h"