diff options
| author | James E. Housley <jeh@FreeBSD.org> | 2000-10-23 19:51:17 +0000 |
|---|---|---|
| committer | James E. Housley <jeh@FreeBSD.org> | 2000-10-23 19:51:17 +0000 |
| commit | a175bb655833db3b3b30b74b7db1b8680f844322 (patch) | |
| tree | 067e244a3302b88179b52804ecb4a23af76e630d /audio/grip/files/patch-ad | |
| parent | Detach the WITH_I18N knob and always configure for the int'lized (diff) | |
Update to version 0.65
PR: 22246
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to 'audio/grip/files/patch-ad')
| -rw-r--r-- | audio/grip/files/patch-ad | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/audio/grip/files/patch-ad b/audio/grip/files/patch-ad index 1f8e5382abbf..9fa8b797b681 100644 --- a/audio/grip/files/patch-ad +++ b/audio/grip/files/patch-ad @@ -1,15 +1,29 @@ ---- grip.c.orig Tue Apr 18 10:37:44 2000 -+++ grip.c Mon Sep 4 17:59:26 2000 -@@ -1279,6 +1279,12 @@ - CDStat(cd_desc,&info,FALSE); +--- grip.c.orig Thu Oct 19 04:12:53 2000 ++++ grip.c Fri Oct 20 20:55:01 2000 +@@ -314,7 +314,7 @@ + gboolean use_proxy=FALSE; + gboolean use_proxy_env=FALSE; - if(info.disc_present) { -+ /* FreeBSD CD ioctl CDIOREADTOCHEADER fails when old disk is ejected -+ * and a new disk one entered. Re-opening device fixes this. -+ */ -+ CDCloseDevice(cd_desc); -+ cd_desc = CDInitDevice(cddevice); -+ - CDStat(cd_desc,&info,TRUE); - - Debug("CDStat found a disc, checking tracks\n"); +-char *bin_search_paths[]={"/cpd/misc/bin","/usr/bin","/usr/local/bin",NULL}; ++char *bin_search_paths[]={"/cpd/misc/bin","/usr/bin","%%LOCALBASE%%/bin",NULL}; + Ripper ripper_defaults[]={ + #ifdef CDPAR + {"grip (cdparanoia)",""}, +@@ -327,7 +327,7 @@ + #endif + {"other",""}, + {"",""}}; +-char ripexename[256]="/usr/bin/cdparanoia"; ++char ripexename[256]="%%LOCALBASE%%/bin/cdparanoia"; + char ripcmdline[256]="-d %c %t:[.%b]-%t:[.%e] %f"; + int selected_ripper=0; + char outputdir[256]; +@@ -346,7 +346,7 @@ + gboolean disable_extra_paranoia=FALSE; + gboolean disable_scratch_detect=FALSE; + gboolean disable_scratch_repair=FALSE; +-char mp3exename[256]="/usr/bin/bladeenc"; ++char mp3exename[256]="%%LOCALBASE%%/bin/bladeenc"; + char mp3cmdline[256]="-%b -QUIT %f"; + int selected_encoder=1; + char mp3fileformat[256]="~/mp3/%a/%d/%n.mp3"; |