- Update to 0.98.1

PR:		ports/103528
Submitted by:	Rainer Alves <rainer.alves@gmail.com> (maintainer)

16 files changed, 358 insertions, 257 deletions

diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 21d682102239..70c6b723da36 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	dvdrip
-PORTVERSION=	0.52.7
+PORTVERSION=	0.98.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.exit1.org/dvdrip/dist/ \
 		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Video/JRED
-DISTNAME=	Video-DVDRip-${PORTVERSION}
 
 MAINTAINER=	rainer.alves@gmail.com
 COMMENT=	This is dvd::rip, a Perl Gtk+ based dvd-ripper
@@ -20,23 +19,24 @@ RUN_DEPENDS+=	cdrdao:${PORTSDIR}/sysutils/cdrdao \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools \
 		convert:${PORTSDIR}/graphics/ImageMagick \
 		mplayer:${PORTSDIR}/multimedia/mplayer \
+		pstree:${PORTSDIR}/sysutils/pstree \
 		transcode:${PORTSDIR}/multimedia/transcode \
 		vcdimager:${PORTSDIR}/multimedia/vcdimager \
+		xvid4conf:${PORTSDIR}/multimedia/xvid4conf \
+		${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping \
 		${BUILD_DEPENDS}
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \
-		${SITE_PERL}/${PERL_ARCH}/Gtk/Gdk/Pixbuf.pm:${PORTSDIR}/x11-toolkits/p5-GdkPixbuf \
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+		${SITE_PERL}/Event/RPC.pm:${PORTSDIR}/devel/p5-Event-RPC \
 		${SITE_PERL}/Locale/Messages.pm:${PORTSDIR}/devel/p5-Locale-libintl
 
-OPTIONS=	CLUSTER		"Enable cluster mode"	on \
-		SUBTITLE	"Enable support for getting subtitles"	on \
+OPTIONS=	SUBTITLE	"Enable support for getting subtitles"	on \
 		VORBIS		"OGG/Vorbis audio support" 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
+MAN1=		dvdrip.1 dvdrip-progress.1 dvdrip-splitpipe.1
 
 .include <bsd.port.pre.mk>
 
@@ -49,13 +49,6 @@ 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 \
-		${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping \
-		pstree:${PORTSDIR}/sysutils/pstree
-.endif
-
 .if !defined(WITHOUT_VORBIS)
 RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools \
 		ogmmerge:${PORTSDIR}/multimedia/ogmtools
@@ -65,29 +58,23 @@ RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools \
 RUN_DEPENDS+=	subtitle2pgm:${PORTSDIR}/multimedia/subtitleripper
 .endif
 
-pre-everything::
-.if !defined(WITHOUT_CLUSTER)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You can disable the cluster daemon and its"
-	@${ECHO_MSG} "dependencies by defining WITHOUT_CLUSTER."
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Warning: dvdrip does not like this and will"
-	@${ECHO_MSG} "throw cryptic error-messages. Use with caution."
-.endif
-
 post-patch:
 	@${PERL} -pi -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#' \
 		${WRKSRC}/lib/Video/DVDRip/Cluster/Master.pm \
 		${WRKSRC}/lib/Video/DVDRip/Depend.pm
 	@${PERL} -pi -e 's#/usr/local/bin/perl#${PERL5}#' \
-		${WRKSRC}/dvdrip
-	@${PERL} -pi -e 's#/usr/local/bin/perl#${PERL5}#' \
-		${WRKSRC}/dvdrip-master
-	@${PERL} -pi -e 's#cc#${CC}#' \
-		${WRKSRC}/src/Makefile
+		${WRKSRC}/bin/dvdrip \
+		${WRKSRC}/bin/dvdrip-exec \
+		${WRKSRC}/bin/dvdrip-master \
+		${WRKSRC}/bin/dvdrip-multitee \
+		${WRKSRC}/bin/dvdrip-replex \
+		${WRKSRC}/bin/dvdrip-splash \
+		${WRKSRC}/bin/dvdrip-subpng \
+		${WRKSRC}/bin/dvdrip-thumb
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
 post-install:
-	@${CAT} ${PKGMESSAGE}
+	@cd ${WRKSRC}/blib/man3 && ${FIND} * -name "*.3" | ${SED} \
+		's,^,${MAN3PREFIX:S,^${TARGETDIR}/,,}/man/man3/,' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/dvdrip/distinfo b/multimedia/dvdrip/distinfo
index 04e68fd1764b..168b1a0e6869 100644
--- a/multimedia/dvdrip/distinfo
+++ b/multimedia/dvdrip/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (dvdrip-0.98.1.tar.gz) = f532e5b87415bec82c3e12631ffc7627
+SHA256 (dvdrip-0.98.1.tar.gz) = 61c1436a3206b3d1a2289acdb2cece9e861f880566702fac4029779f5b3c5d3f
+SIZE (dvdrip-0.98.1.tar.gz) = 1098743
diff --git a/multimedia/dvdrip/files/patch-Makefile.PL b/multimedia/dvdrip/files/patch-Makefile.PL
new file mode 100644
index 000000000000..15d5efe7be24
--- /dev/null
+++ b/multimedia/dvdrip/files/patch-Makefile.PL
@@ -0,0 +1,55 @@
+--- Makefile.PL.orig	Sat Sep 23 14:08:26 2006
++++ Makefile.PL	Sat Sep 23 14:14:33 2006
+@@ -14,7 +14,7 @@
+ 	'Event'                 => 1.06,
+         'Gtk2::Ex::FormFactory' => 0.65,
+         'Event::ExecFlow'       => 0.62,
+-        'Event::RPC'            => 0.89,
++#       'Event::RPC'            => 0.89,
+         'AnyEvent'              => 1.02,
+ );
+ 
+@@ -66,8 +66,8 @@
+         next unless $module_dist_file;
+         
+         #-- now check if this module is already installed
+-        my $out = qx[ perl -M$module -e1 2>&1 >/dev/null && echo PERL_MODULE_OK 2>&1 ];
+-        next if $out =~ /PERL_MODULE_OK/;
++	my $out = qx[ perl -M$module -e1 2>&1 >/dev/null && echo PERL_MODULE_OK 2>&1 ];
++	# next if $out =~ /PERL_MODULE_OK/;
+         
+         #-- Ok, module is missing and will be installed during
+         #-- dvd::rip install
+@@ -104,19 +104,19 @@
+ 
+     if ( @modules ) {
+         @modules = sort @modules;
+-        print "\n";
+-        print "Note:\n";
+-        print "-----\n";
+-        print "The following modules are required for dvd::rip but not found on your\n";
+-        print "system. They're shipped with dvd::rip for your convenience and will be\n";
+-        print "installed automatically when you run 'make install':\n\n";
+-        print "  @modules\n";
+-        print "\n";
+-        print "You can ignore the 'prerequisite not found' warnings beyond for them.\n\n";
+-        print "If you don't like this and want to install these modules manually\n";
+-        print "just set SKIP_UNPACK_REQUIRED_MODULES before executing Makefile.PL,\n";
+-        print "e.g. this way:\n\n";
+-        print "  SKIP_UNPACK_REQUIRED_MODULES=1 perl Makefile.PL\n\n";
++#        print "\n";
++#        print "Note:\n";
++#        print "-----\n";
++#        print "The following modules are required for dvd::rip but not found on your\n";
++#        print "system. They're shipped with dvd::rip for your convenience and will be\n";
++#        print "installed automatically when you run 'make install':\n\n";
++#        print "  @modules\n";
++#        print "\n";
++#        print "You can ignore the 'prerequisite not found' warnings beyond for them.\n\n";
++#        print "If you don't like this and want to install these modules manually\n";
++#        print "just set SKIP_UNPACK_REQUIRED_MODULES before executing Makefile.PL,\n";
++#        print "e.g. this way:\n\n";
++#        print "  SKIP_UNPACK_REQUIRED_MODULES=1 perl Makefile.PL\n\n";
+     }
+ 
+     return join(" ", @files);
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Cluster::Title.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Cluster::Title.pm
deleted file mode 100644
index 4e3919357afa..000000000000
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Cluster::Title.pm
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/*";
- 
- 	$command .= " && rm $avi_chunks_dir/*"
- 			if $self->with_cleanup;
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
deleted file mode 100644
index 0f25dec4e8e9..000000000000
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
+++ /dev/null
@@ -1,53 +0,0 @@
---- 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",
- 		type => 'file',
--		value => "/dev/dvd",
-+		value => "/dev/cd0",
- 	},
- 	dvd_mount_point => {
- 		label => __"DVD mount point",
-@@ -67,12 +67,12 @@
- 	writer_device => {
- 		label => __"Writer device file",
- 		type => 'file',
--		value => "/dev/cdrom",
-+		value => "/dev/cd0",
- 	},
- 	eject_command => {
- 		label => __"Eject Command",
- 		type => 'string',
--		value => "eject",
-+		value => "cdcontrol",
- 	},
- 	play_dvd_command => {
- 		label => __"DVD player command",
-@@ -95,7 +95,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',
-@@ -151,7 +151,7 @@
- 	default_video_codec => {
- 		label => __"Default video codec",
- 		type  => 'string',
--		value => 'divx4',
-+		value => 'xvid4',
- 		presets => [
- 			"SVCD","VCD","XSVCD","XVCD","CVD",
- 			"divx4","divx5",
-@@ -198,7 +198,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',
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
deleted file mode 100644
index 2b3b88b6e2cb..000000000000
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::BurnTab.pm
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/Video/DVDRip/GUI/Project/BurnTab.pm.orig	Sun Aug 14 17:42:57 2005
-+++ lib/Video/DVDRip/GUI/Project/BurnTab.pm	Sun Aug 14 17:44:50 2005
-@@ -839,7 +839,7 @@
- sub eject_media {
-         my $self = shift;
- 
--        my $command = $self->config('eject_command') . " " . $self->config('writer_device');
-+        my $command = $self->config('eject_command') . " -f " . $self->config('writer_device') . " eject";
- 
-         system ("$command &");
- 
-@@ -849,7 +849,7 @@
- sub insert_media {
-         my $self = shift;
- 
--        my $command = $self->config('eject_command') . " -t " . $self->config('writer_device');
-+        my $command = $self->config('eject_command') . " -f " . $self->config('writer_device') . " close";
- 
-         system ("$command &");
- 
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TitleTab.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TitleTab.pm
deleted file mode 100644
index 2179e34fb4db..000000000000
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TitleTab.pm
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/Video/DVDRip/GUI/Project/TitleTab.pm.orig	Sun Aug 14 17:46:36 2005
-+++ lib/Video/DVDRip/GUI/Project/TitleTab.pm	Sun Aug 14 17:46:53 2005
-@@ -965,7 +965,7 @@
- sub eject_dvd {
-         my $self = shift;
- 
--        my $command = $self->config('eject_command') . " " . $self->config('dvd_device');
-+        my $command = $self->config('eject_command') . " -f " . $self->config('dvd_device') . " eject";
- 
-         system ("$command &");
-         
-@@ -975,7 +975,7 @@
- sub insert_dvd {
-         my $self = shift;
- 
--        my $command = $self->config('eject_command') . " -t " . $self->config('dvd_device');
-+        my $command = $self->config('eject_command') . " -f " . $self->config('dvd_device') . " close";
- 
-          system ("$command &");
-         
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
deleted file mode 100644
index 973906e3c836..000000000000
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
-@@ -1348,14 +1348,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"
-+					"xvid4",
-+					"ffmpeg","fame","af6"
- 				);
- 		}
- 	}
diff --git a/multimedia/dvdrip/files/patch-lib__Video__DVDRip__Cluster__Title.pm b/multimedia/dvdrip/files/patch-lib__Video__DVDRip__Cluster__Title.pm
new file mode 100644
index 000000000000..d5e7d100aa86
--- /dev/null
+++ b/multimedia/dvdrip/files/patch-lib__Video__DVDRip__Cluster__Title.pm
@@ -0,0 +1,15 @@
+--- lib/Video/DVDRip/Cluster/Title.pm.orig	Fri Sep 22 15:35:37 2006
++++ lib/Video/DVDRip/Cluster/Title.pm	Fri Sep 22 15:38:24 2006
+@@ -300,10 +300,10 @@
+         if $self->tc_nice =~ /\S/;
+ 
+     my $command = "mkdir -m 0775 -p '$audio_video_psu_dir' && "
+-        . "${nice}execflow avimerge -i $avi_chunks_dir/*"
+-        . " -o $audio_video_psu_file ";
++        . "${nice}execflow avimerge -o $audio_video_psu_file";
+ 
+     $command .= " -p $audio_psu_file " if !$self->is_ogg;
++    $command .= " -i $avi_chunks_dir/*";
+ 
+     $command .= " && rm $avi_chunks_dir/*"
+         if $self->with_cleanup;
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 000000000000..f21f1560098d
--- /dev/null
+++ b/multimedia/dvdrip/files/patch-lib__Video__DVDRip__Config.pm
@@ -0,0 +1,40 @@
+--- lib/Video/DVDRip/Config.pm.orig	Sun Aug 20 07:56:01 2006
++++ lib/Video/DVDRip/Config.pm	Sat Sep 23 13:58:03 2006
+@@ -193,16 +193,16 @@
+     dvd_device => {
+         label => __ "Default DVD device",
+         type  => 'file',
+-        value => "",
++        value => "/cdrom",
+         dvd_button => 1,
+     },
+     selected_dvd_device => {
+-        value   => "/dev/dvd",
++        value   => "/cdrom",
+     },
+     eject_command => {
+         label => __ "Eject Command",
+         type  => 'string',
+-        value => "eject",
++        value => "cdcontrol",
+         rules => "executable-command",
+     },
+     play_dvd_command => {
+@@ -226,7 +226,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',
+         ],
+@@ -274,7 +274,7 @@
+     default_video_codec => {
+         label   => __ "Default video codec",
+         type    => 'string',
+-        value   => 'xvid',
++        value   => 'xvid4',
+         presets => [
+             "SVCD",   "VCD",  "XSVCD",   "XVCD",  "CVD",   "divx4",
+             "divx5",  "xvid", "xvidcvs", "xvid2", "xvid3", "xvid4",
diff --git a/multimedia/dvdrip/files/patch-lib__Video__DVDRip__FilterList.pm b/multimedia/dvdrip/files/patch-lib__Video__DVDRip__FilterList.pm
index aafaa40c338c..300de0fe00f7 100644
--- a/multimedia/dvdrip/files/patch-lib__Video__DVDRip__FilterList.pm
+++ b/multimedia/dvdrip/files/patch-lib__Video__DVDRip__FilterList.pm
@@ -1,11 +1,11 @@
---- lib/Video/DVDRip/FilterList.pm.orig	Sat Jul 23 03:00:00 2005
-+++ lib/Video/DVDRip/FilterList.pm	Sat Mar 25 18:09:24 2006
-@@ -211,7 +211,7 @@
- 	print STDERR "[filterlist] (re)scanning transcode's module path $modpath...\n";
- 	
- 	my @filter_names = grep !/^(pv|preview)$/,
--			   map  {m!/filter_([^/]+)\.so$!}
-+			   map  {m!/filter_([^/]+)\.so$/!}
- 			   glob ("$modpath/filter_*");
+--- lib/Video/DVDRip/FilterList.pm.orig	Fri Sep 22 16:05:34 2006
++++ lib/Video/DVDRip/FilterList.pm	Fri Sep 22 16:06:07 2006
+@@ -220,7 +220,7 @@
+         "[filterlist] (re)scanning transcode's module path $modpath...\n";
  
- 	my %filters;
+     my @filter_names = grep !/^(pv|preview)$/,
+-        map {m!/filter_([^/]+)\.so$!} glob("$modpath/filter_*");
++        map {m!/filter_([^/]+)\.so$/!} glob("$modpath/filter_*");
+ 
+     my %filters;
+     foreach my $filter_name (@filter_names) {
diff --git a/multimedia/dvdrip/files/patch-lib__Video__DVDRip__GUI__Project__Storage.pm b/multimedia/dvdrip/files/patch-lib__Video__DVDRip__GUI__Project__Storage.pm
new file mode 100644
index 000000000000..acc6e4b11e5e
--- /dev/null
+++ b/multimedia/dvdrip/files/patch-lib__Video__DVDRip__GUI__Project__Storage.pm
@@ -0,0 +1,15 @@
+--- lib/Video/DVDRip/GUI/Project/Storage.pm.orig	Sat Sep 23 16:06:43 2006
++++ lib/Video/DVDRip/GUI/Project/Storage.pm	Sat Sep 23 16:15:30 2006
+@@ -144,6 +144,12 @@
+                                             ."Either it's the filename of a physical DVD "
+                                             ."device or the path of a full DVD image copy."
+                             ),
++                            Gtk2::Ex::FormFactory::Label->new(
++                                label =>
++				    __"Important: On FreeBSD, please mount your DVD disc first\n"
++				     ."(eg 'mount /cdrom'), and then specify the mountpoint above\n"
++				     ."(click \"Choose DVD image directory\" and select '/cdrom').\n"
++                            ),
+                         ],
+                     ),
+                 ],
diff --git a/multimedia/dvdrip/files/patch-lib__Video__DVDRip__GUI__Project__Title.pm b/multimedia/dvdrip/files/patch-lib__Video__DVDRip__GUI__Project__Title.pm
new file mode 100644
index 000000000000..881d7de0c6d8
--- /dev/null
+++ b/multimedia/dvdrip/files/patch-lib__Video__DVDRip__GUI__Project__Title.pm
@@ -0,0 +1,27 @@
+--- lib/Video/DVDRip/GUI/Project/Title.pm.orig	Fri Sep 22 15:53:09 2006
++++ lib/Video/DVDRip/GUI/Project/Title.pm	Fri Sep 22 15:56:35 2006
+@@ -433,8 +433,10 @@
+     my $title = $self->selected_title;
+ 
+     my $command
+-        = $self->config('eject_command') . " " .
+-            $title->project->dvd_device;
++        = $self->config('eject_command') . " -f " .
++            $title->project->dvd_device .
++	    " eject";
++
+ 
+     system("$command &");
+ 
+@@ -446,8 +448,9 @@
+ 
+     my $title = $self->selected_title;
+ 
+-    my $command = $self->config('eject_command') . " -t "
+-        . $title->project->dvd_device;
++    my $command = $self->config('eject_command') . " -f " .
++        $title->project->dvd_device .
++	" close";
+ 
+     system("$command &");
+ 
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 000000000000..4607d0a71b0f
--- /dev/null
+++ b/multimedia/dvdrip/files/patch-lib__Video__DVDRip__Project.pm
@@ -0,0 +1,51 @@
+--- lib/Video/DVDRip/Project.pm.orig	Wed Aug 16 16:34:38 2006
++++ lib/Video/DVDRip/Project.pm	Sat Sep 23 15:32:16 2006
+@@ -345,24 +345,27 @@
+     return \%symlinks;
+ }
+ 
+-sub get_mount_dir_from_mtab {
++sub get_mount_dir_from_fstab {
+     my $self = shift;
+-    my ( $dvd_device, $mtab_file ) = @_;
++    my ( $dvd_device, $fstab_file ) = @_;
+ 
+     my $symlinks_href = $self->resolve_symlinks($dvd_device);
+ 
+-    open( my $fh, $mtab_file )
+-        or die "can't read $mtab_file";
++    open(FSTABINPUT, $fstab_file )
++	or die "can't read $fstab_file";
+ 
+     my $mount_dir;
+-    while ( my $line = <$fh> ) {
+-        my ( $device, $dir ) = split( /\s+/, $line );
+-        if ( $symlinks_href->{$device} ) {
+-            $mount_dir = $dir;
+-            last;
+-        }
++    while (<FSTABINPUT>) {
++	my ($dev, $mnt, $fstyp, $opt, $dump, $pass) = split;
++	next if $dev =~ /^#/;
++	if (( $dev eq $symlinks_href->{$dev} ) ||
++	   ( $mnt eq $symlinks_href->{$dev} )  ||
++	   ( $fstyp eq 'cd9660' )) {
++	    $mount_dir = $mnt;
++	    last;
++	}
+     }
+-    close $fh;
++    close (FSTABINPUT);
+ 
+     return $mount_dir;
+ }
+@@ -373,8 +376,7 @@
+     my $dvd_device = $self->dvd_device;
+ 
+     my $dvd_mount_point
+-        = $self->get_mount_dir_from_mtab( $dvd_device,  "/etc/mtab" )
+-        || $self->get_mount_dir_from_mtab( $dvd_device, "/etc/fstab" );
++        = $self->get_mount_dir_from_fstab( $dvd_device, "/etc/fstab" );
+ 
+     return $dvd_mount_point;
+ }
diff --git a/multimedia/dvdrip/pkg-message b/multimedia/dvdrip/pkg-message
deleted file mode 100644
index 15b05db8fdf5..000000000000
--- a/multimedia/dvdrip/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-
-In order to have automated ripping work right, enable usermount (sysctl 
-vfs.usermount=1), add a mountpoint for your dvd-drive to your home directory
-(mkdir /home/foo/cdrom) and add a corresponding entry to /etc/fstab
-(/dev/cd0       /usr/home/foo/cdrom    cd9660  ro,noauto       0       0) and
-specify this mountpoint in dvd::rip's preferences.
-
-################################################################################
diff --git a/multimedia/dvdrip/pkg-plist b/multimedia/dvdrip/pkg-plist
index 5c4fd96ffbac..c705c5d3153d 100644
--- a/multimedia/dvdrip/pkg-plist
+++ b/multimedia/dvdrip/pkg-plist
@@ -1,27 +1,87 @@
-bin/dr_exec
-bin/dr_progress
-bin/dr_splitpipe
 bin/dvdrip
+bin/dvdrip-exec
 bin/dvdrip-master
+bin/dvdrip-multitee
+bin/dvdrip-progress
+bin/dvdrip-replex
+bin/dvdrip-splash
+bin/dvdrip-splitpipe
+bin/dvdrip-subpng
+bin/dvdrip-thumb
+bin/execflow
+%%SITE_PERL%%/AnyEvent.pm
+%%SITE_PERL%%/AnyEvent/Impl/Coro.pm
+%%SITE_PERL%%/AnyEvent/Impl/Event.pm
+%%SITE_PERL%%/AnyEvent/Impl/Glib.pm
+%%SITE_PERL%%/AnyEvent/Impl/Tk.pm
+%%SITE_PERL%%/Event/ExecFlow.pm
+%%SITE_PERL%%/Event/ExecFlow/Callbacks.pm
+%%SITE_PERL%%/Event/ExecFlow/Frontend.pm
+%%SITE_PERL%%/Event/ExecFlow/Frontend/Term.pm
+%%SITE_PERL%%/Event/ExecFlow/Job.pm
+%%SITE_PERL%%/Event/ExecFlow/Job/Code.pm
+%%SITE_PERL%%/Event/ExecFlow/Job/Command.pm
+%%SITE_PERL%%/Event/ExecFlow/Job/Group.pm
+%%SITE_PERL%%/Event/ExecFlow/Scheduler.pm
+%%SITE_PERL%%/Event/ExecFlow/Scheduler/SimpleMax.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Button.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/CheckButton.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/CheckButtonGroup.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Combo.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Container.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Context.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/DialogButtons.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Entry.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/ExecFlow.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Expander.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Form.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/GtkWidget.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/HBox.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/HSeparator.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Image.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Intro.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Label.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Layout.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/List.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Loader.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Menu.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Notebook.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Popup.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/ProgressBar.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Proxy.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/ProxyBuffered.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/RadioButton.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Rules.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Table.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/TextView.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Timestamp.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/ToggleButton.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/VBox.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/VPaned.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/VSeparator.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Widget.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/Window.pm
+%%SITE_PERL%%/Gtk2/Ex/FormFactory/YesNo.pm
+%%SITE_PERL%%/LocaleData/cs/LC_MESSAGES/video.dvdrip.mo
+%%SITE_PERL%%/LocaleData/de/LC_MESSAGES/video.dvdrip.mo
+%%SITE_PERL%%/LocaleData/es/LC_MESSAGES/video.dvdrip.mo
+%%SITE_PERL%%/LocaleData/fr/LC_MESSAGES/video.dvdrip.mo
+%%SITE_PERL%%/LocaleData/it/LC_MESSAGES/video.dvdrip.mo
+%%SITE_PERL%%/LocaleData/sr/LC_MESSAGES/video.dvdrip.mo
 %%SITE_PERL%%/Video/DVDRip.pm
 %%SITE_PERL%%/Video/DVDRip/Audio.pm
 %%SITE_PERL%%/Video/DVDRip/Base.pm
 %%SITE_PERL%%/Video/DVDRip/BitrateCalc.pm
 %%SITE_PERL%%/Video/DVDRip/CPAN/Scanf.pm
-%%SITE_PERL%%/Video/DVDRip/Cluster/Job.pm
-%%SITE_PERL%%/Video/DVDRip/Cluster/Job/AddAudioMerge.pm
-%%SITE_PERL%%/Video/DVDRip/Cluster/Job/BitrateCalc.pm
-%%SITE_PERL%%/Video/DVDRip/Cluster/Job/MergePSUs.pm
-%%SITE_PERL%%/Video/DVDRip/Cluster/Job/MergeVideoAudio.pm
-%%SITE_PERL%%/Video/DVDRip/Cluster/Job/RemoveVOBs.pm
-%%SITE_PERL%%/Video/DVDRip/Cluster/Job/Split.pm
-%%SITE_PERL%%/Video/DVDRip/Cluster/Job/TranscodeAudio.pm
-%%SITE_PERL%%/Video/DVDRip/Cluster/Job/TranscodeVideo.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/ExecFlowFrontend.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/JobPlanner.pm
 %%SITE_PERL%%/Video/DVDRip/Cluster/Master.pm
 %%SITE_PERL%%/Video/DVDRip/Cluster/Node.pm
 %%SITE_PERL%%/Video/DVDRip/Cluster/PSU.pm
 %%SITE_PERL%%/Video/DVDRip/Cluster/Pipe.pm
 %%SITE_PERL%%/Video/DVDRip/Cluster/Project.pm
+%%SITE_PERL%%/Video/DVDRip/Cluster/Scheduler.pm
 %%SITE_PERL%%/Video/DVDRip/Cluster/Title.pm
 %%SITE_PERL%%/Video/DVDRip/Cluster/Webserver.pm
 %%SITE_PERL%%/Video/DVDRip/Config.pm
@@ -32,98 +92,87 @@ bin/dvdrip-master
 %%SITE_PERL%%/Video/DVDRip/FilterSettings.pm
 %%SITE_PERL%%/Video/DVDRip/GUI/Base.pm
 %%SITE_PERL%%/Video/DVDRip/GUI/BitrateCalc.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/CheckedEntry.pm
 %%SITE_PERL%%/Video/DVDRip/GUI/Cluster/Control.pm
 %%SITE_PERL%%/Video/DVDRip/GUI/Cluster/Node.pm
 %%SITE_PERL%%/Video/DVDRip/GUI/Cluster/Title.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Component.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Config.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Context.pm
 %%SITE_PERL%%/Video/DVDRip/GUI/Depend.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/ExecuteJobs.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/ExecFlow.pm
 %%SITE_PERL%%/Video/DVDRip/GUI/Filters.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/ImageClip.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Logger.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/FormFactory/ClipImage.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/FormFactory/SubtitlePreviews.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Icons/dvdrip-audio-matrix.png
+%%SITE_PERL%%/Video/DVDRip/GUI/Icons/dvdrip-calc-height.png
+%%SITE_PERL%%/Video/DVDRip/GUI/Icons/dvdrip-calc-width.png
+%%SITE_PERL%%/Video/DVDRip/GUI/Icons/dvdrip-clip-move.png
+%%SITE_PERL%%/Video/DVDRip/GUI/Icons/dvdrip-play-movie.png
+%%SITE_PERL%%/Video/DVDRip/GUI/Icons/dvdrip-scan-volume.png
 %%SITE_PERL%%/Video/DVDRip/GUI/Main.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/MinSizeGroup.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/MultiAudio.pm
 %%SITE_PERL%%/Video/DVDRip/GUI/Pipe.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Preferences.pm
 %%SITE_PERL%%/Video/DVDRip/GUI/Preview.pm
 %%SITE_PERL%%/Video/DVDRip/GUI/Progress.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Project.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Project/BurnTab.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Project/ClipZoomTab.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Project/LoggingTab.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Project/StorageTab.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Project/SubtitleTab.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Project/TitleTab.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Project/TranscodeTab.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Project/TranscodeTabAudio.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Setting.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Setting/Checkbox.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Setting/Text.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/VisualFrameRange.pm
-%%SITE_PERL%%/Video/DVDRip/GUI/Window.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/ClipZoom.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/Logging.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/Storage.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/Subtitle.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/Title.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Project/Transcode.pm
+%%SITE_PERL%%/Video/DVDRip/GUI/Rules.pm
 %%SITE_PERL%%/Video/DVDRip/GUI/ZoomCalculator.pm
 %%SITE_PERL%%/Video/DVDRip/InfoFile.pm
-%%SITE_PERL%%/Video/DVDRip/Job.pm
-%%SITE_PERL%%/Video/DVDRip/Job/BurnCD.pm
-%%SITE_PERL%%/Video/DVDRip/Job/CountFramesInFile.pm
-%%SITE_PERL%%/Video/DVDRip/Job/CreateCDImage.pm
-%%SITE_PERL%%/Video/DVDRip/Job/CreateVobsub.pm
-%%SITE_PERL%%/Video/DVDRip/Job/CreateWav.pm
-%%SITE_PERL%%/Video/DVDRip/Job/ExtractPS1.pm
-%%SITE_PERL%%/Video/DVDRip/Job/GrabPreviewFrame.pm
-%%SITE_PERL%%/Video/DVDRip/Job/GrabSubtitleImages.pm
-%%SITE_PERL%%/Video/DVDRip/Job/MergeAudio.pm
-%%SITE_PERL%%/Video/DVDRip/Job/Mplex.pm
-%%SITE_PERL%%/Video/DVDRip/Job/Probe.pm
-%%SITE_PERL%%/Video/DVDRip/Job/ProbeTitleCount.pm
-%%SITE_PERL%%/Video/DVDRip/Job/Rip.pm
-%%SITE_PERL%%/Video/DVDRip/Job/ScanVolume.pm
-%%SITE_PERL%%/Video/DVDRip/Job/Split.pm
-%%SITE_PERL%%/Video/DVDRip/Job/TranscodeAudio.pm
-%%SITE_PERL%%/Video/DVDRip/Job/TranscodeVideo.pm
+%%SITE_PERL%%/Video/DVDRip/JobPlanner.pm
+%%SITE_PERL%%/Video/DVDRip/Logger.pm
 %%SITE_PERL%%/Video/DVDRip/PSU.pm
 %%SITE_PERL%%/Video/DVDRip/Preset.pm
 %%SITE_PERL%%/Video/DVDRip/Probe.pm
 %%SITE_PERL%%/Video/DVDRip/Project.pm
-%%SITE_PERL%%/Video/DVDRip/RPC/Client.pm
-%%SITE_PERL%%/Video/DVDRip/RPC/Message.pm
-%%SITE_PERL%%/Video/DVDRip/RPC/Server.pm
+%%SITE_PERL%%/Video/DVDRip/SrtxFile.pm
 %%SITE_PERL%%/Video/DVDRip/Subtitle.pm
+%%SITE_PERL%%/Video/DVDRip/Term/ExitTask.pm
+%%SITE_PERL%%/Video/DVDRip/Term/Main.pm
+%%SITE_PERL%%/Video/DVDRip/Term/Progress.pm
 %%SITE_PERL%%/Video/DVDRip/Title.pm
 %%SITE_PERL%%/Video/DVDRip/TranscodeRC.pm
 %%SITE_PERL%%/Video/DVDRip/icon.xpm
-%%SITE_PERL%%/Video/DVDRip/splash.png
-%%SITE_PERL%%/LocaleData/cs/LC_MESSAGES/video.dvdrip.mo
-%%SITE_PERL%%/LocaleData/de/LC_MESSAGES/video.dvdrip.mo
-%%SITE_PERL%%/LocaleData/es/LC_MESSAGES/video.dvdrip.mo
-%%SITE_PERL%%/LocaleData/fr/LC_MESSAGES/video.dvdrip.mo
-%%SITE_PERL%%/LocaleData/it/LC_MESSAGES/video.dvdrip.mo
-%%SITE_PERL%%/LocaleData/sr/LC_MESSAGES/video.dvdrip.mo
+%%SITE_PERL%%/Video/DVDRip/license.txt
+%%SITE_PERL%%/Video/DVDRip/splash.de.png
+%%SITE_PERL%%/Video/DVDRip/splash.en.png
+%%SITE_PERL%%/Video/DVDRip/splash.es.png
+%%SITE_PERL%%/Video/DVDRip/translators.txt
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/DVDRip/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/DVDRip
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video
-@dirrm %%SITE_PERL%%/Video/DVDRip/RPC
-@dirrm %%SITE_PERL%%/Video/DVDRip/Job
-@dirrm %%SITE_PERL%%/Video/DVDRip/GUI/Setting
+@dirrm %%SITE_PERL%%/Video/DVDRip/Term
 @dirrm %%SITE_PERL%%/Video/DVDRip/GUI/Project
+@dirrm %%SITE_PERL%%/Video/DVDRip/GUI/Icons
+@dirrm %%SITE_PERL%%/Video/DVDRip/GUI/FormFactory
 @dirrm %%SITE_PERL%%/Video/DVDRip/GUI/Cluster
 @dirrm %%SITE_PERL%%/Video/DVDRip/GUI
-@dirrm %%SITE_PERL%%/Video/DVDRip/Cluster/Job
 @dirrm %%SITE_PERL%%/Video/DVDRip/Cluster
 @dirrm %%SITE_PERL%%/Video/DVDRip/CPAN
 @dirrm %%SITE_PERL%%/Video/DVDRip
 @dirrmtry %%SITE_PERL%%/Video
-@dirrmtry %%SITE_PERL%%/LocaleData/cs/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/de/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/es/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/fr/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/it/LC_MESSAGES
 @dirrmtry %%SITE_PERL%%/LocaleData/sr/LC_MESSAGES
-@dirrmtry %%SITE_PERL%%/LocaleData/cs
-@dirrmtry %%SITE_PERL%%/LocaleData/de
-@dirrmtry %%SITE_PERL%%/LocaleData/es
-@dirrmtry %%SITE_PERL%%/LocaleData/fr
-@dirrmtry %%SITE_PERL%%/LocaleData/it
 @dirrmtry %%SITE_PERL%%/LocaleData/sr
+@dirrmtry %%SITE_PERL%%/LocaleData/it/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/it
+@dirrmtry %%SITE_PERL%%/LocaleData/fr/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/fr
+@dirrmtry %%SITE_PERL%%/LocaleData/es/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/es
+@dirrmtry %%SITE_PERL%%/LocaleData/de/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/de
+@dirrmtry %%SITE_PERL%%/LocaleData/cs/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/cs
 @dirrmtry %%SITE_PERL%%/LocaleData
+@dirrm %%SITE_PERL%%/Gtk2/Ex/FormFactory
+@dirrm %%SITE_PERL%%/Gtk2/Ex
+@dirrmtry %%SITE_PERL%%/Gtk2
+@dirrm %%SITE_PERL%%/Event/ExecFlow/Scheduler
+@dirrm %%SITE_PERL%%/Event/ExecFlow/Job
+@dirrm %%SITE_PERL%%/Event/ExecFlow/Frontend
+@dirrm %%SITE_PERL%%/Event/ExecFlow
+@dirrm %%SITE_PERL%%/AnyEvent/Impl
+@dirrm %%SITE_PERL%%/AnyEvent