From owner-svn-ports-head@freebsd.org Thu Sep 17 15:34:17 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 1E61B9CEDAB; Thu, 17 Sep 2015 15:34:17 +0000 (UTC) (envelope-from danfe@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 029A71E11; Thu, 17 Sep 2015 15:34:17 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8HFYGX9054000; Thu, 17 Sep 2015 15:34:16 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8HFYFTh053995; Thu, 17 Sep 2015 15:34:15 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201509171534.t8HFYFTh053995@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 17 Sep 2015 15:34:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397119 - in head/audio/flacon: . files 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, 17 Sep 2015 15:34:17 -0000 Author: danfe Date: Thu Sep 17 15:34:14 2015 New Revision: 397119 URL: https://svnweb.freebsd.org/changeset/ports/397119 Log: - Update to version 1.2.0 - Allow to build against Qt 5 instead of Qt 4 (off by default) - Add missing `desktop-file-utils' to USES as suggested by `stage-qa' - Remove INSTALLS_ICONS knob (not to be used for Qt-based programs) - Fix a typo and rephrase pkg-message text while I am at it Modified: head/audio/flacon/Makefile head/audio/flacon/distinfo head/audio/flacon/files/patch-CMakeLists.txt head/audio/flacon/pkg-message head/audio/flacon/pkg-plist Modified: head/audio/flacon/Makefile ============================================================================== --- head/audio/flacon/Makefile Thu Sep 17 15:26:27 2015 (r397118) +++ head/audio/flacon/Makefile Thu Sep 17 15:34:14 2015 (r397119) @@ -3,7 +3,7 @@ PORTNAME= flacon DISTVERSIONPREFIX= v -DISTVERSION= 1.0.1 +DISTVERSION= 1.2.0 CATEGORIES= audio MAINTAINER= danfe@FreeBSD.org @@ -15,9 +15,19 @@ LIB_DEPENDS= libuchardet.so:${PORTSDIR}/ USE_GITHUB= yes -USES= cmake pkgconfig -USE_QT4= gui network \ - linguisttools_build moc_build qmake_build rcc_build uic_build -INSTALLS_ICONS= yes +USES= cmake desktop-file-utils pkgconfig + +OPTIONS_DEFINE= QT5 +QT5_DESC= Build against Qt 5 instead of Qt 4 + +QT5_CMAKE_ARGS= -DUSE_QT5:BOOL=ON +# :ts, would be handy here but is not available in fmake(1) +QT5_USE= QT5=${_QT5_DEPS},${_QT5_BDEPS:C/,/_build&/g:%=_build} +QT5_USE_OFF= QT4=${_QT4_DEPS},${_QT4_BDEPS:C/,/_build&/g:%=_build} + +_QT4_DEPS= gui,network +_QT4_BDEPS= linguisttools,moc,qmake,rcc,uic +_QT5_DEPS= gui,network,widgets +_QT5_BDEPS= qmake,buildtools,linguisttools .include Modified: head/audio/flacon/distinfo ============================================================================== --- head/audio/flacon/distinfo Thu Sep 17 15:26:27 2015 (r397118) +++ head/audio/flacon/distinfo Thu Sep 17 15:34:14 2015 (r397119) @@ -1,2 +1,2 @@ -SHA256 (flacon-flacon-v1.0.1_GH0.tar.gz) = 6a10ddf20d767aeb3ce0d6187f5b85c1a1cf64bfc42a0f827e0d5bd88b78977f -SIZE (flacon-flacon-v1.0.1_GH0.tar.gz) = 245710 +SHA256 (flacon-flacon-v1.2.0_GH0.tar.gz) = 2ebc83d733ea6d50f2bd4ad8c20c65368be5eaf351e0195c9b4d47a54957b8f8 +SIZE (flacon-flacon-v1.2.0_GH0.tar.gz) = 283187 Modified: head/audio/flacon/files/patch-CMakeLists.txt ============================================================================== --- head/audio/flacon/files/patch-CMakeLists.txt Thu Sep 17 15:26:27 2015 (r397118) +++ head/audio/flacon/files/patch-CMakeLists.txt Thu Sep 17 15:34:14 2015 (r397119) @@ -1,14 +1,6 @@ ---- CMakeLists.txt.orig 2014-08-19 17:05:30 UTC +--- CMakeLists.txt.orig 2015-09-04 19:04:20 UTC +++ CMakeLists.txt -@@ -204,6 +204,7 @@ include(translations/translatorsinfo.cma - create_translatorsinfo_qrc(TRANSLATORS_INFO_QRC translations) - set(LIBRARIES ${LIBRARIES} ${UCHARDET_LIBRARIES}) - include_directories(${UCHARDET_INCLUDE_DIRS}) -+link_directories(${UCHARDET_LIBRARY_DIRS}) - - - add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QM_FILES} ${QRC_SOURCES} ${UI_HEADERS} ${ENGINES_CPP} ${ENGINES_H} ${TRANSLATORS_INFO_QRC}) -@@ -271,7 +272,7 @@ configure_file( +@@ -348,7 +348,7 @@ configure_file( add_custom_command(TARGET ${PROJECT_NAME} COMMAND gzip -c ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 > ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz ) Modified: head/audio/flacon/pkg-message ============================================================================== --- head/audio/flacon/pkg-message Thu Sep 17 15:26:27 2015 (r397118) +++ head/audio/flacon/pkg-message Thu Sep 17 15:34:14 2015 (r397119) @@ -1,7 +1,8 @@ Flacon uses external programs to perform audio conversion. Install - them manually, depending on your needs, from the following ports: + them manually, depending on your needs, from the following ports or + corresponding packages: - autio/faac audio/flac + audio/faac audio/flac audio/lame audio/mac audio/mp3gain audio/shntool audio/tta audio/vorbisgain Modified: head/audio/flacon/pkg-plist ============================================================================== --- head/audio/flacon/pkg-plist Thu Sep 17 15:26:27 2015 (r397118) +++ head/audio/flacon/pkg-plist Thu Sep 17 15:34:14 2015 (r397119) @@ -13,11 +13,16 @@ share/icons/hicolor/48x48/apps/flacon.pn %%DATADIR%%/translations/flacon_gl.qm %%DATADIR%%/translations/flacon_hu.qm %%DATADIR%%/translations/flacon_it.qm +%%DATADIR%%/translations/flacon_ja_JP.qm +%%DATADIR%%/translations/flacon_lt.qm %%DATADIR%%/translations/flacon_pl.qm %%DATADIR%%/translations/flacon_pl_PL.qm %%DATADIR%%/translations/flacon_pt_BR.qm %%DATADIR%%/translations/flacon_pt_PT.qm +%%DATADIR%%/translations/flacon_ro_RO.qm %%DATADIR%%/translations/flacon_ru.qm +%%DATADIR%%/translations/flacon_sr.qm +%%DATADIR%%/translations/flacon_tr.qm %%DATADIR%%/translations/flacon_uk.qm %%DATADIR%%/translations/flacon_zh_CN.qm %%DATADIR%%/translations/flacon_zh_TW.qm