Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 May 2014 13:34:23 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r355514 - head/audio/ardour
Message-ID:  <201405271334.s4RDYNcP014556@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue May 27 13:34:23 2014
New Revision: 355514
URL: http://svnweb.freebsd.org/changeset/ports/355514
QAT: https://qat.redports.org/buildarchive/r355514/

Log:
  Convert to USES=scons

Modified:
  head/audio/ardour/Makefile

Modified: head/audio/ardour/Makefile
==============================================================================
--- head/audio/ardour/Makefile	Tue May 27 13:31:01 2014	(r355513)
+++ head/audio/ardour/Makefile	Tue May 27 13:34:23 2014	(r355514)
@@ -19,10 +19,8 @@ LIB_DEPENDS=	liblo.so:${PORTSDIR}/audio/
 		libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
 		libgnomecanvasmm-2.6.so:${PORTSDIR}/graphics/libgnomecanvasmm26
 
-USE_BZIP2=	yes
-USES=		gettext pkgconfig
-USE_SCONS=	yes
-SCONS_ENV+=	SYSLIBS=yes PREFIX=${PREFIX} NLS=yes
+USES=		gettext scons pkgconfig tar:bzip2
+MAKE_ARGS+=	SYSLIBS=yes PREFIX=${PREFIX} NLS=yes
 CFLAGS+=	-I${LOCALBASE}/include
 USE_GNOME=	libxslt
 USE_LDCONFIG=	${PREFIX}/lib/ardour2 ${PREFIX}/lib/ardour2/surfaces
@@ -37,7 +35,7 @@ VST_DESC=	VST plugins support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVST}
-SCONS_ENV+=	VST=yes
+ONS_ENV+=	VST=yes
 BUILD_DEPENDS+=	winegcc:${PORTSDIR}/emulators/wine \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gsed:${PORTSDIR}/textproc/gsed
@@ -54,17 +52,17 @@ PLIST_SUB+=	VST="@comment "
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math -fstrength-reduce
 .  if ${ARCH} == "amd64"
-SCONS_ENV+=	DIST_TARGET=x86_64
-SCONS_ENV+=	FPU_OPTIMIZATION=1
+MAKE_ARGS+=	DIST_TARGET=x86_64
+MAKE_ARGS+=	FPU_OPTIMIZATION=1
 .  elif ${MACHINE_CPU:Msse}
-SCONS_ENV+=	DIST_TARGET=i686
-SCONS_ENV+=	FPU_OPTIMIZATION=1
+MAKE_ARGS+=	DIST_TARGET=i686
+MAKE_ARGS+=	FPU_OPTIMIZATION=1
 .  else
-SCONS_ENV+=	DIST_TARGET=i386
-SCONS_ENV+=	FPU_OPTIMIZATION=0
+MAKE_ARGS+=	DIST_TARGET=i386
+MAKE_ARGS+=	FPU_OPTIMIZATION=0
 .  endif
 .else
-SCONS_ENV+=	FPU_OPTIMIZATION=0
+MAKE_ARGS+=	FPU_OPTIMIZATION=0
 .endif
 
 post-patch:



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