From 555264f09a21b1ac0714b1740d8fe9d1aac1bde3 Mon Sep 17 00:00:00 2001
From: nigel <nigel@openbsd.org>
Date: Mon, 5 Sep 2011 17:07:29 +0000
Subject: [PATCH] update to version 2.80

ok sthen@ (maintainer)
---
 multimedia/get_iplayer/Makefile               | 12 +++----
 multimedia/get_iplayer/distinfo               | 10 +++---
 .../get_iplayer/patches/patch-get_iplayer     | 32 +++++++++----------
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/multimedia/get_iplayer/Makefile b/multimedia/get_iplayer/Makefile
index decff3702ef..bb44197861d 100644
--- a/multimedia/get_iplayer/Makefile
+++ b/multimedia/get_iplayer/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.56 2011/05/28 20:42:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.57 2011/09/05 17:07:29 nigel Exp $
 
 COMMENT =		download/stream programmes from BBC iPlayer
 
-DISTNAME =		get_iplayer-2.79pl1
+DISTNAME =		get_iplayer-2.80
 CATEGORIES =		multimedia
 
 # http://git.infradead.org/get_iplayer.git
@@ -16,20 +16,18 @@ PERMIT_DISTFILES_FTP =	Yes
 
 MAINTAINER =		Stuart Henderson <sthen@openbsd.org>
 
-# repackaged from git
-MASTER_SITES =		http://spacehopper.org/mirrors/
-#MASTER_SITES =		ftp://ftp.infradead.org/pub/get_iplayer/
+MASTER_SITES =		ftp://ftp.infradead.org/pub/get_iplayer/
 
 RUN_DEPENDS =		audio/id3lib \
+			audio/p5-MP3-Tag \
 			multimedia/atomicparsley \
-			net/rtmpdump>=2.1 \
+			net/rtmpdump>=2.4 \
 			textproc/p5-XML-Simple \
 			www/p5-HTML-Parser \
 			www/p5-libwww>=5.826
 
 BUILD_DEPENDS =		${RUN_DEPENDS}
 
-USE_GROFF =		Yes
 NO_REGRESS =		Yes
 PKG_ARCH =		*
 
diff --git a/multimedia/get_iplayer/distinfo b/multimedia/get_iplayer/distinfo
index 0c97f2996eb..17aa6d4d28e 100644
--- a/multimedia/get_iplayer/distinfo
+++ b/multimedia/get_iplayer/distinfo
@@ -1,5 +1,5 @@
-MD5 (get_iplayer-2.79pl1.tar.gz) = vYejt/SjvWzEJ8P7PBxF5A==
-RMD160 (get_iplayer-2.79pl1.tar.gz) = ZkPzPw9jOF6sOoOfyKVMwl/8RWA=
-SHA1 (get_iplayer-2.79pl1.tar.gz) = ohFjrDNStnagUp+p7hhJHSlCJuc=
-SHA256 (get_iplayer-2.79pl1.tar.gz) = Cc9Mb1FduL2qo6fG4J6DWE0ZbuXKdShgkzH4nbcSza8=
-SIZE (get_iplayer-2.79pl1.tar.gz) = 226332
+MD5 (get_iplayer-2.80.tar.gz) = jPqmeJWoykKbQ2JyzCmLVg==
+RMD160 (get_iplayer-2.80.tar.gz) = jgpnrPGrb5ac3SSK8d1Yv6/Uj8k=
+SHA1 (get_iplayer-2.80.tar.gz) = m7qLAU2uvLyiL6q/zR0XMK50YBU=
+SHA256 (get_iplayer-2.80.tar.gz) = yEmv7Caee+PpzYznO1T3m8OYrh1YTAfDXkOx731uysI=
+SIZE (get_iplayer-2.80.tar.gz) = 230377
diff --git a/multimedia/get_iplayer/patches/patch-get_iplayer b/multimedia/get_iplayer/patches/patch-get_iplayer
index 4a08e46221b..62bd46ec060 100644
--- a/multimedia/get_iplayer/patches/patch-get_iplayer
+++ b/multimedia/get_iplayer/patches/patch-get_iplayer
@@ -1,7 +1,7 @@
-$OpenBSD: patch-get_iplayer,v 1.45 2011/05/28 20:42:17 sthen Exp $
---- get_iplayer.orig	Sat May 28 21:00:47 2011
-+++ get_iplayer	Sat May 28 21:04:09 2011
-@@ -296,6 +296,7 @@ $opt->{verbose} = 1 if $opt_pre->{verbose};
+$OpenBSD: patch-get_iplayer,v 1.46 2011/09/05 17:07:29 nigel Exp $
+--- get_iplayer.orig	Mon Aug 29 15:09:13 2011
++++ get_iplayer	Wed Aug 31 18:23:50 2011
+@@ -308,6 +308,7 @@ $opt->{verbose} = 1 if $opt_pre->{verbose};
  $opt->{quiet} = 1 if $opt_pre->{quiet};
  $opt->{pvr} = 1 if $opt_pre->{pvr};
  $opt->{stdout} = 1 if $opt_pre->{stdout} || $opt_pre->{stream};
@@ -9,7 +9,7 @@ $OpenBSD: patch-get_iplayer,v 1.45 2011/05/28 20:42:17 sthen Exp $
  
  # show version and exit
  if ( $opt_pre->{showver} ) {
-@@ -332,7 +333,7 @@ mkpath $profile_dir if ! -d $profile_dir;
+@@ -344,7 +345,7 @@ mkpath $profile_dir if ! -d $profile_dir;
  
  
  # get list of additional user plugins and load plugin
@@ -18,7 +18,7 @@ $OpenBSD: patch-get_iplayer,v 1.45 2011/05/28 20:42:17 sthen Exp $
  my $plugin_dir_user = "$profile_dir/plugins";
  for my $plugin_dir ( ( $plugin_dir_user, $plugin_dir_system ) ) {
  	if ( opendir( DIR, $plugin_dir ) ) {
-@@ -660,7 +661,7 @@ sub init_search {
+@@ -732,7 +733,7 @@ sub init_search {
  	delete $binopts->{vlc};
  	push @{ $binopts->{vlc} }, '-vv' if $opt->{debug};
  
@@ -27,7 +27,7 @@ $OpenBSD: patch-get_iplayer,v 1.45 2011/05/28 20:42:17 sthen Exp $
  	$bin->{atomicparsley}	= $opt->{atomicparsley} || 'AtomicParsley';
  
  	$bin->{tee}		= 'tee';
-@@ -1988,7 +1989,7 @@ sub update_script {
+@@ -2014,7 +2015,7 @@ sub update_script {
  		} elsif ( $opt->{packagemanager} =~ /disable/i ) {
  			logger "ERROR: get_iplayer should only be updated using your local package management system, for more information see http://linuxcentre.net/installation\n";
  		} else {
@@ -36,12 +36,12 @@ $OpenBSD: patch-get_iplayer,v 1.45 2011/05/28 20:42:17 sthen Exp $
  		}
  		exit 1;
  	} 
-@@ -4254,7 +4255,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}, 
+@@ -9543,7 +9544,7 @@ sub tag_file_id3 {
+ # add basic ID3 tag with id3v2
+ sub tag_file_id3_basic {
+ 	my ($self, $meta, $tags) = @_;
+-	if ( main::exists_in_path('id3v2') ) {
++	if ( main::exists_in_path('id3tag') ) {
+ 		main::logger "INFO: ID3 BASIC tagging \U$meta->{ext}\E file\n";
+ 		# notify about limitations of basic tagging
+ 		if ( $opt->{verbose} ) {