From owner-svn-ports-head@FreeBSD.ORG Sat Oct 26 07:55:23 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 10EDCAA4; Sat, 26 Oct 2013 07:55:23 +0000 (UTC) (envelope-from nemysis@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D86402E31; Sat, 26 Oct 2013 07:55:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9Q7tMcI064816; Sat, 26 Oct 2013 07:55:22 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9Q7tMoS064815; Sat, 26 Oct 2013 07:55:22 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201310260755.r9Q7tMoS064815@svn.freebsd.org> From: Rusmir Dusko Date: Sat, 26 Oct 2013 07:55:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331657 - head/audio/fmit 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.14 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: Sat, 26 Oct 2013 07:55:23 -0000 Author: nemysis Date: Sat Oct 26 07:55:22 2013 New Revision: 331657 URL: http://svnweb.freebsd.org/changeset/ports/331657 Log: - Bump PORTREVISION for dependency change - Fix portaudio2 dependency due to recent commit - Support STAGEDIR and add OPTIONS_SUB Approved by: pawel / wg (mentors, implicit) Modified: head/audio/fmit/Makefile Modified: head/audio/fmit/Makefile ============================================================================== --- head/audio/fmit/Makefile Sat Oct 26 07:52:07 2013 (r331656) +++ head/audio/fmit/Makefile Sat Oct 26 07:55:22 2013 (r331657) @@ -3,7 +3,7 @@ PORTNAME= fmit PORTVERSION= 0.99.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://download.gna.org/fmit/ DISTNAME= ${PORTNAME}-${PORTVERSION}-Source @@ -15,11 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 -OPTIONS_DEFINE= OSS ALSA PORTAUDIO JACK -OPTIONS_DEFAULT= OSS JACK - USE_BZIP2= yes -NO_STAGE= yes USE_XORG= xmu USE_QT4= corelib gui opengl \ linguist_build moc_build qmake_build rcc_build uic_build @@ -27,34 +23,25 @@ USE_GL= glut USES= cmake INSTALLS_ICONS= yes -.include +OPTIONS_DEFINE= ALSA JACK OSS PORTAUDIO +OPTIONS_DEFAULT= JACK OSS + +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MOSS} -CMAKE_ARGS+= -DSOUNDSYSTEM_USE_OSS:BOOL=true -.else -CMAKE_ARGS+= -DSOUNDSYSTEM_USE_OSS:BOOL=false -.endif - -.if ${PORT_OPTIONS:MALSA} -LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib -CMAKE_ARGS+= -DSOUNDSYSTEM_USE_ALSA:BOOL=true -.else -CMAKE_ARGS+= -DSOUNDSYSTEM_USE_ALSA:BOOL=false -.endif - -.if ${PORT_OPTIONS:MPORTAUDIO} -BUILD_DEPENDS+= portaudio>=19:${PORTSDIR}/audio/portaudio2 -RUN_DEPENDS+= portaudio>=19:${PORTSDIR}/audio/portaudio2 -CMAKE_ARGS+= -DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=true -.else -CMAKE_ARGS+= -DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=false -.endif - -.if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack -CMAKE_ARGS+= -DSOUNDSYSTEM_USE_JACK:BOOL=true -.else -CMAKE_ARGS+= -DSOUNDSYSTEM_USE_JACK:BOOL=false -.endif +ALSA_LIB_DEPENDS= libasound.so.2:${PORTSDIR}/audio/alsa-lib +ALSA_CMAKE_ON= -DSOUNDSYSTEM_USE_ALSA:BOOL=true +ALSA_CMAKE_OFF= -DSOUNDSYSTEM_USE_ALSA:BOOL=false + +OSS_CMAKE_ON= -DSOUNDSYSTEM_USE_OSS:BOOL=true +OSS_CMAKE_OFF= -DSOUNDSYSTEM_USE_OSS:BOOL=false + +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack +JACK_CMAKE_ON= -DSOUNDSYSTEM_USE_JACK:BOOL=true +JACK_CMAKE_OFF= -DSOUNDSYSTEM_USE_JACK:BOOL=false + +PORTAUDIO_BUILD_DEPENDS= portaudio2>=0:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_RUN_DEPENDS= portaudio2>=0:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_CMAKE_ON= -DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=true +PORTAUDIO_CMAKE_OFF= -DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=false .include