From 6bd57498902501f735cb8da7fde59605c8221554 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sat, 5 Sep 2015 23:52:25 +0200 Subject: [PATCH] cdrtools: delete recipes of several old releases. --- app-cdr/cdrtools/cdrtools-3.01~a07.recipe | 152 ---------------- app-cdr/cdrtools/cdrtools-3.01~a17.recipe | 151 ---------------- app-cdr/cdrtools/cdrtools-3.01~a18.recipe | 151 ---------------- .../cdrtools/patches/cdrtools-3.01a01.patch | 23 --- .../cdrtools/patches/cdrtools-3.01a06.patch | 23 --- .../cdrtools/patches/cdrtools-3.01a07.patch | 139 -------------- .../cdrtools/patches/cdrtools-3.01~a07.patch | 139 -------------- .../cdrtools/patches/cdrtools-3.01~a17.patch | 170 ------------------ .../cdrtools/patches/cdrtools-3.01~a18.patch | 170 ------------------ 9 files changed, 1118 deletions(-) delete mode 100644 app-cdr/cdrtools/cdrtools-3.01~a07.recipe delete mode 100644 app-cdr/cdrtools/cdrtools-3.01~a17.recipe delete mode 100644 app-cdr/cdrtools/cdrtools-3.01~a18.recipe delete mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01a01.patch delete mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01a06.patch delete mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01a07.patch delete mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01~a07.patch delete mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch delete mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01~a18.patch diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe deleted file mode 100644 index 2b2d2a2c4..000000000 --- a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe +++ /dev/null @@ -1,152 +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.berlios.de" -COPYRIGHT="1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs) - 1995-2012 J. Schilling (cdrecord)" -LICENSE="GNU GPL v2 - CDDL v1" -REVISION="3" -SOURCE_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2" -CHECKSUM_SHA256="cc54fefaf4ed5b6b49b996da1d1ebb1c44e88bbfada5c60e8f76c3a082591428" -SOURCE_DIR="cdrtools-3.01" -PATCHES='cdrtools-3.01~a07.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=" - haiku_devel - cmd:gcc - cmd:ld - cmd:make - cmd:sed - " - -patchInsdir() -{ - # Usage: patchInsdir ... - 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 -} diff --git a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe deleted file mode 100644 index 96200d888..000000000 --- a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe +++ /dev/null @@ -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.berlios.de" -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="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a17.tar.bz2" -CHECKSUM_SHA256="3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa" -SOURCE_DIR="cdrtools-3.01" -PATCHES='cdrtools-3.01~a17.patch' - -ARCHITECTURES="x86_gcc2 x86" - -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:gcc - cmd:ld - cmd:make - cmd:sed - " - -patchInsdir() -{ - # Usage: patchInsdir ... - 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 -} diff --git a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe deleted file mode 100644 index 859828516..000000000 --- a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe +++ /dev/null @@ -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.berlios.de" -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="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a18.tar.bz2" -CHECKSUM_SHA256="7e9ad9e00679bb0c0456455243eb41614a5a3395eebded9371a0c843dd3494d6" -SOURCE_DIR="cdrtools-3.01" -PATCHES='cdrtools-3.01~a18.patch' - -ARCHITECTURES="x86_gcc2 x86" - -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 - " -BUILD_REQUIRES=" - haiku_devel - " - -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_PREREQUIRES=" - cmd:gcc - cmd:ld - cmd:make - cmd:sed - " - -GLOBAL_WRITABLE_FILES=" - settings/cdrecord keep-old - settings/rscsi keep-old - " - -patchInsdir() -{ - # Usage: patchInsdir ... - 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 -} diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01a01.patch b/app-cdr/cdrtools/patches/cdrtools-3.01a01.patch deleted file mode 100644 index b7cdc050f..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-3.01a01.patch +++ /dev/null @@ -1,23 +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 --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_COMMON_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_COMMON_DIRECTORY) - INS_KBASE= / - INS_RBASE= / - # diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01a06.patch b/app-cdr/cdrtools/patches/cdrtools-3.01a06.patch deleted file mode 100644 index b7cdc050f..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-3.01a06.patch +++ /dev/null @@ -1,23 +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 --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_COMMON_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_COMMON_DIRECTORY) - INS_KBASE= / - INS_RBASE= / - # diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01a07.patch b/app-cdr/cdrtools/patches/cdrtools-3.01a07.patch deleted file mode 100644 index e11110e03..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-3.01a07.patch +++ /dev/null @@ -1,139 +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 --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_COMMON_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_COMMON_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 --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a07.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a07.patch deleted file mode 100644 index e11110e03..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-3.01~a07.patch +++ /dev/null @@ -1,139 +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 --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_COMMON_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_COMMON_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 --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch deleted file mode 100644 index 8fca82f12..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch +++ /dev/null @@ -1,170 +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 --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), diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a18.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a18.patch deleted file mode 100644 index 8fca82f12..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-3.01~a18.patch +++ /dev/null @@ -1,170 +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 --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),