Current port will stop build when includes are updated to be more
standards compliant since it redefines _BYTE_ORDER. btorder.h diff
from NetBSD.
- todd
Index: misc/cdrdao/Makefile
===================================================================
RCS file: /home/cvs/openbsd/ports/misc/cdrdao/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- misc/cdrdao/Makefile 22 Dec 2004 11:48:33 -0000 1.20
+++ misc/cdrdao/Makefile 29 May 2005 16:09:19 -0000
@@ -2,10 +2,9 @@
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/
Index: misc/cdrdao/distinfo
===================================================================
RCS file: /home/cvs/openbsd/ports/misc/cdrdao/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- misc/cdrdao/distinfo 5 Jan 2005 17:05:04 -0000 1.3
+++ misc/cdrdao/distinfo 29 May 2005 16:09:21 -0000
@@ -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
Index: misc/cdrdao/patches/patch-scsilib_RULES_i386-openbsd-cc_rul
===================================================================
RCS file:
/home/cvs/openbsd/ports/misc/cdrdao/patches/patch-scsilib_RULES_i386-openbsd-cc_rul,v
retrieving revision 1.1
diff -u -r1.1 patch-scsilib_RULES_i386-openbsd-cc_rul
--- misc/cdrdao/patches/patch-scsilib_RULES_i386-openbsd-cc_rul 3 Oct 2001
16:08:48 -0000 1.1
+++ misc/cdrdao/patches/patch-scsilib_RULES_i386-openbsd-cc_rul 29 May 2005
16:12:02 -0000
@@ -1,14 +1,7 @@
$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
-@@ -24,13 +24,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg
- ###########################################################################
-
- CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
--CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
-+CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
-
- CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
+--- scsilib/RULES/i386-openbsd-cc.rul.orig Tue Oct 15 14:43:40 2002
++++ scsilib/RULES/i386-openbsd-cc.rul Sun May 29 10:11:49 2005
+@@ -30,7 +30,7 @@ CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR)
COPTS=
CWOPTS= -Wall -Wtraditional \
-Wshadow -Wmissing-prototypes -Wstrict-prototypes
Index: misc/cdrdao/patches/patch-scsilib_RULES_rules1_top
===================================================================
RCS file:
/home/cvs/openbsd/ports/misc/cdrdao/patches/patch-scsilib_RULES_rules1_top,v
retrieving revision 1.1
diff -u -r1.1 patch-scsilib_RULES_rules1_top
--- misc/cdrdao/patches/patch-scsilib_RULES_rules1_top 3 Oct 2001 16:08:48
-0000 1.1
+++ misc/cdrdao/patches/patch-scsilib_RULES_rules1_top 29 May 2005 16:12:02
-0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-scsilib_RULES_rules1_top,v 1.1 2001/10/03 16:08:48 naddy Exp $
---- scsilib/RULES/rules1.top.orig Sun Apr 29 10:44:46 2001
-+++ scsilib/RULES/rules1.top Mon Oct 1 20:04:22 2001
-@@ -186,7 +186,7 @@ __PARCH= $(_PARCH:$(_UNIQ)=$(PARCH_DEF))
- PARCH= $(__PARCH:$(_UNIQ)%=%)
-
+--- scsilib/RULES/rules1.top.orig Sat Jul 10 17:12:30 2004
++++ scsilib/RULES/rules1.top Sun May 29 10:10:10 2005
+@@ -249,7 +249,7 @@ include $(_DCC)
+ #
+ ###########################################################################
#OARCH= $(MARCH)$(-O_ARCH)-$(C_ARCH)
-OARCH= $(PARCH)$(-O_ARCH)-$(C_ARCH)
+OARCH= $(K_ARCH)$(-O_ARCH)-$(C_ARCH)
XARCH= $(K_ARCH)$(-O_ARCH)-$(C_ARCH)
.print:
- echo $(XP_ARCH) $(P_ARCH)
+ echo $(XP_ARCH) $(P_ARCH) $(OARCH) $(XARCH)
Index: misc/cdrdao/patches/patch-scsilib_include_btorder_h
===================================================================
RCS file: misc/cdrdao/patches/patch-scsilib_include_btorder_h
diff -N misc/cdrdao/patches/patch-scsilib_include_btorder_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ misc/cdrdao/patches/patch-scsilib_include_btorder_h 29 May 2005 16:18:09
-0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+--- 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
