From owner-svn-ports-head@FreeBSD.ORG Fri Mar 7 20:09:55 2014 Return-Path: Delivered-To: svn-ports-head@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 ESMTPS id CBCC5813; Fri, 7 Mar 2014 20:09:55 +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 B833796F; Fri, 7 Mar 2014 20:09:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s27K9tro022929; Fri, 7 Mar 2014 20:09:55 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s27K9tSM022927; Fri, 7 Mar 2014 20:09:55 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201403072009.s27K9tSM022927@svn.freebsd.org> From: Dmitry Marakasov Date: Fri, 7 Mar 2014 20:09:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347419 - head/audio/liblastfm 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, 07 Mar 2014 20:09:55 -0000 Author: amdmi3 Date: Fri Mar 7 20:09:55 2014 New Revision: 347419 URL: http://svnweb.freebsd.org/changeset/ports/347419 QAT: https://qat.redports.org/buildarchive/r347419/ Log: - Use new OPTIONS features - After switch to cmake, it should be MAKE_JOBS_SAFE - Remove unneeded lines Modified: head/audio/liblastfm/Makefile Modified: head/audio/liblastfm/Makefile ============================================================================== --- head/audio/liblastfm/Makefile Fri Mar 7 19:58:13 2014 (r347418) +++ head/audio/liblastfm/Makefile Fri Mar 7 20:09:55 2014 (r347419) @@ -3,7 +3,6 @@ PORTNAME= liblastfm PORTVERSION= 1.0.6 -#PORTREVISION= 0 CATEGORIES= audio MAINTAINER= ports@FreeBSD.org @@ -17,35 +16,20 @@ LIB_DEPENDS= libfftw3.so:${PORTSDIR}/mat GH_ACCOUNT= lastfm GH_COMMIT= 5826fe6 -GH_PROJECT= liblastfm -GH_TAGNAME= ${PORTVERSION} - -MAKE_JOBS_UNSAFE= yes - -OPTIONS_DEFINE= FINGERPRINT TESTS -FINGERPRINT_DESC= Build the lastfm-fingerprint library -TESTS_DESC= Build liblastfm tests -OPTIONS_DEFAULT= FINGERPRINT USES= cmake pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes USE_QT4= dbus moc_build rcc_build network qmake_build qtestlib sql xml -.include - -.if ${PORT_OPTIONS:MFINGERPRINT} -CMAKE_ARGS+= -DBUILD_FINGERPRINT:BOOL=ON -PLIST_SUB+= FINGERPRINT="" -.else -CMAKE_ARGS+= -DBUILD_FINGERPRINT:BOOL=OFF -PLIST_SUB+= FINGERPRINT="@comment " -.endif - -.if ${PORT_OPTIONS:MTESTS} -CMAKE_ARGS+= -DBUILD_TESTS:BOOL=ON -.else -CMAKE_ARGS+= -DBUILD_TESTS:BOOL=OFF -.endif +OPTIONS_DEFINE= FINGERPRINT TESTS +OPTIONS_DEFAULT= FINGERPRINT +OPTIONS_SUB= yes +FINGERPRINT_DESC= Build the lastfm-fingerprint library +FINGERPRINT_CMAKE_ON= -DBUILD_FINGERPRINT:BOOL=ON +FINGERPRINT_CMAKE_OFF= -DBUILD_FINGERPRINT:BOOL=OFF +TESTS_DESC= Build liblastfm tests +TESTS_CMAKE_ON= -DBUILD_TESTS:BOOL=ON +TESTS_CMAKE_OFF= -DBUILD_TESTS:BOOL=OFF .include