- Update to 0.52.7

- Take maintainer
- portlint(1)

PR:		95859
Submitted by:	Rainer Alves <rainer.alves___gmail.com>

8 files changed, 27 insertions, 100 deletions

diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 6ebb7994dd3f..21d682102239 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	dvdrip
-PORTVERSION=	0.52.6
-PORTREVISION=	4
+PORTVERSION=	0.52.7
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.exit1.org/dvdrip/dist/
+MASTER_SITES=	http://www.exit1.org/dvdrip/dist/ \
+		${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Video/JRED
 DISTNAME=	Video-DVDRip-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	rainer.alves@gmail.com
 COMMENT=	This is dvd::rip, a Perl Gtk+ based dvd-ripper
 
 RUN_DEPENDS+=	cdrdao:${PORTSDIR}/sysutils/cdrdao \
@@ -32,12 +33,22 @@ OPTIONS=	CLUSTER		"Enable cluster mode"	on \
 
 PERL_CONFIGURE=	yes
 USE_PERL5=	yes
+USE_GETTEXT=	yes
 
 MAN1=		dvdrip.1 dr_splitpipe.1 dr_progress.1
 MAN3=		Video::DVDRip.3 Video::DVDRip::CPAN::Scanf.3
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+BROKEN=		Broken dependencies
+.endif
+
+.if ${PERL_LEVEL} < 500600
+BROKEN=		You need at least perl 5.6.0. Do not use FreeBSD 4.x' system perl, \
+		it's outdated. Install lang/perl5 and issue 'use.perl port'
+.endif
+
 .if !defined(WITHOUT_CLUSTER)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
 		${SITE_PERL}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event \
@@ -54,10 +65,6 @@ RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools \
 RUN_DEPENDS+=	subtitle2pgm:${PORTSDIR}/multimedia/subtitleripper
 .endif
 
-.if ${OSVERSION} < 500000
-BROKEN=		Broken dependencies
-.endif
-
 pre-everything::
 .if !defined(WITHOUT_CLUSTER)
 	@${ECHO_MSG}
@@ -83,9 +90,4 @@ post-patch:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.if ${PERL_LEVEL} < 500600
-BROKEN=	"You need at least perl 5.6.0. Do not use FreeBSD 4.x' system perl,\
-	it's outdated. Install lang/perl5 and issue 'use.perl port'"
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/multimedia/dvdrip/distinfo b/multimedia/dvdrip/distinfo
index fdbd731e8a1e..04e68fd1764b 100644
--- a/multimedia/dvdrip/distinfo
+++ b/multimedia/dvdrip/distinfo
@@ -1,3 +1,3 @@
-MD5 (Video-DVDRip-0.52.6.tar.gz) = 83f972e5053e61ea18b2f9ea40e88a43
-SHA256 (Video-DVDRip-0.52.6.tar.gz) = 343757787cad53c4c7b11b8bc9663a0b11148d38d95c6b828178bb680ea69203
-SIZE (Video-DVDRip-0.52.6.tar.gz) = 522611
+MD5 (Video-DVDRip-0.52.7.tar.gz) = f63ee02933c80ce203ff1cde2a995928
+SHA256 (Video-DVDRip-0.52.7.tar.gz) = 3fabb89cf57965e6c2dfc22a1e97e47875e65389bca6c8cf9f71b32da1c0427a
+SIZE (Video-DVDRip-0.52.7.tar.gz) = 525563
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Cluster::Title.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Cluster::Title.pm
index 25e9239e2955..4e3919357afa 100644
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Cluster::Title.pm
+++ b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Cluster::Title.pm
@@ -1,26 +1,13 @@
---- lib/Video/DVDRip/Cluster/Title.pm.orig	Sat Apr 10 11:18:03 2004
-+++ lib/Video/DVDRip/Cluster/Title.pm		Sun Jan  9 17:41:11 2005
-@@ -277,10 +277,10 @@
- 	} else {
- 		$command .=
- 			"dr_exec avimerge".
--			" -i $avi_file".
- 			" -p $audio_file".
- 			" -a $target_nr".
--			" -o $avi_file.merged &&".
-+			" -o $avi_file.merged ".
-+			" -i $avi_file &&".
- 			" mv $avi_file.merged $target_file &&".
- 			" rm $audio_file &&".
- 			" echo DVDRIP_SUCCESS";
-@@ -312,10 +312,9 @@
+--- lib/Video/DVDRip/Cluster/Title.pm.orig	Sun Aug 14 18:22:29 2005
++++ lib/Video/DVDRip/Cluster/Title.pm	Sun Apr 16 04:44:24 2006
+@@ -313,10 +313,10 @@
  
  	my $command =
  		"mkdir -m 0775 -p '$audio_video_psu_dir' && ".
 -		"${nice}dr_exec avimerge -i $avi_chunks_dir/*".
 -		" -o $audio_video_psu_file ";
--	
 +		"${nice}dr_exec avimerge -o $audio_video_psu_file";
+ 	
  	$command .= " -p $audio_psu_file " if not $self->is_ogg;
 +	$command .= " -i $avi_chunks_dir/*";
  
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
index 0764f05f72d3..0f25dec4e8e9 100644
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
+++ b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
@@ -1,5 +1,5 @@
---- lib/Video/DVDRip/Config.pm.orig	Sun Aug 14 17:34:52 2005
-+++ lib/Video/DVDRip/Config.pm	Sun Aug 14 17:39:55 2005
+--- lib/Video/DVDRip/Config.pm.orig	Sat Mar 18 08:26:51 2006
++++ lib/Video/DVDRip/Config.pm	Sun Apr 16 04:52:57 2006
 @@ -57,7 +57,7 @@
  	dvd_device => {
  		label => __"DVD device",
@@ -33,7 +33,7 @@
  		presets => [
  			'mplayer -aid %(%a+128) -',
  			'xine stdin://mpeg2 -g -pq -a %a',
-@@ -151,11 +151,10 @@
+@@ -151,7 +151,7 @@
  	default_video_codec => {
  		label => __"Default video codec",
  		type  => 'string',
@@ -41,13 +41,8 @@
 +		value => 'xvid4',
  		presets => [
  			"SVCD","VCD","XSVCD","XVCD","CVD",
--			"divx4","divx5",
--			"xvid","xvidcvs","xvid2","xvid3","xvid4",
-+			"xvid4",
- 			"ffmpeg","fame","af6"
- 		],
- 	},
-@@ -198,7 +197,7 @@
+ 			"divx4","divx5",
+@@ -198,7 +198,7 @@
  	burn_cdrecord_cmd => {
  		label => __"cdrecord command",
  		type  => 'string',
@@ -56,14 +51,3 @@
  		presets => [
  			'/usr/lib/xcdroast-0.98/bin/xcdrwrap CDRECORD',
  			'cdrecord',
-@@ -791,8 +790,8 @@
- sub test_play_file_command  	{ _executable (@_) 	}
- sub test_play_stdin_command 	{ _executable (@_) 	}
- sub test_rar_command 		{ _executable (@_) 	}
--sub test_dvd_device		{ _writable (@_)	}
--sub test_writer_device		{ _writable (@_)	}
-+sub test_dvd_device		{ _exists (@_)	}
-+sub test_writer_device		{ _exists (@_)	}
- sub test_dvd_mount_point	{ _exists (@_)		}
- sub test_base_project_dir	{ _writable (@_)	}
- sub test_dvdrip_files_dir	{ _writable (@_)	}
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Subtitle.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Subtitle.pm
deleted file mode 100644
index 88b16e74d050..000000000000
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Subtitle.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Video/DVDRip/Subtitle.pm.orig	Wed Dec 29 20:15:32 2004
-+++ lib/Video/DVDRip/Subtitle.pm	Wed Dec 29 20:16:34 2004
-@@ -193,7 +193,7 @@
- 	my %par = @_;
- 	my ($filename, $time) = @par{'filename','time'};
- 
--	my $catch = qx[identify -ping $filename 2>&1];
-+	my $catch = qx[identify $filename 2>&1];
- 	my ($width, $height);
- 	($width, $height) = ( $catch =~ /(\d+)x(\d+)/ );
- 
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Title.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Title.pm
deleted file mode 100644
index be8f553defff..000000000000
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Title.pm
+++ /dev/null
@@ -1,33 +0,0 @@
---- lib/Video/DVDRip/Title.pm.orig	Wed Dec 29 20:15:48 2004
-+++ lib/Video/DVDRip/Title.pm	Wed Dec 29 20:16:44 2004
-@@ -2205,10 +2205,10 @@
- 
- 		$command .=
- 			"dr_exec avimerge".
--			" -i $avi_file".
- 			" -p $audio_file".
- 			" -a $target_nr".
--			" -o $avi_file.merged &&".
-+			" -o $avi_file.merged".
-+			" -i $avi_file &&".
- 			" mv $avi_file.merged $avi_file &&".
- 			" rm $audio_file &&".
- 			" echo DVDRIP_SUCCESS";
-@@ -2595,7 +2595,7 @@
- 	my $target_file = $self->preview_filename( type => $type );
- 	
- 	my $catch = $self->system (
--		command => "identify -ping $source_file"
-+		command => "identify $source_file"
- 	);
- 	my ($width, $height);
- 	($width, $height) = ( $catch =~ /(\d+)x(\d+)/ );
-@@ -2653,7 +2653,7 @@
- 	}
- 	
- 	my $catch = $self->system (
--		command => "identify -ping $source_file"
-+		command => "identify $source_file"
- 	);
- 	my ($width, $height);
- 	($width, $height) = ( $catch =~ /(\d+)x(\d+)/ );
diff --git a/multimedia/dvdrip/files/patch-FilterList.pm b/multimedia/dvdrip/files/patch-lib__Video__DVDRip__FilterList.pm
index aafaa40c338c..aafaa40c338c 100644
--- a/multimedia/dvdrip/files/patch-FilterList.pm
+++ b/multimedia/dvdrip/files/patch-lib__Video__DVDRip__FilterList.pm
diff --git a/multimedia/dvdrip/pkg-descr b/multimedia/dvdrip/pkg-descr
index f58bb1aed188..c7d3832f77d1 100644
--- a/multimedia/dvdrip/pkg-descr
+++ b/multimedia/dvdrip/pkg-descr
@@ -4,5 +4,3 @@ DVDs a breeze. It also features a cluster daemon, which can distribute
 encoding jobs over multiple machines.
 
 WWW: http://www.exit1.org/dvdrip/
-
-- Michael Nottebrock <michaelnottebrock@gmx.net>