Merge pull request #330 from fbrosson/patch-1

cdrtools: update recipe to 3.02a02
This commit is contained in:
diversys
2015-11-22 23:41:15 +03:00
9 changed files with 2 additions and 964 deletions

View File

@@ -1,151 +0,0 @@
SUMMARY="A CD/DVD/Blu-ray premastering and recording software"
DESCRIPTION="Cdrtools is a set of command line programs that allows to \
record CD/DVD/BluRay media.
The suite includes the following programs:
- cdrecord: A CD/DVD/BD recording program
- readcd: A program to read CD/DVD/BD media with CD-clone features
- cdda2wav: The most evolved CD-audio extraction program with paranoia support
- mkisofs: A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
optional Rock Ridge attributes
- isodebug: A program to print mkisofs debug information from media
- isodump: A program to dump ISO-9660 media
- isoinfo: A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems
- isovfy: A program to verify the ISO-9660 structures
- rscsi: A Remote SCSI enabling daemon"
HOMEPAGE="http://cdrecord.org"
COPYRIGHT="1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)
1995-2013 J. Schilling (cdrecord) "
LICENSE="GNU GPL v2
CDDL v1"
REVISION="1"
SOURCE_URI="http://sourceforge.net/projects/cdrtools/files/alpha/cdrtools-3.01a25.tar.bz2"
CHECKSUM_SHA256="12c555263c9b56d83ea104918c0c6c7df41c3dd51206ae1986e88aed892b29be"
SOURCE_DIR="cdrtools-3.01"
PATCHES='cdrtools-3.01~a25.patch'
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
cdrtools = $portVersion compat >= 3
cmd:devdump = $portVersion compat >= 3
cmd:rscsi = $portVersion compat >= 3
cmd:scgcheck = $portVersion compat >= 3
cmd:mkisofs = $portVersion compat >= 3
cmd:btcflash = $portVersion compat >= 3
cmd:scgskeleton = $portVersion compat >= 3
cmd:isovfy = $portVersion compat >= 3
cmd:readcd = $portVersion compat >= 3
cmd:isodebug = $portVersion compat >= 3
cmd:cdda2mp3 = $portVersion compat >= 3
cmd:cdda2ogg = $portVersion compat >= 3
cmd:cdda2wav = $portVersion compat >= 3
cmd:mkhybrid = $portVersion compat >= 3
cmd:cdrecord = $portVersion compat >= 3
cmd:isodump = $portVersion compat >= 3
cmd:isoinfo = $portVersion compat >= 3
"
REQUIRES="
haiku
"
PROVIDES_devel="
cdrtools_devel = $portVersion
devel:libcdrdeflt = $portVersion compat >= 3
devel:libedc_ecc = $portVersion compat >= 3
devel:libedc_ecc_dec = $portVersion compat >= 3
devel:libdeflt = $portVersion compat >= 3
devel:libfile = $portVersion compat >= 3
devel:libfind = $portVersion compat >= 3
devel:libhfs = $portVersion compat >= 3
devel:libmdigest = $portVersion compat >= 3
devel:libparanoia = $portVersion compat >= 3
devel:librscg = $portVersion compat >= 3
devel:libscg = $portVersion compat >= 3
devel:libsiconv = $portVersion compat >= 3
devel:libscgcmd = $portVersion compat >= 3
devel:libschily = $portVersion compat >= 3
"
REQUIRES_devel="
cdrtools == $portVersion
"
BUILD_REQUIRES="
haiku_devel
"
BUILD_PREREQUIRES="
cmd:gcc
cmd:grep
cmd:ld
cmd:make
cmd:sed
"
GLOBAL_WRITABLE_FILES="
settings/cdrecord keep-old
settings/rscsi keep-old
"
patchInsdir()
{
# Usage: patchInsdir <oldDir> <newDir> <file> ...
oldDir=$1
newDir=$2
shift 2
sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@
}
PATCH()
{
allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)"
patchInsdir bin $relativeBinDir $allMakefiles
patchInsdir sbin $relativeBinDir $allMakefiles
patchInsdir share/doc $relativeDocDir $allMakefiles
patchInsdir include $relativeIncludeDir $allMakefiles
patchInsdir lib $relativeLibDir $allMakefiles
patchInsdir etc/default settings $allMakefiles
sed -i "s,/etc/default,$sysconfDir," \
btcflash/btcflash.1 \
cdda2wav/cdda2mp3 \
cdda2wav/cdda2ogg \
cdda2wav/cdda2*.1 \
cdrecord/COPYING \
cdrecord/README.* \
cdrecord/auinfo.c \
cdrecord/cdrecord.1 \
doc/*.man \
doc/*.ps \
include/schily/deflts.h \
libcdrdeflt/cdrdeflt.c \
libcdrdeflt/cdrdeflt.h \
mkisofs/diag/isoinfo.8 \
readcd/readcd.1 \
rscsi/rscsi.1 \
rscsi/rscsi.c \
scgskeleton/scgskeleton.1
}
BUILD()
{
make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \
RUNPATH="" DEFMANBASE=$relativeDocumentationDir
# not multi-job safe
}
INSTALL()
{
make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \
RUNPATH="" DEFMANBASE=$relativeDocumentationDir install
# The whole lib folder only contains static libraries (even in several
# subdirectories).
mkdir -p $developLibDir
mv $libDir/* $developLibDir/
rmdir $libDir
# devel package
packageEntries devel \
$developDir
}

View File

@@ -1,154 +0,0 @@
SUMMARY="A CD/DVD/Blu-ray premastering and recording software"
DESCRIPTION="
cdrtools is a set of command line programs that allows to record CD/DVD/BluRay \
media.
The suite includes the following programs:
- cdrecord: A CD/DVD/BD recording program
- readcd: A program to read CD/DVD/BD media with CD-clone features
- cdda2wav: The most evolved CD-audio extraction program with paranoia support
- mkisofs: A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
optional Rock Ridge attributes
- isodebug: A program to print mkisofs debug information from media
- isodump: A program to dump ISO-9660 media
- isoinfo: A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems
- isovfy: A program to verify the ISO-9660 structures
- rscsi: A Remote SCSI enabling daemon"
HOMEPAGE="http://cdrecord.org"
COPYRIGHT="1995-2015 Joerg Schilling (cdrecord, readcd)
1993-2004 Heiko Eissfeldt, 2004-2015 Joerg Schilling (cdda2wav)
1993-1997 Eric Youngdale, 1997-2002 James Pearson, 1997-2015 Joerg \
Schilling (mkisofs)"
LICENSE="GNU GPL v2
CDDL v1"
REVISION="1"
SOURCE_URI="http://downloads.sourceforge.net/project/cdrtools/alpha/cdrtools-3.01a29.tar.bz2"
CHECKSUM_SHA256="3ad98ea911a4ee7811ecfc433b70dac3a3b9671eb71a55da9f4a7e08cb6fc247"
SOURCE_DIR="cdrtools-3.01"
PATCHES='cdrtools-3.01~a29.patch'
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
cdrtools = $portVersion compat >= 3
cmd:devdump = $portVersion compat >= 3
cmd:rscsi = $portVersion compat >= 3
cmd:scgcheck = $portVersion compat >= 3
cmd:mkisofs = $portVersion compat >= 3
cmd:btcflash = $portVersion compat >= 3
cmd:scgskeleton = $portVersion compat >= 3
cmd:isovfy = $portVersion compat >= 3
cmd:readcd = $portVersion compat >= 3
cmd:isodebug = $portVersion compat >= 3
cmd:cdda2mp3 = $portVersion compat >= 3
cmd:cdda2ogg = $portVersion compat >= 3
cmd:cdda2wav = $portVersion compat >= 3
cmd:mkhybrid = $portVersion compat >= 3
cmd:cdrecord = $portVersion compat >= 3
cmd:isodump = $portVersion compat >= 3
cmd:isoinfo = $portVersion compat >= 3
"
REQUIRES="
haiku
"
PROVIDES_devel="
cdrtools_devel = $portVersion
devel:libcdrdeflt = $portVersion compat >= 3
devel:libedc_ecc = $portVersion compat >= 3
devel:libedc_ecc_dec = $portVersion compat >= 3
devel:libdeflt = $portVersion compat >= 3
devel:libfile = $portVersion compat >= 3
devel:libfind = $portVersion compat >= 3
devel:libhfs = $portVersion compat >= 3
devel:libmdigest = $portVersion compat >= 3
devel:libparanoia = $portVersion compat >= 3
devel:librscg = $portVersion compat >= 3
devel:libscg = $portVersion compat >= 3
devel:libsiconv = $portVersion compat >= 3
devel:libscgcmd = $portVersion compat >= 3
devel:libschily = $portVersion compat >= 3
"
REQUIRES_devel="
cdrtools == $portVersion
"
BUILD_REQUIRES="
haiku_devel
"
BUILD_PREREQUIRES="
cmd:gcc
cmd:grep
cmd:ld
cmd:make
cmd:sed
"
GLOBAL_WRITABLE_FILES="
settings/cdrecord keep-old
settings/rscsi keep-old
"
patchInsdir()
{
# Usage: patchInsdir <oldDir> <newDir> <file> ...
oldDir=$1
newDir=$2
shift 2
sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@
}
PATCH()
{
allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)"
patchInsdir bin $relativeBinDir $allMakefiles
patchInsdir sbin $relativeBinDir $allMakefiles
patchInsdir share/doc $relativeDocDir $allMakefiles
patchInsdir include $relativeIncludeDir $allMakefiles
patchInsdir lib $relativeLibDir $allMakefiles
patchInsdir etc/default settings $allMakefiles
sed -i "s,/etc/default,$sysconfDir," \
btcflash/btcflash.1 \
cdda2wav/cdda2mp3 \
cdda2wav/cdda2ogg \
cdda2wav/cdda2*.1 \
cdrecord/COPYING \
cdrecord/README.* \
cdrecord/auinfo.c \
cdrecord/cdrecord.1 \
doc/*.man \
doc/*.ps \
include/schily/deflts.h \
libcdrdeflt/cdrdeflt.c \
libcdrdeflt/cdrdeflt.h \
mkisofs/diag/isoinfo.8 \
readcd/readcd.1 \
rscsi/rscsi.1 \
rscsi/rscsi.c \
scgskeleton/scgskeleton.1
}
BUILD()
{
make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \
RUNPATH="" DEFMANBASE=$relativeDocumentationDir
# not multi-job safe
}
INSTALL()
{
make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \
RUNPATH="" DEFMANBASE=$relativeDocumentationDir install
# The whole lib folder only contains static libraries (even in several
# subdirectories).
mkdir -p $developLibDir
mv $libDir/* $developLibDir/
rmdir $libDir
# devel package
packageEntries devel \
$developDir
}

View File

@@ -1,155 +0,0 @@
SUMMARY="A CD/DVD/Blu-ray premastering and recording software"
DESCRIPTION="cdrtools is a set of command line programs suitable for creating \
and recording file system images to CD, DVD and Blu-ray media.
The suite includes the following programs:
- cdrecord: A CD/DVD/BD recording program
- readcd: A program to read CD/DVD/BD media with CD-clone features
- cdda2wav: The most evolved CD-audio extraction program with paranoia support
- mkisofs: A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
optional Rock Ridge attributes
- isodebug: A program to print mkisofs debug information from media
- isodump: A program to dump ISO-9660 media
- isoinfo: A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems
- isovfy: A program to verify the ISO-9660 structures
- rscsi: A Remote SCSI enabling daemon"
HOMEPAGE="http://cdrecord.org/"
COPYRIGHT="1995-2015 Joerg Schilling (cdrecord, readcd)
1993-2004 Heiko Eissfeldt, 2004-2015 Joerg Schilling (cdda2wav)
1993-1997 Eric Youngdale, 1997-2002 James Pearson, 1997-2015 Joerg \
Schilling (mkisofs)"
LICENSE="GNU GPL v2
CDDL v1"
REVISION="1"
SOURCE_URI="http://downloads.sourceforge.net/project/cdrtools/alpha/cdrtools-3.01a30.tar.bz2"
CHECKSUM_SHA256="5b9a2f98771c9d0097a1e7640727655ece2864eea95f38e5611af2b2f6e6d9cd"
SOURCE_DIR="cdrtools-3.01"
PATCHES="cdrtools-3.01~a30.patch"
ARCHITECTURES="x86_gcc2 x86 x86_64"
GLOBAL_WRITABLE_FILES="
settings/cdrecord keep-old
settings/rscsi keep-old
"
PROVIDES="
cdrtools = $portVersion compat >= 3
cmd:devdump = $portVersion compat >= 3
cmd:rscsi = $portVersion compat >= 3
cmd:scgcheck = $portVersion compat >= 3
cmd:mkisofs = $portVersion compat >= 3
cmd:btcflash = $portVersion compat >= 3
cmd:scgskeleton = $portVersion compat >= 3
cmd:isovfy = $portVersion compat >= 3
cmd:readcd = $portVersion compat >= 3
cmd:isodebug = $portVersion compat >= 3
cmd:cdda2mp3 = $portVersion compat >= 3
cmd:cdda2ogg = $portVersion compat >= 3
cmd:cdda2wav = $portVersion compat >= 3
cmd:mkhybrid = $portVersion compat >= 3
cmd:cdrecord = $portVersion compat >= 3
cmd:isodump = $portVersion compat >= 3
cmd:isoinfo = $portVersion compat >= 3
"
REQUIRES="
haiku
"
PROVIDES_devel="
cdrtools_devel = $portVersion
devel:libcdrdeflt = $portVersion compat >= 3
devel:libedc_ecc = $portVersion compat >= 3
devel:libedc_ecc_dec = $portVersion compat >= 3
devel:libdeflt = $portVersion compat >= 3
devel:libfile = $portVersion compat >= 3
devel:libfind = $portVersion compat >= 3
devel:libhfs = $portVersion compat >= 3
devel:libmdigest = $portVersion compat >= 3
devel:libparanoia = $portVersion compat >= 3
devel:librscg = $portVersion compat >= 3
devel:libscg = $portVersion compat >= 3
devel:libsiconv = $portVersion compat >= 3
devel:libscgcmd = $portVersion compat >= 3
devel:libschily = $portVersion compat >= 3
"
REQUIRES_devel="
cdrtools == $portVersion
"
BUILD_REQUIRES="
haiku_devel
"
BUILD_PREREQUIRES="
cmd:find
cmd:gcc
cmd:grep
cmd:ld
cmd:make
cmd:sed
"
patchInsdir()
{
# Usage: patchInsdir <oldDir> <newDir> <file> ...
oldDir=$1
newDir=$2
shift 2
sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@
}
PATCH()
{
allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)"
patchInsdir bin $relativeBinDir $allMakefiles
patchInsdir sbin $relativeBinDir $allMakefiles
patchInsdir share/doc $relativeDocDir $allMakefiles
patchInsdir include $relativeIncludeDir $allMakefiles
patchInsdir lib $relativeLibDir $allMakefiles
patchInsdir etc/default settings $allMakefiles
sed -i "s,/etc/default,$sysconfDir," \
btcflash/btcflash.1 \
cdda2wav/cdda2mp3 \
cdda2wav/cdda2ogg \
cdda2wav/cdda2*.1 \
cdrecord/COPYING \
cdrecord/README.* \
cdrecord/auinfo.c \
cdrecord/cdrecord.1 \
doc/*.man \
doc/*.ps \
include/schily/deflts.h \
libcdrdeflt/cdrdeflt.c \
libcdrdeflt/cdrdeflt.h \
mkisofs/diag/isoinfo.8 \
readcd/readcd.1 \
rscsi/rscsi.1 \
rscsi/rscsi.c \
scgskeleton/scgskeleton.1
}
BUILD()
{
# not multi-job safe
make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \
RUNPATH="" DEFMANBASE=$relativeDocumentationDir
}
INSTALL()
{
make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \
RUNPATH="" DEFMANBASE=$relativeDocumentationDir install
# The whole lib folder only contains static libraries (even in several
# subdirectories).
mkdir -p $developLibDir
mv $libDir/* $developLibDir/
rmdir $libDir
# devel package
packageEntries devel \
$developDir
}

View File

@@ -1,155 +0,0 @@
SUMMARY="A CD/DVD/Blu-ray premastering and recording software"
DESCRIPTION="cdrtools is a set of command line programs suitable for creating \
and recording file system images to CD, DVD and Blu-ray media.
The suite includes the following programs:
- cdrecord: A CD/DVD/BD recording program
- readcd: A program to read CD/DVD/BD media with CD-clone features
- cdda2wav: The most evolved CD-audio extraction program with paranoia support
- mkisofs: A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
optional Rock Ridge attributes
- isodebug: A program to print mkisofs debug information from media
- isodump: A program to dump ISO-9660 media
- isoinfo: A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems
- isovfy: A program to verify the ISO-9660 structures
- rscsi: A Remote SCSI enabling daemon"
HOMEPAGE="http://cdrecord.org/"
COPYRIGHT="1995-2015 Joerg Schilling (cdrecord, readcd)
1993-2004 Heiko Eissfeldt, 2004-2015 Joerg Schilling (cdda2wav)
1993-1997 Eric Youngdale, 1997-2002 James Pearson, 1997-2015 Joerg \
Schilling (mkisofs)"
LICENSE="GNU GPL v2
CDDL v1"
REVISION="1"
SOURCE_URI="http://downloads.sourceforge.net/project/cdrtools/alpha/cdrtools-3.01a31.tar.bz2"
CHECKSUM_SHA256="183b5c12777779e78d8b69461aae52401f863768e7e7391d60730006f8cadc5a"
SOURCE_DIR="cdrtools-3.01"
PATCHES="cdrtools-3.01~a31.patch"
ARCHITECTURES="x86_gcc2 x86 x86_64"
GLOBAL_WRITABLE_FILES="
settings/cdrecord keep-old
settings/rscsi keep-old
"
PROVIDES="
cdrtools = $portVersion compat >= 3
cmd:devdump = $portVersion compat >= 3
cmd:rscsi = $portVersion compat >= 3
cmd:scgcheck = $portVersion compat >= 3
cmd:mkisofs = $portVersion compat >= 3
cmd:btcflash = $portVersion compat >= 3
cmd:scgskeleton = $portVersion compat >= 3
cmd:isovfy = $portVersion compat >= 3
cmd:readcd = $portVersion compat >= 3
cmd:isodebug = $portVersion compat >= 3
cmd:cdda2mp3 = $portVersion compat >= 3
cmd:cdda2ogg = $portVersion compat >= 3
cmd:cdda2wav = $portVersion compat >= 3
cmd:mkhybrid = $portVersion compat >= 3
cmd:cdrecord = $portVersion compat >= 3
cmd:isodump = $portVersion compat >= 3
cmd:isoinfo = $portVersion compat >= 3
"
REQUIRES="
haiku
"
PROVIDES_devel="
cdrtools_devel = $portVersion
devel:libcdrdeflt = $portVersion compat >= 3
devel:libedc_ecc = $portVersion compat >= 3
devel:libedc_ecc_dec = $portVersion compat >= 3
devel:libdeflt = $portVersion compat >= 3
devel:libfile = $portVersion compat >= 3
devel:libfind = $portVersion compat >= 3
devel:libhfs = $portVersion compat >= 3
devel:libmdigest = $portVersion compat >= 3
devel:libparanoia = $portVersion compat >= 3
devel:librscg = $portVersion compat >= 3
devel:libscg = $portVersion compat >= 3
devel:libsiconv = $portVersion compat >= 3
devel:libscgcmd = $portVersion compat >= 3
devel:libschily = $portVersion compat >= 3
"
REQUIRES_devel="
cdrtools == $portVersion
"
BUILD_REQUIRES="
haiku_devel
"
BUILD_PREREQUIRES="
cmd:find
cmd:gcc
cmd:grep
cmd:ld
cmd:make
cmd:sed
"
patchInsdir()
{
# Usage: patchInsdir <oldDir> <newDir> <file> ...
oldDir=$1
newDir=$2
shift 2
sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@
}
PATCH()
{
allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)"
patchInsdir bin $relativeBinDir $allMakefiles
patchInsdir sbin $relativeBinDir $allMakefiles
patchInsdir share/doc $relativeDocDir $allMakefiles
patchInsdir include $relativeIncludeDir $allMakefiles
patchInsdir lib $relativeLibDir $allMakefiles
patchInsdir etc/default settings $allMakefiles
sed -i "s,/etc/default,$sysconfDir," \
btcflash/btcflash.1 \
cdda2wav/cdda2mp3 \
cdda2wav/cdda2ogg \
cdda2wav/cdda2*.1 \
cdrecord/COPYING \
cdrecord/README.* \
cdrecord/auinfo.c \
cdrecord/cdrecord.1 \
doc/*.man \
doc/*.ps \
include/schily/deflts.h \
libcdrdeflt/cdrdeflt.c \
libcdrdeflt/cdrdeflt.h \
mkisofs/diag/isoinfo.8 \
readcd/readcd.1 \
rscsi/rscsi.1 \
rscsi/rscsi.c \
scgskeleton/scgskeleton.1
}
BUILD()
{
# not multi-job safe
make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \
RUNPATH="" DEFMANBASE=$relativeDocumentationDir
}
INSTALL()
{
make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \
RUNPATH="" DEFMANBASE=$relativeDocumentationDir install
# The whole lib folder only contains static libraries (even in several
# subdirectories).
mkdir -p $developLibDir
mv $libDir/* $developLibDir/
rmdir $libDir
# devel package
packageEntries devel \
$developDir
}

View File

@@ -21,8 +21,8 @@ Schilling (mkisofs)"
LICENSE="GNU GPL v2
CDDL v1"
REVISION="1"
SOURCE_URI="http://downloads.sourceforge.net/cdrtools/cdrtools-3.02a01.tar.bz2"
CHECKSUM_SHA256="7f3cccabe108e26cae62976bd4b0ee0f50c5f715f016eb535f749b275b66ce63"
SOURCE_URI="http://downloads.sourceforge.net/cdrtools/cdrtools-3.02a02.tar.bz2"
CHECKSUM_SHA256="b5c33d6cfbe265806f24f365bdb885dfe35194ef716f4b6f809b4377ec159c05"
SOURCE_DIR="cdrtools-3.02"
PATCHES="cdrtools-3.02-Defaults.haiku.patch cdrtools-3.02-scsi-beos.c.patch"

View File

@@ -1,171 +0,0 @@
diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
--- cdrtools-3.01/DEFAULTS/Defaults.haiku
+++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
@@ -29,16 +29,16 @@
CWARNOPTS=
DEFINCDIRS= $(SRCROOT)/include
DEFOSINCDIRS=
-LDPATH= -L/opt/schily/lib
+LDPATH= -L$(shell finddir B_SYSTEM_LIB_DIRECTORY)
#RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib
+RUNPATH= -R$(INS_BASE)/lib
###########################################################################
#
# Installation config stuff
#
###########################################################################
-INS_BASE= /boot/opt/schily
+INS_BASE= $(shell finddir B_SYSTEM_DIRECTORY)
INS_KBASE= /
INS_RBASE= /
#
diff -urN cdrtools-3.01/RULES/x86_64-haiku-cc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul
--- cdrtools-3.01/RULES/x86_64-haiku-cc.rul 1970-01-01 00:00:00.000000000 +0000
+++ cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul 2012-12-08 19:24:57.418643968 +0000
@@ -0,0 +1,54 @@
+#ident "@(#)bepc-haiku-cc.rul 1.3 09/02/05 "
+###########################################################################
+# Written 1996 by J. Schilling
+###########################################################################
+#
+# Platform dependent MACROS for Haiku, a BeOS like OS
+#
+###########################################################################
+# Copyright (c) J. Schilling
+###########################################################################
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# See the file CDDL.Schily.txt in this distribution for details.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file CDDL.Schily.txt from this distribution.
+###########################################################################
+include $(SRCROOT)/$(RULESDIR)/rules.prg
+###########################################################################
+include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul
+
+#
+# XXX Old BeOS needs libroot.so to get [efg]cvt()
+# XXX New BeOS seems to have this in libc and in addition we include
+# XXX strtod.c for floating point conversion on OS without such code.
+# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been
+# XXX removed and printing floating numbers will work with old/new BeOS
+#
+#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS
+OSDEFS +=
+
+KDEFINES= -DKERNEL -D_KERNEL
+
+#CONFFLAGS= i586
+
+LIB_PREFIX= lib
+LIB_SUFFIX= .a
+SHL_SUFFIX= .so
+
+#LIB_SOCKET= -lsocket -lbind
+LIB_SOCKET= -lnetwork
+LIB_MATH=
+LIB_KVM=
+
+#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
+LDOPTS= $(LIBS_PATH) $(LDPATH)
+
+LORDER= echo
+TSORT= cat
+
+LN= /bin/ln -s
diff -urN cdrtools-3.01/RULES/x86_64-haiku-gcc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul
--- cdrtools-3.01/RULES/x86_64-haiku-gcc.rul 1970-01-01 00:00:00.000000000 +0000
+++ cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul 2012-12-08 19:24:57.421265408 +0000
@@ -0,0 +1,54 @@
+#ident "@(#)bepc-haiku-gcc.rul 1.3 09/02/05 "
+###########################################################################
+# Written 1996 by J. Schilling
+###########################################################################
+#
+# Platform dependent MACROS for Haiku, a BeOS like OS
+#
+###########################################################################
+# Copyright (c) J. Schilling
+###########################################################################
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# See the file CDDL.Schily.txt in this distribution for details.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file CDDL.Schily.txt from this distribution.
+###########################################################################
+include $(SRCROOT)/$(RULESDIR)/rules.prg
+###########################################################################
+include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul
+
+#
+# XXX Old BeOS needs libroot.so to get [efg]cvt()
+# XXX New BeOS seems to have this in libc and in addition we include
+# XXX strtod.c for floating point conversion on OS without such code.
+# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been
+# XXX removed and printing floating numbers will work with old/new BeOS
+#
+#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS
+OSDEFS +=
+
+KDEFINES= -DKERNEL -D_KERNEL
+
+#CONFFLAGS= i586
+
+LIB_PREFIX= lib
+LIB_SUFFIX= .a
+SHL_SUFFIX= .so
+
+#LIB_SOCKET= -lsocket -lbind
+LIB_SOCKET= -lnetwork
+LIB_MATH=
+LIB_KVM=
+
+#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
+LDOPTS= $(LIBS_PATH) $(LDPATH)
+
+LORDER= echo
+TSORT= cat
+
+LN= /bin/ln -s
diff -up cdrtools-3.01/libscg/scsi-beos.c.orig cdrtools-3.01/libscg/scsi-beos.c
--- cdrtools-3.01/libscg/scsi-beos.c.orig 2009-06-30 12:34:03.022282240 -0600
+++ cdrtools-3.01/libscg/scsi-beos.c 2012-07-19 18:25:01.146800640 -0600
@@ -292,7 +292,11 @@ scgo_havebus(scgp, busno)
char buf[128];
if (busno < 8)
+#ifdef __HAIKU__
+ js_snprintf(buf, sizeof (buf), "/dev/disk/scsi/%d", busno);
+#else
js_snprintf(buf, sizeof (buf), "/dev/bus/scsi/%d", busno);
+#endif
else
#ifdef __HAIKU__
js_snprintf(buf, sizeof (buf), "/dev/disk/atapi/%d", busno-8);
@@ -320,9 +324,15 @@ scgo_fileno(scgp, busno, tgt, tlun)
return (f->fd);
}
if (busno < 8) {
+#ifdef __HAIKU__
+ js_snprintf(buf, sizeof (buf),
+ "/dev/disk/scsi/%d/%d/%d/raw",
+ busno, tgt, tlun);
+#else
js_snprintf(buf, sizeof (buf),
"/dev/bus/scsi/%d/%d/%d/raw",
busno, tgt, tlun);
+#endif
} else {
char *tgtstr = (tgt == 0) ? "master" : (tgt == 1) ? "slave" : "dummy";
js_snprintf(buf, sizeof (buf),

View File

@@ -1,68 +0,0 @@
diff -urp cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
--- cdrtools-3.01/DEFAULTS/Defaults.haiku 2013-11-04 20:58:20.000000000 +0000
+++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
@@ -30,16 +30,16 @@ CWARNOPTS=
DEFINCDIRS= $(SRCROOT)/include
DEFOSINCDIRS=
-LDPATH= -L/opt/schily/lib
+LDPATH= -L$(shell finddir B_SYSTEM_LIB_DIRECTORY)
#RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib
+RUNPATH= -R$(INS_BASE)/lib
###########################################################################
#
# Installation config stuff
#
###########################################################################
-INS_BASE= /boot/opt/schily
+#INS_BASE= $(shell finddir B_SYSTEM_DIRECTORY)
INS_KBASE= /
INS_RBASE= /
#
diff -urp cdrtools-3.01/libscg/scsi-beos.c cdrtools-3.01-haiku/libscg/scsi-beos.c
--- cdrtools-3.01/libscg/scsi-beos.c 2009-06-30 18:34:03.000000000 +0000
+++ cdrtools-3.01-haiku/libscg/scsi-beos.c
@@ -292,7 +292,11 @@ scgo_havebus(scgp, busno)
char buf[128];
if (busno < 8)
+#ifdef __HAIKU__
+ js_snprintf(buf, sizeof (buf), "/dev/disk/scsi/%d", busno);
+#else
js_snprintf(buf, sizeof (buf), "/dev/bus/scsi/%d", busno);
+#endif
else
#ifdef __HAIKU__
js_snprintf(buf, sizeof (buf), "/dev/disk/atapi/%d", busno-8);
@@ -320,9 +324,15 @@ scgo_fileno(scgp, busno, tgt, tlun)
return (f->fd);
}
if (busno < 8) {
+#ifdef __HAIKU__
+ js_snprintf(buf, sizeof (buf),
+ "/dev/disk/scsi/%d/%d/%d/raw",
+ busno, tgt, tlun);
+#else
js_snprintf(buf, sizeof (buf),
"/dev/bus/scsi/%d/%d/%d/raw",
busno, tgt, tlun);
+#endif
} else {
char *tgtstr = (tgt == 0) ? "master" : (tgt == 1) ? "slave" : "dummy";
js_snprintf(buf, sizeof (buf),
diff --git a/include/schily/wait.h b/include/schily/wait.h
index 806a5da..6d22f10 100644
--- a/include/schily/wait.h
+++ b/include/schily/wait.h
@@ -160,7 +160,7 @@ extern "C" {
# endif
# ifndef WCOREDUMP
# ifdef WIFCORED /* Haiku */
-# define WCOREDUMP(status) (WIFCORED(_W_I(status))
+# define WCOREDUMP(status) (WIFCORED(_W_I(status)))
# else
# define WCOREDUMP(status) (_W_I(status) & 0x80)
# endif

View File

@@ -1,54 +0,0 @@
diff -urp cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
--- cdrtools-3.01/DEFAULTS/Defaults.haiku 2013-11-04 20:58:20.000000000 +0000
+++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
@@ -30,16 +30,16 @@ CWARNOPTS=
DEFINCDIRS= $(SRCROOT)/include
DEFOSINCDIRS=
-LDPATH= -L/opt/schily/lib
+LDPATH= -L$(shell finddir B_SYSTEM_LIB_DIRECTORY)
#RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib
+RUNPATH= -R$(INS_BASE)/lib
###########################################################################
#
# Installation config stuff
#
###########################################################################
-INS_BASE= /boot/opt/schily
+#INS_BASE= /boot/opt/schily
INS_KBASE= /
INS_RBASE= /
#
diff -urp cdrtools-3.01/libscg/scsi-beos.c cdrtools-3.01-haiku/libscg/scsi-beos.c
--- cdrtools-3.01/libscg/scsi-beos.c 2009-06-30 18:34:03.000000000 +0000
+++ cdrtools-3.01-haiku/libscg/scsi-beos.c
@@ -292,7 +292,11 @@ scgo_havebus(scgp, busno)
char buf[128];
if (busno < 8)
+#ifdef __HAIKU__
+ js_snprintf(buf, sizeof (buf), "/dev/disk/scsi/%d", busno);
+#else
js_snprintf(buf, sizeof (buf), "/dev/bus/scsi/%d", busno);
+#endif
else
#ifdef __HAIKU__
js_snprintf(buf, sizeof (buf), "/dev/disk/atapi/%d", busno-8);
@@ -320,9 +324,15 @@ scgo_fileno(scgp, busno, tgt, tlun)
return (f->fd);
}
if (busno < 8) {
+#ifdef __HAIKU__
+ js_snprintf(buf, sizeof (buf),
+ "/dev/disk/scsi/%d/%d/%d/raw",
+ busno, tgt, tlun);
+#else
js_snprintf(buf, sizeof (buf),
"/dev/bus/scsi/%d/%d/%d/raw",
busno, tgt, tlun);
+#endif
} else {
char *tgtstr = (tgt == 0) ? "master" : (tgt == 1) ? "slave" : "dummy";
js_snprintf(buf, sizeof (buf),

View File

@@ -1,54 +0,0 @@
diff -urp cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
--- cdrtools-3.01/DEFAULTS/Defaults.haiku 2013-11-04 20:58:20.000000000 +0000
+++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
@@ -30,16 +30,16 @@ CWARNOPTS=
DEFINCDIRS= $(SRCROOT)/include
DEFOSINCDIRS=
-LDPATH= -L/opt/schily/lib
+LDPATH= -L$(shell finddir B_SYSTEM_LIB_DIRECTORY)
#RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib
+RUNPATH= -R$(INS_BASE)/lib
###########################################################################
#
# Installation config stuff
#
###########################################################################
-INS_BASE= /boot/opt/schily
+#INS_BASE= /boot/opt/schily
INS_KBASE= /
INS_RBASE= /
#
diff -urp cdrtools-3.01/libscg/scsi-beos.c cdrtools-3.01-haiku/libscg/scsi-beos.c
--- cdrtools-3.01/libscg/scsi-beos.c 2009-06-30 18:34:03.000000000 +0000
+++ cdrtools-3.01-haiku/libscg/scsi-beos.c
@@ -292,7 +292,11 @@ scgo_havebus(scgp, busno)
char buf[128];
if (busno < 8)
+#ifdef __HAIKU__
+ js_snprintf(buf, sizeof (buf), "/dev/disk/scsi/%d", busno);
+#else
js_snprintf(buf, sizeof (buf), "/dev/bus/scsi/%d", busno);
+#endif
else
#ifdef __HAIKU__
js_snprintf(buf, sizeof (buf), "/dev/disk/atapi/%d", busno-8);
@@ -320,9 +324,15 @@ scgo_fileno(scgp, busno, tgt, tlun)
return (f->fd);
}
if (busno < 8) {
+#ifdef __HAIKU__
+ js_snprintf(buf, sizeof (buf),
+ "/dev/disk/scsi/%d/%d/%d/raw",
+ busno, tgt, tlun);
+#else
js_snprintf(buf, sizeof (buf),
"/dev/bus/scsi/%d/%d/%d/raw",
busno, tgt, tlun);
+#endif
} else {
char *tgtstr = (tgt == 0) ? "master" : (tgt == 1) ? "slave" : "dummy";
js_snprintf(buf, sizeof (buf),