diff options
| author | hrs <hrs@FreeBSD.org> | 2011-01-19 09:58:24 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2011-01-19 09:58:24 +0800 |
| commit | 068b7d5a33461a65079ead382e8b4652cac41a91 (patch) | |
| tree | a038f44d5f86d2dbab1fd6faf8cde12b40f49678 /multimedia/rtmpdump | |
| parent | a77782bac616b9117fe0797e4b17cac69be20141 (diff) | |
| download | freebsd-ports-gnome-068b7d5a33461a65079ead382e8b4652cac41a91.tar.gz freebsd-ports-gnome-068b7d5a33461a65079ead382e8b4652cac41a91.tar.zst freebsd-ports-gnome-068b7d5a33461a65079ead382e8b4652cac41a91.zip | |
Fix an implicit library dependency issue.
Discussed with: Jan Henrik Sylvester and Thomas Zander
Feature safe: yes
Diffstat (limited to 'multimedia/rtmpdump')
| -rw-r--r-- | multimedia/rtmpdump/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/rtmpdump/distinfo | 1 | ||||
| -rw-r--r-- | multimedia/rtmpdump/files/patch-librtmp-Makefile | 22 | ||||
| -rw-r--r-- | multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in | 10 |
4 files changed, 31 insertions, 3 deletions
diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile index ab30aed41f10..1ca48998ba38 100644 --- a/multimedia/rtmpdump/Makefile +++ b/multimedia/rtmpdump/Makefile @@ -6,6 +6,7 @@ PORTNAME= rtmpdump PORTVERSION= 2.3 +PORTREVISION= 1 CATEGORIES= multimedia net MASTER_SITES= http://rtmpdump.mplayerhq.hu/download/ EXTRACT_SUFX= .tgz diff --git a/multimedia/rtmpdump/distinfo b/multimedia/rtmpdump/distinfo index 511a4c22c821..4a8873a953ed 100644 --- a/multimedia/rtmpdump/distinfo +++ b/multimedia/rtmpdump/distinfo @@ -1,3 +1,2 @@ -MD5 (rtmpdump-2.3.tgz) = eb961f31cd55f0acf5aad1a7b900ef59 SHA256 (rtmpdump-2.3.tgz) = ef38b7a99d82ce6912063d21063aeaf28185341b3df486e24bffce5354224b2c SIZE (rtmpdump-2.3.tgz) = 125103 diff --git a/multimedia/rtmpdump/files/patch-librtmp-Makefile b/multimedia/rtmpdump/files/patch-librtmp-Makefile index 9c54876dd8fa..906d084d6b80 100644 --- a/multimedia/rtmpdump/files/patch-librtmp-Makefile +++ b/multimedia/rtmpdump/files/patch-librtmp-Makefile @@ -1,5 +1,5 @@ --- librtmp/Makefile.orig 2010-07-01 05:01:28.000000000 +0900 -+++ librtmp/Makefile 2010-08-01 01:18:35.000000000 +0900 ++++ librtmp/Makefile 2011-01-05 23:18:28.000000000 +0900 @@ -1,10 +1,10 @@ VERSION=v2.3 @@ -15,6 +15,15 @@ SYS=posix CRYPTO=OPENSSL +@@ -14,7 +14,7 @@ + DEF_GNUTLS=-DUSE_GNUTLS + DEF_=-DNO_CRYPTO + REQ_GNUTLS=gnutls +-REQ_OPENSSL=libssl,libcrypto ++#REQ_OPENSSL=libssl,libcrypto + LIBZ=-lz + LIBS_posix= + LIBS_mingw=-lws2_32 -lwinmm -lgdi32 @@ -39,15 +39,18 @@ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) @@ -35,7 +44,16 @@ MANDIR=$(DESTDIR)$(mandir) OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o -@@ -77,10 +80,10 @@ +@@ -72,15 +75,18 @@ + + librtmp.pc: librtmp.pc.in Makefile + sed -e "s;@prefix@;$(prefix);" -e "s;@VERSION@;$(VERSION);" \ +- -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" librtmp.pc.in > $@ ++ -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \ ++ -e "s;@OPENSSLLIB@;$(OPENSSLLIB);" \ ++ -e "s;@OPENSSLINC@;$(OPENSSLINC);" \ ++ librtmp.pc.in > $@ + install: install_base $(SO_INST) install_base: librtmp.a librtmp.pc diff --git a/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in b/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in new file mode 100644 index 000000000000..de5de1b0c29e --- /dev/null +++ b/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in @@ -0,0 +1,10 @@ +--- librtmp/librtmp.pc.in.orig 2010-07-01 04:58:34.000000000 +0900 ++++ librtmp/librtmp.pc.in 2011-01-05 23:29:34.000000000 +0900 +@@ -8,5 +8,5 @@ + Version: @VERSION@ + Requires: @CRYPTO_REQ@ + URL: http://rtmpdump.mplayerhq.hu +-Libs: -L${libdir} -lrtmp -lz +-Cflags: -I${incdir} ++Libs: -L${libdir} -L@OPENSSLLIB@ -lrtmp -lz -lssl -lcrypto ++Cflags: -I${incdir} -I@OPENSSLINC@ |