Update dvdrip to the latest stable release.

PR:		ports/47117
Submitted by:	Michael Nottebrock <lofi@lofi.dyndns.org>

6 files changed, 186 insertions, 11 deletions

diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index f3602ed..5fda911 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	dvdrip
-PORTVERSION=	0.44
-CATEGORIES=	graphics
+PORTVERSION=	0.48.8
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.exit1.org/dvdrip/dist/
 DISTNAME=	Video-DVDRip-${PORTVERSION}
 
@@ -23,15 +23,21 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable
 RUN_DEPENDS+=	xine:${PORTSDIR}/graphics/xine \
 		${X11BASE}/lib/xine/plugins/xineplug_inp_d4d.so:${PORTSDIR}/graphics/xine_d4d_plugin
 .endif
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick \
-		transcode:${PORTSDIR}/graphics/transcode
+RUN_DEPENDS+=	cdrdao:${PORTSDIR}/sysutils/cdrdao \
+		cdrecord:${PORTSDIR}/sysutils/cdrtools \
+		convert:${PORTSDIR}/graphics/ImageMagick \
+		mkisofs:${PORTSDIR}/sysutils/mkisofs \
+		mplayer:${PORTSDIR}/multimedia/mplayer \
+		ogmmerge:${PORTSDIR}/multimedia/ogmtools \
+		transcode:${PORTSDIR}/graphics/transcode \
+		vcdimager:${PORTSDIR}/graphics/vcdimager
 BUILD_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk/Gdk/Pixbuf.pm:${PORTSDIR}/x11-toolkits/p5-GdkPixbuf
 
 PERL_CONFIGURE=	yes
 USE_PERL5=	yes
 
-MAN1=		splitpipe.1
+MAN1=		dvdrip.1 dr_splitpipe.1 dr_progress.1
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Video::DVDRip.3
@@ -48,7 +54,7 @@ pre-everything::
 .if !defined(WITH_XINE)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Define WITH_XINE to pull in XINE as a dependency"
-	@${ECHO_MSG} "(used for previewing DVDs prior to ripping)"
+	@${ECHO_MSG} "(alternative DVD previewer)"
 	@${ECHO_MSG}
 .endif
 
@@ -61,5 +67,9 @@ post-patch:
 		${WRKSRC}/dvdrip-master
 	@${PERL} -pi -e 's#cc#${CC}#' \
 		${WRKSRC}/src/Makefile
+	@${FIND} ${WRKSRC} -name *.orig -delete
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/multimedia/dvdrip/distinfo b/multimedia/dvdrip/distinfo
index ba8b474..9ba2b39 100644
--- a/multimedia/dvdrip/distinfo
+++ b/multimedia/dvdrip/distinfo
@@ -1 +1 @@
-MD5 (Video-DVDRip-0.44.tar.gz) = fea7e9b8e5809574db9e6510361afb54
+MD5 (Video-DVDRip-0.48.8.tar.gz) = f3aa765b0bd720daed233e34be6ce867
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
new file mode 100644
index 0000000..219ffc5
--- /dev/null
+++ b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
@@ -0,0 +1,89 @@
+--- lib/Video/DVDRip/Config.pm.orig	Fri Dec 20 12:09:39 2002
++++ lib/Video/DVDRip/Config.pm	Fri Dec 20 12:14:45 2002
+@@ -52,7 +52,7 @@
+ 	dvd_device => {
+ 		label => "DVD device",
+ 		type => 'file',
+-		value => "/dev/dvd",
++		value => "/dev/cd0c",
+ 	},
+ 	dvd_mount_point => {
+ 		label => "DVD mount point",
+@@ -81,7 +81,7 @@
+ 	play_stdin_command => {
+ 		label => "STDIN player command",
+ 		type  => 'string',
+-		value => 'xine stdin://mpeg2 -g -pq -a %a',
++		value => 'mplayer -aid %(%a+128) -',
+ 		presets => [
+ 			'mplayer -aid %(%a+128) -',
+ 			'xine stdin://mpeg2 -g -pq -a %a',
+@@ -124,7 +124,7 @@
+ 	burn_cdrecord_cmd => {
+ 		label => "cdrecord command",
+ 		type  => 'string',
+-		value => '/usr/lib/xcdroast-0.98/bin/xcdrwrap CDRECORD',
++		value => 'cdrecord',
+ 		presets => [
+ 			'/usr/lib/xcdroast-0.98/bin/xcdrwrap CDRECORD',
+ 			'cdrecord',
+@@ -171,11 +171,10 @@
+ 	default_video_codec => {
+ 		label => "Default Video Codec",
+ 		type  => 'string',
+-		value => 'divx4',
++		value => 'xvid',
+ 		presets => [
+-			"SVCD","VCD","divx4","divx5",
+-			"xvid","xvidcvs","ffmpeg4","fame",
+-			"af6"
++			"SVCD","VCD","xvid","ffmpeg4",
++			"fame","af6"
+ 		],
+ 	},
+ );
+--- lib/Video/DVDRip/Config.pm.orig	Fri Jan  3 15:21:22 2003
++++ lib/Video/DVDRip/Config.pm		Fri Jan  3 15:27:10 2003
+@@ -54,11 +54,6 @@
+ 		type => 'file',
+ 		value => "/dev/dvd",
+ 	},
+-	dvd_mount_point => {
+-		label => "DVD mount point",
+-		type => 'dir',
+-		value => "/cdrom",
+-	},
+ 	play_dvd_command => {
+ 		label => "DVD player command",
+ 		type  => 'string',
+--- lib/Video/DVDRip/Config.pm.orig	Fri Jan  3 15:42:30 2003
++++ lib/Video/DVDRip/Config.pm	Fri Jan  3 15:43:33 2003
+@@ -50,7 +50,7 @@
+ 		value => 5,
+ 	},
+ 	dvd_device => {
+-		label => "DVD device",
++		label => "DVD mount point",
+ 		type => 'file',
+ 		value => "/dev/cd0c",
+ 	},
+@@ -176,7 +176,7 @@
+ 
+ my @CONFIG_ORDER = (
+ 	"Filesystem" => [qw(
+-		dvd_device         dvd_mount_point
++		dvd_device
+ 		base_project_dir
+ 		dvdrip_files_dir   ogg_file_ext
+ 	)],
+--- lib/Video/DVDRip/Config.pm.orig	Fri Jan  3 15:47:07 2003
++++ lib/Video/DVDRip/Config.pm	Fri Jan  3 15:47:17 2003
+@@ -546,7 +546,7 @@
+ sub test_play_file_command  	{ _executable (@_) 	}
+ sub test_play_stdin_command 	{ _executable (@_) 	}
+ 
+-sub test_dvd_device		{ _writable (@_)	}
++sub test_dvd_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::GUI::Project::TranscodeTab.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm
new file mode 100644
index 0000000..199610f
--- /dev/null
+++ b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm
@@ -0,0 +1,11 @@
+--- lib/Video/DVDRip/GUI/Project/TranscodeTab.pm.orig	Fri Dec 20 12:15:47 2002
++++ lib/Video/DVDRip/GUI/Project/TranscodeTab.pm	Fri Dec 20 12:16:11 2002
+@@ -218,7 +218,7 @@
+ 
+ 	$entry = Gtk::Combo->new;
+ 	$entry->show;
+-	$entry->set_popdown_strings ("SVCD","VCD","divx4","divx5","xvid","xvidcvs","ffmpeg","fame","af6");
++	$entry->set_popdown_strings ("SVCD","VCD","xvid","ffmpeg","fame","af6");
+ 	$entry->set_usize(80,undef);
+ 	$hbox->pack_start($entry, 0, 1, 0);
+ 
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Project.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Project.pm
new file mode 100644
index 0000000..c67de0c
--- /dev/null
+++ b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Project.pm
@@ -0,0 +1,38 @@
+--- lib/Video/DVDRip/Project.pm.orig	Fri Jan  3 15:22:00 2003
++++ lib/Video/DVDRip/Project.pm		Fri Jan  3 15:24:34 2003
+@@ -272,7 +272,7 @@
+ 	my $dir;
+ 
+ 	if ( $mode eq 'rip' or $mode eq 'dvd' ) {
+-		$dir = $self->config('dvd_mount_point');
++		$dir = $self->config('dvd_device');
+ 
+ 	} elsif ( $mode eq 'dvd_image' ) {
+ 		$dir = $self->dvd_image_dir;
+@@ -445,7 +445,7 @@
+ 	
+ 	return 1 if $self->rip_mode eq 'dvd_image';
+ 	
+-	my $dvd_mount_point = $self->config('dvd_mount_point');
++	my $dvd_mount_point = $self->config('dvd_device');
+ 
+ 	return 1 if -d "$dvd_mount_point/video_ts";
+ 	return 1 if -d "$dvd_mount_point/VIDEO_TS";
+@@ -457,7 +457,7 @@
+ 	
+ 	return 1 if $self->rip_mode eq 'dvd_image';
+ 
+-	my $dvd_mount_point = $self->config('dvd_mount_point');
++	my $dvd_mount_point = $self->config('dvd_device');
+ 
+ 	$self->log ("Mounting DVD at $dvd_mount_point");
+ 
+@@ -476,7 +476,7 @@
+ 	
+ 	return 1 if $self->rip_mode eq 'dvd_image';
+ 
+-	my $dvd_mount_point = $self->config('dvd_mount_point');
++	my $dvd_mount_point = $self->config('dvd_device');
+ 
+ 	my $mount = qx[ umount $dvd_mount_point 2>&1 ];
+ 
diff --git a/multimedia/dvdrip/pkg-plist b/multimedia/dvdrip/pkg-plist
index 704721d..3566c7d 100644
--- a/multimedia/dvdrip/pkg-plist
+++ b/multimedia/dvdrip/pkg-plist
@@ -1,13 +1,13 @@
+bin/dr_progress
+bin/dr_splitpipe
 bin/dvdrip
 bin/dvdrip-master
-bin/splitpipe
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Video/DVDRip/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Audio.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Base.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/Audio.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/MergeAudio.pm
-lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/MergeChunks.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/AddAudioMerge.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/MergePSUs.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/MergeVideoAudio.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job/RemoveVOBs.pm
@@ -23,33 +23,59 @@ lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Title.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Config.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Content.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Base.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/CheckedEntry.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Cluster/Control.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Cluster/Node.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Cluster/Title.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Component.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Config.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/ExecuteJobs.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/ImageClip.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Logger.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Main.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/MinSizeGroup.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Pipe.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Progress.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/BurnTab.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/ClipZoomTab.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/LoggingTab.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/StorageTab.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/SubtitleTab.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/TitleTab.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/TranscodeTab.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Project/TranscodeTabAudio.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/Window.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI/ZoomCalculator.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/InfoFile.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/BurnCD.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/CountFramesInFile.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/CreateCDImage.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/CreateVobsub.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/ExtractPS1.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/GrabPreviewFrame.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/GrabSubtitleImages.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/MergeAudio.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/Mplex.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/Probe.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/Rip.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/ScanVolume.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/Split.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/TranscodeAudio.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job/TranscodeVideo.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/PSU.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Preset.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Probe.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/ProbeAudio.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Project.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/RPC/Client.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/RPC/Message.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/RPC/Server.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Scan.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Subtitle.pm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Title.pm
+lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/icon.xpm
 lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/splash.png
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Video/DVDRip
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Video 2>/dev/null || true
@@ -59,5 +85,6 @@ lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/splash.png
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/GUI
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster/Job
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Cluster
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip/Job
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Video/DVDRip
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Video 2>/dev/null || true