update to versino 1.2.0; OK fgs@

This commit is contained in:
millert 2005-05-31 19:40:24 +00:00
parent 96d4b47b02
commit 1d94b77d9e
5 changed files with 38 additions and 14 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.20 2004/12/22 11:48:33 alek Exp $
# $OpenBSD: Makefile,v 1.21 2005/05/31 19:40:24 millert Exp $
COMMENT= "write audio/data CD-Rs in disk-at-once mode"
DISTNAME= cdrdao-1.1.7
DISTNAME= cdrdao-1.2.0
CATEGORIES= audio misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
DISTFILES= ${DISTNAME}.src${EXTRACT_SUFX}
HOMEPAGE= http://cdrdao.sourceforge.net/
@ -18,7 +17,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m stdc++
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu dest
CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/paranoia ${WRKSRC}/scsilib/conf
CONFIGURE_ARGS+= --with-posix-threads=no --without-lame \
--with-gtkmm-prefix=/nonexistent

View File

@ -1,4 +1,4 @@
MD5 (cdrdao-1.1.7.src.tar.gz) = 766a534137f2c6e99ab771e3178793f8
RMD160 (cdrdao-1.1.7.src.tar.gz) = 804ae3e163b41c6b7c4d2e9a10521f23cd0154dc
SHA1 (cdrdao-1.1.7.src.tar.gz) = d688f8b117de367841958f1ca977100fc4e8484b
SIZE (cdrdao-1.1.7.src.tar.gz) = 1433366
MD5 (cdrdao-1.2.0.tar.gz) = dc2bdef7a7c8973e678ba4a4a2d9cc7e
RMD160 (cdrdao-1.2.0.tar.gz) = 031be2ce0ed0894d1026a90f9ce62b3154849d14
SHA1 (cdrdao-1.2.0.tar.gz) = 0da9f0ae829dba5afe7efc34981ce4ad1dd7d210
SIZE (cdrdao-1.2.0.tar.gz) = 2041966

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-scsilib_RULES_i386-openbsd-cc_rul,v 1.1 2001/10/03 16:08:48 naddy Exp $
--- scsilib/RULES/i386-openbsd-cc.rul.orig Sun Apr 29 10:44:45 2001
+++ scsilib/RULES/i386-openbsd-cc.rul Mon Oct 1 20:04:09 2001
$OpenBSD: patch-scsilib_RULES_i386-openbsd-cc_rul,v 1.2 2005/05/31 19:40:24 millert Exp $
--- scsilib/RULES/i386-openbsd-cc.rul.orig Tue Oct 15 14:43:40 2002
+++ scsilib/RULES/i386-openbsd-cc.rul Sun May 29 14:12:44 2005
@@ -24,13 +24,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg
###########################################################################
CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
+CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
+CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
COPTS=

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-scsilib_include_btorder_h,v 1.3 2005/05/31 19:40:24 millert Exp $
--- scsilib/include/btorder.h.orig Sun Jun 15 15:41:22 2003
+++ scsilib/include/btorder.h Sun May 29 10:18:06 2005
@@ -28,6 +28,9 @@
#include <sys/types.h> /* try to load isa_defs.h on Solaris */
#define _INCL_SYS_TYPES_H
#endif
+#ifdef __OpenBSD__
+#include <machine/endian.h>
+#endif
#ifndef _MCONFIG_H
#include <mconfig.h> /* load bit/byte-oder from xmconfig.h*/
@@ -108,7 +111,7 @@ error Only one of _BIT_FIELDS_LTOH or _
# if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
defined(__PPC) || defined(powerpc) || defined(__powerpc__)
-# if defined(__BIG_ENDIAN__)
+# if defined(__BIG_ENDIAN__) || BYTE_ORDER == BIG_ENDIAN
# define _BIT_FIELDS_HTOL
# else
# define _BIT_FIELDS_LTOH

View File

@ -1,7 +1,10 @@
@comment $OpenBSD: PLIST,v 1.5 2004/09/15 17:54:15 espie Exp $
@comment $OpenBSD: PLIST,v 1.6 2005/05/31 19:40:24 millert Exp $
bin/cdrdao
bin/cue2toc
bin/toc2cddb
bin/toc2cue
@man man/man1/cdrdao.1
@man man/man1/cue2toc.1
share/cdrdao/
share/cdrdao/drivers
share/doc/cdrdao/