CVS commit: pkgsrc/net/get_iplayer

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Nov 18 09:58:54 UTC 2016

Modified Files:
        pkgsrc/net/get_iplayer: Makefile PLIST distinfo
Removed Files:
        pkgsrc/net/get_iplayer/files: options.default
        pkgsrc/net/get_iplayer/patches: patch-aa
            patch-windows_get_iplayer_setup.cgi

Log Message:
Update net/get_iplayer to version 2.97.

pkgsrc changes:

  - Migrate to GitHub.
  - Remove no longer valid options file.
  - Simplify patching.

Upstream changes since 2.94:

  A significant number of changes have been made since 2.94, so for the
  full list of changes please refer to the release notes for each release
  since then here:

  https://github.com/get-iplayer/get_iplayer/wiki/release297
  https://github.com/get-iplayer/get_iplayer/wiki/release296
  https://github.com/get-iplayer/get_iplayer/wiki/release295

  The most visible change (for me) is that get_iplayer now defaults to
  fetching the best quality file as a transport stream, rather than the
  previous default of lower quality flash.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/get_iplayer/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/get_iplayer/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/get_iplayer/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/get_iplayer/files/options.default
cvs rdiff -u -r1.2 -r0 pkgsrc/net/get_iplayer/patches/patch-aa
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/net/get_iplayer/patches/patch-windows_get_iplayer_setup.cgi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/get_iplayer/Makefile
diff -u pkgsrc/net/get_iplayer/Makefile:1.7 pkgsrc/net/get_iplayer/Makefile:1.8
--- pkgsrc/net/get_iplayer/Makefile:1.7 Fri Jun 12 10:50:41 2015
+++ pkgsrc/net/get_iplayer/Makefile     Fri Nov 18 09:58:53 2016
@@ -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@localhost
-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-li
 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"

Index: pkgsrc/net/get_iplayer/PLIST
diff -u pkgsrc/net/get_iplayer/PLIST:1.1 pkgsrc/net/get_iplayer/PLIST:1.2
--- pkgsrc/net/get_iplayer/PLIST:1.1    Tue Nov 11 21:49:01 2014
+++ pkgsrc/net/get_iplayer/PLIST        Fri Nov 18 09:58:53 2016
@@ -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

Index: pkgsrc/net/get_iplayer/distinfo
diff -u pkgsrc/net/get_iplayer/distinfo:1.5 pkgsrc/net/get_iplayer/distinfo:1.6
--- pkgsrc/net/get_iplayer/distinfo:1.5 Wed Nov  4 00:35:01 2015
+++ pkgsrc/net/get_iplayer/distinfo     Fri Nov 18 09:58:53 2016
@@ -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