From owner-svn-ports-head@FreeBSD.ORG Fri Feb 14 05:10:27 2014 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 ESMTPS id B0F12A7C; Fri, 14 Feb 2014 05:10:27 +0000 (UTC) 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 83D371DBB; Fri, 14 Feb 2014 05:10:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1E5ARfJ049346; Fri, 14 Feb 2014 05:10:27 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1E5ARjN049345; Fri, 14 Feb 2014 05:10:27 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201402140510.s1E5ARjN049345@svn.freebsd.org> From: Martin Wilke Date: Fri, 14 Feb 2014 05:10:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344161 - head/audio/hydrogen 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.17 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: Fri, 14 Feb 2014 05:10:27 -0000 Author: miwi Date: Fri Feb 14 05:10:27 2014 New Revision: 344161 URL: http://svnweb.freebsd.org/changeset/ports/344161 QAT: https://qat.redports.org/buildarchive/r344161/ Log: - Convert USE_SCONS to USES Modified: head/audio/hydrogen/Makefile Modified: head/audio/hydrogen/Makefile ============================================================================== --- head/audio/hydrogen/Makefile Fri Feb 14 04:36:49 2014 (r344160) +++ head/audio/hydrogen/Makefile Fri Feb 14 05:10:27 2014 (r344161) @@ -17,8 +17,7 @@ LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/ MAJORVERSION= 0.9.5 USE_QT4= corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml -USE_SCONS= yes -USES= pkgconfig +USES= pkgconfig scons OPTIONS_DEFINE= JACK ALSA PORTAUDIO LIBARCHIVE LASH OPTIONS_DEFAULT= JACK @@ -30,47 +29,47 @@ post-patch: .include -SCONS_ENV+= oss=1 +MAKE_ARGS+= oss=1 .if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -SCONS_ENV+= jack=1 +MAKE_ARGS+= jack=1 .else -SCONS_ENV+= jack=0 +MAKE_ARGS+= jack=0 .endif .if ${PORT_OPTIONS:MPORTAUDIO} LIB_DEPENDS+= libportaudio.so:${PORTSDIR}/audio/portaudio -SCONS_ENV+= portaudio=1 +MAKE_ARGS+= portaudio=1 .else -SCONS_ENV+= portaudio=0 +MAKE_ARGS+= portaudio=0 .endif .if ${PORT_OPTIONS:MLIBARCHIVE} LIB_DEPENDS+= libarchive.so:${PORTSDIR}/archivers/libarchive -SCONS_ENV+= libarchive=1 +MAKE_ARGS+= libarchive=1 .else -SCONS_ENV+= libarchive=0 +MAKE_ARGS+= libarchive=0 .endif .if ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins -SCONS_ENV+= alsa=1 +MAKE_ARGS+= alsa=1 .else -SCONS_ENV+= alsa=0 +MAKE_ARGS+= alsa=0 .endif .if ${PORT_OPTIONS:MLASH} LIB_DEPENDS+= liblash.so:${PORTSDIR}/audio/lash -SCONS_ENV+= lash=1 +MAKE_ARGS+= lash=1 .else -SCONS_ENV+= lash=0 +MAKE_ARGS+= lash=0 .endif -SCONS_ENV+= cppflags="${CXXFLAGS}" linkflags="${LINKFLAGS}" prefix="${PREFIX}" CC="${CC}" CXX="${CXX}" +MAKE_ARGS+= cppflags="${CXXFLAGS}" linkflags="${LINKFLAGS}" prefix="${PREFIX}" CC="${CC}" CXX="${CXX}" pre-install: -@${RM} -rf ${WRKSRC}/data/doc/man