From owner-svn-ports-head@freebsd.org  Wed Aug 26 06:22:27 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 84CD39BF721;
 Wed, 26 Aug 2015 06:22:27 +0000 (UTC)
 (envelope-from riggs@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 756ECB2E;
 Wed, 26 Aug 2015 06:22:27 +0000 (UTC)
 (envelope-from riggs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7Q6MRnu090974;
 Wed, 26 Aug 2015 06:22:27 GMT (envelope-from riggs@FreeBSD.org)
Received: (from riggs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7Q6MRLs090973;
 Wed, 26 Aug 2015 06:22:27 GMT (envelope-from riggs@FreeBSD.org)
Message-Id: <201508260622.t7Q6MRLs090973@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: riggs set sender to
 riggs@FreeBSD.org using -f
From: Thomas Zander <riggs@FreeBSD.org>
Date: Wed, 26 Aug 2015 06:22:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r395348 - head/multimedia/libass
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Aug 2015 06:22:27 -0000

Author: riggs
Date: Wed Aug 26 06:22:26 2015
New Revision: 395348
URL: https://svnweb.freebsd.org/changeset/ports/395348

Log:
  Convert ASM to option helpers, make ASM arch-dependent
  
  - Provide ASM option only on supported archs (i386, amd64)
  - i386: ASM is no longer default OPTION (fixes bug 252587)
  - Bump PORTREVISION
  
  PR:		202599
  Submitted by:	jbeich
  Reviewed by:	riggs

Modified:
  head/multimedia/libass/Makefile

Modified: head/multimedia/libass/Makefile
==============================================================================
--- head/multimedia/libass/Makefile	Wed Aug 26 05:07:20 2015	(r395347)
+++ head/multimedia/libass/Makefile	Wed Aug 26 06:22:26 2015	(r395348)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libass
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	multimedia devel
 
 MAINTAINER=	multimedia@FreeBSD.org
@@ -21,9 +22,14 @@ USE_LDCONFIG=	yes
 PATHFIX_MAKEFILEIN=Makefile.am
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	ASM ENCA FONTCONFIG HARFBUZZ
-OPTIONS_DEFAULT=ASM ENCA FONTCONFIG HARFBUZZ
+OPTIONS_DEFINE=	ENCA FONTCONFIG HARFBUZZ
+OPTIONS_DEFAULT=ENCA FONTCONFIG HARFBUZZ
+OPTIONS_DEFINE_amd64=	ASM
+OPTIONS_DEFINE_i386=	ASM
+OPTIONS_DEFAULT_amd64=	ASM
 
+ASM_BUILD_DEPENDS=${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
+ASM_CONFIGURE_ENABLE=asm
 ASM_DESC?=	Use optimized ASM routines on x86/amd64
 
 ENCA_LIB_DEPENDS=libenca.so:${PORTSDIR}/converters/enca
@@ -37,15 +43,4 @@ HARFBUZZ_LIB_DEPENDS=libharfbuzz.so:${PO
 HARFBUZZ_CONFIGURE_ENABLE=harfbuzz
 HARFBUZZ_DESC?=	Font shaping via HarfBuzz
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
-.if ${PORT_OPTIONS:MASM}
-CONFIGURE_ARGS+=	--enable-asm
-BUILD_DEPENDS+=	${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
-.else
-CONFIGURE_ARGS+=	--disable-asm
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>