diff options
| author | hrs <hrs@FreeBSD.org> | 2013-07-05 10:42:35 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2013-07-05 10:42:35 +0800 |
| commit | 063f9e6055370bf82e5d1f2571e1e6f098e0ae02 (patch) | |
| tree | 80783a385b11f66134085a258f175fcc69e2dab3 /multimedia | |
| parent | 0f13d2bfa77bdc7a9501bdab451abe6cbbcabd21 (diff) | |
| download | freebsd-ports-gnome-063f9e6055370bf82e5d1f2571e1e6f098e0ae02.tar.gz freebsd-ports-gnome-063f9e6055370bf82e5d1f2571e1e6f098e0ae02.tar.zst freebsd-ports-gnome-063f9e6055370bf82e5d1f2571e1e6f098e0ae02.zip | |
Fix inconsistent library dependency when OpenSSL is installed
from the Ports Collection.
PR: ports/180283
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/rtmpdump/Makefile | 11 | ||||
| -rw-r--r-- | multimedia/rtmpdump/files/patch-librtmp-Makefile | 11 |
2 files changed, 13 insertions, 9 deletions
diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile index 860bd11b2eed..42aa413250c8 100644 --- a/multimedia/rtmpdump/Makefile +++ b/multimedia/rtmpdump/Makefile @@ -1,12 +1,8 @@ -# Ports collection makefile for: rtmpdump -# Date created: March 15, 2010 -# Whom: hrs -# # $FreeBSD$ PORTNAME= rtmpdump PORTVERSION= 2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia net MASTER_SITES= http://rtmpdump.mplayerhq.hu/download/ @@ -14,7 +10,6 @@ MAINTAINER= hrs@FreeBSD.org COMMENT= A tool to download RTMP streams LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING USE_GNOME= pkgconfig USE_LDCONFIG= yes @@ -28,6 +23,8 @@ MAN1= rtmpdump.1 MAN3= librtmp.3 MAN8= rtmpgw.8 +OPTIONS_DEFINE= DOCS + .include <bsd.port.pre.mk> .if ${OSVERSION} < 700000 @@ -39,8 +36,8 @@ CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .endif +.if ${PORT_OPTIONS:MDOCS} post-install: -.if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif diff --git a/multimedia/rtmpdump/files/patch-librtmp-Makefile b/multimedia/rtmpdump/files/patch-librtmp-Makefile index edddc129b1a0..b5cfaabc7023 100644 --- a/multimedia/rtmpdump/files/patch-librtmp-Makefile +++ b/multimedia/rtmpdump/files/patch-librtmp-Makefile @@ -1,5 +1,5 @@ --- librtmp/Makefile.orig 2011-07-12 09:24:33.000000000 +0900 -+++ librtmp/Makefile 2012-01-20 10:06:27.000000000 +0900 ++++ librtmp/Makefile 2013-07-05 11:19:02.000000000 +0900 @@ -1,19 +1,21 @@ VERSION=v2.4 @@ -26,7 +26,7 @@ SYS=posix CRYPTO=OPENSSL -@@ -23,7 +25,7 @@ +@@ -23,13 +25,13 @@ DEF_GNUTLS=-DUSE_GNUTLS DEF_=-DNO_CRYPTO REQ_GNUTLS=gnutls @@ -35,6 +35,13 @@ LIBZ=-lz LIBS_posix= LIBS_darwin= + LIBS_mingw=-lws2_32 -lwinmm -lgdi32 + LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) +-LIB_OPENSSL=-lssl -lcrypto $(LIBZ) ++LIB_OPENSSL=-L${OPENSSLLIB} -lssl -lcrypto $(LIBZ) + LIB_POLARSSL=-lpolarssl $(LIBZ) + PRIVATE_LIBS=$(LIBS_$(SYS)) + CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS) @@ -67,7 +69,8 @@ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) |