git: 4d92d8dc2c0c - main - audio/dagrab: Remove expired port:
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 31 Mar 2023 00:01:18 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4d92d8dc2c0c178e216f6711d042dab75e30c685
commit 4d92d8dc2c0c178e216f6711d042dab75e30c685
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-03-25 12:59:58 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-03-30 23:59:29 +0000
audio/dagrab: Remove expired port:
2023-03-31 audio/dagrab: Abandonware and superseded by audio/cdparanoia
---
MOVED | 1 +
audio/Makefile | 1 -
audio/dagrab/Makefile | 21 ---
audio/dagrab/distinfo | 2 -
audio/dagrab/files/patch-Makefile | 14 --
audio/dagrab/files/patch-dagrab.c | 262 --------------------------------------
audio/dagrab/pkg-descr | 2 -
7 files changed, 1 insertion(+), 302 deletions(-)
diff --git a/MOVED b/MOVED
index c4078fbd2ada..36e77501f088 100644
--- a/MOVED
+++ b/MOVED
@@ -17830,3 +17830,4 @@ audio/cmp3||2023-03-31|Has expired: Abandonware, no development in 20 years. Ple
audio/cpige||2023-03-31|Has expired: Doesn't work, newer versions also fails
audio/crip||2023-03-31|Has expired: Abandonware, last release in 2007. Please consider using audio/cyanrip or audio/abcde
audio/cue2toc||2023-03-31|Has expired: Abandonware and unmaintained, please consider using audio/cuetools or sysutils/cdrdao
+audio/dagrab||2023-03-31|Has expired: Abandonware and superseded by audio/cdparanoia
diff --git a/audio/Makefile b/audio/Makefile
index a4522d74f348..40ed6bb549ef 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -99,7 +99,6 @@
SUBDIR += cutmp3
SUBDIR += cyanrip
SUBDIR += d11amp
- SUBDIR += dagrab
SUBDIR += darkice
SUBDIR += dcd
SUBDIR += deadbeef
diff --git a/audio/dagrab/Makefile b/audio/dagrab/Makefile
deleted file mode 100644
index d606898f6f67..000000000000
--- a/audio/dagrab/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-PORTNAME= dagrab
-PORTVERSION= 0.3.5
-PORTREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= SUNSITE/apps/sound/cdrom
-
-MAINTAINER= clkao@CirX.ORG
-COMMENT= Read audio tracks from a CD into wav sound files
-WWW= http://web.tiscalinet.it/marcellou/dagrab.html
-
-DEPRECATED= Abandonware and superseded by audio/cdparanoia
-EXPIRATION_DATE=2023-03-31
-
-PLIST_FILES= bin/dagrab \
- man/man1/dagrab.1.gz
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/dagrab ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/dagrab.1 ${STAGEDIR}${MANPREFIX}/man/man1
-
-.include <bsd.port.mk>
diff --git a/audio/dagrab/distinfo b/audio/dagrab/distinfo
deleted file mode 100644
index d8acf8f1faf2..000000000000
--- a/audio/dagrab/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (dagrab-0.3.5.tar.gz) = e7505047e36b0520f6bd1b4ffb5bbf03dd2d85c46591677e0fb105b73f66878c
-SIZE (dagrab-0.3.5.tar.gz) = 22209
diff --git a/audio/dagrab/files/patch-Makefile b/audio/dagrab/files/patch-Makefile
deleted file mode 100644
index e13d83efb98c..000000000000
--- a/audio/dagrab/files/patch-Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.orig 2000-02-19 15:41:30 UTC
-+++ Makefile
-@@ -1,8 +1,8 @@
--CC=gcc
-+#CC=gcc
- #uncomment the following line for linux 2.0.x (and maybe 2.1.x or 1.x too ...)
- #UCD=-DUSE_UCDROM
--PREFIX=/usr/local
--CFLAGS=-Wall -g ${UCD}
-+PREFIX?=/usr/local
-+CFLAGS+=${UCD} -DCDDB_PATH=\"${LOCALBASE}/lib/X11/xmcd/cddb\"
- all:dagrab
-
- dagrab:dagrab.o
diff --git a/audio/dagrab/files/patch-dagrab.c b/audio/dagrab/files/patch-dagrab.c
deleted file mode 100644
index 63dabf6cc624..000000000000
--- a/audio/dagrab/files/patch-dagrab.c
+++ /dev/null
@@ -1,262 +0,0 @@
---- dagrab.c.orig 2000-02-19 16:32:46 UTC
-+++ dagrab.c
-@@ -94,26 +94,21 @@
- #include <string.h>
- #include <errno.h>
- #include <fcntl.h>
--#include <getopt.h>
- #include <dirent.h>
- #include <netdb.h>
--#include <unistd.h>
- #include <pwd.h>
- #include <ctype.h>
--#define __need_timeval /* needed by glibc */
--#include <time.h>
--#include <linux/cdrom.h>
--#ifdef USE_UCDROM
--#include <linux/ucdrom.h>
--#endif
--#include <sys/vfs.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#include <sys/cdio.h>
-+#include <sys/cdrio.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
- #define CDDEVICE "/dev/cdrom"
--#define N_BUF 8
-+#define N_BUF 12
- #define OVERLAP 2
- #define KEYLEN 12
- #define OFS 12
-@@ -123,12 +118,18 @@
- #define D_MODE 0660
- #define CDDB_MAX 65535
- #define CDDB_PORT 888
-+#ifndef CDDB_PATH
- #define CDDB_PATH "/usr/lib/X11/xmcd/cddb"
-+#endif
- #define CDDB_HOST "freedb.freedb.org"
- //#define USE_CDDB (opt_save||opt_name)
- #define USE_CDDB opt_cddb
- #define PROGNAME "dagrab"
- #define VERSION "0.3.5"
-+#define CD_MSF_OFFSET 150
-+#define CDROM_DATA_TRACK 4
-+#define CDROM_LEADOUT 0xaa
-+#define CD_FRAMESIZE_RAW 2352
- #define KW_TRACK 0
- #define KW_FULLD 1
- #define KW_AUTHOR 2
-@@ -206,16 +207,20 @@ struct kword kwords[]={
-
- struct Wavefile cd_newave(unsigned size)
- {
-- struct Wavefile dummy={{'R','I','F','F'},0x24+size,{'W','A','V','E'},
-- {'f','m','t',' '},0x10,1,2,44100,4*44100,4,16,
-- {'d','a','t','a'},size };
-- /*dummy.Dlen=size;
-- dummy.Rlen=0x24+size;*/
-- dummy.sample_rate = opt_srate;
-- dummy.channel = 2 - opt_mono;
-- dummy.byte_rate = opt_srate << dummy.channel;
-- dummy.align = dummy.channel * dummy.sample >> 3;
-- dummy.Dlen >>= opt_mono;
-+ struct Wavefile dummy={{'R','I','F','F'}, /* Rid */
-+ 0x24 + (size >> opt_mono), /* Rlen */
-+ {'W','A','V','E'}, /* Wid */
-+ {'f','m','t',' '}, /* Fid */
-+ 0x10, /* Flen */
-+ 1, /* tag */
-+ 2 - opt_mono, /* channel */
-+ opt_srate, /* sample_rate */
-+ opt_srate << (2 - opt_mono), /* byte_rate */
-+ 16 * (2 - opt_mono) >> 3, /* align */
-+ 16, /* sample */
-+ {'d','a','t','a'}, /* Did */
-+ size >> opt_mono /* Dlen */
-+ };
- return dummy;
- }
-
-@@ -226,16 +231,16 @@ char *resttime(int sec)
- return buf;
- }
-
--int cd_get_tochdr(struct cdrom_tochdr *Th)
-+int cd_get_tochdr(struct ioc_toc_header *Th)
- {
-- return ioctl(cdrom_fd,CDROMREADTOCHDR,Th);
-+ return ioctl(cdrom_fd,CDIOREADTOCHEADER,Th);
- }
-
--int cd_get_tocentry(int trk,struct cdrom_tocentry *Te,int mode)
-+int cd_get_tocentry(int trk,struct ioc_read_toc_single_entry *Te,int mode)
- {
-- Te->cdte_track=trk;
-- Te->cdte_format=mode;
-- return ioctl(cdrom_fd,CDROMREADTOCENTRY,Te);
-+ Te->track=trk;
-+ Te->address_format=mode;
-+ return ioctl(cdrom_fd,CDIOREADTOCENTRY,Te);
- }
-
- void cd_read_audio(int lba,int num,char *buf)
-@@ -244,16 +249,27 @@ void cd_read_audio(int lba,int num,char
- /*NOTE: if num>CDROM_NBLOCKS_BUFFER as defined in ide_cd.c (8 in linux 2.0.32)
- jitter correction may be required inside the block. */
- {
-- struct cdrom_read_audio ra;
-+/* CDIOCREADAUDIO has been removed in FreeBSD 5.1-CURRENT */
-+#if defined (__FreeBSD__) && (__FreeBSD_version >= 501106)
-+ int bsize = 2352;
-+ if(ioctl(cdrom_fd,CDRIOCSETBLOCKSIZE,&bsize) == -1) {
-+ fprintf(stderr, "setblocksize");
-+ exit(1);
-+ }
-+ if (pread(cdrom_fd, buf, num*bsize, lba*bsize) != num*bsize){
-+ fprintf(stderr,"\n%s: read device at lba %d length %d: %s\n",
-+ progname,lba,num,strerror(errno));
-+#else
-+ struct ioc_read_audio ra;
-
-- ra.addr.lba=lba;
-- ra.addr_format=CDROM_LBA;
-+ ra.address.lba=lba;
-+ ra.address_format=CD_LBA_FORMAT;
- ra.nframes=num;
-- ra.buf=buf;
-- if(ioctl(cdrom_fd,CDROMREADAUDIO,&ra)){
-- /*fprintf(stderr,"%s: read raw ioctl failed \n",progname);*/
-+ ra.buffer=buf;
-+ if(ioctl(cdrom_fd,CDIOCREADAUDIO,&ra)){
- fprintf(stderr,"\n%s: read raw ioctl failed at lba %d length %d: %s\n",
- progname,lba,num,strerror(errno));
-+#endif
- exit(1);
- }
- }
-@@ -471,7 +487,7 @@ int cddb_main(struct cd_trk_list *tl)
- DIR *d;
- struct dirent *e;
- char *id2,*p,*cddb,*loc;
-- int i,cddbs,locs;
-+ int i,cddbs,locs=0;
- char id[12];
- char *path;
- char path2[500];
-@@ -645,10 +661,10 @@ void ExpandTempl (char *templ,char *out,
- int cd_getinfo(char *cd_dev,struct cd_trk_list *tl)
- {
- int i;
-- struct cdrom_tochdr Th;
-- struct cdrom_tocentry Te;
-+ struct ioc_toc_header Th;
-+ struct ioc_read_toc_single_entry Te;
-
-- if ((cdrom_fd=open(cd_dev,O_RDONLY|O_NONBLOCK))==-1){
-+ if ((cdrom_fd=open(cd_dev,O_RDONLY))==-1){
- fprintf(stderr,"%s: error opening device %s\n",progname,cd_dev);
- exit(1);
- }
-@@ -656,7 +672,7 @@ int cd_getinfo(char *cd_dev,struct cd_tr
- fprintf(stderr,"%s: read TOC ioctl failed: %s\n",progname,strerror(errno));
- exit(1);
- }
-- tl->min=Th.cdth_trk0;tl->max=Th.cdth_trk1;
-+ tl->min=Th.starting_track;tl->max=Th.ending_track;
- if((tl->starts=(int *)malloc((tl->max-tl->min+2)*sizeof(int)))==NULL){
- fprintf(stderr,"%s: list data allocation failed\n",progname);
- exit(1);
-@@ -668,21 +684,21 @@ int cd_getinfo(char *cd_dev,struct cd_tr
-
- for (i=tl->min;i<=tl->max;i++)
- {
-- if(cd_get_tocentry(i,&Te,CDROM_LBA)){
-+ if(cd_get_tocentry(i,&Te,CD_LBA_FORMAT)){
- fprintf(stderr,"%s: read TOC entry ioctl failed: %s\n",
- progname,strerror(errno));
- exit(1);
- }
-- tl->starts[i-tl->min]=Te.cdte_addr.lba;
-- tl->types[i-tl->min]=Te.cdte_ctrl&CDROM_DATA_TRACK;
-+ tl->starts[i-tl->min]=ntohl(Te.entry.addr.lba);
-+ tl->types[i-tl->min]=Te.entry.control&CDROM_DATA_TRACK;
- }
- i=CDROM_LEADOUT;
-- if(cd_get_tocentry(i,&Te,CDROM_LBA)){
-+ if(cd_get_tocentry(i,&Te,CD_LBA_FORMAT)){
- fprintf(stderr,"%s: read TOC entry ioctl failed: %s\n",progname,strerror(errno));
- exit(1);
- }
-- tl->starts[tl->max-tl->min+1]=Te.cdte_addr.lba;
-- tl->types[tl->max-tl->min+1]=Te.cdte_ctrl&CDROM_DATA_TRACK;
-+ tl->starts[tl->max-tl->min+1]=ntohl(Te.entry.addr.lba);
-+ tl->types[tl->max-tl->min+1]=Te.entry.control&CDROM_DATA_TRACK;
-
- i=cddb_main(tl);
- if(i==-1) {
-@@ -796,6 +812,7 @@ int cd_read_track(char *basename,int tn,
- struct Wavefile header;
- int fd,bytes,i,n,q,space;
- int bcount, sc, missing, speed = 0, ldp, now;
-+ ssize_t wlen;
-
- if(tn<tl->min || tn>tl->max) return (-1);
- space = ((tl->starts[tn-tl->min+1]-tl->starts[tn-tl->min]) *
-@@ -879,8 +896,10 @@ int cd_read_track(char *basename,int tn,
- d = p1[c];
- buf3[c] = ((short)(d&65535) + (short)(d>>16)) >> 1;
- }
-- write(fd,buf3,n>>1);
-- } else if(write(fd,p1,n)==-1){
-+ wlen = write(fd,buf3,n>>1);
-+ } else
-+ wlen = write(fd,p1,n);
-+ if (wlen == -1){
- fprintf(stderr,"%s: error writing wave file %s: %s\n",
- progname,nam,strerror(errno));
- exit(1);
-@@ -896,7 +915,17 @@ int cd_read_track(char *basename,int tn,
- /* dump last bytes */
- if (bytes<(tl->starts[tn+1]-tl->starts[tn])*CD_FRAMESIZE_RAW){
- n=(tl->starts[tn+1]-tl->starts[tn])*CD_FRAMESIZE_RAW-bytes;
-- if(write(fd,p1,n)==-1){
-+ if(opt_mono) {
-+ register int c, d;
-+ for(c = 0; c < (n>>2); c++) {
-+ d = p1[c];
-+ buf3[c] = ((short)(d&65535) + (short)(d>>16)) >> 1;
-+ }
-+ wlen = write(fd,buf3,n>>1);
-+ } else
-+ wlen = write(fd,p1,n);
-+
-+ if(wlen==-1){
- fprintf(stderr,"%s: error writing wave file %s: %s\n",progname,nam,strerror(errno));
- exit(1);
- };
-@@ -961,7 +990,7 @@ void usage(void)
- int main(int ac,char **av)
- {
- int i,l,disp_TOC=0;
-- char c;
-+ int c;
- int all_tracks=0;
- struct cd_trk_list tl;
- char cd_dev[BLEN+1]=CDDEVICE;
-@@ -969,10 +998,8 @@ int main(int ac,char **av)
- char filter[BLEN+1] = "";
- char path[500];
- FILE *f;
--
- progname=av[0];
-- optind=0;
-- while((c=getopt(ac,av,"d:f:n:o:k:r:t:m:e:H:P:D:pshaivCSN"))!=EOF){
-+ while((c=getopt(ac,av,"pshaivCSNd:f:n:o:k:r:t:m:e:H:P:D:"))!=-1){
- switch(c){
- case 'h':usage();break;
- case 'd':CPARG(cd_dev);break;
diff --git a/audio/dagrab/pkg-descr b/audio/dagrab/pkg-descr
deleted file mode 100644
index b12e68b2f8b3..000000000000
--- a/audio/dagrab/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-DAGRAB is a program for reading audio tracks from a CD into wav sound
-files. An IDE CD-rom drive that supports digital audio is required.