From owner-svn-ports-all@FreeBSD.ORG Fri Oct 4 16:57:31 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8DB0EE97; Fri, 4 Oct 2013 16:57:31 +0000 (UTC) (envelope-from bapt@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 7A5692938; Fri, 4 Oct 2013 16:57:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r94GvV0U004744; Fri, 4 Oct 2013 16:57:31 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r94GvVCE004742; Fri, 4 Oct 2013 16:57:31 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201310041657.r94GvVCE004742@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 4 Oct 2013 16:57:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329340 - head/audio/fluidsynth X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 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: Fri, 04 Oct 2013 16:57:31 -0000 Author: bapt Date: Fri Oct 4 16:57:30 2013 New Revision: 329340 URL: http://svnweb.freebsd.org/changeset/ports/329340 Log: Stagify Use options helpers Modified: head/audio/fluidsynth/Makefile head/audio/fluidsynth/pkg-plist Modified: head/audio/fluidsynth/Makefile ============================================================================== --- head/audio/fluidsynth/Makefile Fri Oct 4 16:46:10 2013 (r329339) +++ head/audio/fluidsynth/Makefile Fri Oct 4 16:57:30 2013 (r329340) @@ -15,69 +15,42 @@ OPTIONS_DEFINE= JACK ALSA DBUS LADSPA LA OPTIONS_DEFAULT= JACK USE_BZIP2= yes -NO_STAGE= yes USE_GNOME= glib20 USES= cmake pkgconfig CMAKE_ARGS= -Denable-ladcca:BOOL=FALSE \ -Denable-midishare:BOOL=FALSE USE_LDCONFIG= yes -CFLAGS+= ${PA_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= ${PA_LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -MAN1= fluidsynth.1 +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack +JACK_CMAKE_OFF= -Denable-jack:BOOL=FALSE -.include +ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib +ALSA_CMAKE_OFF= -Denable-alsa:BOOL=FALSE -.if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack -.else -CMAKE_ARGS+= -Denable-jack:BOOL=FALSE -.endif - -.if ${PORT_OPTIONS:MALSA} -LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib -.else -CMAKE_ARGS+= -Denable-alsa:BOOL=FALSE -.endif - -.if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS+= dbus-1:${PORTSDIR}/devel/dbus -.else -CMAKE_ARGS+= -Denable-dbus:BOOL=FALSE -.endif - -.if ${PORT_OPTIONS:MLADSPA} -BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa -RUN_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa -CMAKE_ARGS+= -Denable-ladspa:BOOL=TRUE -.endif - -.if ${PORT_OPTIONS:MLASH} -LIB_DEPENDS+= lash:${PORTSDIR}/audio/lash -.else -CMAKE_ARGS+= -Denable-lash:BOOL=FALSE -.endif - -.if ${PORT_OPTIONS:MPORTAUDIO} -BUILD_DEPENDS+= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2 -RUN_DEPENDS+= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2 -CMAKE_ARGS+= -Denable-portaudio:BOOL=TRUE -PA_CFLAGS= -I${LOCALBASE}/include/portaudio2 -PA_LDFLAGS= -L${LOCALBASE}/lib/portaudio2 -.endif - -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio -.else -CMAKE_ARGS+= -Denable-pulseaudio:BOOL=FALSE -.endif - -.if ${PORT_OPTIONS:MSNDFILE} -LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile -.else -CMAKE_ARGS+= -Denable-libsndfile:BOOL=FALSE -.endif +DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus +DBUS_CMAKE_OFF= -Denable-dbus:BOOL=FALSE + +LADSPA_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa +LADSPA_RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa +LADSPA_CMAKE_ON= -Denable-ladspa:BOOL=TRUE + +LASH_LIB_DEPENDS= liblash.so:${PORTSDIR}/audio/lash +LASH_CMAKE_OFF= -Denable-lash:BOOL=FALSE + +PORTAUDIO_BUILD_DEPENDS= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_RUN_DEPENDS= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_CMAKE_ON= -Denable-portaudio:BOOL=TRUE +PORTAUDIO_CFLAGS= -I${LOCALBASE}/include/portaudio2 +PORTAUDIO_LDFLAGS= -L${LOCALBASE}/lib/portaudio2 + +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CMAKE_OFF= -Denable-pulseaudio:BOOL=FALSE + +SNDFILE_LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile +SNDFILE_CMAKe_OFF= -Denable-libsndfile:BOOL=FALSE post-patch: @${REINPLACE_CMD} -e \ @@ -89,4 +62,4 @@ post-patch: @${REINPLACE_CMD} -e \ 's|share/man|man|' ${WRKSRC}/cmake_admin/DefaultDirs.cmake -.include +.include Modified: head/audio/fluidsynth/pkg-plist ============================================================================== --- head/audio/fluidsynth/pkg-plist Fri Oct 4 16:46:10 2013 (r329339) +++ head/audio/fluidsynth/pkg-plist Fri Oct 4 16:57:30 2013 (r329340) @@ -21,4 +21,5 @@ lib/libfluidsynth.so lib/libfluidsynth.so.1 lib/libfluidsynth.so.1.5.2 libdata/pkgconfig/fluidsynth.pc +man/man1/fluidsynth.1.gz @dirrm include/fluidsynth