Date: Fri, 5 Jul 2013 02:42:35 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322301 - in head/multimedia/rtmpdump: . files Message-ID: <201307050242.r652gZ7Y047997@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Fri Jul 5 02:42:35 2013 New Revision: 322301 URL: http://svnweb.freebsd.org/changeset/ports/322301 Log: Fix inconsistent library dependency when OpenSSL is installed from the Ports Collection. PR: ports/180283 Modified: head/multimedia/rtmpdump/Makefile head/multimedia/rtmpdump/files/patch-librtmp-Makefile Modified: head/multimedia/rtmpdump/Makefile ============================================================================== --- head/multimedia/rtmpdump/Makefile Thu Jul 4 23:34:32 2013 (r322300) +++ head/multimedia/rtmpdump/Makefile Fri Jul 5 02:42:35 2013 (r322301) @@ -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 Modified: head/multimedia/rtmpdump/files/patch-librtmp-Makefile ============================================================================== --- head/multimedia/rtmpdump/files/patch-librtmp-Makefile Thu Jul 4 23:34:32 2013 (r322300) +++ head/multimedia/rtmpdump/files/patch-librtmp-Makefile Fri Jul 5 02:42:35 2013 (r322301) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307050242.r652gZ7Y047997>