From nobody Fri Mar 31 00:01:18 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PngRy73J2z42YVh; Fri, 31 Mar 2023 00:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PngRy5cjzz4MFC; Fri, 31 Mar 2023 00:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680220878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KhJOxW0MPDZo6PTiTzLKv/Klcmm6c+m4RQq8iYUV22Y=; b=VLjY0QOIF7twIuZB/Klq/V6RzvWMSAmk6loYD89XNRGNsLJRfD+7WNBh3RZpISnxt4j0bY nNtQPLbA65kIeJo6g+uJsFxUE76U0gjP7lTPd2njcSRaa96/lCvkVqUYSrDE6ngrLbySQ/ i35zr6yaC7Q8ufoSFp/S9bFmPyMq44ywjxnTINRtN3dzuM8ld6R5AYAJftmDCXEs7EObtk vFQpJtrphE1AiYeN1XAOkYm943H0ofpPlSSIfT+2H5OYWkusw/jO5L+hit/3fdyRT0zda/ 8//3DNGmSGUKQjc60wQ/zUhXpm6cvH/XSfBa1epUiWJr8B9BXZTsu1JCRqn1QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680220878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KhJOxW0MPDZo6PTiTzLKv/Klcmm6c+m4RQq8iYUV22Y=; b=SV0ukkLXn4RNC//NeRl1omphKZXE/lba78rtKiSUPscyHnNrribBr+UKw69cE6fkpf/UkE papSsGRj5Jsrx9x50ZJygkPys5WaI36N0P1UJXxIsgQk/E0Bx+CUb18CLAyZwyJCJg4b8p Dbs9tWB82vgROh/bsrxo3kDN+dw1y3w+vp6ApFkEXjfwzcRdslkSzu3ilDte5+EbZB1pp6 Tj3BzK1tcC3yMspOpudj9zhr4p39PmnA+jUao9caz0YQW/gxFbZGm4C1qpXps1d6dQkrg0 UDaBlqVstOtbkQDekznB6X3uH62/xVqE1EnPsTjDuSsW5okWC7P41Klx+SDsQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680220878; a=rsa-sha256; cv=none; b=kJCAdmFaeu/EGaonRgmeiALilcQsCNkL6X+NT28//Jcifvs12QsyeujcYBqK0GtWM0uMt5 kLXdUeiPHlHYCuLcRT4LqQzVw0uyLMoS1G+l7St+7zaqQ43eHAegdsE5jag/s0LFcIG0Ge 4VfH79kTBFCNZ4Ivh91leyBSrdLSMFWBJkO7Ir7X68UVJFtbK3ZEavNI9mrTKRvYnA19UJ qSMzdn3BAhXu1FzUOKZm7nPbPwtnuXKR5EDrbXhqq+7AN3ECU0kw49IGVFjP91DgQLlQkf jtMCc7XKVHoFAUEB4bFCR9VGM48gjOQ8nQdrrjA5dnKxXe8BYhzlRvhA4D7ucg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PngRy4jZ3zWgR; Fri, 31 Mar 2023 00:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V01Isa011726; Fri, 31 Mar 2023 00:01:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V01IsE011725; Fri, 31 Mar 2023 00:01:18 GMT (envelope-from git) Date: Fri, 31 Mar 2023 00:01:18 GMT Message-Id: <202303310001.32V01IsE011725@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 4d92d8dc2c0c - main - audio/dagrab: Remove expired port: List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d92d8dc2c0c178e216f6711d042dab75e30c685 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=4d92d8dc2c0c178e216f6711d042dab75e30c685 commit 4d92d8dc2c0c178e216f6711d042dab75e30c685 Author: Muhammad Moinur Rahman AuthorDate: 2023-03-25 12:59:58 +0000 Commit: Muhammad Moinur Rahman 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 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 - #include - #include --#include - #include - #include --#include - #include - #include --#define __need_timeval /* needed by glibc */ --#include --#include --#ifdef USE_UCDROM --#include --#endif --#include - #include - #include - #include - #include - #include -+#include -+#include -+#include -+#include - #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(tnmin || 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.