Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Oct 2012 21:50:06 GMT
From:      Nikolai Lifanov <lifanov@mail.lifanov.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/172799: [PATCH] sysutils/cdrtools
Message-ID:  <201210162150.q9GLo6w8080118@red.freebsd.org>
Resent-Message-ID: <201210162200.q9GM00I6005194@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         172799
>Category:       ports
>Synopsis:       [PATCH] sysutils/cdrtools
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 16 22:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Nikolai Lifanov
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
FreeBSD lifanovbsd0 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r241486: Fri Oct 12 22:10:52 EDT 2012 root@lifanovbsd0:/usr/obj/usr/src/sys/LIFANOV_FAST amd64
>Description:
On a system that uses clang as cc, cdrtools package fails to install because cdda2wav is missing from the build directory. cdrtools breaks important ports, such as emulators/virtualbox-ose. Same problem affects cdrkit, cdrtools-devel, and cjk-cdrtools; however, this one can be installed automatically and breaks other ports.

>How-To-Repeat:
Compile world with WITH_CLANG_IS_CC=yes and try to install sysutils/cdrtools
>Fix:
This is mostly fixed by adding USE_GCC=any to the Makefile.
Here is a patch and a build log:
https://redports.org/buildarchive/20121013203536-38525/

Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	cdrtools
#	cdrtools/pkg-plist
#	cdrtools/pkg-descr
#	cdrtools/files
#	cdrtools/files/patch-cdrecord::cdrecord.1
#	cdrtools/files/patch-readcd::readcd.1
#	cdrtools/files/patch-rscsi::rscsi.dfl
#	cdrtools/files/patch-ad
#	cdrtools/files/patch-btcflash::btcflash.1
#	cdrtools/files/patch-mkisofs::mkisofs.8
#	cdrtools/files/patch-scgcheck::scgcheck.1
#	cdrtools/files/patch-cdrecord::README.rscsi
#	cdrtools/files/pkg-message.in
#	cdrtools/files/patch-cdrecord::cdrecord.dfl
#	cdrtools/distinfo
#	cdrtools/Makefile
#	cdrtools/pkg-install.rscsi
#
echo c - cdrtools
mkdir -p cdrtools > /dev/null 2>&1
echo x - cdrtools/pkg-plist
sed 's/^X//' >cdrtools/pkg-plist << 'a9c300f1b56b1bcf1e973ec08f78ed35'
Xbin/btcflash
X%%CDDA2MP3%%bin/cdda2mp3
X%%CDDA2OGG%%bin/cdda2ogg
Xbin/cdda2wav
Xbin/cdrecord
Xbin/devdump
Xbin/isodebug
Xbin/isodump
Xbin/isoinfo
Xbin/isovfy
Xbin/list_audio_tracks
Xbin/mkhybrid
Xbin/mkisofs
Xbin/readcd
Xbin/scgcheck
Xlib/siconv/cp10000
Xlib/siconv/cp10006
Xlib/siconv/cp10007
Xlib/siconv/cp10029
Xlib/siconv/cp10079
Xlib/siconv/cp10081
Xlib/siconv/cp1250
Xlib/siconv/cp1251
Xlib/siconv/cp1252
Xlib/siconv/cp1253
Xlib/siconv/cp1254
Xlib/siconv/cp1255
Xlib/siconv/cp1256
Xlib/siconv/cp1257
Xlib/siconv/cp1258
Xlib/siconv/cp437
Xlib/siconv/cp737
Xlib/siconv/cp775
Xlib/siconv/cp850
Xlib/siconv/cp852
Xlib/siconv/cp855
Xlib/siconv/cp857
Xlib/siconv/cp860
Xlib/siconv/cp861
Xlib/siconv/cp862
Xlib/siconv/cp863
Xlib/siconv/cp864
Xlib/siconv/cp865
Xlib/siconv/cp866
Xlib/siconv/cp869
Xlib/siconv/cp874
Xlib/siconv/iso8859-1
Xlib/siconv/iso8859-10
Xlib/siconv/iso8859-11
Xlib/siconv/iso8859-13
Xlib/siconv/iso8859-14
Xlib/siconv/iso8859-15
Xlib/siconv/iso8859-16
Xlib/siconv/iso8859-2
Xlib/siconv/iso8859-3
Xlib/siconv/iso8859-4
Xlib/siconv/iso8859-5
Xlib/siconv/iso8859-6
Xlib/siconv/iso8859-7
Xlib/siconv/iso8859-8
Xlib/siconv/iso8859-9
Xlib/siconv/koi8-r
Xlib/siconv/koi8-u
X@dirrm lib/siconv
X%%RSCSI%%sbin/rscsi
X%%RSCSI%%@exec chmod u+s %B/%f
X@unexec if cmp -s %D/etc/cdrecord.sample %D/etc/cdrecord; then rm -f %D/etc/cdrecord; else echo "If permanently deleting this package, %D/etc/cdrecord must be removed manually."; fi
Xetc/cdrecord.sample
X@exec [ -f %B/cdrecord ] || cp %B/%f %B/cdrecord
X%%RSCSI%%@unexec if cmp -s %D/etc/rscsi.sample %D/etc/rscsi; then rm -f %D/etc/rscsi; else echo "If permanently deleting this package, %D/etc/rscsi must be removed manually."; fi
X%%RSCSI%%etc/rscsi.sample
X%%RSCSI%%@exec [ -f %B/rscsi ] || cp %B/%f %B/rscsi
X%%RSCSI%%@unexec if pw usershow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, user \"rscsi\" and its homedirectory must be removed manually."; fi
X%%RSCSI%%@unexec if pw groupshow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, group \"rscsi\" must be removed manually."; fi
X%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
X%%PORTDOCS%%%%DOCSDIR%%/README.mkisofs
X%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/FAQ
X%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/Frontends
X%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/HOWTOUSE
X%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/OtherProgs
X%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/README
X%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/THANKS
X%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/TODO
X%%PORTDOCS%%@dirrm %%DOCSDIR%%/cdda2wav
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.ATAPI
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.DiskT@2
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.WORM
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.audio
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdplus
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdrw
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdtext
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.clone
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.copy
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.multi
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.raw
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.rscsi
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.sony
X%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.verify
X%%PORTDOCS%%@dirrm %%DOCSDIR%%/cdrecord
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.compression
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.eltorito
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.graft_dirs
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.hfs_boot
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.hfs_magic
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.hide
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.joliet
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.macosx
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.mkhybrid
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.prep_boot
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.rootinfo
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.session
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sort
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sparcboot
X%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sunx86boot
X%%PORTDOCS%%@dirrm %%DOCSDIR%%/mkisofs
X%%PORTDOCS%%@dirrm %%DOCSDIR%%
a9c300f1b56b1bcf1e973ec08f78ed35
echo x - cdrtools/pkg-descr
sed 's/^X//' >cdrtools/pkg-descr << '61736a7b4d2992123687b78fdcfc3584'
XThe cdrtools software includes tools to create and/or extract
XISO-9660 filesystems, verify their integrity, and write them to
Xdisc.
X
XThis package contains the following programs:
X- btcflash (a firmware flash utility for BTC DRW1008 DVD+/-RW recorder)
X- cdda2wav (a digital CD audio extraction program)
X- cdrecord (a CD/DVD/BluRay recording program)
X- devdump (dump a device or file in hex)
X- isodebug (show debug info contained in an ISO-9660 image)
X- isodump (dump a device or file based on ISO-9660)
X- isoinfo (analyze or list an ISO-9660 image)
X- isovfy (verify an ISO-9660 image)
X- mkisofs (an ISO-9660 filesystem image creator)
X- mkhybrid (an ISO-9660/HFS filesystem image creator)
X  Link to mkisofs.
X- readcd (a data CD reading and recording program)
X  May be used to write to DVD-RAM and to copy Solaris boot CD's.
X- scgcheck (checks and validates the ABI of libscg)
X- rscsi (daemon providing access to local SCSI-devices over the network)
X
XWWW: http://cdrecord.berlios.de/old/private/cdrecord.html
61736a7b4d2992123687b78fdcfc3584
echo c - cdrtools/files
mkdir -p cdrtools/files > /dev/null 2>&1
echo x - cdrtools/files/patch-cdrecord::cdrecord.1
sed 's/^X//' >cdrtools/files/patch-cdrecord::cdrecord.1 << 'de04f7648eadecfdad7fd07d8f80b06f'
X###########################################################################
X# This patch was contributed by Marius Strobl.
X###########################################################################
X# The contents of this file are subject to the terms of the
X# Common Development and Distribution License, Version 1.0 only
X# (the "License").  You may not use this file except in compliance
X# with the License.
X#
X# See the file CDDL.Schily.txt in this distribution for details.
X#
X# When distributing Covered Code, include this CDDL HEADER in each
X# file and include the License file CDDL.Schily.txt from this distribution.
X###########################################################################
X# The file CDDL.Schily.txt can be found in the original cdrtools tarball,
X# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
X###########################################################################
X
X--- cdrecord/cdrecord.1.orig	Mon Sep 29 14:48:48 2003
X+++ cdrecord/cdrecord.1	Mon Sep 29 14:49:23 2003
X@@ -1738,8 +1738,6 @@
X .SH SEE ALSO
X .BR cdda2wav (1),
X .BR readcd (1),
X-.BR scg (7),
X-.BR fbk (7),
X .BR mkisofs (8),
X .BR rcmd (3),
X .BR ssh (1).
de04f7648eadecfdad7fd07d8f80b06f
echo x - cdrtools/files/patch-readcd::readcd.1
sed 's/^X//' >cdrtools/files/patch-readcd::readcd.1 << '3eb5fbc45a413aa2eaed3d9265b34d83'
X###########################################################################
X# This patch was contributed by Marius Strobl.
X###########################################################################
X# The contents of this file are subject to the terms of the
X# Common Development and Distribution License, Version 1.0 only
X# (the "License").  You may not use this file except in compliance
X# with the License.
X#
X# See the file CDDL.Schily.txt in this distribution for details.
X#
X# When distributing Covered Code, include this CDDL HEADER in each
X# file and include the License file CDDL.Schily.txt from this distribution.
X###########################################################################
X# The file CDDL.Schily.txt can be found in the original cdrtools tarball,
X# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
X###########################################################################
X
X--- readcd/readcd.1.orig	Mon Sep 29 14:53:05 2003
X+++ readcd/readcd.1	Mon Sep 29 15:10:06 2003
X@@ -432,9 +432,7 @@
X .SH FILES
X .SH SEE ALSO
X .BR cdrecord (1),
X-.BR mkisofs (1),
X-.BR scg (7),
X-.BR fbk (7),
X+.BR mkisofs (8),
X .BR rcmd (3),
X .BR ssh (1).
X 
3eb5fbc45a413aa2eaed3d9265b34d83
echo x - cdrtools/files/patch-rscsi::rscsi.dfl
sed 's/^X//' >cdrtools/files/patch-rscsi::rscsi.dfl << '214e8f866bca7085b8925e1d7fa012f3'
X--- rscsi/rscsi.dfl.orig	Sun Aug 17 11:50:57 2003
X+++ rscsi/rscsi.dfl	Sun Aug 17 12:28:46 2003
X@@ -18,14 +18,13 @@
X # Each USER= entry adds the listed user to the users who may run rscsi
X #
X # A typical passwd entry looks like this:
X-# rscsi:x:1999:1000:Remote SCSI:/export/home/rscsi:/opt/schily/sbin/rscsi
X+# rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/opt/schily/sbin/rscsi
X #
X-# Add entries for all valid remote users to /export/home/rscsi/.rhosts
X+# Add entries for all valid remote users to /usr/local/rscsi/.rhosts
X #
X # USER= entries are checked with a pattern matcher. USER=* matches all users.
X #
X USER=rscsi
X-#USER=joerg
X 
X #
X # Each ACCESS= entry adds a target or group of targets to the list of visible
214e8f866bca7085b8925e1d7fa012f3
echo x - cdrtools/files/patch-ad
sed 's/^X//' >cdrtools/files/patch-ad << '9dee69582ce86c2afde29698f044343e'
X###########################################################################
X# This patch was contributed by Marius Strobl.
X###########################################################################
X# The contents of this file are subject to the terms of the
X# Common Development and Distribution License, Version 1.0 only
X# (the "License").  You may not use this file except in compliance
X# with the License.
X#
X# See the file CDDL.Schily.txt in this distribution for details.
X#
X# When distributing Covered Code, include this CDDL HEADER in each
X# file and include the License file CDDL.Schily.txt from this distribution.
X###########################################################################
X# The file CDDL.Schily.txt can be found in the original cdrtools tarball,
X# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
X###########################################################################
X
X--- RULES/cc-gcc.rul.orig	Thu Jul  6 12:59:44 2006
X+++ RULES/cc-gcc.rul	Sat Jul 22 03:55:52 2006
X@@ -20,8 +20,9 @@
X ###########################################################################
X 
X CPPFLAGS=	-DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX)
X-CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
X-C++FLAGS=	$(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX)
X+XCFLAGS:=	$(CFLAGS)
X+CFLAGS=		$(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX)
X+C++FLAGS=	$(C++OPTS) $(C++WARNOPTS) $(XCFLAGS) $(G++OPTOPT) $(C++OPTX)
X 
X CPPOPTS=	-I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS)
X COPTS=
X@@ -29,12 +30,10 @@
X CWOPTS=		-Wall -Wtraditional
X CWOPTS=		-Wall -Wno-unknown-pragmas \
X 		-Wshadow -Wmissing-prototypes -Wstrict-prototypes
X-COPTOPT=	-O
X COPTDYN=	-fpic
X COPTGPROF=	-pg
X C++OPTS=
X C++WOPTS=	$(CWOPTS)
X-C++OPTOPT=	$(COPTOPT)
X C++OPTDYN=	-fpic
X C++OPTGPROF=	-pg
X 
X@@ -54,15 +53,15 @@
X 
X FLOAT_OPTIONS=	
X 
X-CC=		@echo "	==> COMPILING \"$@\""; gcc
X-CC++ =		@echo "	==> COMPILING \"$@\""; g++
X-LDCC=		@echo "	==> LINKING \"$@\""; gcc
X-LDCC++ =	@echo "	==> LINKING \"$@\""; g++
X-DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
X-DYNLDC++ =	@echo "	==> LINKING dynamic library \"$@\""; g++
X+CC_COM=		$(CC)
X+CC++ =		$(CXX)
X+LDCC=		$(CC)
X+LDCC++ =	$(CXX)
X+DYNLD=		$(CC)
X+DYNLDC++ =	$(CXX)
X 
X RMDEP=		:
X-MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
X+MKDEP=		$(CC) -M
X MKDEP_OUT=
X-MKC++DEP=	@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); g++ -M
X+MKC++DEP=	$(CXX) -M
X MKC++DEP_OUT=
9dee69582ce86c2afde29698f044343e
echo x - cdrtools/files/patch-btcflash::btcflash.1
sed 's/^X//' >cdrtools/files/patch-btcflash::btcflash.1 << 'ecd49aaf42404868059cb343669b7a9d'
X--- btcflash/btcflash.1.orig	Wed Feb  8 23:13:24 2006
X+++ btcflash/btcflash.1	Thu Feb 16 14:54:32 2006
X@@ -293,7 +293,6 @@
X login shell.
X .SH "SEE ALSO"
X .BR cdrecord (1),
X-.BR scg (7),
X .BR rcmd (3),
X .BR ssh (1).
X .SH NOTES
ecd49aaf42404868059cb343669b7a9d
echo x - cdrtools/files/patch-mkisofs::mkisofs.8
sed 's/^X//' >cdrtools/files/patch-mkisofs::mkisofs.8 << '2fefb0631815d3ae0ab2d8adb5edad09'
X--- mkisofs/mkisofs.8.orig	Mon Sep 29 15:11:48 2003
X+++ mkisofs/mkisofs.8	Mon Sep 29 15:19:01 2003
X@@ -1668,7 +1668,7 @@
X The format of the
X .I magic
X file is almost identical to the
X-.BR magic (4)
X+.BR magic (5)
X file used by the Linux
X .BR file (1)
X command - the routines for reading and decoding the
X@@ -1707,7 +1707,7 @@
X .TE
X .PP
X The format of the file is described in the
X-.BR magic (4)
X+.BR magic (5)
X man page. The only difference here is that for each entry in the magic file, the
X .I message
X for the initial offset
2fefb0631815d3ae0ab2d8adb5edad09
echo x - cdrtools/files/patch-scgcheck::scgcheck.1
sed 's/^X//' >cdrtools/files/patch-scgcheck::scgcheck.1 << '8804ad329aded77ae393b267f31bdabc'
X###########################################################################
X# This patch was contributed by Marius Strobl.
X###########################################################################
X# The contents of this file are subject to the terms of the
X# Common Development and Distribution License, Version 1.0 only
X# (the "License").  You may not use this file except in compliance
X# with the License.
X#
X# See the file CDDL.Schily.txt in this distribution for details.
X#
X# When distributing Covered Code, include this CDDL HEADER in each
X# file and include the License file CDDL.Schily.txt from this distribution.
X###########################################################################
X# The file CDDL.Schily.txt can be found in the original cdrtools tarball,
X# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
X###########################################################################
X
X--- scgcheck/scgcheck.1.orig	Mon Sep 29 14:56:16 2003
X+++ scgcheck/scgcheck.1	Mon Sep 29 14:56:44 2003
X@@ -234,8 +234,7 @@
X .SH SEE ALSO
X .BR cdrecord (1),
X .BR readcd (1),
X-.BR mkisofs (1),
X-.BR scg (7).
X+.BR mkisofs (8).
X 
X .SH NOTES
X .PP
8804ad329aded77ae393b267f31bdabc
echo x - cdrtools/files/patch-cdrecord::README.rscsi
sed 's/^X//' >cdrtools/files/patch-cdrecord::README.rscsi << '7ec10ca9f4b72d311e51dd9cc54f31b4'
X--- cdrecord/README.rscsi.orig	Sun Aug 17 11:31:39 2003
X+++ cdrecord/README.rscsi	Sun Aug 17 14:38:57 2003
X@@ -18,24 +18,21 @@
X 		NOTE: In this case, rscsi must be installed suid root. 
X 		**** This is the preferred method ****
X 
X-To enable remote SCSI via the login shell method you should do the following:
X-
X-	-	Add an entry to /etc/passwd in the form:
X+		The FreeBSD port automatically installs the rscsi binary suid
X+		root and creates the user "rscsi".
X 
X-		rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi
X-
X-		(modify this according to your OS). And don't forget to
X-		modify /etc/shadow the way it needs to be on your OS.
X+To enable remote SCSI via the login shell method you should do the following:
X 
X-	-	Create a  home directory for this user and add a .rhosts file
X-		to allow access to all users you like.
X+	-	Make sure that there is an entry for rshd(8) in /etc/inetd.conf
X+		and inetd(8) is running.
X 
X-	-	Install rscsi suid root into /opt/schily/sbin
X+	-	Edit /usr/local/rscsi/.rhosts to allow access to all users you
X+		like.
X 
X-	-	Install a file /etc/default/rscsi and define access rights.
X+	-	Edit /usr/local/etc/rscsi and define access rights.
X 		Without this file, rscsi will not work at all.
X 
X-		The template for this file is: rscsi/rscsi.dfl
X+		The template for this file is: /usr/local/etc/rscsi.sample
X 
X RSCSI Security:
X 
7ec10ca9f4b72d311e51dd9cc54f31b4
echo x - cdrtools/files/pkg-message.in
sed 's/^X//' >cdrtools/files/pkg-message.in << '8f13aaccce606df69f96a5fd134c96c8'
X===========================================================================
X
XNote: The location of the cdrtools `defaults' files has been set to
X
X	%%PREFIX%%/etc
X
XThis is the FreeBSD ports standard config file location, NOT the cdrtools
Xstandard location, which is /etc/default.
X
XThe reason for this is that FreeBSD ports and packages should not use
Xconfiguration files outside of %%PREFIX%%.
X
X===========================================================================
8f13aaccce606df69f96a5fd134c96c8
echo x - cdrtools/files/patch-cdrecord::cdrecord.dfl
sed 's/^X//' >cdrtools/files/patch-cdrecord::cdrecord.dfl << 'a56e4c079e7231faa6243ca2166f8092'
X--- cdrecord/cdrecord.dfl.orig	Mon Aug 18 19:45:45 2003
X+++ cdrecord/cdrecord.dfl	Mon Aug 18 19:46:32 2003
X@@ -3,7 +3,7 @@
X # This file is /etc/default/cdrecord
X # It contains defaults that are used if no command line option
X # or environment is present.
X-# 
X+#
X # The default device, if not specified elswhere
X # Note that since Sommer 2006, cdrecord by default searches for a
X # single CD-ROM device. You should set CDR_DEVICE= together with
X@@ -11,15 +11,14 @@
X # one CR-ROM drive in your system.
X #
X #CDR_DEVICE=yamaha
X-#CDR_DEVICE=default
X 
X-# 
X+#
X # The default speed (speed=), if not specified elswhere
X #
X # Note that newer cdrecord versions do not default
X # to speed=1. For MMC compliant drives, the default
X # is to write at maximum speed, so it in general does
X-# not make sense to set up a default speed in /etc/default/cdrecord 
X+# not make sense to set up a default speed in /etc/default/cdrecord
X #
X #CDR_SPEED=40
X 
X@@ -34,7 +33,7 @@
X # Linux and Solaris have problems with bigger transfer sizes.
X # If you are on FreeBSD, it is recommened to set CDR_TRANSFERSIZE=126k
X #
X-#CDR_TRANSFERSIZE=32k
X+CDR_TRANSFERSIZE=126k
X 
X #
X # The following definitions allow abstract device names.
X@@ -56,14 +55,14 @@
X #
X # drive name	device		speed	fifosize driveropts	transfersize
X #
X-my-default=	1,0,0		-1	-1	burnfree	63k
X-sol-default=	USCSI:1,0,0	-1	-1	burnfree
X-ricoh-u=	USCSI:0,2,0	-1	-1	burnfree
X-teac=		1,3,0		-1	-1	""
X-teac-max-ts=	1,3,0		-1	-1	""		32k
X-panasonic=	1,4,0		-1	-1	""
X-plextor=	1,4,0		-1	-1	""
X-sanyo=		1,4,0		-1	-1	burnfree
X-yamaha=		1,5,0		-1	-1	""
X-cdrom=		0,6,0		2	1m	""
X-remote=	REMOTE:rscsi@somehost:1,0,0 16	16m	burnfree
X+#my-default=	1,0,0		-1	-1	burnfree	63k
X+#sol-default=	USCSI:1,0,0	-1	-1	burnfree
X+#ricoh-u=	USCSI:0,2,0	-1	-1	burnfree
X+#teac=		1,3,0		-1	-1	""
X+#teac-max-ts=	1,3,0		-1	-1	""		32k
X+#panasonic=	1,4,0		-1	-1	""
X+#plextor=	1,4,0		-1	-1	""
X+#sanyo=		1,4,0		-1	-1	burnfree
X+#yamaha=		1,5,0		-1	-1	""
X+#cdrom=		0,6,0		2	1m	""
X+#remote=	REMOTE:rscsi@somehost:1,0,0 16	16m	burnfree
a56e4c079e7231faa6243ca2166f8092
echo x - cdrtools/distinfo
sed 's/^X//' >cdrtools/distinfo << 'a97da5e41977c8cc14224ebcf386b2ca'
XSHA256 (cdrtools-3.00.tar.bz2) = 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d
XSIZE (cdrtools-3.00.tar.bz2) = 1978563
a97da5e41977c8cc14224ebcf386b2ca
echo x - cdrtools/Makefile
sed 's/^X//' >cdrtools/Makefile << 'bdac4c077983a2e6d8fb8601582b8b78'
X# New ports collection makefile for:	cdrtools
X# Date created:		Wed Jul 25 23:30:19 CEST 2001
X# Whom:			Dirk Froemberg <dirk@FreeBSD.org>
X#
X# $FreeBSD: head/sysutils/cdrtools/Makefile 300897 2012-07-14 14:29:18Z beat $
X#
X###########################################################################
X# This makefile was contributed by Marius Strobl.
X###########################################################################
X# The contents of this file are subject to the terms of the
X# Common Development and Distribution License, Version 1.0 only
X# (the "License").  You may not use this file except in compliance
X# with the License.
X#
X# See the file CDDL.Schily.txt in this distribution for details.
X#
X# When distributing Covered Code, include this CDDL HEADER in each
X# file and include the License file CDDL.Schily.txt from this distribution.
X###########################################################################
X# The file CDDL.Schily.txt can be found in the original cdrtools tarball,
X# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
X###########################################################################
X
XPORTNAME=	cdrtools
XPORTVERSION=	3.00
XPORTREVISION=	3
XCATEGORIES=	sysutils audio
XMASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/ \
X		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/
X
XMAINTAINER=	marius@FreeBSD.org
XCOMMENT=	CD/DVD/BluRay and ISO-9660 image creation and extraction tools
X
XCONFLICTS=	cdrkit-* cdrtools-devel-* cjk-cdrtools-*
X
XMAN1=		btcflash.1 cdda2wav.1 cdrecord.1 readcd.1 scgcheck.1
XMAN8=		isoinfo.8 mkisofs.8
XMLINKS=		isoinfo.8 devdump.8 isoinfo.8 isodump.8 isoinfo.8 isovfy.8 \
X		mkisofs.8 mkhybrid.8
XDOCS=		README.FreeBSD README.mkisofs
XCDDA2WAVDOCS=	FAQ Frontends HOWTOUSE OtherProgs README THANKS TODO
XCDRECORDDOCS=	README README.ATAPI README.DiskT@2 README.WORM README.audio \
X		README.cdplus README.cdrw README.cdtext README.clone \
X		README.copy README.multi README.raw README.rscsi README.sony \
X		README.verify
XMKISOFSDOCS=	README README.compression README.eltorito README.graft_dirs \
X		README.hfs_boot README.hfs_magic README.hide README.joliet \
X		README.macosx README.mkhybrid README.prep_boot README.rootinfo \
X		README.session README.sort README.sparcboot README.sunx86boot
XSICONVTABLES=	cp10000 cp10006 cp10007 cp10029 cp10079 cp10081 cp1250 \
X		cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
X		cp437 cp737 cp775 cp850 cp852 cp855 cp857 cp860 cp861 \
X		cp862 cp863 cp864 cp865 cp866 cp869 cp874 iso8859-1 \
X		iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \
X		iso8859-16 iso8859-2 iso8859-3 iso8859-4 iso8859-5 \
X		iso8859-6 iso8859-7 iso8859-8 iso8859-9 koi8-r koi8-u
X
XUSE_BZIP2=	yes
XUSE_GMAKE=	yes
XUSE_GCC=	any
X#CFLAGS+=	-DSOURCE_MODIFIED
XSUB_FILES=	pkg-message
XMAKE_JOBS_UNSAFE=	yes
X
X.if defined(WITH_CDDA2MP3)
XMAN1+=		cdda2mp3.1
XPLIST_SUB+=	CDDA2MP3=""
XRUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
X.else
XPLIST_SUB+=	CDDA2MP3="@comment "
X.endif
X.if defined(WITH_CDDA2OGG)
XMAN1+=		cdda2ogg.1
XPLIST_SUB+=	CDDA2OGG=""
XRUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
X.else
XPLIST_SUB+=	CDDA2OGG="@comment "
X.endif
X.if defined(WITH_RSCSI)
XMAN1+=		rscsi.1
XPKGINSTALL=	${PKGDIR}/pkg-install.rscsi
XPLIST_SUB+=	RSCSI=""
XPKGNAMESUFFIX=	-rscsi
X.else
XPLIST_SUB+=	RSCSI="@comment "
X.endif
X
X# Hack to allow building with TARGET and TARGET_ARCH set in the environment
X# as done by the release building scripts.
XSETENV=		/usr/bin/env -i
XMAKE_ENV=	PATH=${PATH}
X
XMAKE_ENV+=	CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \
X		INS_RBASE=${LOCALBASE}
XCDRTLSTARGET=	${ARCH:S/powerpc64/powerpc/}-freebsd-cc
X
X.include <bsd.port.pre.mk>
X
X.if exists(${LOCALBASE}/lib/libiconv.a) || \
X	exists(${LOCALBASE}/lib/libintl.a) || !defined(WITHOUT_NLS)
XMAKE_ENV+=	OSDEFS=-I${LOCALBASE}/include
XUSE_GETTEXT=	yes
XUSE_ICONV=	yes
X.endif
X
Xpre-everything::
X.if !defined(WITH_CDDA2MP3) || !defined(CDDA2OGG) || !defined(WITH_RSCSI)
X	@${ECHO_MSG} ""
X	@${ECHO_MSG} "You may use the following build option(s):"
X	@${ECHO_MSG} ""
X.if !defined(WITH_CDDA2MP3)
X	@${ECHO_MSG} "WITH_CDDA2MP3=yes	builds with cdda2mp3 (requires audio/lame)"
X.endif
X.if !defined(WITH_CDDA2OGG)
X	@${ECHO_MSG} "WITH_CDDA2OGG=yes	builds with cdda2ogg (requires audio/vorbis-tools)"
X.endif
X.if !defined(WITH_RSCSI)
X	@${ECHO_MSG} "WITH_RSCSI=yes		builds with the rscsi daemon which provides access to"
X	@${ECHO_MSG} "			local SCSI-devices over the network (the client-side"
X	@${ECHO_MSG} "			in cdda2wav, cdrecord, etc. is built unconditionally)."
X	@${ECHO_MSG} "			BEWARE:	The rscsi binary will be installed suid root"
X	@${ECHO_MSG} "				as this is the preferred way of setting it up."
X.endif
X	@${ECHO_MSG} ""
X.endif
X
Xpost-extract:
X.for i in config.guess config.sub
X.for j in autoconf conf cdda2wav
X	@${CP} -fp ${PORTSDIR}/Templates/${i} ${WRKSRC}/${j}
X.endfor
X.endfor
X.if ${CDRTLSTARGET} != "i386-freebsd-cc"
X	@${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \
X		${WRKSRC}/RULES/${CDRTLSTARGET}.rul
X.endif
X
Xpost-patch:
X	@${RM} ${WRKSRC}/TARGETS/55scgskeleton ${WRKSRC}/TARGETS/85man
X.if !defined(WITH_RSCSI)
X	@${RM} ${WRKSRC}/TARGETS/55rscsi
X.endif
X	@${REINPLACE_CMD} -e 's|\/opt\/schily\/bin\/|${PREFIX}\/etc\/|g' \
X		${WRKSRC}/cdda2wav/cdda2ogg.1
X.for i in DEFAULTS/Defaults.freebsd btcflash/btcflash.1 cdda2wav/cdda2mp3 \
X	cdda2wav/cdda2ogg cdda2wav/cdda2ogg.1 cdda2wav/cdda2wav.1 \
X	cdrecord/README.rscsi cdrecord/cdrecord.1 cdrecord/cdrecord.dfl \
X	include/schily/deflts.h libcdrdeflt/cdrdeflt.c librscg/scsi-remote.c \
X	readcd/readcd.1 rscsi/rscsi.1 rscsi/rscsi.c rscsi/rscsi.dfl \
X	scgcheck/scgcheck.1
X	@${REINPLACE_CMD} -e 's|\/opt\/schily|${PREFIX}|g; \
X		s|\/usr\/local|${PREFIX}|g; s|\/etc\/default|${PREFIX}\/etc|g; \
X		s|\/var\/adm\/messages|\/var\/run\/dmesg.boot|g; \
X		s|^CDDA2WAV=|&${PREFIX}\/bin\/|g; \
X		s|^MP_CODER=|&${LOCALBASE}\/bin\/|g' ${WRKSRC}/${i}
X.endfor
X	@${MV} -f ${WRKSRC}/libparanoia/cdda_paranoia.h \
X		${WRKSRC}/libparanoia/js_cdda_paranoia.h
X.for i in cdda2wav/cdda2wav.c cdda2wav/global.h libparanoia/gap.c \
X	libparanoia/overlap.c libparanoia/p_block.c libparanoia/paranoia.c
X	@${REINPLACE_CMD} -e 's|cdda_paranoia\.h|js_cdda_paranoia.h|g' \
X		${WRKSRC}/${i}
X.endfor
X#	@${REINPLACE_CMD} -E -e \
X#		's|#define.+INSERT_YOUR_EMAIL_ADDRESS_HERE|& "${MAINTAINER}"|' \
X#		${WRKSRC}/cdrecord/cdrecord.c
X
Xdo-install:
X	@${INSTALL_PROGRAM} ${WRKSRC}/btcflash/OBJ/${CDRTLSTARGET}/btcflash \
X		${PREFIX}/bin
X.if defined(WITH_CDDA2MP3)
X	@${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2mp3 ${PREFIX}/bin
X	@${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \
X		${PREFIX}/man/man1/cdda2mp3.1
X.endif
X.if defined(WITH_CDDA2OGG)
X	@${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2ogg ${PREFIX}/bin
X	@${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 ${PREFIX}/man/man1
X.endif
X	@${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \
X		${PREFIX}/bin
X	@${LN} -sf cdda2wav ${PREFIX}/bin/list_audio_tracks
X	@${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/${CDRTLSTARGET}/cdrecord \
X		${PREFIX}/bin
X.for i in devdump isodebug isodump isoinfo isovfy
X	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${CDRTLSTARGET}/${i} \
X		${PREFIX}/bin
X.endfor
X	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/OBJ/${CDRTLSTARGET}/mkisofs \
X		${PREFIX}/bin
X	@${LN} -sf mkisofs ${PREFIX}/bin/mkhybrid
X	@${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${CDRTLSTARGET}/readcd \
X		${PREFIX}/bin
X.if defined(WITH_RSCSI)
X	@${INSTALL_PROGRAM} ${WRKSRC}/rscsi/OBJ/${CDRTLSTARGET}/rscsi \
X		${PREFIX}/sbin
X	@${CHMOD} u+s ${PREFIX}/sbin/rscsi
X.endif
X	@${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${CDRTLSTARGET}/scgcheck \
X		${PREFIX}/bin
X	@${INSTALL_MAN} ${WRKSRC}/btcflash/btcflash.1 ${PREFIX}/man/man1
X	@${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 ${PREFIX}/man/man1
X	@${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1
X	@${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${PREFIX}/man/man1
X.if defined(WITH_RSCSI)
X	@${INSTALL_MAN} ${WRKSRC}/rscsi/rscsi.1 ${PREFIX}/man/man1
X.endif
X	@${INSTALL_MAN} ${WRKSRC}/scgcheck/scgcheck.1 ${PREFIX}/man/man1
X	@${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${PREFIX}/man/man8
X	@${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 ${PREFIX}/man/man8
X	@${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \
X		${PREFIX}/etc/cdrecord.sample
X.if !exists(${PREFIX}/etc/cdrecord)
X	@${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl ${PREFIX}/etc/cdrecord
X.endif
X	@${MKDIR} ${PREFIX}/lib/siconv
X.for i in ${SICONVTABLES}
X	@${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/${i} ${PREFIX}/lib/siconv
X.endfor
X.if defined(WITH_RSCSI)
X	@${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi.sample
X.if !exists(${PREFIX}/etc/rscsi)
X	@${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi
X.endif
X.endif
X.if !defined(NOPORTDOCS)
X	@${MKDIR} ${DOCSDIR}
X.for i in ${DOCS}
X	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
X.endfor
X	@${MKDIR} ${DOCSDIR}/cdda2wav
X.for i in ${CDDA2WAVDOCS}
X	@${INSTALL_DATA} ${WRKSRC}/cdda2wav/${i} ${DOCSDIR}/cdda2wav
X.endfor
X	@${MKDIR} ${DOCSDIR}/cdrecord
X.for i in ${CDRECORDDOCS}
X	@${INSTALL_DATA} ${WRKSRC}/cdrecord/${i} ${DOCSDIR}/cdrecord
X.endfor
X	@${MKDIR} ${DOCSDIR}/mkisofs
X.for i in ${MKISOFSDOCS}
X	@${INSTALL_DATA} ${WRKSRC}/mkisofs/${i} ${DOCSDIR}/mkisofs
X.endfor
X.endif
X
Xpost-install:
X	-@if [ -f ${PKGINSTALL} ]; then ${SETENV} PKG_PREFIX=${PREFIX} \
X		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; fi
X	@${CAT} ${PKGMESSAGE}
X
X.include <bsd.port.post.mk>
bdac4c077983a2e6d8fb8601582b8b78
echo x - cdrtools/pkg-install.rscsi
sed 's/^X//' >cdrtools/pkg-install.rscsi << '370b62051f98700fe801433b8b968e41'
X#!/bin/sh
X
XPATH=/bin:/usr/sbin:/usr/bin
X
XPKG_PREFIX=${PKG_PREFIX:=/usr/local}
X
Xcase $2 in
X	PRE-INSTALL)
X		;;
X
X	POST-INSTALL)
X		USER=rscsi
X		UID=99
X		GROUP=${USER}
X		GID=${UID}
X		UCOMMENT="Remote SCSI"
X		UHOME=${PKG_PREFIX}/rscsi
X		USHELL=${PKG_PREFIX}/sbin/rscsi
X
X		echo "==========================================================================="
X		echo
X
X		if ! pw groupshow "${GROUP}" >/dev/null 2>&1; then
X			if ! pw groupadd ${GROUP} -g ${GID}; then
X				echo "Adding group \"${GROUP}\" failed."
X				exit 1
X			fi
X		fi
X
X		if ! pw usershow "${USER}" >/dev/null 2>&1; then
X			if ! pw useradd ${USER} -u ${UID} -c "${UCOMMENT}" \
X				-d ${UHOME} -g ${GROUP} -s ${USHELL}; then
X				echo "Adding user \"${USER}\" failed."
X				exit 1
X			fi
X		fi
X
X		if ! [ -d ${UHOME} ] ; then 
X			mkdir -p ${UHOME}
X			chown ${UID}:${GID} ${UHOME}
X		fi
X
X		if ! [ -f ${UHOME}/.rhosts ] ; then
X			cp /usr/share/skel/dot.rhosts ${UHOME}/.rhosts
X			chown ${UID}:${GID} ${UHOME}/.rhosts
X			chmod 0600 ${UHOME}/.rhosts
X		fi
X
X		echo "See ${PKG_PREFIX}/share/doc/cdrtools/README.rscsi and ${PKG_PREFIX}/etc/rscsi"
X		echo "for further information on how to configure remote access to SCSI-devices"
X		echo "via rscsi."
X
X		if ! grep '^shell' /etc/inetd.conf >/dev/null 2>&1; then
X			echo "Don't forget to add an entry for rshd(8) to /etc/inetd.conf in order to"
X			echo "be able to use the remote SCSI daemon."
X		fi
X
X		echo
X
X		;;
Xesac
370b62051f98700fe801433b8b968e41
exit



>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210162150.q9GLo6w8080118>