From owner-svn-ports-all@FreeBSD.ORG  Sun Jan 18 11:40:02 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B069A68E;
 Sun, 18 Jan 2015 11:40:02 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9B8F6E7A;
 Sun, 18 Jan 2015 11:40:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0IBe2iS080374;
 Sun, 18 Jan 2015 11:40:02 GMT (envelope-from riggs@FreeBSD.org)
Received: (from riggs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0IBe2l8080372;
 Sun, 18 Jan 2015 11:40:02 GMT (envelope-from riggs@FreeBSD.org)
Message-Id: <201501181140.t0IBe2l8080372@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: riggs set sender to
 riggs@FreeBSD.org using -f
From: Thomas Zander <riggs@FreeBSD.org>
Date: Sun, 18 Jan 2015 11:40:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r377323 - head/multimedia/mplayer
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jan 2015 11:40:02 -0000

Author: riggs
Date: Sun Jan 18 11:40:01 2015
New Revision: 377323
URL: https://svnweb.freebsd.org/changeset/ports/377323
QAT: https://qat.redports.org/buildarchive/r377323/

Log:
  Handle arch-dependent CFLAGS in Makefile.options because it
  should be included by mencoder as well.

Modified:
  head/multimedia/mplayer/Makefile
  head/multimedia/mplayer/Makefile.options

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Sun Jan 18 11:20:54 2015	(r377322)
+++ head/multimedia/mplayer/Makefile	Sun Jan 18 11:40:01 2015	(r377323)
@@ -60,10 +60,6 @@ CONFIGURE_ARGS+=	--disable-arts \
 
 .include "${.CURDIR}/Makefile.options"
 
-.if ${ARCH} == "armv6"
-CFLAGS_armv6+=	-no-integrated-as
-.endif
-
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 PLIST_SUB+=	GMPLAYER=""
 DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false

Modified: head/multimedia/mplayer/Makefile.options
==============================================================================
--- head/multimedia/mplayer/Makefile.options	Sun Jan 18 11:20:54 2015	(r377322)
+++ head/multimedia/mplayer/Makefile.options	Sun Jan 18 11:40:01 2015	(r377323)
@@ -141,6 +141,9 @@ MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bi
 .endif # ${PORT_OPTIONS:MOTCHAIN}
 .endif # defined(WITH_BASE_CLANG)
 
+.if ${ARCH} == "armv6"
+CFLAGS_armv6+=	-no-integrated-as
+.endif
 
 # Extra build options for debugging and optimised CFLAGS
 # ======================================================