Date: Sat, 22 Dec 2001 16:03:53 -0500 (EST) From: Alan Eldridge <alane@geeksrus.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/33095: update cdrtools to 1.11a13pre3 (1.10.p11.a13) Message-ID: <200112222103.fBML3r912110@wwweasel.geeksrus.net>
next in thread | raw e-mail | index | archive | help
>Number: 33095 >Category: ports >Synopsis: update cdrtools to 1.11a13pre3 (1.10.p11.a13) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 22 13:10:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: Alan Eldridge >Release: FreeBSD 4.4-STABLE i386 >Organization: Geeksrus.NET >Environment: System: FreeBSD wwweasel.geeksrus.net 4.4-STABLE FreeBSD 4.4-STABLE #0: Sun Dec 2 19:14:12 EST 2001 root@wwweasel.geeksrus.net:/usr/obj/usr/src/sys/WWWEASEL i386 >Description: Update to latest alpha version (capable of reading defective audio CDs recently released by some major record companies). This version (1.11) is a major rewrite according to the author. The version number I assigned 1.10.p11.a13 is designed to allow smooth upgrading once 1.11 (release) come out without need of PORTEPOCH. >How-To-Repeat: >Fix: diff -r -u3 -N cdrtools/Makefile cdrtools-alpha/Makefile --- cdrtools/Makefile Sun Nov 18 06:50:31 2001 +++ cdrtools-alpha/Makefile Sat Dec 22 00:25:56 2001 @@ -6,13 +6,14 @@ # PORTNAME?= cdrtools -PORTVERSION?= 1.10 -PORTREVISION?= 1 +PORTVERSION?= 1.10.p11.a13 +#PORTREVISION?= 1 CATEGORIES?= sysutils audio -MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \ - ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/ \ - ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/ -DISTNAME= cdrtools-1.10 +MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/ \ + ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/alpha/ \ + ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/alpha/ +WRKSRC= ${WRKDIR}/cdrtools-1.11 +DISTNAME= cdrtools-1.11a13pre3 MAINTAINER= dirk@FreeBSD.org @@ -55,11 +56,11 @@ @${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${ARCH}-freebsd-cc/cdda2wav \ ${PREFIX}/bin @${LN} -sf cdda2wav ${PREFIX}/bin/list_audio_tracks - @${INSTALL_PROGRAM} ${WRKSRC}/misc/OBJ/${ARCH}-freebsd-cc/readcd \ + @${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${ARCH}-freebsd-cc/readcd \ ${PREFIX}/bin @${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 ${PREFIX}/man/man1 @${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1 - @${INSTALL_MAN} ${WRKSRC}/misc/readcd.1 ${PREFIX}/man/man1 + @${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${PREFIX}/man/man1 .endif .include <bsd.port.mk> diff -r -u3 -N cdrtools/distinfo cdrtools-alpha/distinfo --- cdrtools/distinfo Thu Aug 2 04:55:16 2001 +++ cdrtools-alpha/distinfo Fri Dec 21 23:42:56 2001 @@ -1 +1 @@ -MD5 (cdrtools-1.10.tar.gz) = 3a7c452738eb9f58c738908d8146601d +MD5 (cdrtools-1.11a13pre3.tar.gz) = 877978dedc60e06018ff89056f3731e4 diff -r -u3 -N cdrtools/files/patch-aa cdrtools-alpha/files/patch-aa --- cdrtools/files/patch-aa Sun Nov 18 06:50:31 2001 +++ cdrtools-alpha/files/patch-aa Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- cdda2wav/ioctl.c.orig Sat Dec 9 23:39:59 2000 -+++ cdda2wav/ioctl.c Sun Nov 18 10:38:23 2001 -@@ -162,7 +162,7 @@ - exit( -1 ); - } - for (i = 0; i < tracks; i++) { -- toc[i].dwStartSector = entry[i].cdte_addr.lba; -+ toc[i].dwStartSector = ntohl(entry[i].cdte_addr.lba); - } - bufferTOC[0] = '\0'; - bufferTOC[1] = '\0'; diff -r -u3 -N cdrtools/files/patch-ai cdrtools-alpha/files/patch-ai --- cdrtools/files/patch-ai Thu Sep 20 05:59:50 2001 +++ cdrtools-alpha/files/patch-ai Sat Dec 22 15:34:57 2001 @@ -1,20 +1,24 @@ ---- cdrecord/drv_philips.c.orig Tue Feb 20 23:56:44 2001 -+++ cdrecord/drv_philips.c Tue Sep 18 17:42:51 2001 -@@ -505,12 +505,15 @@ - * READ BUFFER SCSI cmd which is meant to be used for - * something totally else, and which would only jam the - * Plasmon due to the incorrect parameters used. -+ * -+ * We need to return some !0 value, otherwise the upper -+ * layer would still issue a READ BUFFER, sigh. - */ - - if (sp) +--- cdrecord/drv_philips.c.orig Mon Nov 26 20:08:49 2001 ++++ cdrecord/drv_philips.c Sat Dec 22 15:33:33 2001 +@@ -540,12 +540,15 @@ + * the Plasmon drive. Calling READ BUFFER would only jam the Plasmon + * as the non standard implementation in the Plasmon firmware + * expects different parameters. +- */ +- +- if (sp) - *sp = 0L; -+ *sp = 1L * 1024 * 1024; - if (fp) +- if (fp) - *fp = 0L; -+ *fp = 1L * 1024 * 1024; ++ * ++ * We need to return some !0 value, otherwise the upper ++ * layer would still issue a READ BUFFER, sigh. ++ */ ++ ++ if (sp) ++ *sp = 1L * 1024 * 1024; ++ if (fp) ++ *fp = 1L * 1024 * 1024; return (100); /* 100 % */ } diff -r -u3 -N cdrtools/files/patch-ak cdrtools-alpha/files/patch-ak --- cdrtools/files/patch-ak Thu Aug 2 04:55:16 2001 +++ cdrtools-alpha/files/patch-ak Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- scgcheck/Makefile.orig Mon Mar 19 00:19:43 2001 -+++ scgcheck/Makefile Sun Jul 29 10:46:48 2001 -@@ -13,7 +13,7 @@ - - HFILES= scgcheck.h - #LIBS= -lschily $(LIB_SOCKET) --LIBS= -lrscg -lscg -lschily $(LIB_SOCKET) -+LIBS= -lrscg -lscg -lschily $(SCSILIB) $(LIB_SOCKET) - XMK_FILE= Makefile.man - - ########################################################################### >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112222103.fBML3r912110>