View | Details | Raw Unified | Return to bug 134913 | Differences between
and this patch

Collapse All | Expand All

(-)b/audio/ripit/Makefile (-3 / +2 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	ripit
8
PORTNAME=	ripit
9
PORTVERSION=	3.6.0
9
PORTVERSION=	3.7.0
10
PORTREVISION=	1
11
CATEGORIES=	audio
10
CATEGORIES=	audio
12
MASTER_SITES=	http://www.suwald.com/ripit/
11
MASTER_SITES=	http://www.suwald.com/ripit/
13
12
Lines 28-34 USE_PERL5_RUN= yes Link Here
28
USE_BZIP2=	yes
27
USE_BZIP2=	yes
29
28
30
post-patch:
29
post-patch:
31
	@${REINPLACE_CMD} -e "s|#!/usr/bin/perl|#!${PERL}|" ${WRKSRC}/ripit.pl
30
	@${REINPLACE_CMD} -e "s|#!/usr/bin/env perl|#!${PERL}|" ${WRKSRC}/ripit.pl
32
31
33
do-install:
32
do-install:
34
	${INSTALL_SCRIPT} ${WRKSRC}/ripit.pl ${PREFIX}/bin/ripit
33
	${INSTALL_SCRIPT} ${WRKSRC}/ripit.pl ${PREFIX}/bin/ripit
(-)b/audio/ripit/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (ripit-3.6.0.tar.bz2) = 037ddab85cffd0a9519c48679f2e79ef
1
MD5 (ripit-3.7.0.tar.bz2) = f1553013cbc4dfc237e701341ea6182a
2
SHA256 (ripit-3.6.0.tar.bz2) = 7e84218009cc672a14f041d5a27279bcd9ebac0ca298f6c11ef6cfd053d64a8e
2
SHA256 (ripit-3.7.0.tar.bz2) = 16a8ab0977a8de3231fe35f74be46cf68aef12b81fe0ae3853a21fd6f365b21e
3
SIZE (ripit-3.6.0.tar.bz2) = 67702
3
SIZE (ripit-3.7.0.tar.bz2) = 80076
(-)a/audio/ripit/files/patch-ripit.pl (-43 lines)
Removed Link Here
1
--- ./ripit.pl.orig	2009-02-02 19:23:52.000000000 +0000
2
+++ ./ripit.pl	2009-02-02 19:24:58.000000000 +0000
3
@@ -3398,7 +3398,7 @@
4
 
5
    # If Lame is not used, don't die if ID3v2-tag is not compliant.
6
    if($lameflag == 0) {
7
-      unless(log_system("lame --genre-list | grep -i \" $genre\$\" > /dev/null ")) {
8
+      unless(log_system("lame --genre-list 2>&1 | grep -i \" $genre\$\" > /dev/null ")) {
9
          print "Genre $genre is not ID3v2 compliant!\n"
10
             if($verbose >= 1);
11
          print "I continue anyway!\n\n" if($verbose >= 1);
12
@@ -3417,7 +3417,7 @@
13
 
14
    # Check if (similar) genre exists. Enter a new one with interaction,
15
    # or take the default one.
16
-   while(!log_system("lame --genre-list | grep -i \"$genre\" > /dev/null ")) {
17
+   while(!log_system("lame --genre-list 2>&1 | grep -i \"$genre\" > /dev/null ")) {
18
       print "Genre $genre is not ID3v2 compliant!\n" if($verbose >= 1);
19
       if($interaction == 1) {
20
          print "Use \"lame --genre-list\" to get a list!\n";
21
@@ -3437,7 +3437,7 @@
22
       return;
23
    }
24
    elsif($genre =~ /^\d+$/) {
25
-      $genre = `lame --genre-list | grep -i \' $genre \'`;
26
+      $genre = `lame --genre-list 2>&1 | grep -i \' $genre \'`;
27
       chomp $genre;
28
    }
29
    else {
30
@@ -3449,10 +3449,10 @@
31
       # "pop-like" genres!
32
       # There will be a linebreak, if multiple possibilities found.
33
       my $ogenre = $genre;
34
-      $genre = `lame --genre-list | grep -i \'$genre\'`;
35
+      $genre = `lame --genre-list 2>&1 | grep -i \'$genre\'`;
36
       chomp $genre;
37
       # Second we want THE original genre, if it precisly exists.
38
-      my $testgenre = `lame --genre-list | grep -i \'\^... $ogenre\$\'`;
39
+      my $testgenre = `lame --genre-list 2>&1 | grep -i \'\^... $ogenre\$\'`;
40
       chomp $testgenre;
41
       $genre = $testgenre if($testgenre);
42
       # If we still have several genres:
43
- 

Return to bug 134913