From owner-svn-ports-all@FreeBSD.ORG Thu Feb 13 14:13:49 2014 Return-Path: Delivered-To: svn-ports-all@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 E7213CC2; Thu, 13 Feb 2014 14:13:49 +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 B8BB11821; Thu, 13 Feb 2014 14:13:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DEDn7s096822; Thu, 13 Feb 2014 14:13:49 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DEDnBT096821; Thu, 13 Feb 2014 14:13:49 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201402131413.s1DEDnBT096821@svn.freebsd.org> From: Martin Wilke Date: Thu, 13 Feb 2014 14:13:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344116 - head/net-p2p/museekplus 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.17 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: Thu, 13 Feb 2014 14:13:50 -0000 Author: miwi Date: Thu Feb 13 14:13:49 2014 New Revision: 344116 URL: http://svnweb.freebsd.org/changeset/ports/344116 QAT: https://qat.redports.org/buildarchive/r344116/ Log: - Convert USE_SCONS to USES Modified: head/net-p2p/museekplus/Makefile Modified: head/net-p2p/museekplus/Makefile ============================================================================== --- head/net-p2p/museekplus/Makefile Thu Feb 13 14:12:50 2014 (r344115) +++ head/net-p2p/museekplus/Makefile Thu Feb 13 14:13:49 2014 (r344116) @@ -14,11 +14,10 @@ COMMENT= SoulSeek client with separate t LIB_DEPENDS= xml\\+\\+:${PORTSDIR}/textproc/libxml++26 BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 -USES= fam pkgconfig +USES= fam pkgconfig scons USE_BZIP2= yes -USE_SCONS= yes -SCONS_ARGS= QTDIR=${QT_PREFIX} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes +MAKE_ARGS+= QTDIR=${QT_PREFIX} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes DATADIR= share/museek MAN1= musetup.1 mulog.1 museekcontrol.1 muscan.1 muscand.1 museekd.1 @@ -36,55 +35,55 @@ NO_STAGE= yes USE_PYTHON= yes .endif -SCONS_ARGS+= MUSEEQ=no +MAKE_ARGS+= MUSEEQ=no PLIST_SUB+= MUSEEQ="@comment " -SCONS_ARGS+= QSA=no +MAKE_ARGS+= QSA=no .if ${PORT_OPTIONS:MVORBIS} -SCONS_ARGS+= VORBIS=yes +MAKE_ARGS+= VORBIS=yes LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis .else -SCONS_ARGS+= VORBIS=no +MAKE_ARGS+= VORBIS=no .endif .if ${PORT_OPTIONS:MMUSETUPGTK} -SCONS_ARGS+= MUSETUPGTK=yes +MAKE_ARGS+= MUSETUPGTK=yes MAN1+= musetup-gtk.1 PLIST_SUB+= MUSETUPGTK="" .else -SCONS_ARGS+= MUSETUPGTK=no +MAKE_ARGS+= MUSETUPGTK=no PLIST_SUB+= MUSETUPGTK="@comment " .endif .if ${PORT_OPTIONS:MPYMUCIPHER} -SCONS_ARGS+= PYMUCIPHER=yes +MAKE_ARGS+= PYMUCIPHER=yes PLIST_SUB+= PYMUCIPHER="" .else -SCONS_ARGS+= PYMUCIPHER=no +MAKE_ARGS+= PYMUCIPHER=no PLIST_SUB+= PYMUCIPHER="@comment " .endif .if ${PORT_OPTIONS:MMURMUR} -SCONS_ARGS+= MURMUR=yes +MAKE_ARGS+= MURMUR=yes MAN1+= murmur.1 PLIST_SUB+= MURMUR="" .else -SCONS_ARGS+= MURMUR=no +MAKE_ARGS+= MURMUR=no PLIST_SUB+= MURMUR="@comment " .endif .if ${PORT_OPTIONS:MMUCOUS} -SCONS_ARGS+= MUCOUS=yes +MAKE_ARGS+= MUCOUS=yes MAN1+= mucous.1 PLIST_SUB+= MUCOUS="" .else -SCONS_ARGS+= MUCOUS=no +MAKE_ARGS+= MUCOUS=no PLIST_SUB+= MUCOUS="@comment " .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -SCONS_ARGS+= RELEASE=yes +MAKE_ARGS+= RELEASE=yes .else -SCONS_ARGS+= RELEASE=no +MAKE_ARGS+= RELEASE=no .endif .if ${PORT_OPTIONS:MDEBUG} -SCONS_ARGS+= MULOG="cycle,debug" +MAKE_ARGS+= MULOG="cycle,debug" .endif post-patch: