Date: Fri, 11 Aug 2000 17:00:04 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/20553: Update port: audio/dagrab (fix ports/20414) Message-ID: <20000812000004.72BE837BD79@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 20553
>Category: ports
>Synopsis: Update port: audio/dagrab (fix ports/20414)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 11 17:10:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CFLAGS/X11BASE properly
- Add WWW: line into pkg/DESCR
This PR supersedes ports/20414.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/audio/dagrab/Makefile audio/dagrab/Makefile
--- /usr/ports/audio/dagrab/Makefile Mon Apr 24 18:54:18 2000
+++ audio/dagrab/Makefile Mon Aug 7 19:32:14 2000
@@ -1,4 +1,4 @@
-# New ports collection makefile for: dagrab
+# New ports collection makefile for: dagrab
# Date created: 2nd, Jan 1999
# Whom: Chia-liang Kao <clkao@CirX.ORG>
#
@@ -16,7 +16,7 @@
MAN1= dagrab.1
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/dagrab ${PREFIX}/bin/dagrab
- @${INSTALL_MAN} ${WRKSRC}/dagrab.1 ${MANPREFIX}/man/man1/dagrab.1
+ ${INSTALL_PROGRAM} ${WRKSRC}/dagrab ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/dagrab.1 ${MANPREFIX}/man/man1
.include <bsd.port.mk>
diff -urN /usr/ports/audio/dagrab/patches/patch-aa audio/dagrab/patches/patch-aa
--- /usr/ports/audio/dagrab/patches/patch-aa Mon Apr 24 18:54:18 2000
+++ audio/dagrab/patches/patch-aa Mon Aug 7 19:24:31 2000
@@ -8,7 +8,7 @@
-PREFIX=/usr/local
-CFLAGS=-Wall -g ${UCD}
+PREFIX?=/usr/local
-+CFLAGS+=-Wall -g ${UCD}
++CFLAGS+=${UCD} -DCDDB_PATH=\"${X11BASE}/lib/X11/xmcd/cddb\"
all:dagrab
dagrab:dagrab.o
diff -urN /usr/ports/audio/dagrab/patches/patch-ab audio/dagrab/patches/patch-ab
--- /usr/ports/audio/dagrab/patches/patch-ab Sun Apr 23 06:31:59 2000
+++ audio/dagrab/patches/patch-ab Mon Aug 7 19:29:48 2000
@@ -1,5 +1,5 @@
---- dagrab.c.orig Sat Feb 19 16:32:46 2000
-+++ dagrab.c Fri Apr 21 17:07:04 2000
+--- dagrab.c.orig Sun Feb 20 01:32:46 2000
++++ dagrab.c Mon Aug 7 19:29:28 2000
@@ -94,26 +94,20 @@
#include <string.h>
#include <errno.h>
@@ -31,12 +31,13 @@
#define OVERLAP 2
#define KEYLEN 12
#define OFS 12
-@@ -123,12 +117,16 @@
+@@ -123,12 +117,18 @@
#define D_MODE 0660
#define CDDB_MAX 65535
#define CDDB_PORT 888
--#define CDDB_PATH "/usr/lib/X11/xmcd/cddb"
-+#define CDDB_PATH "/usr/X11R6/lib/X11/xmcd/cddb"
++#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
@@ -49,7 +50,7 @@
#define KW_TRACK 0
#define KW_FULLD 1
#define KW_AUTHOR 2
-@@ -226,16 +224,16 @@
+@@ -226,16 +226,16 @@
return buf;
}
@@ -72,7 +73,7 @@
}
void cd_read_audio(int lba,int num,char *buf)
-@@ -244,13 +242,13 @@
+@@ -244,13 +244,13 @@
/*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. */
{
@@ -91,7 +92,7 @@
/*fprintf(stderr,"%s: read raw ioctl failed \n",progname);*/
fprintf(stderr,"\n%s: read raw ioctl failed at lba %d length %d: %s\n",
progname,lba,num,strerror(errno));
-@@ -471,7 +469,7 @@
+@@ -471,7 +471,7 @@
DIR *d;
struct dirent *e;
char *id2,*p,*cddb,*loc;
@@ -100,7 +101,7 @@
char id[12];
char *path;
char path2[500];
-@@ -645,10 +643,10 @@
+@@ -645,10 +645,10 @@
int cd_getinfo(char *cd_dev,struct cd_trk_list *tl)
{
int i;
@@ -114,7 +115,7 @@
fprintf(stderr,"%s: error opening device %s\n",progname,cd_dev);
exit(1);
}
-@@ -656,7 +654,7 @@
+@@ -656,7 +656,7 @@
fprintf(stderr,"%s: read TOC ioctl failed: %s\n",progname,strerror(errno));
exit(1);
}
@@ -123,7 +124,7 @@
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 +666,21 @@
+@@ -668,21 +668,21 @@
for (i=tl->min;i<=tl->max;i++)
{
@@ -151,7 +152,7 @@
i=cddb_main(tl);
if(i==-1) {
-@@ -961,7 +959,7 @@
+@@ -961,7 +961,7 @@
int main(int ac,char **av)
{
int i,l,disp_TOC=0;
@@ -160,7 +161,7 @@
int all_tracks=0;
struct cd_trk_list tl;
char cd_dev[BLEN+1]=CDDEVICE;
-@@ -969,10 +967,8 @@
+@@ -969,10 +969,8 @@
char filter[BLEN+1] = "";
char path[500];
FILE *f;
diff -urN /usr/ports/audio/dagrab/pkg/DESCR audio/dagrab/pkg/DESCR
--- /usr/ports/audio/dagrab/pkg/DESCR Sun Jan 3 04:40:28 1999
+++ audio/dagrab/pkg/DESCR Mon Aug 7 19:17:59 2000
@@ -1,2 +1,4 @@
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.
+
+WWW: http://web.tiscalinet.it/marcellou/dagrab.html
>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?20000812000004.72BE837BD79>