From owner-svn-ports-all@freebsd.org Sat Nov 24 12:00:57 2018 Return-Path: Delivered-To: svn-ports-all@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 53951114CAAE; Sat, 24 Nov 2018 12:00:57 +0000 (UTC) (envelope-from riggs@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 1BC2A75C66; Sat, 24 Nov 2018 12:00:57 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F10465AC0; Sat, 24 Nov 2018 12:00:56 +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 wAOC0ung035668; Sat, 24 Nov 2018 12:00:56 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAOC0uNU035667; Sat, 24 Nov 2018 12:00:56 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201811241200.wAOC0uNU035667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 24 Nov 2018 12:00:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485765 - head/multimedia/mkvtoolnix X-SVN-Group: ports-head X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: head/multimedia/mkvtoolnix X-SVN-Commit-Revision: 485765 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1BC2A75C66 X-Spamd-Result: default: False [1.81 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.64)[0.643,0]; NEURAL_SPAM_SHORT(0.46)[0.458,0]; NEURAL_SPAM_MEDIUM(0.71)[0.712,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Sat, 24 Nov 2018 12:00:57 -0000 Author: riggs Date: Sat Nov 24 12:00:56 2018 New Revision: 485765 URL: https://svnweb.freebsd.org/changeset/ports/485765 Log: Fix build on GCC-based architectures PR: 232822 Submitted by: pkubaj@anongoth.pl Reviewed by: riggs, linimon Modified: head/multimedia/mkvtoolnix/Makefile Modified: head/multimedia/mkvtoolnix/Makefile ============================================================================== --- head/multimedia/mkvtoolnix/Makefile Sat Nov 24 11:53:38 2018 (r485764) +++ head/multimedia/mkvtoolnix/Makefile Sat Nov 24 12:00:56 2018 (r485765) @@ -26,7 +26,7 @@ LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libpugixml.so:textproc/pugixml \ libmatroska.so:multimedia/libmatroska -USES= compiler:c++14-lang iconv localbase pkgconfig tar:xz +USES= compiler:c++17-lang iconv localbase pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_PO4A=no CONFIGURE_ARGS= --with-boost=${LOCALBASE} \ @@ -59,6 +59,12 @@ QT5_LIB_DEPENDS= libcmark.so:textproc/cmark MANTRANS_DESC= Build and install manpage translations MANTRANS_BUILD_DEPENDS= po4a:textproc/po4a +.include + +.if ${CHOSEN_COMPILER_TYPE} != clang +USE_CXXSTD= c++17 +.endif + post-patch: @${REINPLACE_CMD} -e '/LIBS="-lintl/s,-liconv,$$ICONV_LIBS,' \ ${WRKSRC}/configure @@ -70,4 +76,4 @@ post-configure-NLS-off: @${REINPLACE_CMD} -e 's|#define HAVE_LIBINTL_H|//#define HAVE_LIBINTL_H|g' ${WRKSRC}/config.h @${REINPLACE_CMD} -e 's|S["LIBINTL_LIBS"]=|#S["LIBINTL_LIBS"]=|g' ${WRKSRC}/config.status -.include +.include