From owner-svn-ports-all@freebsd.org Sun Feb 24 12:39:26 2019 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 EC751151DCFD; Sun, 24 Feb 2019 12:39:25 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 919D46BF21; Sun, 24 Feb 2019 12:39:25 +0000 (UTC) (envelope-from danilo@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 835415449; Sun, 24 Feb 2019 12:39:25 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1OCdPP6069517; Sun, 24 Feb 2019 12:39:25 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1OCdPPU069516; Sun, 24 Feb 2019 12:39:25 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201902241239.x1OCdPPU069516@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Sun, 24 Feb 2019 12:39:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493756 - head/audio/fmit X-SVN-Group: ports-head X-SVN-Commit-Author: danilo X-SVN-Commit-Paths: head/audio/fmit X-SVN-Commit-Revision: 493756 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 919D46BF21 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.995,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Sun, 24 Feb 2019 12:39:26 -0000 Author: danilo Date: Sun Feb 24 12:39:25 2019 New Revision: 493756 URL: https://svnweb.freebsd.org/changeset/ports/493756 Log: - Fix options helpers. Should be QMAKE after the migration from cmake to qmake - Fix LICENSE While here - Use buildtools_build instead of buildtools PR: 235655 Submitted by: yuri Modified: head/audio/fmit/Makefile Modified: head/audio/fmit/Makefile ============================================================================== --- head/audio/fmit/Makefile Sun Feb 24 12:07:04 2019 (r493755) +++ head/audio/fmit/Makefile Sun Feb 24 12:39:25 2019 (r493756) @@ -4,43 +4,41 @@ PORTNAME= fmit PORTVERSION= 1.2.6 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MAINTAINER= danilo@FreeBSD.org COMMENT= Free Music Instrument Tuner -LICENSE= GPLv2 +LICENSE= GPLv2 LGPL21 +LICENSE_COMB= multi +LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING_GPL.txt +LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING_LGPL.txt LIB_DEPENDS= libfftw3.so:math/fftw3 USES= gl gnome pkgconfig qmake qt:5 tar:bzip2 -USE_QT= buildtools core gui opengl qmake_build multimedia network svg widgets +USE_QT= buildtools_build core gui opengl qmake_build multimedia network svg widgets USE_GL= gl glut -QMAKE_ARGS+= PREFIXSHORTCUT=${PREFIX} USE_GITHUB= yes GH_ACCOUNT= gillesdegottex -OPTIONS_DEFINE= ALSA JACK OSS PORTAUDIO +QMAKE_ARGS+= PREFIXSHORTCUT=${PREFIX} + +OPTIONS_DEFINE= ALSA JACK OSS PORTAUDIO OPTIONS_DEFAULT= JACK OSS -OPTIONS_SUB= yes +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_QMAKE_ON= CONFIG+=acs_alsa -ALSA_LIB_DEPENDS= libasound.so.2:audio/alsa-lib -ALSA_CMAKE_ON= -DSOUNDSYSTEM_USE_ALSA:BOOL=true -ALSA_CMAKE_OFF= -DSOUNDSYSTEM_USE_ALSA:BOOL=false +OSS_QMAKE_ON= CONFIG+=acs_oss -OSS_CMAKE_ON= -DSOUNDSYSTEM_USE_OSS:BOOL=true -OSS_CMAKE_OFF= -DSOUNDSYSTEM_USE_OSS:BOOL=false - JACK_LIB_DEPENDS= libjack.so:audio/jack -JACK_CMAKE_ON= -DSOUNDSYSTEM_USE_JACK:BOOL=true -JACK_CMAKE_OFF= -DSOUNDSYSTEM_USE_JACK:BOOL=false +JACK_QMAKE_ON= CONFIG+=acs_jack PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio -PORTAUDIO_CMAKE_ON= -DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=true -PORTAUDIO_CMAKE_OFF= -DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=false +PORTAUDIO_QMAKE_ON= CONFIG+=acs_portaudio .include