From owner-svn-ports-all@FreeBSD.ORG Fri Jul 5 02:42:36 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2A409820; Fri, 5 Jul 2013 02:42:36 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0295E1AE0; Fri, 5 Jul 2013 02:42:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r652gZLV048003; Fri, 5 Jul 2013 02:42:35 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r652gZ7Y047997; Fri, 5 Jul 2013 02:42:35 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201307050242.r652gZ7Y047997@svn.freebsd.org> From: Hiroki Sato Date: Fri, 5 Jul 2013 02:42:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322301 - in head/multimedia/rtmpdump: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jul 2013 02:42:36 -0000 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 .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)