Yeah, sounds better. Here's revised diff.
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v
retrieving revision 1.7
diff -u -u -p -r1.7 Makefile
--- Makefile 9 Apr 2016 14:50:59 -0000 1.7
+++ Makefile 1 Sep 2016 04:53:01 -0000
@@ -1,37 +1,42 @@
# $OpenBSD: Makefile,v 1.7 2016/04/09 14:50:59 sthen Exp $
-V = 2.2.1
-REVISION = 0
+V = 2.11
COMMENT = download videos from YLE Areena
DISTNAME = aajanki-yle-$V
PKGNAME = yle-dl-$V
CATEGORIES = multimedia
HOMEPAGE = http://aajanki.github.io/yle-dl/
+MAINTAINER = Timo Myyra <timo.my...@wickedbsd.net>
-# GPLv2
+# GPLv3
PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = https://github.com/aajanki/yle-dl/tarball/${V}/
-MODULES = lang/python
-RUN_DEPENDS = net/rtmpdump \
- security/py-crypto
+MODULES = lang/python \
+ lang/php
+RUN_DEPENDS = net/rtmpdump \
+ security/py-crypto \
+ lang/php/${MODPHP_VERSION},-curl \
+ lang/php/${MODPHP_VERSION},-mcrypt
+
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/aajanki-yle-dl-b2b1869
+WRKDIST = ${WRKDIR}/aajanki-yle-dl-23c7d98
+MODPY_SETUPTOOLS = Yes
MODPY_ADJ_FILES = yle-dl
-do-build:
- cd ${WRKSRC} && env -i ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
- -f ${MAKE_FILE} ${ALL_TARGET}
+SUBST_VARS += MODPHP_BIN
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/yle-dl ${PREFIX}/bin/yle-dl
+ ${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 \
- ${PREFIX}/share/doc/yle-dl
+ ${WRKSRC}/README.md ${PREFIX}/share/doc/yle-dl
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/yle-dl/distinfo,v
retrieving revision 1.4
diff -u -u -p -r1.4 distinfo
--- distinfo 20 May 2014 14:37:02 -0000 1.4
+++ distinfo 1 Sep 2016 04:53:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (aajanki-yle-2.2.1.tar.gz) =
/zERphVHkPjL/noVvFFohzdWtck3FYax+ob09suaRds=
-SIZE (aajanki-yle-2.2.1.tar.gz) = 25557
+SHA256 (aajanki-yle-2.11.tar.gz) = L2AAPF2VEAO506ZNCvRH3UyJyqO+28yaeN8rit9YRKw=
+SIZE (aajanki-yle-2.11.tar.gz) = 57808
Index: patches/patch-yle-dl
===================================================================
RCS file: patches/patch-yle-dl
diff -N patches/patch-yle-dl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-yle-dl 1 Sep 2016 04:53:01 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- yle-dl.orig Thu Sep 1 07:31:12 2016
++++ yle-dl Thu Sep 1 07:32:07 2016
+@@ -73,7 +73,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')
+@@ -116,7 +116,7 @@ def usage():
+ log(u' or "best" or "worst". Not exact on HDS
streams.')
+ log(u'--rtmpdump path Set path to rtmpdump binary')
+ log(u'--adobehds cmd Set command for executing AdobeHDS.php
script')
+- log(u' Default: "php
/usr/local/share/yle-dl/AdobeHDS.php"')
++ log(u' Default: "${MODPHP_BIN}
/usr/local/share/yle-dl/AdobeHDS.php"')
+ log(u'--postprocess cmd Execute a command cmd after a successful
download.')
+ log(u' cmd is called with arguments: video,
subtitle files')
+ log(u'--proxy uri Proxy for downloading streams')
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/yle-dl/pkg/PLIST,v
retrieving revision 1.2
diff -u -u -p -r1.2 PLIST
--- pkg/PLIST 20 May 2014 14:37:03 -0000 1.2
+++ pkg/PLIST 1 Sep 2016 04:53:01 -0000
@@ -3,3 +3,6 @@ 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
Stuart Henderson <s...@spacehopper.org> writes:
> I'm not sure if I can test this, but doesn't it need to patch to use
> ${MODPHP_BIN}
> rather than "php"?
>
>
> log(u'--adobehds cmd Set command for executing AdobeHDS.php
> script')
> log(u' Default: "php
> /usr/local/share/yle-dl/AdobeHDS.php"')
>
>
> On 2016/08/31 17:13, Timo Myyrä wrote:
>> Hi,
>>
>> Here's an update for YLE-dl to make it usable again.
>> Tested by downloading a movie from Areena with subtitles.
>> While here, I can take maintainership for it.
>>
>> Timo
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v
>> retrieving revision 1.7
>> diff -u -u -p -r1.7 Makefile
>> --- Makefile 9 Apr 2016 14:50:59 -0000 1.7
>> +++ Makefile 31 Aug 2016 14:15:19 -0000
>> @@ -1,37 +1,40 @@
>> # $OpenBSD: Makefile,v 1.7 2016/04/09 14:50:59 sthen Exp $
>>
>> -V = 2.2.1
>> -REVISION = 0
>> +V = 2.11
>> COMMENT = download videos from YLE Areena
>> DISTNAME = aajanki-yle-$V
>> PKGNAME = yle-dl-$V
>> CATEGORIES = multimedia
>>
>> HOMEPAGE = http://aajanki.github.io/yle-dl/
>> +MAINTAINER = Timo Myyra <timo.my...@wickedbsd.net>
>>
>> # GPLv2
>> PERMIT_PACKAGE_CDROM = Yes
>>
>> MASTER_SITES = https://github.com/aajanki/yle-dl/tarball/${V}/
>>
>> -MODULES = lang/python
>> +MODULES = lang/python \
>> + lang/php
>> +
>> RUN_DEPENDS = net/rtmpdump \
>> - security/py-crypto
>> + security/py-crypto \
>> + lang/php/${MODPHP_VERSION},-curl \
>> + lang/php/${MODPHP_VERSION},-mcrypt
>>
>> NO_TEST = Yes
>>
>> -WRKDIST = ${WRKDIR}/aajanki-yle-dl-b2b1869
>> +WRKDIST = ${WRKDIR}/aajanki-yle-dl-23c7d98
>>
>> +MODPY_SETUPTOOLS = Yes
>> MODPY_ADJ_FILES = yle-dl
>>
>> -do-build:
>> - cd ${WRKSRC} && env -i ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
>> - -f ${MAKE_FILE} ${ALL_TARGET}
>> -
>> do-install:
>> ${INSTALL_SCRIPT} ${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 \
>> - ${PREFIX}/share/doc/yle-dl
>> + ${WRKSRC}/README.md ${PREFIX}/share/doc/yle-dl
>>
>> .include <bsd.port.mk>
>> Index: distinfo
>> ===================================================================
>> RCS file: /cvs/ports/multimedia/yle-dl/distinfo,v
>> retrieving revision 1.4
>> diff -u -u -p -r1.4 distinfo
>> --- distinfo 20 May 2014 14:37:02 -0000 1.4
>> +++ distinfo 31 Aug 2016 14:15:19 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (aajanki-yle-2.2.1.tar.gz) =
>> /zERphVHkPjL/noVvFFohzdWtck3FYax+ob09suaRds=
>> -SIZE (aajanki-yle-2.2.1.tar.gz) = 25557
>> +SHA256 (aajanki-yle-2.11.tar.gz) =
>> L2AAPF2VEAO506ZNCvRH3UyJyqO+28yaeN8rit9YRKw=
>> +SIZE (aajanki-yle-2.11.tar.gz) = 57808
>> Index: pkg/PLIST
>> ===================================================================
>> RCS file: /cvs/ports/multimedia/yle-dl/pkg/PLIST,v
>> retrieving revision 1.2
>> diff -u -u -p -r1.2 PLIST
>> --- pkg/PLIST 20 May 2014 14:37:03 -0000 1.2
>> +++ pkg/PLIST 31 Aug 2016 14:15:19 -0000
>> @@ -3,3 +3,6 @@ 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
>>
