From 61938daf404d613848dc4436f9e93ff2f82480c4 Mon Sep 17 00:00:00 2001 From: jca Date: Tue, 22 Apr 2014 08:54:57 +0000 Subject: [PATCH] Link against libjson-c, not libjson which will go away soon. This port should be updated, as said by Antti Harri (MAINTAINER) it is broken at runtime. --- multimedia/yle-dl/Makefile | 9 +++++---- multimedia/yle-dl/distinfo | 3 --- multimedia/yle-dl/patches/patch-Makefile | 12 ++++++++++++ multimedia/yle-dl/patches/patch-librtmp_Makefile | 12 ++++++++++++ 4 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 multimedia/yle-dl/patches/patch-Makefile create mode 100644 multimedia/yle-dl/patches/patch-librtmp_Makefile diff --git a/multimedia/yle-dl/Makefile b/multimedia/yle-dl/Makefile index 200707749ac..ae9077b39e0 100644 --- a/multimedia/yle-dl/Makefile +++ b/multimedia/yle-dl/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.4 2013/03/11 11:35:45 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2014/04/22 08:54:57 jca Exp $ V = 1.4.6 +REVISION = 0 COMMENT = download videos from YLE Areena DISTNAME = rtmpdump-yle-$V PKGNAME = yle-dl-$V @@ -13,7 +14,7 @@ MAINTAINER = Antti Harri # GPLv2 PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c crypto json ssl z +WANTLIB += c crypto json-c ssl z MASTER_SITES = ${HOMEPAGE} @@ -27,8 +28,8 @@ MAKE_ENV = XCFLAGS="${CFLAGS}" XLDFLAGS="${LDFLAGS}" USE_GMAKE = Yes NO_TEST = Yes -CFLAGS += `pkg-config --cflags json` -I${PREFIX}/include -LDFLAGS += `pkg-config --libs json` -liconv +CFLAGS += `pkg-config --cflags json-c` -I${PREFIX}/include +LDFLAGS += `pkg-config --libs json-c` -liconv do-build: cd ${WRKSRC} && env -i ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \ diff --git a/multimedia/yle-dl/distinfo b/multimedia/yle-dl/distinfo index bf12f145a25..1641b23a254 100644 --- a/multimedia/yle-dl/distinfo +++ b/multimedia/yle-dl/distinfo @@ -1,5 +1,2 @@ -MD5 (rtmpdump-yle-1.4.6.tar.gz) = QbpF5vZIL1XrXkwF935+6w== -RMD160 (rtmpdump-yle-1.4.6.tar.gz) = NPpj07B0OGkZRSDaNAgIW6XCLus= -SHA1 (rtmpdump-yle-1.4.6.tar.gz) = Z05W38TpGCz1uTkXaq2mF+1qrN4= SHA256 (rtmpdump-yle-1.4.6.tar.gz) = BVlsnBGf2u7y8JuCxPCIK4HJhyb0p7twoGFWuQCLVnY= SIZE (rtmpdump-yle-1.4.6.tar.gz) = 167441 diff --git a/multimedia/yle-dl/patches/patch-Makefile b/multimedia/yle-dl/patches/patch-Makefile new file mode 100644 index 00000000000..1091e241a62 --- /dev/null +++ b/multimedia/yle-dl/patches/patch-Makefile @@ -0,0 +1,12 @@ +$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 diff --git a/multimedia/yle-dl/patches/patch-librtmp_Makefile b/multimedia/yle-dl/patches/patch-librtmp_Makefile new file mode 100644 index 00000000000..4f3917c89bc --- /dev/null +++ b/multimedia/yle-dl/patches/patch-librtmp_Makefile @@ -0,0 +1,12 @@ +$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=