From owner-svn-ports-head@FreeBSD.ORG  Mon Oct 21 08:39:37 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B0F2431B;
 Mon, 21 Oct 2013 08:39:37 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 852F92519;
 Mon, 21 Oct 2013 08:39:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9L8dbjR047219;
 Mon, 21 Oct 2013 08:39:37 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9L8dbKN047217;
 Mon, 21 Oct 2013 08:39:37 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201310210839.r9L8dbKN047217@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 21 Oct 2013 08:39:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331102 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Oct 2013 08:39:37 -0000

Author: hrs
Date: Mon Oct 21 08:39:36 2013
New Revision: 331102
URL: http://svnweb.freebsd.org/changeset/ports/331102

Log:
  Fix a build breakage when security/openssl is installed.
  
  PR:	ports/183100, ports/183061

Modified:
  head/multimedia/rtmpdump/Makefile
  head/multimedia/rtmpdump/files/patch-Makefile

Modified: head/multimedia/rtmpdump/Makefile
==============================================================================
--- head/multimedia/rtmpdump/Makefile	Mon Oct 21 08:34:26 2013	(r331101)
+++ head/multimedia/rtmpdump/Makefile	Mon Oct 21 08:39:36 2013	(r331102)
@@ -14,17 +14,13 @@ USES=		pkgconfig
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 MAKE_ENV=	THREADLIB="${PTHREAD_LIBS}"
-CFLAGS+=	${PTHREAD_CFLAGS}
+CFLAGS+=	${PTHREAD_CFLAGS} -I${OPENSSLINC}
+LDFLAGS+=	-L${OPENSSLLIB}
 PORTDOCS=	ChangeLog README
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
-.if ${OPENSSLBASE} != "/usr"
-CFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB}
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
@@ -32,4 +28,4 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/multimedia/rtmpdump/files/patch-Makefile
==============================================================================
--- head/multimedia/rtmpdump/files/patch-Makefile	Mon Oct 21 08:34:26 2013	(r331101)
+++ head/multimedia/rtmpdump/files/patch-Makefile	Mon Oct 21 08:39:36 2013	(r331102)
@@ -1,7 +1,7 @@
---- Makefile.orig	2010-07-01 04:58:35.000000000 +0900
-+++ Makefile	2010-08-01 01:26:30.000000000 +0900
+--- Makefile.orig	2013-10-07 03:52:05.000000000 +0900
++++ Makefile	2013-10-20 14:37:46.000000000 +0900
 @@ -1,9 +1,9 @@
- VERSION=v2.3
+ VERSION=v2.4
  
 -prefix=/usr/local
 +prefix=${PREFIX}
@@ -13,7 +13,7 @@
  
  SYS=posix
  #SYS=mingw
-@@ -20,8 +20,9 @@
+@@ -21,8 +21,9 @@
  
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
  OPT=-O2
@@ -25,9 +25,9 @@
  
  bindir=$(prefix)/bin
  sbindir=$(prefix)/sbin
-@@ -37,7 +38,7 @@
- 
+@@ -41,7 +42,7 @@
  THREADLIB_posix=-lpthread
+ THREADLIB_darwin=-lpthread
  THREADLIB_mingw=
 -THREADLIB=$(THREADLIB_$(SYS))
 +THREADLIB?=$(THREADLIB_$(SYS))