From owner-svn-ports-branches@freebsd.org  Wed Oct 24 18:10:18 2018
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F877FFFDCE;
 Wed, 24 Oct 2018 18:10:18 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0500572C14;
 Wed, 24 Oct 2018 18:10:18 +0000 (UTC)
 (envelope-from tobik@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F3D6A2DCE4;
 Wed, 24 Oct 2018 18:10:17 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9OIAHWZ014953;
 Wed, 24 Oct 2018 18:10:17 GMT (envelope-from tobik@FreeBSD.org)
Received: (from tobik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9OIAH4X014952;
 Wed, 24 Oct 2018 18:10:17 GMT (envelope-from tobik@FreeBSD.org)
Message-Id: <201810241810.w9OIAH4X014952@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tobik set sender to
 tobik@FreeBSD.org using -f
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Wed, 24 Oct 2018 18:10:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r482930 - branches/2018Q4/multimedia/ffmpeg
X-SVN-Group: ports-branches
X-SVN-Commit-Author: tobik
X-SVN-Commit-Paths: branches/2018Q4/multimedia/ffmpeg
X-SVN-Commit-Revision: 482930
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Oct 2018 18:10:18 -0000

Author: tobik
Date: Wed Oct 24 18:10:17 2018
New Revision: 482930
URL: https://svnweb.freebsd.org/changeset/ports/482930

Log:
  MFH: r482928
  
  multimedia/ffmpeg: Do not set DATADIR twice
  
  PR:		232637
  
  Approved by:	ports-secteam blanket (avoid potential merge conflict)

Modified:
  branches/2018Q4/multimedia/ffmpeg/Makefile
Directory Properties:
  branches/2018Q4/   (props changed)

Modified: branches/2018Q4/multimedia/ffmpeg/Makefile
==============================================================================
--- branches/2018Q4/multimedia/ffmpeg/Makefile	Wed Oct 24 18:08:53 2018	(r482929)
+++ branches/2018Q4/multimedia/ffmpeg/Makefile	Wed Oct 24 18:10:17 2018	(r482930)
@@ -458,8 +458,6 @@ INSTALL_TARGET=	install-progs install-doc install-data
 		install-libs install-headers install-examples
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
-
-DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin V=1