Stuart Henderson <s...@spacehopper.org> writes:
> On 2017/08/28 08:20, Timo Myyrä wrote:
>> Hi,
>>
>> Here's an a bit due update to yle-dl. The source structure has changed a bit.
>
> Tweaked diff; use ports GH_* infrastructure and MODPY_EGG_VERSION,
> enable tests, update license marker according to setup.py's License:
> line.
>
> But before it can be committed, we need a port of py-progress.
>
>> The patches directory is not needed anymore but that change isn't reflected
>> on
>> the diff. Any ideas how to include that?
>
> CVS doesn't allow removing directories. The closest you get is -P on
> update/checkout.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 23 Mar 2017 01:35:37 -0000 1.12
> +++ Makefile 28 Aug 2017 12:10:37 -0000
> @@ -1,9 +1,12 @@
> # $OpenBSD: Makefile,v 1.12 2017/03/23 01:35:37 jca Exp $
>
> -V = 2.15
> +GH_ACCOUNT = aajanki
> +GH_PROJECT = yle-dl
> +GH_TAGNAME = 2.23
> +MODPY_EGG_VERSION = ${GH_TAGNAME}
> +
> COMMENT = download videos from YLE Areena
> -DISTNAME = aajanki-yle-$V
> -PKGNAME = yle-dl-$V
> +
> CATEGORIES = multimedia
>
> HOMEPAGE = http://aajanki.github.io/yle-dl/
> @@ -12,32 +15,21 @@ MAINTAINER = Timo Myyra <timo.myyra@wic
> # GPLv3
> PERMIT_PACKAGE_CDROM = Yes
>
> -MASTER_SITES = https://github.com/aajanki/yle-dl/tarball/${V}/
> -
> MODULES = lang/python \
> lang/php
>
> -RUN_DEPENDS = net/rtmpdump \
> +TEST_DEPENDS = ${RUN_DEPENDS}
> +RUN_DEPENDS = devel/py-progress \
> + net/rtmpdump \
> security/py-crypto \
> + www/py-requests \
> lang/php/${MODPHP_VERSION},-curl \
> lang/php/${MODPHP_VERSION},-mcrypt
>
> -NO_TEST = Yes
> -
> -WRKDIST = ${WRKDIR}/aajanki-yle-dl-e188267
> -
> MODPY_SETUPTOOLS = Yes
> -MODPY_ADJ_FILES = yle-dl
> MODPHP_BUILDDEP = No
>
> -SUBST_VARS += MODPHP_BIN
> -
> -do-install:
> - ${SUBST_PROGRAM} ${WRKSRC}/yle-dl ${PREFIX}/bin/yle-dl
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/yle-dl
> - ${INSTALL_DATA} ${WRKSRC}/AdobeHDS.php ${PREFIX}/share/yle-dl
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/yle-dl
> - ${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/README.fi \
> - ${WRKSRC}/README.md ${PREFIX}/share/doc/yle-dl
> +pre-configure:
> + @sed -i -e "s,'php','${MODPHP_BIN}',g" ${WRKSRC}/yledl/downloaders.py
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/multimedia/yle-dl/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo 19 Mar 2017 20:28:07 -0000 1.8
> +++ distinfo 28 Aug 2017 12:10:37 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (aajanki-yle-2.15.tar.gz) =
> FHEXm1OG2njar5LkJTQ+rHPKVLXRgfitjToLrHfCurs=
> -SIZE (aajanki-yle-2.15.tar.gz) = 58040
> +SHA256 (yle-dl-2.23.tar.gz) = dK06TgOLinSkIXUy19XDn+Ec8y4pPbhrn46knTj9FBk=
> +SIZE (yle-dl-2.23.tar.gz) = 62337
> Index: patches/patch-yle-dl
> ===================================================================
> RCS file: patches/patch-yle-dl
> diff -N patches/patch-yle-dl
> --- patches/patch-yle-dl 19 Mar 2017 20:28:07 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-yle-dl,v 1.3 2017/03/19 20:28:07 benoit Exp $
> ---- yle-dl.orig Mon Mar 13 06:36:30 2017
> -+++ yle-dl Mon Mar 13 06:37:05 2017
> -@@ -74,7 +74,7 @@ excludechars_linux = '*/|'
> - excludechars_windows = '\"*/:<>?|'
> - excludechars = excludechars_linux
> - rtmpdump_binary = None
> --hds_binary = ['php', '/usr/local/share/yle-dl/AdobeHDS.php']
> -+hds_binary = ['${MODPHP_BIN}', '/usr/local/share/yle-dl/AdobeHDS.php']
> - stream_proxy = None
> -
> - libcname = ctypes.util.find_library('c')
> -@@ -132,7 +132,7 @@ def usage():
> - log('--rtmpdump path Set path to rtmpdump binary')
> - log('--adobehds cmd Set command for executing AdobeHDS.php '
> - 'script')
> -- log(' Default: "php '
> -+ log(' Default: "${MODPHP_BIN} '
> - '/usr/local/share/yle-dl/AdobeHDS.php"')
> - log('--postprocess cmd Execute a command cmd after a successful '
> - 'download.')
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/multimedia/yle-dl/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 1 Sep 2016 13:33:05 -0000 1.3
> +++ pkg/PLIST 28 Aug 2017 12:10:37 -0000
> @@ -1,8 +1,21 @@
> @comment $OpenBSD: PLIST,v 1.3 2016/09/01 13:33:05 sthen Exp $
> bin/yle-dl
> -share/doc/yle-dl/
> -share/doc/yle-dl/COPYING
> -share/doc/yle-dl/README.fi
> -share/doc/yle-dl/README.md
> -share/yle-dl/
> -share/yle-dl/AdobeHDS.php
> +lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> +lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> +lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> +lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> +lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
> +lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
> +lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> +lib/python${MODPY_VERSION}/site-packages/yledl/
> +lib/python${MODPY_VERSION}/site-packages/yledl/AdobeHDS.php
> +lib/python${MODPY_VERSION}/site-packages/yledl/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/yledl/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/yledl/downloaders.py
> +lib/python${MODPY_VERSION}/site-packages/yledl/downloaders.pyc
> +lib/python${MODPY_VERSION}/site-packages/yledl/utils.py
> +lib/python${MODPY_VERSION}/site-packages/yledl/utils.pyc
> +lib/python${MODPY_VERSION}/site-packages/yledl/version.py
> +lib/python${MODPY_VERSION}/site-packages/yledl/version.pyc
> +lib/python${MODPY_VERSION}/site-packages/yledl/yledl.py
> +lib/python${MODPY_VERSION}/site-packages/yledl/yledl.pycSeem better to use Github directly. Forgot to add the port of py-progress so attaching it. At least fetching few videos from Areena works with this.
py-progress.tar.gz
Description: py-progress.tar.gz
Timo
