From owner-svn-ports-head@freebsd.org  Thu Nov 19 10:38:22 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 DA062A339ED;
 Thu, 19 Nov 2015 10:38:22 +0000 (UTC)
 (envelope-from makc@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 A756B1F25;
 Thu, 19 Nov 2015 10:38:22 +0000 (UTC)
 (envelope-from makc@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAJAcLer002649;
 Thu, 19 Nov 2015 10:38:21 GMT (envelope-from makc@FreeBSD.org)
Received: (from makc@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAJAcLSL002648;
 Thu, 19 Nov 2015 10:38:21 GMT (envelope-from makc@FreeBSD.org)
Message-Id: <201511191038.tAJAcLSL002648@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: makc set sender to
 makc@FreeBSD.org using -f
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Thu, 19 Nov 2015 10:38:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r401926 - head/multimedia/mkvtoolnix
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Nov 2015 10:38:23 -0000

Author: makc
Date: Thu Nov 19 10:38:21 2015
New Revision: 401926
URL: https://svnweb.freebsd.org/changeset/ports/401926

Log:
  multimedia/mkvtoolnix:
  - Fix gettext detection. Building the port with NLS and without QT5 option
    reveals the problem.
  
  Reported by:	olgeni

Modified:
  head/multimedia/mkvtoolnix/Makefile

Modified: head/multimedia/mkvtoolnix/Makefile
==============================================================================
--- head/multimedia/mkvtoolnix/Makefile	Thu Nov 19 10:36:02 2015	(r401925)
+++ head/multimedia/mkvtoolnix/Makefile	Thu Nov 19 10:38:21 2015	(r401926)
@@ -59,8 +59,8 @@ MAKE_ENV+=	V=1
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 1000000
 post-patch:
+.if ${OSVERSION} < 1000000
 	@${REINPLACE_CMD} -e 's|std::llround|llround|g' \
 		${WRKSRC}/src/common/hevc.cpp \
 		${WRKSRC}/src/common/mpeg4_p10.cpp \
@@ -82,6 +82,8 @@ post-patch:
 		${WRKSRC}/src/output/p_tta.cpp \
 		${WRKSRC}/src/output/p_wavpack.cpp
 .endif
+	${REINPLACE_CMD} -e '/LIBS="-lintl/s,-liconv,$$ICONV_LIBS,' \
+		${WRKSRC}/configure
 
 post-configure-NLS-off:
 # https://github.com/mbunkus/mkvtoolnix/issues/1501