Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Sep 2015 08:59:18 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r395933 - head/audio/beast
Message-ID:  <201509030859.t838xIcN043157@repo.freebsd.org>

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



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