Index: head/sysutils/cdrtools/Makefile =================================================================== --- head/sysutils/cdrtools/Makefile (revision 404709) +++ head/sysutils/cdrtools/Makefile (revision 404710) @@ -1,220 +1,217 @@ # Created by: Dirk Froemberg # $FreeBSD$ ########################################################################### # This makefile was contributed by Marius Strobl. ########################################################################### # 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. ########################################################################### # The file CDDL.Schily.txt can be found in the original cdrtools tarball, # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. ########################################################################### PORTNAME= cdrtools -PORTVERSION= 3.00 -PORTREVISION= 2 +PORTVERSION= 3.01 CATEGORIES= sysutils audio MASTER_SITES= SF/${PORTNAME} MAINTAINER= marius@FreeBSD.org COMMENT= CD/DVD/BluRay and ISO-9660 image creation and extraction tools LICENSE= BSD2CLAUSE CDDL GPLv2 LGPL21 LICENSE_COMB= multi CONFLICTS= cdrkit-* cdrtools-devel-* cjk-cdrtools-* DOCS= README.FreeBSD README.mkisofs CDDA2WAVDOCS= FAQ Frontends HOWTOUSE OtherProgs README THANKS TODO CDRECORDDOCS= README README.ATAPI README.DiskT@2 README.WORM README.audio \ README.cdplus README.cdrw README.cdtext README.clone \ README.copy README.multi README.raw README.rscsi README.sony \ README.verify MKISOFSDOCS= README README.compression README.eltorito README.graft_dirs \ README.hfs_boot README.hfs_magic README.hide README.joliet \ README.macosx README.mkhybrid README.prep_boot README.rootinfo \ README.session README.sort README.sparcboot README.sunx86boot SICONVTABLES= cp10000 cp10006 cp10007 cp10029 cp10079 cp10081 cp1250 \ cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \ cp437 cp737 cp775 cp850 cp852 cp855 cp857 cp860 cp861 \ cp862 cp863 cp864 cp865 cp866 cp869 cp874 iso8859-1 \ iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \ iso8859-16 iso8859-2 iso8859-3 iso8859-4 iso8859-5 \ iso8859-6 iso8859-7 iso8859-8 iso8859-9 koi8-r koi8-u USES= gmake tar:bzip2 #CFLAGS+= -DSOURCE_MODIFIED SUB_FILES= pkg-message MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= CDDA2MP3 CDDA2OGG DOCS NLS RSCSI CDDA2MP3_DESC= Build cdda2mp3 (requires audio/lame) CDDA2OGG_DESC= Build cdda2ogg (requires audio/vorbis-tools) RSCSI_DESC= Build rscsi suid root remote SCSI access daemon .include .if ${PORT_OPTIONS:MCDDA2MP3} PLIST_SUB+= CDDA2MP3="" RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame .else PLIST_SUB+= CDDA2MP3="@comment " .endif .if ${PORT_OPTIONS:MCDDA2OGG} PLIST_SUB+= CDDA2OGG="" RUN_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools .else PLIST_SUB+= CDDA2OGG="@comment " .endif .if ${PORT_OPTIONS:MRSCSI} PKGINSTALL= ${PKGDIR}/pkg-install.rscsi PLIST_SUB+= RSCSI="" PKGNAMESUFFIX= -rscsi .else PLIST_SUB+= RSCSI="@comment " .endif MAKE_ENV= CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \ INS_RBASE=${LOCALBASE} -CDRTLSTARGET= ${ARCH:S/powerpc64/powerpc/}-${OPSYS:tl}-cc +CDRTLSTARGET= ${ARCH}-${OPSYS:tl}-cc +CDRTLSXARCH!= ${UNAME} -m .if exists(/usr/include/iconv.h) || exists(${LOCALBASE}/lib/libiconv.a) || \ exists(${LOCALBASE}/lib/libintl.a) || ${PORT_OPTIONS:MNLS} -MAKE_ENV+= OSDEFS=-I${LOCALBASE}/include +MAKE_ENV+= DEFOSINCDIRS=${LOCALBASE}/include LDPATH=-L${LOCALBASE}/lib USES+= gettext iconv .endif post-extract: .for i in config.guess config.sub .for j in autoconf conf cdda2wav @${CP} -fp ${PORTSDIR}/Templates/${i} ${WRKSRC}/${j} .endfor .endfor -.if ${CDRTLSTARGET} != "i386-freebsd-cc" +.if ${CDRTLSXARCH} != "i386" @${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \ - ${WRKSRC}/RULES/${CDRTLSTARGET}.rul + ${WRKSRC}/RULES/${CDRTLSXARCH}-${OPSYS:tl}-cc.rul .endif post-patch: @${RM} ${WRKSRC}/TARGETS/55scgskeleton ${WRKSRC}/TARGETS/85man .if !${PORT_OPTIONS:MRSCSI} @${RM} ${WRKSRC}/TARGETS/55rscsi .endif - @${REINPLACE_CMD} -e 's|\/opt\/schily\/bin\/|${PREFIX}\/etc\/|g' \ - ${WRKSRC}/cdda2wav/cdda2ogg.1 -.for i in DEFAULTS/Defaults.freebsd btcflash/btcflash.1 cdda2wav/cdda2mp3 \ - cdda2wav/cdda2ogg cdda2wav/cdda2ogg.1 cdda2wav/cdda2wav.1 \ - cdrecord/README.rscsi cdrecord/cdrecord.1 cdrecord/cdrecord.dfl \ - include/schily/deflts.h libcdrdeflt/cdrdeflt.c librscg/scsi-remote.c \ - readcd/readcd.1 rscsi/rscsi.1 rscsi/rscsi.c rscsi/rscsi.dfl \ - scgcheck/scgcheck.1 +.for i in btcflash/btcflash.1 cdda2wav/cdda2mp3 cdda2wav/cdda2ogg \ + cdda2wav/cdda2ogg.1 cdda2wav/cdda2wav.1 cdrecord/README.rscsi \ + cdrecord/cdrecord.1 cdrecord/cdrecord.dfl include/schily/deflts.h \ + libcdrdeflt/cdrdeflt.c librscg/scsi-remote.c readcd/readcd.1 \ + rscsi/rscsi.1 rscsi/rscsi.c rscsi/rscsi.dfl scgcheck/scgcheck.1 @${REINPLACE_CMD} -e 's|\/opt\/schily|${PREFIX}|g; \ s|\/usr\/local|${PREFIX}|g; s|\/etc\/default|${PREFIX}\/etc|g; \ s|\/var\/adm\/messages|\/var\/run\/dmesg.boot|g; \ s|^CDDA2WAV=|&${PREFIX}\/bin\/|g; \ s|^MP_CODER=|&${LOCALBASE}\/bin\/|g' ${WRKSRC}/${i} .endfor @${MV} -f ${WRKSRC}/libparanoia/cdda_paranoia.h \ ${WRKSRC}/libparanoia/js_cdda_paranoia.h .for i in cdda2wav/cdda2wav.c cdda2wav/global.h libparanoia/gap.c \ libparanoia/overlap.c libparanoia/p_block.c libparanoia/paranoia.c @${REINPLACE_CMD} -e 's|cdda_paranoia\.h|js_cdda_paranoia.h|g' \ ${WRKSRC}/${i} .endfor # @${REINPLACE_CMD} -E -e \ # 's|#define.+INSERT_YOUR_EMAIL_ADDRESS_HERE|& "${MAINTAINER}"|' \ # ${WRKSRC}/cdrecord/cdrecord.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/btcflash/OBJ/${CDRTLSTARGET}/btcflash \ ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MCDDA2MP3} ${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2mp3 ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \ ${STAGEDIR}${PREFIX}/man/man1/cdda2mp3.1 .endif .if ${PORT_OPTIONS:MCDDA2OGG} ${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2ogg ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \ ${STAGEDIR}${PREFIX}/man/man1 .endif ${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \ ${STAGEDIR}${PREFIX}/bin ${LN} -sf cdda2wav ${STAGEDIR}${PREFIX}/bin/list_audio_tracks ${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/${CDRTLSTARGET}/cdrecord \ ${STAGEDIR}${PREFIX}/bin .for i in devdump isodebug isodump isoinfo isovfy ${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${CDRTLSTARGET}/${i} \ ${STAGEDIR}${PREFIX}/bin .endfor ${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/OBJ/${CDRTLSTARGET}/mkisofs \ ${STAGEDIR}${PREFIX}/bin ${LN} -sf mkisofs ${STAGEDIR}${PREFIX}/bin/mkhybrid ${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${CDRTLSTARGET}/readcd \ ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MRSCSI} ${INSTALL_PROGRAM} ${WRKSRC}/rscsi/OBJ/${CDRTLSTARGET}/rscsi \ ${STAGEDIR}${PREFIX}/sbin .endif ${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${CDRTLSTARGET}/scgcheck \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/btcflash/btcflash.1 \ ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 \ ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 \ ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${STAGEDIR}${PREFIX}/man/man1 .if ${PORT_OPTIONS:MRSCSI} @${INSTALL_MAN} ${WRKSRC}/rscsi/rscsi.1 ${STAGEDIR}${PREFIX}/man/man1 .endif ${INSTALL_MAN} ${WRKSRC}/scgcheck/scgcheck.1 \ ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${STAGEDIR}${PREFIX}/man/man8 ${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 \ ${STAGEDIR}${PREFIX}/man/man8 ${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \ ${STAGEDIR}${PREFIX}/etc/cdrecord.sample .if !exists(${STAGEDIR}${PREFIX}/etc/cdrecord) ${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \ ${STAGEDIR}${PREFIX}/etc/cdrecord .endif ${MKDIR} ${STAGEDIR}${PREFIX}/lib/siconv .for i in ${SICONVTABLES} ${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/${i} \ ${STAGEDIR}${PREFIX}/lib/siconv .endfor .if ${PORT_OPTIONS:MRSCSI} ${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl \ ${STAGEDIR}${PREFIX}/etc/rscsi.sample .if !exists(${STAGEDIR}${PREFIX}/etc/rscsi) ${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${STAGEDIR}${PREFIX}/etc/rscsi .endif .endif ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR}/cdda2wav .for i in ${CDDA2WAVDOCS} ${INSTALL_DATA} ${WRKSRC}/cdda2wav/${i} ${STAGEDIR}${DOCSDIR}/cdda2wav .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR}/cdrecord .for i in ${CDRECORDDOCS} ${INSTALL_DATA} ${WRKSRC}/cdrecord/${i} ${STAGEDIR}${DOCSDIR}/cdrecord .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR}/mkisofs .for i in ${MKISOFSDOCS} ${INSTALL_DATA} ${WRKSRC}/mkisofs/${i} ${STAGEDIR}${DOCSDIR}/mkisofs .endfor .include Index: head/sysutils/cdrtools/distinfo =================================================================== --- head/sysutils/cdrtools/distinfo (revision 404709) +++ head/sysutils/cdrtools/distinfo (revision 404710) @@ -1,2 +1,2 @@ -SHA256 (cdrtools-3.00.tar.bz2) = 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d -SIZE (cdrtools-3.00.tar.bz2) = 1978563 +SHA256 (cdrtools-3.01.tar.bz2) = ed282eb6276c4154ce6a0b5dee0bdb81940d0cbbfc7d03f769c4735ef5f5860f +SIZE (cdrtools-3.01.tar.bz2) = 2087416 Index: head/sysutils/cdrtools/files/patch-DEFAULTS__Defaults.freebsd =================================================================== --- head/sysutils/cdrtools/files/patch-DEFAULTS__Defaults.freebsd (nonexistent) +++ head/sysutils/cdrtools/files/patch-DEFAULTS__Defaults.freebsd (revision 404710) @@ -0,0 +1,30 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# 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. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- DEFAULTS/Defaults.freebsd.orig 2013-11-04 21:58:20.000000000 +0100 ++++ DEFAULTS/Defaults.freebsd 2014-02-03 01:16:19.000000000 +0100 +@@ -29,8 +29,8 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-DEFOSINCDIRS= /usr/local/include +-LDPATH= -L/opt/schily/lib -L/usr/local/lib ++#DEFOSINCDIRS= /usr/local/include ++#LDPATH= -L/opt/schily/lib -L/usr/local/lib + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) Will probably not work + + ########################################################################### Property changes on: head/sysutils/cdrtools/files/patch-DEFAULTS__Defaults.freebsd ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul =================================================================== --- head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul (revision 404709) +++ head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul (revision 404710) @@ -1,68 +1,88 @@ ########################################################################### # This patch was contributed by Marius Strobl. ########################################################################### # 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. ########################################################################### # The file CDDL.Schily.txt can be found in the original cdrtools tarball, # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. ########################################################################### --- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006 +++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006 -@@ -20,8 +20,9 @@ - ########################################################################### +@@ -24,11 +24,12 @@ + GCC_OPT= + GCC_OPT32= -m32 + GCC_OPT64= -m64 +-GCC_OPTXX= $(GCC_OPT$(C_ARCH:gcc%=%)) ++GCC_OPTXX= - CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) + CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) $(OSINCDIRS:%=-I%) $(OSDEFS) $(OSDEFSX) -CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) -C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX) +XCFLAGS:= $(CFLAGS) +CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) -+C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(XCFLAGS) $(G++OPTOPT) $(C++OPTX) ++C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(CXXFLAGS) $(G++OPTOPT) $(C++OPTX) - CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS) - COPTS= -@@ -29,12 +30,10 @@ + CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) + COPTS= $(GCC_OPTXX) +@@ -36,12 +37,10 @@ CWOPTS= -Wall -Wtraditional CWOPTS= -Wall -Wno-unknown-pragmas \ -Wshadow -Wmissing-prototypes -Wstrict-prototypes -COPTOPT= -O COPTDYN= -fpic COPTGPROF= -pg - C++OPTS= + C++OPTS= $(GCC_OPTXX) C++WOPTS= $(CWOPTS) -C++OPTOPT= $(COPTOPT) C++OPTDYN= -fpic C++OPTGPROF= -pg -@@ -54,15 +53,15 @@ +@@ -61,28 +60,18 @@ FLOAT_OPTIONS= --CC= @echo " ==> COMPILING \"$@\""; gcc --CC++ = @echo " ==> COMPILING \"$@\""; g++ --LDCC= @echo " ==> LINKING \"$@\""; gcc --LDCC++ = @echo " ==> LINKING \"$@\""; g++ --DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc --DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; g++ +-__CC_COM= $(_UNIQ)$(CC) +-___CC_COM= $(__CC_COM:$(_UNIQ)=$(CC_COM_DEF)) +-CC_COM= $(___CC_COM:$(_UNIQ)%=%) +- +-__CC++_COM= $(_UNIQ)$(CCC) +-___CC++_COM= $(__CC++_COM:$(_UNIQ)=$(CC++_COM_DEF)) +-CC++_COM= $(___CC++_COM:$(_UNIQ)%=%) +- +-CC_COM_DEF= gcc +-CC++_COM_DEF= g++ +-CC= $(CC_COM_DEF) +-CCC= $(CC++_COM_DEF) +- +-CCCC= @echo " ==> COMPILING \"$@\""; $(CC_COM) $(GCC_OPTXX) +-CC++ = @echo " ==> COMPILING \"$@\""; $(CC++_COM) $(GCC_OPTXX) +-LDCC= @echo " ==> LINKING \"$@\""; $(CC_COM) $(GCC_OPTXX) +-LDCC++ = @echo " ==> LINKING \"$@\""; $(CC++_COM) $(GCC_OPTXX) +-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; $(CC_COM) $(GCC_OPTXX) +-DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; $(CC++_COM) $(GCC_OPTXX) +CC_COM= $(CC) -+CC++ = $(CXX) -+LDCC= $(CC) -+LDCC++ = $(CXX) -+DYNLD= $(CC) -+DYNLDC++ = $(CXX) ++CC++_COM= $(CXX) ++ ++CCCC = $(CC_COM) ++CC++ = $(CC++_COM) ++LDCC= $(CC_COM) ++LDCC++ = $(CC++_COM) ++DYNLD= $(CC_COM) ++DYNLDC++ = $(CC++_COM) RMDEP= : --MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M -+MKDEP= $(CC) -M +-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC_COM) $(GCC_OPTXX) -M ++MKDEP= $(CC_COM) -M MKDEP_OUT= --MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); g++ -M -+MKC++DEP= $(CXX) -M +-MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC++_COM) $(GCC_OPTXX) -M ++MKC++DEP= $(CC++_COM) -M MKC++DEP_OUT= Index: head/sysutils/cdrtools/files/patch-include__schily__sha2.h =================================================================== --- head/sysutils/cdrtools/files/patch-include__schily__sha2.h (revision 404709) +++ head/sysutils/cdrtools/files/patch-include__schily__sha2.h (revision 404710) @@ -1,14 +1,15 @@ --- include/schily/sha2.h.orig 2009-08-09 14:29:59.000000000 +0200 +++ include/schily/sha2.h 2012-10-20 14:25:05.000000000 +0200 -@@ -102,9 +102,11 @@ +@@ -104,10 +104,12 @@ #ifdef HAVE_LONGLONG extern void SHA384Init __PR((SHA2_CTX *)); +#ifndef HAVE_PRAGMA_WEAK - extern void SHA384Transform __PR((UInt64_t state[8], const UInt8_t [SHA384_BLOCK_LENGTH])); + extern void SHA384Transform __PR((UInt64_t state[8], + const UInt8_t [SHA384_BLOCK_LENGTH])); extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t)); extern void SHA384Pad __PR((SHA2_CTX *)); +#endif - extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], SHA2_CTX *)); + extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], + SHA2_CTX *)); extern char *SHA384End __PR((SHA2_CTX *, char *)); - extern char *SHA384File __PR((const char *, char *)); Index: head/sysutils/cdrtools/files/patch-readcd__readcd.1 =================================================================== --- head/sysutils/cdrtools/files/patch-readcd__readcd.1 (revision 404709) +++ head/sysutils/cdrtools/files/patch-readcd__readcd.1 (revision 404710) @@ -1,30 +1,28 @@ ########################################################################### # This patch was contributed by Marius Strobl. ########################################################################### # 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. ########################################################################### # The file CDDL.Schily.txt can be found in the original cdrtools tarball, # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. ########################################################################### --- readcd/readcd.1.orig Mon Sep 29 14:53:05 2003 +++ readcd/readcd.1 Mon Sep 29 15:10:06 2003 -@@ -432,9 +432,7 @@ - .SH FILES +@@ -604,8 +604,6 @@ .SH SEE ALSO .BR cdrecord (1), --.BR mkisofs (1), + .BR mkisofs (8), -.BR scg (7), -.BR fbk (7), -+.BR mkisofs (8), .BR rcmd (3), .BR ssh (1). Index: head/sysutils/cdrtools/pkg-descr =================================================================== --- head/sysutils/cdrtools/pkg-descr (revision 404709) +++ head/sysutils/cdrtools/pkg-descr (revision 404710) @@ -1,22 +1,22 @@ The cdrtools software includes tools to create and/or extract ISO-9660 filesystems, verify their integrity, and write them to disc. This package contains the following programs: - btcflash (a firmware flash utility for BTC DRW1008 DVD+/-RW recorder) - cdda2wav (a digital CD audio extraction program) - cdrecord (a CD/DVD/BluRay recording program) - devdump (dump a device or file in hex) - isodebug (show debug info contained in an ISO-9660 image) - isodump (dump a device or file based on ISO-9660) - isoinfo (analyze or list an ISO-9660 image) - isovfy (verify an ISO-9660 image) - mkisofs (an ISO-9660 filesystem image creator) - mkhybrid (an ISO-9660/HFS filesystem image creator) Link to mkisofs. - readcd (a data CD reading and recording program) May be used to write to DVD-RAM and to copy Solaris boot CD's. - scgcheck (checks and validates the ABI of libscg) - rscsi (daemon providing access to local SCSI-devices over the network) -WWW: http://cdrecord.berlios.de/old/private/cdrecord.html +WWW: http://cdrecord.org/