Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Feb 2019 12:39:25 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r493756 - head/audio/fmit
Message-ID:  <201902241239.x1OCdPPU069516@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902241239.x1OCdPPU069516>