6 files changed, 20 insertions, 71 deletions
diff --git a/net/get_iplayer/Makefile b/net/get_iplayer/Makefile
index 170b74a46aa..1b8be6799d0 100644
--- a/net/get_iplayer/Makefile
+++ b/net/get_iplayer/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.7 2015/06/12 10:50:41 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/11/18 09:58:53 jperkin Exp $
 
-DISTNAME=	get_iplayer-2.94
-PKGREVISION=	1
+DISTNAME=	get_iplayer-2.97
 CATEGORIES=	net multimedia
-MASTER_SITES=	ftp://ftp.infradead.org/pub/get_iplayer/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=get-iplayer/}
 
 MAINTAINER=	shattered@NetBSD.org
-HOMEPAGE=	http://www.infradead.org/get_iplayer/html/get_iplayer.html
+HOMEPAGE=	https://github.com/get-iplayer/${GITHUB_PROJECT}
 COMMENT=	Search, index, record or stream BBC iPlayer broadcasts
 LICENSE=	gnu-gpl-v3
 
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+
 DEPENDS+=	p5-HTML-Parser>=3.0:../../www/p5-HTML-Parser
 DEPENDS+=	p5-HTTP-Cookies>=6.0:../../www/p5-HTTP-Cookies
 DEPENDS+=	p5-HTTP-Date>=6.0:../../www/p5-HTTP-Date
@@ -18,26 +19,22 @@ DEPENDS+=	p5-libwww>=6.0:../../www/p5-libwww
 DEPENDS+=	rtmpdump>=1.8:../../net/rtmpdump
 DEPENDS+=	flvstreamer>=1.8:../../multimedia/flvstreamer
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
 USE_LANGUAGES=	# none
 NO_BUILD=	yes
 REPLACE_PERL=	get_iplayer
 
-SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
-SUBST_MESSAGE.prefix=	Fixup config and plugin paths
-SUBST_FILES.prefix=	get_iplayer
-SUBST_SED.prefix=	-e s:@PREFIX@:${PREFIX}:
-
 PKG_SYSCONFSUBDIR=	get_iplayer
-EGDIR=			${PREFIX}/share/examples/get_iplayer
-CONF_FILES=		${EGDIR}/options ${PKG_SYSCONFDIR}/options
-INSTALLATION_DIRS+=	${EGDIR}
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	get_iplayer
+SUBST_SED.paths=	-e "s:/etc/get_iplayer:${PKG_SYSCONFDIR}:g"
+SUBST_SED.paths+=	-e "s:/usr/share/get_iplayer:${PREFIX}/share/get_iplayer:g"
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/get_iplayer ${DESTDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/get_iplayer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-	${INSTALL_DATA} ${FILESDIR}/options.default ${DESTDIR}${EGDIR}/options
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/get_iplayer/PLIST b/net/get_iplayer/PLIST
index f23f5b60071..2063cef715f 100644
--- a/net/get_iplayer/PLIST
+++ b/net/get_iplayer/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2014/11/11 21:49:01 shattered Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/11/18 09:58:53 jperkin Exp $
 bin/get_iplayer
 man/man1/get_iplayer.1
-share/examples/get_iplayer/options
diff --git a/net/get_iplayer/distinfo b/net/get_iplayer/distinfo
index 9f2c54338f0..8c45d41dc3e 100644
--- a/net/get_iplayer/distinfo
+++ b/net/get_iplayer/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 00:35:01 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/11/18 09:58:53 jperkin Exp $
 
-SHA1 (get_iplayer-2.94.tar.gz) = 1082ffb213bf16bfdaa95731f48272b2a7adc4fd
-RMD160 (get_iplayer-2.94.tar.gz) = 70b67bdc2850e914c0606030b6cb2f09a41b0332
-SHA512 (get_iplayer-2.94.tar.gz) = 2e91631fa8d8ef384f454a4812f35a4f8af749feba5373d6203d769d85212f09a8c69b076d245dad00739739b8cf7bdf9a3b401a42295365f9fc7494458be906
-Size (get_iplayer-2.94.tar.gz) = 276644 bytes
-SHA1 (patch-aa) = e15a98daae71135936329d29766a3b70dc845326
-SHA1 (patch-windows_get_iplayer_setup.cgi) = 1f87f0bb74c5883e875cb7676dfd61461dc2cbd0
+SHA1 (get_iplayer-2.97.tar.gz) = 7f3518c4460da8232c178645345a1e5cbbb072eb
+RMD160 (get_iplayer-2.97.tar.gz) = 60e554d5497af382d9dbc158133e5cc69f46f46f
+SHA512 (get_iplayer-2.97.tar.gz) = 6e3da97393e5b1bda6e4e9b3d3ca57cc5ae4bce46fd6ff538248fe9ac541a1ba6c6c204a89b8e8d5902e677c1e8fc451af21364c7a2a4e1c73b11db9399b6a28
+Size (get_iplayer-2.97.tar.gz) = 173532 bytes
diff --git a/net/get_iplayer/files/options.default b/net/get_iplayer/files/options.default
deleted file mode 100644
index 646963c1388..00000000000
--- a/net/get_iplayer/files/options.default
+++ /dev/null
@@ -1,2 +0,0 @@
-packagemanager = disable
-
diff --git a/net/get_iplayer/patches/patch-aa b/net/get_iplayer/patches/patch-aa
deleted file mode 100644
index a85bb4c97db..00000000000
--- a/net/get_iplayer/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2015/01/17 12:33:14 prlw1 Exp $
-
-- Sort out directories
-
---- get_iplayer.orig	2014-12-21 18:58:18.000000000 +0000
-+++ get_iplayer
-@@ -423,10 +423,10 @@ if ( defined $ENV{GETIPLAYERSYSPREFS} ) 
- 	$optfile_system = $ENV{ALLUSERSPROFILE}.'/get_iplayer/options';
- # System options on unix-like systems
- } else {
--	$optfile_system = '/etc/get_iplayer/options';
-+	$optfile_system = '@PREFIX@/etc/get_iplayer/options';
- 	# Show warning if this deprecated location exists and is not a symlink
- 	if ( -f '/var/lib/get_iplayer/options' && ! -l '/var/lib/get_iplayer/options' ) {
--		logger "WARNING: System-wide options file /var/lib/get_iplayer/options will be deprecated in future, please use /etc/get_iplayer/options instead\n";
-+		logger "WARNING: System-wide options file /var/lib/get_iplayer/options will be deprecated in future, please use @PREFIX@/etc/get_iplayer/options instead\n";
- 	}
- }
- # Make profile dir if it doesnt exist
-@@ -438,7 +438,7 @@ my $plugin_dir_system;
- if ( defined $ENV{ALLUSERSPROFILE} && $^O eq "MSWin32" ) {
-     $plugin_dir_system = $ENV{ALLUSERSPROFILE}.'/get_iplayer/plugins';
- } else {
--    $plugin_dir_system = '/usr/share/get_iplayer/plugins';
-+    $plugin_dir_system = '@PREFIX@/share/get_iplayer/plugins';
- }
- my $plugin_dir_user = "$profile_dir/plugins";
- for my $plugin_dir ( ( $plugin_dir_user, $plugin_dir_system ) ) {
diff --git a/net/get_iplayer/patches/patch-windows_get_iplayer_setup.cgi b/net/get_iplayer/patches/patch-windows_get_iplayer_setup.cgi
deleted file mode 100644
index 0387e58162b..00000000000
--- a/net/get_iplayer/patches/patch-windows_get_iplayer_setup.cgi
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-windows_get_iplayer_setup.cgi,v 1.1 2014/11/11 21:49:01 shattered Exp $
-
-test(1) uses = for string comparison.
-
---- windows/get_iplayer_setup.cgi.orig	2012-06-02 16:37:17.000000000 +0000
-+++ windows/get_iplayer_setup.cgi
-@@ -32,7 +32,7 @@ case "$QUERY_STRING" in
-     ;;
- esac
- 
--if [ "$TARGET" == "" ]; then
-+if [ "$TARGET" = "" ]; then
-     cat <<EOF
- Content-Type: text/html
-