5 files changed, 41 insertions, 28 deletions

diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 6fe1b89588be..ec3ce830d45c 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dvdrip
-PORTVERSION=	0.50.13
-PORTREVISION=	2
+PORTVERSION=	0.50.16
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.exit1.org/dvdrip/dist/
 DISTNAME=	Video-DVDRip-${PORTVERSION}
@@ -41,7 +40,7 @@ USE_PERL5=	yes
 MAN1=		dvdrip.1 dr_splitpipe.1 dr_progress.1
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		Video::DVDRip.3
+MAN3=		Video::DVDRip.3 Video::DVDRip::CPAN::Scanf.3
 
 .include <bsd.port.pre.mk>
 
@@ -64,7 +63,7 @@ post-patch:
 		${WRKSRC}/dvdrip-master
 	@${PERL} -pi -e 's#cc#${CC}#' \
 		${WRKSRC}/src/Makefile
-	@${FIND} ${WRKSRC} -name *.orig -delete
+	@${FIND} ${WRKSRC} -name \*.orig -delete
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/multimedia/dvdrip/distinfo b/multimedia/dvdrip/distinfo
index 257858695d8c..e6b27a8545d7 100644
--- a/multimedia/dvdrip/distinfo
+++ b/multimedia/dvdrip/distinfo
@@ -1 +1,2 @@
-MD5 (Video-DVDRip-0.50.13.tar.gz) = 08877521b5ef24044e4ce192d6407e8d
+MD5 (Video-DVDRip-0.50.16.tar.gz) = f315695d5d7cb5d24117314c6b9093fd
+SIZE (Video-DVDRip-0.50.16.tar.gz) = 232011
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
index 265b3c1ef511..c50859602d2e 100644
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
+++ b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
@@ -34,15 +34,18 @@
  		presets => [
  			'mplayer -aid %(%a+128) -',
  			'xine stdin://mpeg2 -g -pq -a %a',
-@@ -149,8 +149,8 @@
+@@ -147,11 +147,10 @@
+ 	default_video_codec => {
+ 		label => "Default video codec",
  		type  => 'string',
- 		value => 'divx4',
+-		value => 'divx4',
++		value => 'xvid2',
  		presets => [
--			"SVCD","VCD","divx4","divx5",
--			"xvid","xvidcvs","ffmpeg","fame",
-+			"SVCD","VCD",
-+			"xvid","ffmpeg","fame",
- 			"af6"
+ 			"SVCD","VCD","XSVCD","XVCD","CVD",
+-			"divx4","divx5",
+-			"xvid","xvidcvs","xvid2","xvid3","xvid4",
++			"xvid2",
+ 			"ffmpeg","fame","af6"
  		],
  	},
 @@ -181,7 +176,7 @@
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::BurnTab.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::BurnTab.pm
index 911b79ac348c..64e0354ed40b 100644
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::BurnTab.pm
+++ b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::BurnTab.pm
@@ -1,8 +1,8 @@
---- lib/Video/DVDRip/GUI/Project/BurnTab.pm.orig	Fri Jun 20 03:14:33 2003
-+++ lib/Video/DVDRip/GUI/Project/BurnTab.pm	Fri Jun 20 03:15:21 2003
-@@ -545,18 +545,6 @@
- 
- 	$widgets->{image_button} = $button;
+--- lib/Video/DVDRip/GUI/Project/BurnTab.pm.orig	Sun Feb 22 12:33:01 2004
++++ lib/Video/DVDRip/GUI/Project/BurnTab.pm	Sun Feb 22 12:33:22 2004
+@@ -550,18 +550,6 @@
+ 	$button_box->show;
+ 	$frame_vbox->pack_start ($button_box, 0, 1, 0);
  
 -	# Eject Button
 -	$button = Gtk::Button->new_with_label (" Open burner tray ");
@@ -16,6 +16,6 @@
 -	$button->signal_connect ("clicked", sub { $self->insert_media } );
 -	$button_box->pack_start ($button, 0, 1, 0);
 -
- 	return $frame;
- }
- 
+ 	# Blank CD-RW button
+ 	$button = Gtk::Button->new_with_label (" Blank CD-RW ");
+ 	$button->show;
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm
index a4380a3e991b..a48ff4091836 100644
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm
+++ b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm
@@ -1,11 +1,21 @@
 --- lib/Video/DVDRip/GUI/Project/TranscodeTab.pm.orig	Mon Jun  2 15:41:16 2003
 +++ lib/Video/DVDRip/GUI/Project/TranscodeTab.pm	Mon Jun  2 16:04:28 2003
-@@ -1205,7 +1205,7 @@
- 			->set_popdown_strings( "SVCD", "VCD" );
- 	} else {
- 		$widgets->{tc_video_codec_combo}
--			->set_popdown_strings( "divx4","divx5","xvid","xvidcvs","ffmpeg","fame","af6" );
-+			->set_popdown_strings( "xvid","ffmpeg","fame","af6" );
+@@ -1269,14 +1269,14 @@
+ 		if ( $self->version ("transcode") < 609 ) {
+ 			$widgets->{tc_video_codec_combo}
+ 				->set_popdown_strings(
+-					"divx4","divx5","xvid",
+-					"xvidcvs","ffmpeg","fame","af6"
++					"xvid",
++					"ffmpeg","fame","af6"
+ 				);
+ 		} else {
+ 			$widgets->{tc_video_codec_combo}
+ 				->set_popdown_strings(
+-					"divx4","divx5","xvid","xvid2","xvid3",
+-					"xvid4","ffmpeg","fame","af6"
++					"xvid2",
++					"ffmpeg","fame","af6"
+ 				);
+ 		}
  	}
- 
- 	$widgets->{tc_video_codec}->set_text($title->tc_video_codec);