Date: Mon, 23 Oct 2000 11:31:32 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/22246: Update port: audio/grip to 0.65 Message-ID: <20001023183132.2B99137B4C5@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 22246 >Category: ports >Synopsis: Update port: audio/grip to 0.65 >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: Mon Oct 23 11:40:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Update to version 0.65 >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/grip/Makefile audio/grip/Makefile --- /usr/ports/audio/grip/Makefile Thu Oct 5 22:40:28 2000 +++ audio/grip/Makefile Fri Oct 20 20:56:34 2000 @@ -6,7 +6,7 @@ # PORTNAME= grip -PORTVERSION= 2.94 +PORTVERSION= 2.95 CATEGORIES= audio MASTER_SITES= http://www.nostatic.org/grip/ EXTRACT_SUFX= .tgz @@ -21,14 +21,17 @@ MAN1= grip.1 MLINKS= grip.1 gcd.1 +post-patch: + @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/*.c + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/grip ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/gcd ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/grip.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/grip.1 ${MANPREFIX}/man/man1 .if !defined(NOPORTDOCS) -.for file in CHANGES CREDITS README TODO @${MKDIR} ${PREFIX}/share/doc/grip - ${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/share/doc/grip +.for file in CHANGES CREDITS README TODO + ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/grip .endfor .endif diff -urN /usr/ports/audio/grip/distinfo audio/grip/distinfo --- /usr/ports/audio/grip/distinfo Mon Jul 10 12:09:53 2000 +++ audio/grip/distinfo Fri Oct 20 20:10:48 2000 @@ -1 +1 @@ -MD5 (grip-2.94.tgz) = d963bd0dc3fac92aaa5df80db8a3a9fd +MD5 (grip-2.95.tgz) = fabf302f9f35708725415b2d1f7d3602 diff -urN /usr/ports/audio/grip/files/patch-aa audio/grip/files/patch-aa --- /usr/ports/audio/grip/files/patch-aa Sun Jul 16 02:16:04 2000 +++ audio/grip/files/patch-aa Fri Oct 20 20:33:24 2000 @@ -1,5 +1,5 @@ ---- Makefile.orig Wed Apr 19 00:37:44 2000 -+++ Makefile Tue Jul 11 03:58:32 2000 +--- Makefile.orig Thu Oct 19 04:12:53 2000 ++++ Makefile Fri Oct 20 20:33:10 2000 @@ -4,24 +4,24 @@ OS=$(shell uname -s) @@ -21,13 +21,12 @@ # Compiler flags -CFLAGS= -Wall `gtk-config --cflags` -DAUXDIR=\"$(AUXDIR)\" \ -- -DINSTALLDIR=\"$(INSTALLDIR)\" -D_REENTRANT -+CFLAGS+= `$(GTK_CONFIG) --cflags` -DAUXDIR=\"$(AUXDIR)\" \ -+ -DINSTALLDIR=\"$(INSTALLDIR)\" -D_REENTRANT -D_THREAD_SAFE ++CFLAGS+= `$(GTK_CONFIG) --cflags gthread` -DAUXDIR=\"$(AUXDIR)\" \ + -DINSTALLDIR=\"$(INSTALLDIR)\" -D_REENTRANT # Link libraries --LIBS= `gtk-config --libs` -+LIBS= `$(GTK_CONFIG) --libs` +-LIBS= `gtk-config --libs gthread` ++LIBS= `$(GTK_CONFIG) --libs gthread` ifeq ($(OS), Linux) LIBS+= -lpthread endif diff -urN /usr/ports/audio/grip/files/patch-ad audio/grip/files/patch-ad --- /usr/ports/audio/grip/files/patch-ad Tue Sep 5 10:33:44 2000 +++ audio/grip/files/patch-ad Fri Oct 20 20:55:09 2000 @@ -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"; >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?20001023183132.2B99137B4C5>