Index: head/multimedia/libass/Makefile
===================================================================
--- head/multimedia/libass/Makefile	(revision 395347)
+++ head/multimedia/libass/Makefile	(revision 395348)
@@ -1,51 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	libass
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	multimedia devel
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Portable ASS/SSA subtitle renderer
 
 LICENSE=	ISCL
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libfribidi.so:${PORTSDIR}/converters/fribidi
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}
 
 USES=		autoreconf iconv libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 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
 ENCA_CONFIGURE_ENABLE=enca
 ENCA_DESC?=	Charset conversion via enca
 
 FONTCONFIG_LIB_DEPENDS=libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_ENABLE=fontconfig
 
 HARFBUZZ_LIB_DEPENDS=libharfbuzz.so:${PORTSDIR}/print/harfbuzz
 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>