From owner-svn-ports-head@freebsd.org Thu Aug 13 15:07:13 2015 Return-Path: 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 563FF9A06A6; Thu, 13 Aug 2015 15:07:13 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 37FFD2D9; Thu, 13 Aug 2015 15:07:13 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7DF7Dkt080604; Thu, 13 Aug 2015 15:07:13 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7DF7CO0080602; Thu, 13 Aug 2015 15:07:12 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201508131507.t7DF7CO0080602@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Thu, 13 Aug 2015 15:07:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394068 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Aug 2015 15:07:13 -0000 Author: ehaupt Date: Thu Aug 13 15:07:12 2015 New Revision: 394068 URL: https://svnweb.freebsd.org/changeset/ports/394068 Log: Introduce an option to build the new Qt5 based GUI. The Qt5 version will replace the now deprecated WXGTK version in the future. If you're currently launching 'mmg' (the WXGTK GUI) you will get the following notification: Please note that this program (mkvmerge GUI) is deprecated and will be removed within one or two releases. It has been superseded by the new MKVToolNix GUI which should also be included in the same package. Don't enable this option by default to give current users a notice that future updates will pull in the Qt5 dependency chain by default. However, users are encouraged to try the Qt5 version and report bugs. This new option does not change the current default build of the port and therefore no PORTREVISION bump is required. Modified: head/multimedia/mkvtoolnix/Makefile head/multimedia/mkvtoolnix/pkg-plist Modified: head/multimedia/mkvtoolnix/Makefile ============================================================================== --- head/multimedia/mkvtoolnix/Makefile Thu Aug 13 15:02:37 2015 (r394067) +++ head/multimedia/mkvtoolnix/Makefile Thu Aug 13 15:07:12 2015 (r394068) @@ -26,14 +26,12 @@ RUBY_NO_RUN_DEPENDS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= ac_cv_path_PO4A=no ZLIB_CFLAGS=-I/usr/include ZLIB_LIBS=-lz -CONFIGURE_ARGS= --disable-qt \ - --with-boost=${LOCALBASE} \ +CONFIGURE_ARGS= --with-boost=${LOCALBASE} \ --with-boost-filesystem=boost_filesystem \ --with-boost-system=boost_system \ - --with-boost-regex=boost_regex \ - --without-curl + --with-boost-regex=boost_regex -OPTIONS_DEFINE= WXGTK FLAC +OPTIONS_DEFINE= WXGTK FLAC QT5 OPTIONS_DEFAULT=WXGTK FLAC BROKEN_sparc64= Does not install on sparc64 @@ -58,6 +56,14 @@ MAKE_ENV+= V=1 INSTALLS_ICONS= yes .endif +.if ${PORT_OPTIONS:MQT5} +USE_QT5= buildtools core widgets quick +LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl +CONFIGURE_ARGS+= --enable-qt --with-curl +.else +CONFIGURE_ARGS+= --disable-qt --without-curl +.endif + .if ${OSVERSION} < 1000000 post-patch: @${REINPLACE_CMD} -e 's|std::llround|llround|g' \ Modified: head/multimedia/mkvtoolnix/pkg-plist ============================================================================== --- head/multimedia/mkvtoolnix/pkg-plist Thu Aug 13 15:02:37 2015 (r394067) +++ head/multimedia/mkvtoolnix/pkg-plist Thu Aug 13 15:07:12 2015 (r394068) @@ -1,3 +1,12 @@ +%%QT5%%bin/mkvtoolnix-gui +%%QT5%%man/de/man1/mkvtoolnix-gui.1.gz +%%QT5%%man/es/man1/mkvtoolnix-gui.1.gz +%%QT5%%man/ja/man1/mkvtoolnix-gui.1.gz +%%QT5%%man/man1/mkvtoolnix-gui.1.gz +%%QT5%%man/nl/man1/mkvtoolnix-gui.1.gz +%%QT5%%man/uk/man1/mkvtoolnix-gui.1.gz +%%QT5%%man/zh_CN/man1/mkvtoolnix-gui.1.gz +%%QT5%%share/applications/mkvtoolnix-gui.desktop %%WXGTK%%%%DOCSDIR%%/guide/en/images/addingremovingattachments.gif %%WXGTK%%%%DOCSDIR%%/guide/en/images/addremovefiles.gif %%WXGTK%%%%DOCSDIR%%/guide/en/images/attachmentoptions.gif