From cb168cfbac0551f13c225268fd6cb9d0d2c8afb0 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sun, 30 Aug 2009 12:58:14 +0000
Subject: [PATCH] - update to 2.22; minor bugfixes and improvements.

- set PKG_ARCH=*

- note that upstream moved to Linux FHS /var/lib/get_iplayer/options;
we patch to retain hier(7)-compatible /etc/get_iplayer/options
---
 multimedia/get_iplayer/Makefile               |  5 +--
 multimedia/get_iplayer/distinfo               | 10 +++---
 .../get_iplayer/patches/patch-get_iplayer     | 32 ++++++++++++++-----
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/multimedia/get_iplayer/Makefile b/multimedia/get_iplayer/Makefile
index c073ec5671b..ecfbb142f20 100644
--- a/multimedia/get_iplayer/Makefile
+++ b/multimedia/get_iplayer/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.20 2009/08/23 19:16:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2009/08/30 12:58:14 sthen Exp $
 
 COMMENT =		download BBC iPlayer and ITV programmes
 
-DISTNAME =		get_iplayer-2.18
+DISTNAME =		get_iplayer-2.22
 
 CATEGORIES =		multimedia
 
@@ -24,6 +24,7 @@ RUN_DEPENDS =		::audio/id3lib \
 
 NO_BUILD =		Yes
 NO_REGRESS =		Yes
+PKG_ARCH =		*
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/get_iplayer
diff --git a/multimedia/get_iplayer/distinfo b/multimedia/get_iplayer/distinfo
index 81f90c1e1de..3da2ad4fb7d 100644
--- a/multimedia/get_iplayer/distinfo
+++ b/multimedia/get_iplayer/distinfo
@@ -1,5 +1,5 @@
-MD5 (get_iplayer-2.18.tar.gz) = XFRIfWx0Q0nGEkgkAQeBjA==
-RMD160 (get_iplayer-2.18.tar.gz) = 4SzCbI/k7tDxCMqNBUXz0yrE1Tw=
-SHA1 (get_iplayer-2.18.tar.gz) = 0G+3ImZYwycHSVzRLRrwDjBC0nY=
-SHA256 (get_iplayer-2.18.tar.gz) = 5C6N2Oes9uZ7KXn+wcKUq04EoIecJIOK2BHECDyhY4I=
-SIZE (get_iplayer-2.18.tar.gz) = 114142
+MD5 (get_iplayer-2.22.tar.gz) = ZzUm47UKJbbZCasrLft0MA==
+RMD160 (get_iplayer-2.22.tar.gz) = 0+K9aht7hbtkw1H5ZMAdRwjT314=
+SHA1 (get_iplayer-2.22.tar.gz) = URY4lR/91Ir3YRf9Toj9U63WVP4=
+SHA256 (get_iplayer-2.22.tar.gz) = qODXdxery9J+yqfvSQMKINa4tYV18CketCz92hKHUHw=
+SIZE (get_iplayer-2.22.tar.gz) = 115816
diff --git a/multimedia/get_iplayer/patches/patch-get_iplayer b/multimedia/get_iplayer/patches/patch-get_iplayer
index 4f2baf91400..d1b3dffefe4 100644
--- a/multimedia/get_iplayer/patches/patch-get_iplayer
+++ b/multimedia/get_iplayer/patches/patch-get_iplayer
@@ -1,7 +1,23 @@
-$OpenBSD: patch-get_iplayer,v 1.14 2009/08/23 19:16:17 sthen Exp $
---- get_iplayer.orig	Sat Aug 22 19:14:38 2009
-+++ get_iplayer	Sun Aug 23 20:10:35 2009
-@@ -290,7 +290,7 @@ mkpath $profile_dir if ! -d $profile_dir;
+$OpenBSD: patch-get_iplayer,v 1.15 2009/08/30 12:58:14 sthen Exp $
+
+- default to using id3tag not id3v2
+- follow hier(7) not Linux FHS for options file location
+
+--- get_iplayer.orig	Thu Aug 27 21:54:04 2009
++++ get_iplayer	Sun Aug 30 13:51:29 2009
+@@ -275,10 +275,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';
+-	$optfile_system = '/var/lib/get_iplayer/options';
+-	if ( -f '/etc/get_iplayer/options' ) {
+-		logger "WARNING: System-wide options in /etc/get_iplayer/options are now ignored, please use /var/lib/get_iplayer/options instead\n";
+-	}
++	$optfile_system = '${SYSCONFDIR}/get_iplayer/options';
+ # Otherwise look for windows style file locations
+ } elsif ( defined $ENV{USERPROFILE} ) {
+ 	$profile_dir = $opt_pre->{profiledir} || $ENV{USERPROFILE}.'/.get_iplayer';
+@@ -289,7 +286,7 @@ mkpath $profile_dir if ! -d $profile_dir;
  
  
  # get list of additional user plugins and load plugin
@@ -10,15 +26,15 @@ $OpenBSD: patch-get_iplayer,v 1.14 2009/08/23 19:16: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 ) ) {
-@@ -407,6 +407,7 @@ if ( ! keys %plugin_files ) {
+@@ -406,6 +403,7 @@ if ( ! keys %plugin_files ) {
  	$opt->{pluginsupdate} = 1;
  }
  # Update this script if required
-+$opt->{packagemanager}='pkg_add';
++$opt->{packagemanager}='disable';
  update_script() if $opt->{update} || $opt->{pluginsupdate};
  
  
-@@ -590,7 +591,7 @@ sub find_matches {
+@@ -587,7 +585,7 @@ sub find_matches {
  	$binopts->{lame}	.= ' --quiet ' if $opt->{quiet};
  	$bin->{vlc}		= $opt->{vlc} || 'cvlc';
  	$binopts->{vlc}		= '-vv' if $opt->{verbose} || $opt->{debug};
@@ -27,7 +43,7 @@ $OpenBSD: patch-get_iplayer,v 1.14 2009/08/23 19:16:17 sthen Exp $
  	$bin->{tee}		= 'tee';
  	$bin->{flvstreamer}	= $opt->{flvstreamer} || $opt->{rtmpdump} || 'flvstreamer';
  	# quote binaries which allows for spaces in the path
-@@ -4521,7 +4522,7 @@ sub optional_list_entry_format {
+@@ -4567,7 +4565,7 @@ sub optional_list_entry_format {
  # Returns the modes to try for this prog type
  sub modelist {
  	my $prog = shift;