Attachment 93413 Details for Bug 131308 – ripit-3.6-0_1.diff

[patch] ripit-3.6-0_1.diff

ripit-3.6-0_1.diff (text/plain), 2.42 KB, created by Tobias Rehbein on 2009-02-02 20:50:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Rehbein

Created: 2009-02-02 20:50:02 UTC

Size: 2.42 KB

patch

obsolete

>diff -ruN audio/ripit.orig/Makefile audio/ripit/Makefile
>--- audio/ripit.orig/Makefile	2007-07-16 15:56:38.000000000 +0200
>+++ audio/ripit/Makefile	2009-02-02 20:27:18.000000000 +0100
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	ripit
> PORTVERSION=	3.6.0
>+PORTREVISION=	1
> CATEGORIES=	audio
> MASTER_SITES=	http://www.suwald.com/ripit/
> 
>diff -ruN audio/ripit.orig/files/patch-ripit.pl audio/ripit/files/patch-ripit.pl
>--- audio/ripit.orig/files/patch-ripit.pl	1970-01-01 01:00:00.000000000 +0100
>+++ audio/ripit/files/patch-ripit.pl	2009-02-02 20:25:12.000000000 +0100
>@@ -0,0 +1,42 @@
>+--- ./ripit.pl.orig	2009-02-02 19:23:52.000000000 +0000
>++++ ./ripit.pl	2009-02-02 19:24:58.000000000 +0000
>+@@ -3398,7 +3398,7 @@
>+ 
>+    # If Lame is not used, don't die if ID3v2-tag is not compliant.
>+    if($lameflag == 0) {
>+-      unless(log_system("lame --genre-list | grep -i \" $genre\$\" > /dev/null ")) {
>++      unless(log_system("lame --genre-list 2>&1 | grep -i \" $genre\$\" > /dev/null ")) {
>+          print "Genre $genre is not ID3v2 compliant!\n"
>+             if($verbose >= 1);
>+          print "I continue anyway!\n\n" if($verbose >= 1);
>+@@ -3417,7 +3417,7 @@
>+ 
>+    # Check if (similar) genre exists. Enter a new one with interaction,
>+    # or take the default one.
>+-   while(!log_system("lame --genre-list | grep -i \"$genre\" > /dev/null ")) {
>++   while(!log_system("lame --genre-list 2>&1 | grep -i \"$genre\" > /dev/null ")) {
>+       print "Genre $genre is not ID3v2 compliant!\n" if($verbose >= 1);
>+       if($interaction == 1) {
>+          print "Use \"lame --genre-list\" to get a list!\n";
>+@@ -3437,7 +3437,7 @@
>+       return;
>+    }
>+    elsif($genre =~ /^\d+$/) {
>+-      $genre = `lame --genre-list | grep -i \' $genre \'`;
>++      $genre = `lame --genre-list 2>&1 | grep -i \' $genre \'`;
>+       chomp $genre;
>+    }
>+    else {
>+@@ -3449,10 +3449,10 @@
>+       # "pop-like" genres!
>+       # There will be a linebreak, if multiple possibilities found.
>+       my $ogenre = $genre;
>+-      $genre = `lame --genre-list | grep -i \'$genre\'`;
>++      $genre = `lame --genre-list 2>&1 | grep -i \'$genre\'`;
>+       chomp $genre;
>+       # Second we want THE original genre, if it precisly exists.
>+-      my $testgenre = `lame --genre-list | grep -i \'\^... $ogenre\$\'`;
>++      my $testgenre = `lame --genre-list 2>&1 | grep -i \'\^... $ogenre\$\'`;
>+       chomp $testgenre;
>+       $genre = $testgenre if($testgenre);
>+       # If we still have several genres:

Actions: View | Diff

Attachments on bug 131308: 93413