Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Feb 2014 05:10:27 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r344161 - head/audio/hydrogen
Message-ID:  <201402140510.s1E5ARjN049345@svn.freebsd.org>

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



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