- Update to 2.01a19.

- Remove one site that seems to have stopped carrying the latest alpha
  versions from MASTER_SITES.
- Install some PORTDOCS for cdda2wav.
- Refine the patching of the manual pages.
- Add a workaround for the bug in -current that causes cdrecord to trigger
  a panic.

Submitted by:	maintainer
This commit is contained in:
Alexander Leidinger 2003-09-30 17:09:58 +00:00
parent a4ab8a8bad
commit a2b303d7e4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=89909
8 changed files with 111 additions and 38 deletions

View file

@ -6,22 +6,19 @@
#
PORTNAME?= cdrtools
PORTVERSION?= 2.01a18
PORTVERSION?= 2.01a19
PORTREVISION?= 0
CATEGORIES?= sysutils audio
MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/alpha/ \
ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/alpha/
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/alpha/
PKGNAMESUFFIX= -devel
DISTNAME= cdrtools-2.01a18
DISTNAME= cdrtools-2.01a19
MAINTAINER= marius@alchemy.franken.de
COMMENT?= Cdrecord and other programs to extract and record CDs/CD-R[W]s
CONFLICTS?= cdrtools-[0-9]*
NO_LATEST_LINK= yes
.if defined(MKISOFS)
MAN8= isoinfo.8 mkisofs.8
MLINKS= isoinfo.8 devdump.8 isoinfo.8 isodump.8 isoinfo.8 isovfy.8 \
@ -36,25 +33,31 @@ DOCS= README README.DiskT@2 README.FreeBSD README.WORM README.cdplus \
README.cdrw README.cdtext README.clone README.copy \
README.mkisofs README.multi README.raw README.rscsi \
README.sony README.verify
CDDA2WAVDOCS= FAQ Frontends HOWTOUSE OtherProgs README THANKS TODO
.endif
NO_LATEST_LINK= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_REINPLACE= yes
MAKE_ENV= CCOM=${CC}
WRKSRC= ${WRKDIR}/${DISTNAME:C/a(.+)$//}
.if !defined(MKISOFS)
.if !defined(WITH_RSCSI)
PLIST_SUB= RSCSI="@comment "
.if defined(MKISOFS)
DOCSSRC= ${WRKSRC}/${PORTNAME}
PKGMESSAGE= ""
.else
DOCSSRC= ${WRKSRC}
PKGMESSAGE= ${WRKDIR}/pkg-message
.if defined(WITH_RSCSI)
PKGINSTALL= ${PKGDIR}/pkg-install.rscsi
PLIST_SUB= RSCSI=""
.endif
PKGMESSAGE= ${WRKDIR}/pkg-message
.else
PKGMESSAGE= ""
PLIST_SUB= RSCSI="@comment "
.endif
.endif
.include <bsd.port.pre.mk>
pre-everything::
.if !defined(MKISOFS)
@ -91,9 +94,9 @@ post-patch:
.if !defined(WITH_RSCSI)
@${RM} ${WRKSRC}/TARGETS/55rscsi
.endif
.for i in README.rscsi include/deflts.h cdrecord/cdrecord.1 \
cdrecord/cdrecord.dfl cdrecord/defaults.c readcd/readcd.1 \
rscsi/rscsi.c rscsi/rscsi.dfl scgcheck/scgcheck.1
.for i in README.rscsi include/deflts.h cdda2wav/cdda2wav.1 \
cdrecord/cdrecord.1 cdrecord/cdrecord.dfl cdrecord/defaults.c \
readcd/readcd.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' ${WRKSRC}/${i}
@ -113,18 +116,12 @@ do-install:
.endfor
@${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${PREFIX}/man/man8
@${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 ${PREFIX}/man/man8
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for i in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/mkisofs/${i} ${DOCSDIR}
.endfor
.endif
.else
@${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/${ARCH}-freebsd-cc/cdrecord \
${PREFIX}/bin
@${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${ARCH}-freebsd-cc/cdda2wav \
${PREFIX}/bin
@${LN} -sf cdda2wav ${PREFIX}/bin/list_audio_tracks
@${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/${ARCH}-freebsd-cc/cdrecord \
${PREFIX}/bin
@${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${ARCH}-freebsd-cc/readcd \
${PREFIX}/bin
.if defined(WITH_RSCSI)
@ -140,23 +137,25 @@ do-install:
@${INSTALL_MAN} ${WRKSRC}/scgcheck/scgcheck.1 ${PREFIX}/man/man1
@${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \
${PREFIX}/etc/cdrecord.sample
#.if !exists(${PREFIX}/etc/cdrecord)
# @${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl ${PREFIX}/etc/cdrecord
#.endif
@if ! [ -f ${PREFIX}/etc/cdrecord ]; then ${INSTALL_DATA} \
${WRKSRC}/cdrecord/cdrecord.dfl ${PREFIX}/etc/cdrecord; fi
.if !exists(${PREFIX}/etc/cdrecord)
@${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl ${PREFIX}/etc/cdrecord
.endif
.if defined(WITH_RSCSI)
@${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi.sample
#.if !exists(${PREFIX}/etc/rscsi)
# @${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi
#.endif
@if ! [ -f ${PREFIX}/etc/rscsi ]; then ${INSTALL_DATA} \
${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi; fi
.if !exists(${PREFIX}/etc/rscsi)
@${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi
.endif
.endif
.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for i in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
@${INSTALL_DATA} ${DOCSSRC}/${i} ${DOCSDIR}
.endfor
.if !defined(MKISOFS)
@${MKDIR} ${DOCSDIR}/cdda2wav
.for i in ${CDDA2WAVDOCS}
@${INSTALL_DATA} ${DOCSSRC}/cdda2wav/${i} ${DOCSDIR}/cdda2wav
.endfor
.endif
.endif
@ -166,4 +165,4 @@ post-install:
${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; fi
@if [ -f ${WRKDIR}/pkg-message ]; then ${CAT} ${WRKDIR}/pkg-message; fi
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View file

@ -1 +1 @@
MD5 (cdrtools-2.01a18.tar.bz2) = 0c6bb3399a2e2b93cfd4c3a777a6d84c
MD5 (cdrtools-2.01a19.tar.bz2) = d35cbd5af1b2a375656db66e9bd79739

View file

@ -0,0 +1,11 @@
--- cdrecord/cdrecord.1.orig Mon Sep 29 14:48:48 2003
+++ cdrecord/cdrecord.1 Mon Sep 29 14:49:23 2003
@@ -1738,8 +1738,6 @@
.SH SEE ALSO
.BR cdda2wav (1),
.BR readcd (1),
-.BR scg (7),
-.BR fbk (7),
.BR mkisofs (8),
.BR rcmd (3),
.BR ssh (1).

View file

@ -0,0 +1,10 @@
--- conf/configure.orig Fri Sep 19 16:47:37 2003
+++ conf/configure Fri Sep 19 16:49:26 2003
@@ -5567,6 +5567,7 @@
int
main()
{
+ exit(1);
if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0) {
if (errno == EINVAL || errno == ENOMEM ||
errno == EPERM || errno == EACCES)

View file

@ -0,0 +1,20 @@
--- mkisofs/mkisofs.8.orig Mon Sep 29 15:11:48 2003
+++ mkisofs/mkisofs.8 Mon Sep 29 15:19:01 2003
@@ -1668,7 +1668,7 @@
The format of the
.I magic
file is almost identical to the
-.BR magic (4)
+.BR magic (5)
file used by the Linux
.BR file (1)
command - the routines for reading and decoding the
@@ -1707,7 +1707,7 @@
.TE
.PP
The format of the file is described in the
-.BR magic (4)
+.BR magic (5)
man page. The only difference here is that for each entry in the magic file, the
.I message
for the initial offset

View file

@ -0,0 +1,13 @@
--- 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
.SH SEE ALSO
.BR cdrecord (1),
-.BR mkisofs (1),
-.BR scg (7),
-.BR fbk (7),
+.BR mkisofs (8),
.BR rcmd (3),
.BR ssh (1).

View file

@ -0,0 +1,12 @@
--- scgcheck/scgcheck.1.orig Mon Sep 29 14:56:16 2003
+++ scgcheck/scgcheck.1 Mon Sep 29 14:56:44 2003
@@ -234,8 +234,7 @@
.SH SEE ALSO
.BR cdrecord (1),
.BR readcd (1),
-.BR mkisofs (1),
-.BR scg (7).
+.BR mkisofs (8).
.SH NOTES
.PP

View file

@ -5,10 +5,10 @@ bin/readcd
bin/scgcheck
%%RSCSI%%sbin/rscsi
%%RSCSI%%@exec chmod u+s %B/%f
@unexec if cmp -s %D/etc/cdrecord %D/etc/cdrecord.sample; then rm -f %D/etc/cdrecord; else echo "If permanently deleting this package, %D/etc/cdrecord must be removed manually."; fi
@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
etc/cdrecord.sample
@exec [ -f %B/cdrecord ] || cp %B/%f %B/cdrecord
%%RSCSI%%@unexec if cmp -s %D/etc/rscsi %D/etc/rscsi.sample; then rm -f %D/etc/rscsi; else echo "If permanently deleting this package, %D/etc/rscsi must be removed manually."; fi
%%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
%%RSCSI%%etc/rscsi.sample
%%RSCSI%%@exec [ -f %B/rscsi ] || cp %B/%f %B/rscsi
%%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
@ -28,4 +28,12 @@ etc/cdrecord.sample
%%PORTDOCS%%%%DOCSDIR%%/README.rscsi
%%PORTDOCS%%%%DOCSDIR%%/README.sony
%%PORTDOCS%%%%DOCSDIR%%/README.verify
%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/FAQ
%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/Frontends
%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/HOWTOUSE
%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/OtherProgs
%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/README
%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/THANKS
%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/TODO
%%PORTDOCS%%@dirrm %%DOCSDIR%%/cdda2wav
%%PORTDOCS%%@dirrm %%DOCSDIR%%