From owner-svn-ports-all@freebsd.org  Fri Jan  6 10:15:51 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8DD45CA2B0C;
 Fri,  6 Jan 2017 10:15:51 +0000 (UTC)
 (envelope-from riggs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5D37A1B9A;
 Fri,  6 Jan 2017 10:15:51 +0000 (UTC)
 (envelope-from riggs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v06AFoGR021170;
 Fri, 6 Jan 2017 10:15:50 GMT (envelope-from riggs@FreeBSD.org)
Received: (from riggs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v06AFobo021169;
 Fri, 6 Jan 2017 10:15:50 GMT (envelope-from riggs@FreeBSD.org)
Message-Id: <201701061015.v06AFobo021169@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: riggs set sender to
 riggs@FreeBSD.org using -f
From: Thomas Zander <riggs@FreeBSD.org>
Date: Fri, 6 Jan 2017 10:15:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r430700 - branches/2017Q1/multimedia/livestreamer
X-SVN-Group: ports-branches
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jan 2017 10:15:51 -0000

Author: riggs
Date: Fri Jan  6 10:15:50 2017
New Revision: 430700
URL: https://svnweb.freebsd.org/changeset/ports/430700

Log:
  MFH: r430646
  
  Resolve dependency conflicts with www/py-requests; bump PORTREVISION
  
  PR:		213999
  Submitted by:	kaltheat@gmail.com
  
  Approved by:	ports-secteam (junovitch)

Modified:
  branches/2017Q1/multimedia/livestreamer/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/multimedia/livestreamer/Makefile
==============================================================================
--- branches/2017Q1/multimedia/livestreamer/Makefile	Fri Jan  6 10:13:42 2017	(r430699)
+++ branches/2017Q1/multimedia/livestreamer/Makefile	Fri Jan  6 10:15:50 2017	(r430700)
@@ -3,6 +3,7 @@
 
 PORTNAME=	livestreamer
 PORTVERSION=	1.12.2
+PORTREVISION=	1
 CATEGORIES=	multimedia python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE=	BSD2CLAUSE MIT APACHE20
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	rtmpdump:multimedia/rtmpdump \
-		${PYTHON_PKGNAMEPREFIX}requests1>=0:www/py-requests1 \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
 		${PYTHON_PKGNAMEPREFIX}futures>=0:devel/py-futures \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}librtmp>=0:multimedia/py-librtmp