From owner-svn-ports-all@freebsd.org Thu Sep 3 08:59:18 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CFEA19C7441; Thu, 3 Sep 2015 08:59:18 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A6B45881; Thu, 3 Sep 2015 08:59:18 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t838xIvV043158; Thu, 3 Sep 2015 08:59:18 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t838xIcN043157; Thu, 3 Sep 2015 08:59:18 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201509030859.t838xIcN043157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 3 Sep 2015 08:59:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395933 - head/audio/beast 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.20 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, 03 Sep 2015 08:59:18 -0000 Author: danfe Date: Thu Sep 3 08:59:17 2015 New Revision: 395933 URL: https://svnweb.freebsd.org/changeset/ports/395933 Log: - Convert to option helpers, provide better support and defaults for SSE - Remove BROKEN on powerpc statement which is no longer true these days - Wrap overly long USES line and move OPTIONS block lower while I'm here Modified: head/audio/beast/Makefile Modified: head/audio/beast/Makefile ============================================================================== --- head/audio/beast/Makefile Thu Sep 3 08:50:29 2015 (r395932) +++ head/audio/beast/Makefile Thu Sep 3 08:59:17 2015 (r395933) @@ -18,10 +18,8 @@ LIB_DEPENDS= libasound.so:${PORTSDIR}/au libguile.so:${PORTSDIR}/lang/guile RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils -OPTIONS_DEFINE= DEBUG -OPTIONS_DEFINE_i386= SSE - -USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig shared-mime-info shebangfix tar:bzip2 +USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \ + shared-mime-info shebangfix tar:bzip2 SHEBANG_FILES= autotools/intltool-merge # Fails to build with GCC 4.9, cf. PR 196849. USE_GCC= 4.8 @@ -38,22 +36,16 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION="${PORTVERSION}" +OPTIONS_SUB= yes -DEBUG_CONFIGURE_ENABLE= debug - -.include +OPTIONS_DEFINE= DEBUG +OPTIONS_DEFINE_i386= SSE +OPTIONS_DEFINE_amd64= SSE +OPTIONS_DEFAULT_i386= ${MACHINE_CPU:Msse:tu} +OPTIONS_DEFAULT_amd64= SSE -.if ${ARCH} == "powerpc" -BROKEN= Does not compile on powerpc: array bound is not an integer constant -.endif - -.if ${PORT_OPTIONS:MSSE} || ${ARCH} == "amd64" -PLIST_SUB+= SSE="" -SSE_FLAGS= -mmmx -msse -.else -PLIST_SUB+= SSE="@comment " -SSE_FLAGS= # none -.endif +DEBUG_CONFIGURE_ENABLE= debug +SSE_VARS= SSE_FLAGS="-mmmx -msse" post-patch: @${REINPLACE_CMD} -e \ @@ -73,4 +65,4 @@ post-patch: 's|-DG_DISABLE_DEPRECATED||' ${WRKSRC}/bse/Makefile.am \ ${WRKSRC}/bse/Makefile.in -.include +.include