On 2014/05/20 14:40, vesa norrman wrote: > Update for yle-dl. Old version is broken. > > - Vesa
tweaked: remove REVISION, use MODPY_ADJ_FILES rather than patching. works for me with a random choice from areena.yle.fi. Antti, OK? Index: Makefile =================================================================== RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile 22 Apr 2014 08:54:57 -0000 1.5 +++ Makefile 20 May 2014 11:50:57 -0000 @@ -1,44 +1,36 @@ # $OpenBSD: Makefile,v 1.5 2014/04/22 08:54:57 jca Exp $ -V = 1.4.6 -REVISION = 0 +V = 2.2.1 COMMENT = download videos from YLE Areena -DISTNAME = rtmpdump-yle-$V +DISTNAME = aajanki-yle-$V PKGNAME = yle-dl-$V CATEGORIES = multimedia -HOMEPAGE = http://users.tkk.fi/~aajanki/rtmpdump-yle/ +HOMEPAGE = http://aajanki.github.io/yle-dl/ MAINTAINER = Antti Harri <[email protected]> # GPLv2 PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c crypto json-c ssl z +MASTER_SITES = https://github.com/aajanki/yle-dl/tarball/${V}/ -MASTER_SITES = ${HOMEPAGE} +MODULES = lang/python +RUN_DEPENDS = net/rtmpdump \ + security/py-crypto -MODULES = converters/libiconv \ - lang/python -LIB_DEPENDS = devel/json-c - -MAKE_FLAGS = OPT="" CC="${CC}" -MAKE_ENV = XCFLAGS="${CFLAGS}" XLDFLAGS="${LDFLAGS}" - -USE_GMAKE = Yes NO_TEST = Yes -CFLAGS += `pkg-config --cflags json-c` -I${PREFIX}/include -LDFLAGS += `pkg-config --libs json-c` -liconv +WRKDIST = ${WRKDIR}/aajanki-yle-dl-b2b1869 + +MODPY_ADJ_FILES = yle-dl do-build: cd ${WRKSRC} && env -i ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \ -f ${MAKE_FILE} ${ALL_TARGET} do-install: - ${SUBST_CMD} ${WRKSRC}/yle-dl.py - ${INSTALL_SCRIPT} ${WRKSRC}/yle-dl.py ${PREFIX}/bin/yle-dl - ${INSTALL_PROGRAM} ${WRKSRC}/rtmpdump-yle ${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/yle-dl ${PREFIX}/bin/yle-dl ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/yle-dl ${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/README.fi \ ${PREFIX}/share/doc/yle-dl Index: distinfo =================================================================== RCS file: /cvs/ports/multimedia/yle-dl/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 22 Apr 2014 08:54:57 -0000 1.3 +++ distinfo 20 May 2014 11:50:57 -0000 @@ -1,2 +1,2 @@ -SHA256 (rtmpdump-yle-1.4.6.tar.gz) = BVlsnBGf2u7y8JuCxPCIK4HJhyb0p7twoGFWuQCLVnY= -SIZE (rtmpdump-yle-1.4.6.tar.gz) = 167441 +SHA256 (aajanki-yle-2.2.1.tar.gz) = /zERphVHkPjL/noVvFFohzdWtck3FYax+ob09suaRds= +SIZE (aajanki-yle-2.2.1.tar.gz) = 25557 Index: patches/patch-Makefile =================================================================== RCS file: patches/patch-Makefile diff -N patches/patch-Makefile --- patches/patch-Makefile 22 Apr 2014 08:54:57 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile,v 1.1 2014/04/22 08:54:57 jca Exp $ ---- Makefile.orig Mon Apr 21 18:28:44 2014 -+++ Makefile Mon Apr 21 18:29:10 2014 -@@ -22,7 +22,7 @@ CRYPTO_DEF=$(DEF_$(CRYPTO)) - - STATIC_JSON= - #STATIC_JSON=/path/to/json-c --JSON_LIB=$(if $(STATIC_JSON),$(STATIC_JSON)/.libs/libjson.a,-ljson) -+JSON_LIB=$(if $(STATIC_JSON),$(STATIC_JSON)/.libs/libjson-c.a,-ljson-c) - - DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" -DYLERTMPDUMP_VERSION=\"$(VERSION_YLE)\" $(CRYPTO_DEF) $(XDEF) - OPT=-O2 Index: patches/patch-librtmp_Makefile =================================================================== RCS file: patches/patch-librtmp_Makefile diff -N patches/patch-librtmp_Makefile --- patches/patch-librtmp_Makefile 22 Apr 2014 08:54:57 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-librtmp_Makefile,v 1.1 2014/04/22 08:54:57 jca Exp $ ---- librtmp/Makefile.orig Mon Apr 21 18:28:22 2014 -+++ librtmp/Makefile Mon Apr 21 18:28:39 2014 -@@ -64,7 +64,7 @@ INSTALL_IMPLIB=$(INSTALL_IMPLIB_$(SYS)) - - STATIC_JSON= - JSON_DEF=$(if $(STATIC_JSON),-I$(STATIC_JSON),-I/usr/include/json) --LIB_JSON=$(if $(STATIC_JSON),,-ljson) -+LIB_JSON=$(if $(STATIC_JSON),,-ljson-c) - REQ_JSON=json - - SHARED= Index: patches/patch-yle-dl_py =================================================================== RCS file: patches/patch-yle-dl_py diff -N patches/patch-yle-dl_py --- patches/patch-yle-dl_py 13 Dec 2011 13:10:47 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-yle-dl_py,v 1.2 2011/12/13 13:10:47 sthen Exp $ ---- yle-dl.py.orig Tue Nov 29 21:41:58 2011 -+++ yle-dl.py Mon Dec 12 18:52:45 2011 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!${MODPY_BIN} - - """ - yle-dl - Frontend for rtmpdump-yle, the YLE Areena stream downloader -@@ -21,8 +21,8 @@ import htmlentitydefs - import json - import string - --RTMPDUMPYLE_BINARY = './rtmpdump-yle' # @BINARY@ make install replaces this line with the real path --AREENA_RTMP = 'rtmp://flashk.yle.fi/AreenaServer' -+RTMPDUMPYLE_BINARY = '${TRUEPREFIX}/bin/rtmpdump-yle' # @BINARY@ make install replaces this line with the real path -+AREENA_RTMP = 'rtmp://flashu.yle.fi/AreenaServer' - AREENA_SWF = 'http://areena.yle.fi/player/Application.swf?build=2' - RTMPDUMPYLE_OPTIONS = ['-r', AREENA_RTMP, '-s', AREENA_SWF, '-m', '60'] - ARKISTO_SWF = 'http://yle.fi/elavaarkisto/flowplayer/flowplayer.commercial-3.2.7.swf?0.739011391531676' Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/multimedia/yle-dl/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 19 Oct 2011 09:16:08 -0000 1.1.1.1 +++ pkg/PLIST 20 May 2014 11:50:57 -0000 @@ -1,5 +1,4 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2011/10/19 09:16:08 sthen Exp $ -@bin bin/rtmpdump-yle bin/yle-dl share/doc/yle-dl/ share/doc/yle-dl/COPYING
