From 353bf7634dba040dfc55105b208c73b8675791bf Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sun, 25 Oct 2009 20:01:12 +0000
Subject: [PATCH] - update to 2.43 - take maintainer

---
 multimedia/get_iplayer/Makefile               |  7 +++--
 multimedia/get_iplayer/distinfo               | 10 +++----
 .../get_iplayer/patches/patch-get_iplayer     | 29 ++++++++++++-------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/multimedia/get_iplayer/Makefile b/multimedia/get_iplayer/Makefile
index f8cc59a05c8..e0b67599417 100644
--- a/multimedia/get_iplayer/Makefile
+++ b/multimedia/get_iplayer/Makefile
@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.26 2009/10/10 10:42:42 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2009/10/25 20:01:12 sthen Exp $
 
 COMMENT =		download BBC iPlayer and ITV programmes
 
-DISTNAME =		get_iplayer-2.41
-
+DISTNAME =		get_iplayer-2.43
 CATEGORIES =		multimedia
 
 HOMEPAGE =		http://linuxcentre.net/get_iplayer/
 
+MAINTAINER =		Stuart Henderson <sthen@openbsd.org>
+
 # GPLv3+
 PERMIT_PACKAGE_CDROM =	Yes 
 PERMIT_PACKAGE_FTP =	Yes
diff --git a/multimedia/get_iplayer/distinfo b/multimedia/get_iplayer/distinfo
index 53343468e9e..68c37244895 100644
--- a/multimedia/get_iplayer/distinfo
+++ b/multimedia/get_iplayer/distinfo
@@ -1,5 +1,5 @@
-MD5 (get_iplayer-2.41.tar.gz) = Pw6JtUhnkFROS2NQIKxwBA==
-RMD160 (get_iplayer-2.41.tar.gz) = AYDQjMUb4/dzqKefzxzCARJjfco=
-SHA1 (get_iplayer-2.41.tar.gz) = pk33MtLo7rTlo/eY8fHoNqbQMiQ=
-SHA256 (get_iplayer-2.41.tar.gz) = ZnVYK33el6/JKmCknMI349d4EoBJk+5NffZqjoVMNfM=
-SIZE (get_iplayer-2.41.tar.gz) = 120672
+MD5 (get_iplayer-2.43.tar.gz) = s3cYOsFH9Ec9gh4P0LZ4Rg==
+RMD160 (get_iplayer-2.43.tar.gz) = jqLD7IAI5evBpbK0+jxHGa60bj4=
+SHA1 (get_iplayer-2.43.tar.gz) = 8ctf+gXLH6DgxRRpgEB36f8LJek=
+SHA256 (get_iplayer-2.43.tar.gz) = FboBFE4LfuAQqH6hM3o40U3LNlBkAb3mzjAuNIX/ZZk=
+SIZE (get_iplayer-2.43.tar.gz) = 122084
diff --git a/multimedia/get_iplayer/patches/patch-get_iplayer b/multimedia/get_iplayer/patches/patch-get_iplayer
index 990eeda2d33..40f26f562c4 100644
--- a/multimedia/get_iplayer/patches/patch-get_iplayer
+++ b/multimedia/get_iplayer/patches/patch-get_iplayer
@@ -1,11 +1,11 @@
-$OpenBSD: patch-get_iplayer,v 1.20 2009/10/10 10:42:42 sthen Exp $
+$OpenBSD: patch-get_iplayer,v 1.21 2009/10/25 20:01:12 sthen Exp $
 
 - default to using id3tag not id3v2
 - follow hier(7) not Linux FHS for options file location
 
---- get_iplayer.orig	Fri Oct  2 14:04:23 2009
-+++ get_iplayer	Sat Oct 10 12:39:11 2009
-@@ -304,10 +304,7 @@ if ( defined $ENV{GETIPLAYERUSERPREFS} && $ENV{GETIPLA
+--- get_iplayer.orig	Sat Oct 24 18:03:56 2009
++++ get_iplayer	Sun Oct 25 19:52:53 2009
+@@ -305,10 +305,7 @@ if ( defined $ENV{GETIPLAYERUSERPREFS} && $ENV{GETIPLA
  # Options on unix-like systems
  } elsif ( defined $ENV{HOME} ) {
  	$profile_dir = $opt_pre->{profiledir} || $ENV{HOME}.'/.get_iplayer';
@@ -17,7 +17,7 @@ $OpenBSD: patch-get_iplayer,v 1.20 2009/10/10 10:42:42 sthen Exp $
  # Otherwise look for windows style file locations
  } elsif ( defined $ENV{USERPROFILE} ) {
  	$profile_dir = $opt_pre->{profiledir} || $ENV{USERPROFILE}.'/.get_iplayer';
-@@ -318,7 +315,7 @@ mkpath $profile_dir if ! -d $profile_dir;
+@@ -319,7 +316,7 @@ mkpath $profile_dir if ! -d $profile_dir;
  
  
  # get list of additional user plugins and load plugin
@@ -26,7 +26,7 @@ $OpenBSD: patch-get_iplayer,v 1.20 2009/10/10 10:42:42 sthen Exp $
  my $plugin_dir_user = "$profile_dir/plugins";
  for my $plugin_dir ( ( $plugin_dir_user, $plugin_dir_system ) ) {
  	if ( opendir( DIR, $plugin_dir ) ) {
-@@ -439,6 +436,7 @@ if ( ! keys %plugin_files ) {
+@@ -440,6 +437,7 @@ if ( ! keys %plugin_files ) {
  	$opt->{pluginsupdate} = 1;
  }
  # Update this script if required
@@ -34,16 +34,25 @@ $OpenBSD: patch-get_iplayer,v 1.20 2009/10/10 10:42:42 sthen Exp $
  update_script() if $opt->{update} || $opt->{pluginsupdate};
  
  
-@@ -632,7 +630,7 @@ sub find_matches {
- 	$bin->{vlc}		= $opt->{vlc} || 'cvlc';
+@@ -636,7 +634,7 @@ sub find_matches {
+ 	delete $binopts->{vlc};
  	push @{ $binopts->{vlc} }, '-vv' if $opt->{debug};
  
 -	$bin->{id3v2}		= $opt->{id3v2} || 'id3v2';
 +	$bin->{id3v2}		= $opt->{id3v2} || 'id3tag';
+ 	$bin->{AtomicParsley}	= $opt->{AtomicParsley} || 'AtomicParsley';
  
  	$bin->{tee}		= 'tee';
- 
-@@ -5189,7 +5187,7 @@ sub optional_list_entry_format {
+@@ -3631,7 +3629,7 @@ sub tag_file {
+ 		my ( $id3_name, $id3_episode, $id3_desc, $id3_channel ) = ( $prog->{name}, $prog->{episode}, $prog->{desc}, $prog->{channel} );
+ 		s|"|\\"|g for ($id3_name, $id3_episode, $id3_desc, $id3_channel);
+ 		# Only tag if the required tool exists
+-		if ( main::exists_in_path('id3v2') ) {
++		if ( main::exists_in_path('id3tag') ) {
+ 			main::logger "INFO: id3 tagging $prog->{ext} file\n";
+ 			my @cmd = (
+ 				$bin->{id3v2}, 
+@@ -5311,7 +5309,7 @@ sub optional_list_entry_format {
  # Returns the modes to try for this prog type
  sub modelist {
  	my $prog = shift;